← Back to branch summary

~ubuntu-branches/debian/squeeze/smplayer/squeeze

« back to all changes in this revision

Viewing changes to src/mplayerwindow.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Breuil Cyril
  • Date: 2007-06-24 16:35:29 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20070624163529-hhckbmd24uicada7
Tags: 0.5.20-0ubuntu1
* New upstream release
* Change Maintainer Email

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mplayerwindow.cpp
32
32
#include <qpainter.h>
33
33
 
34
34
Screen::Screen(QWidget* parent, const char* name, WFlags fl) 
 
35
#if USE_GL_WIDGET
 
36
        : QGLWidget(parent, name, 0, fl | Qt::WStaticContents | Qt::WNoAutoErase) 
 
37
#else
35
38
        : QWidget(parent, name, fl | Qt::WStaticContents | Qt::WNoAutoErase) 
 
39
#endif
36
40
{
37
41
        setMouseTracking(TRUE);
38
42
        setFocusPolicy( NOFOCUS );
133
137
        #if QT_VERSION >= 0x040000
134
138
        mplayerlayer->setAutoFillBackground(TRUE);
135
139
        #endif
136
 
        mplayerlayer->setBackgroundColor( COLORKEY );
 
140
        //mplayerlayer->setBackgroundColor( COLORKEY );
 
141
        //setColorKey( COLORKEY );
137
142
 
138
143
        logo = new QLabel( mplayerlayer, "logo" );
139
144
        #if QT_VERSION >= 0x040000
159
164
MplayerWindow::~MplayerWindow() {
160
165
}
161
166
 
 
167
void MplayerWindow::setColorKey( QColor c ) {
 
168
        mplayerlayer->setBackgroundColor( c );
 
169
}
 
170
 
162
171
void MplayerWindow::languageChange() {
163
172
        qDebug("MplayerWindow::languageChange");
164
173
 
220
229
void MplayerWindow::setAspect( double asp) {
221
230
    aspect = asp;
222
231
        if (monitoraspect!=0) {
223
 
                aspect = aspect / monitoraspect * desktop_aspectRatio();
 
232
                aspect = aspect / monitoraspect * DesktopInfo::desktop_aspectRatio(this);
224
233
        }
225
234
        updateVideoWindow();
226
235
}