fix crash #1408

1 files changed, 79 insertions, 79 deletions

diff --git a/core/multimedia/opieplayer/videowidget.cpp b/core/multimedia/opieplayer/videowidget.cpp
index e851044..2396ed5 100644
--- a/core/multimedia/opieplayer/videowidget.cpp
+++ b/core/multimedia/opieplayer/videowidget.cpp
@@ -45,150 +45,147 @@ extern MediaPlayerState *mediaPlayerState;
 
 static const int xo = 2; // movable x offset
 static const int yo = 0; // movable y offset
 
 
 struct MediaButton {
 //     int  xPos, yPos;
    bool isToggle, isHeld, isDown;
 //     int  controlType;
 };
 
 
 // Layout information for the videoButtons (and if it is a toggle button or not)
 MediaButton videoButtons[] = {
    { FALSE, FALSE, FALSE }, // stop
    { FALSE, FALSE, FALSE }, // play
    { FALSE, FALSE, FALSE }, // previous
    { FALSE, FALSE, FALSE }, // next
    { FALSE, FALSE, FALSE }, // volUp
    { FALSE, FALSE, FALSE }, // volDown
    { TRUE, FALSE, FALSE }  // fullscreen
 };
 
 //static const int numButtons = (sizeof(videoButtons)/sizeof(MediaButton));
 
 const char *skinV_mask_file_names[7] = {
    "stop","play","back","fwd","up","down","full"
 };
 
 static const int numVButtons = (sizeof(videoButtons)/sizeof(MediaButton));
 
 VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) :
-   QWidget( parent, name, f ), scaledWidth( 0 ), scaledHeight( 0 )
+				QWidget( parent, name, f ), scaledWidth( 0 ), scaledHeight( 0 )
 {
-   setCaption( tr("OpiePlayer") );
-   Config cfg("OpiePlayer");
+		setCaption( tr("OpiePlayer") );
+		Config cfg("OpiePlayer");
 
-   cfg.setGroup("Options");
-   skin = cfg.readEntry("Skin","default");
+		cfg.setGroup("Options");
+		skin = cfg.readEntry("Skin","default");
 
-   QString skinPath;
-   skinPath = "opieplayer2/skins/" + skin;
+		QString skinPath;
+		skinPath = "opieplayer2/skins/" + skin;
     if(!QDir(QString(getenv("OPIEDIR")) +"/pics/"+skinPath).exists())
-      skinPath = "opieplayer2/skins/default";
+				skinPath = "opieplayer2/skins/default";
 
-    //   odebug << "skin path " + skinPath << oendl;
 
 //     QString skinPath = "opieplayer2/skins/" + skin;
 
-   pixBg = new QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) );
-   imgUp = new QImage( Resource::loadImage( QString("%1/skinV_up").arg(skinPath) ) );
-   imgDn = new QImage( Resource::loadImage( QString("%1/skinV_down").arg(skinPath) ) );
-
-   imgButtonMask = new QImage( imgUp->width(), imgUp->height(), 8, 255 );
-   imgButtonMask->fill( 0 );
-
-   for ( int i = 0; i < 7; i++ ) {
-      QString filename = QString( QPEApplication::qpeDir() + "/pics/" + skinPath +
-                                  "/skinV_mask_" + skinV_mask_file_names[i] + ".png" );
-      //      odebug << "loading "+filename << oendl;
-      masks[i] = new QBitmap( filename );
-
-      if ( !masks[i]->isNull() ) {
-         QImage imgMask = masks[i]->convertToImage();
-         uchar **dest = imgButtonMask->jumpTable();
-         for ( int y = 0; y < imgUp->height(); y++ ) {
-            uchar *line = dest[y];
-            for ( int x = 0; x < imgUp->width(); x++ ) {
-               if ( !qRed( imgMask.pixel( x, y ) ) )
-                  line[x] = i + 1;
-            }
-         }
-      }
-   }
-   //   odebug << "finished loading first pics" << oendl;
-   for ( int i = 0; i < 7; i++ ) {
-      buttonPixUp[i] = NULL;
-      buttonPixDown[i] = NULL;
-   }
-
-
-        QWidget *d = QApplication::desktop();
-        int width = d->width();
-        int height = d->height();
-
-    if( (width != pixBg->width() ) || (height != pixBg->height() ) ) {
-//              odebug << "<<<<<<<< scale image >>>>>>>>>>>>" << oendl;
-                QImage img;
-                img = pixBg->convertToImage();
-                pixBg->convertFromImage( img.smoothScale( width, height));
-        }
-   setBackgroundPixmap( *pixBg );
-
-   currentFrame = new QImage( 220 + 2, 160, (QPixmap::defaultDepth() == 16) ? 16 : 32 );
-
-   slider = new QSlider( Qt::Horizontal, this );
-   slider->setMinValue( 0 );
-   slider->setMaxValue( 1 );
-   slider->setBackgroundPixmap( Resource::loadPixmap( backgroundPix ) );
-   slider->setFocusPolicy( QWidget::NoFocus );
+		pixBg = new QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) );
+		imgUp = new QImage( Resource::loadImage( QString("%1/skinV_up").arg(skinPath) ) );
+		imgDn = new QImage( Resource::loadImage( QString("%1/skinV_down").arg(skinPath) ) );
+
+		imgButtonMask = new QImage( imgUp->width(), imgUp->height(), 8, 255 );
+		imgButtonMask->fill( 0 );
+
+		for ( int i = 0; i < 7; i++ ) {
+				QString filename = QString( QPEApplication::qpeDir() + "/pics/" + skinPath +
+																		"/skinV_mask_" + skinV_mask_file_names[i] + ".png" );
+					//      odebug << "loading "+filename << oendl;
+				masks[i] = new QBitmap( filename );
+
+				if ( !masks[i]->isNull() ) {
+						QImage imgMask = masks[i]->convertToImage();
+						uchar **dest = imgButtonMask->jumpTable();
+						for ( int y = 0; y < imgUp->height(); y++ ) {
+								uchar *line = dest[y];
+								for ( int x = 0; x < imgUp->width(); x++ ) {
+										if ( !qRed( imgMask.pixel( x, y ) ) )
+												line[x] = i + 1;
+								}
+						}
+				}
+		}
+		for ( int i = 0; i < 7; i++ ) {
+				buttonPixUp[i] = NULL;
+				buttonPixDown[i] = NULL;
+		}
+
+		QWidget *d = QApplication::desktop();
+		int width = d->width();
+		int height = d->height();
+
+		if( (width != pixBg->width() ) || (height != pixBg->height() ) ) {
+				QImage img;
+				img = pixBg->convertToImage();
+				pixBg->convertFromImage( img.smoothScale( width, height));
+		}
+				
+		setBackgroundPixmap( *pixBg );
+		currentFrame = new QImage( 220 + 2, 160, (QPixmap::defaultDepth() == 16) ? 16 : 32 );
+		slider = new QSlider( Qt::Horizontal, this );
+		slider->setMinValue( 0 );
+		slider->setMaxValue( 1 );
+
+		slider->setBackgroundPixmap( *pixBg );
+		slider->setFocusPolicy( QWidget::NoFocus );
 //    slider->setGeometry( QRect( 7, 250, 220, 20 ) );
 
-   connect( slider,         SIGNAL( sliderPressed() ),      this, SLOT( sliderPressed() ) );
-   connect( slider,         SIGNAL( sliderReleased() ),     this, SLOT( sliderReleased() ) );
+		connect(slider,SIGNAL(sliderPressed()),this,SLOT(sliderPressed()));
+		connect(slider,SIGNAL(sliderReleased()),this,SLOT(sliderReleased()));
 
-   connect( mediaPlayerState, SIGNAL( lengthChanged(long) ),  this, SLOT( setLength(long) ) );
-   connect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) );
-   connect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) );
-   connect( mediaPlayerState, SIGNAL( viewChanged(char) ),    this, SLOT( setView(char) ) );
+		connect(mediaPlayerState,SIGNAL(lengthChanged(long)),this,SLOT(setLength(long)));
+		connect(mediaPlayerState,SIGNAL(positionChanged(long)),this,SLOT(setPosition(long)));
+		connect(mediaPlayerState,SIGNAL(positionUpdated(long)),this,SLOT(setPosition(long)));
+		connect(mediaPlayerState,SIGNAL(viewChanged(char)),this,SLOT(setView(char)));
 //   connect( mediaPlayerState, SIGNAL( pausedToggled(bool) ),  this, SLOT( setPaused(bool) ) );
-   connect( mediaPlayerState, SIGNAL( playingToggled(bool) ), this, SLOT( setPlaying(bool) ) );
-
-   // Intialise state
-   setLength( mediaPlayerState->length() );
-   setPosition( mediaPlayerState->position() );
-   setFullscreen( mediaPlayerState->fullscreen() );
-//   setPaused( mediaPlayerState->paused() );
-   setPlaying( mediaPlayerState->playing() );
+		connect(mediaPlayerState,SIGNAL(playingToggled(bool)),this,SLOT(setPlaying(bool)));
+
+			// Intialise state
+		setLength( mediaPlayerState->length() );
+		setPosition( mediaPlayerState->position() );
+		setFullscreen( mediaPlayerState->fullscreen() );
+//   setPlaying( mediaPlayerState->playing() );
+// 		if(this->x() < 0 || this->y() < 0)
+// 			this->move(0,0);
 }
 
 
 VideoWidget::~VideoWidget() {
 
    for ( int i = 0; i < 7; i++ )
    {
       delete buttonPixUp[i];
       delete buttonPixDown[i];
    }
 
    delete pixBg;
    delete imgUp;
    delete imgDn;
    delete imgButtonMask;
    for ( int i = 0; i < 7; i++ )
    {
       delete masks[i];
    }
 
 //     for ( int i = 0; i < 3; i++ )
 //   delete pixmaps[i];
 //     delete currentFrame;
 }
 
 
 static bool videoSliderBeingMoved = FALSE;
 
 QPixmap *combineVImageWithBackground( QImage img, QPixmap bg, QPoint offset ) {
    QPixmap pix( img.width(), img.height() );
    QPainter p( &pix );
    p.drawTiledPixmap( pix.rect(), bg, offset );
@@ -443,120 +440,123 @@ void VideoWidget::paintEvent( QPaintEvent * pe) {
          p.drawTiledPixmap( pe->rect(), *pixBg, pe->rect().topLeft() );
          for ( int i = 0; i < numVButtons; i++ ) {
             paintButton( &p, i );
          }
          QPainter p2( this );
          p2.drawPixmap( pe->rect().topLeft(), pix );
       } else {
          QPainter p( this );
          for ( int i = 0; i < numVButtons; i++ )
             paintButton( &p, i );
       }
       slider->repaint( TRUE );
    }
 }
 
 
 void VideoWidget::closeEvent( QCloseEvent* ) {
    mediaPlayerState->setList();
 }
 
 
 bool VideoWidget::playVideo() {
    bool result = FALSE;
 //   odebug << "<<<<<<<<<<<<<<<< play video" << oendl;
    int stream = 0;
 
    int sw = mediaPlayerState->curDecoder()->videoWidth( stream );
    int sh = mediaPlayerState->curDecoder()->videoHeight( stream );
    int dd = QPixmap::defaultDepth();
    int w = height();
    int h = width();
 
+	 QWidget *d = QApplication::desktop();
+    int d_width = d->width();
+    int d_height = d->height();
+
    ColorFormat format = (dd == 16) ? RGB565 : BGRA8888;
 
    if ( mediaPlayerState->fullscreen() )
    {
 #ifdef USE_DIRECT_PAINTER
       QDirectPainter p(this);
 
       if ( ( qt_screen->transformOrientation() == 3 ) &&
            ( ( dd == 16 ) || ( dd == 32 ) ) && ( p.numRects() == 1 ) )
       {
 
-         w = 320;
-         h = 240;
+				w = d_width; //320;
+				h = d_height; //240;
 
          if ( mediaPlayerState->scaled() )
          {
             // maintain aspect ratio
             if ( w * sh > sw * h )
                w = sw * h / sh;
             else
                h = sh * w / sw;
          }
          else
          {
             w = sw;
             h = sh;
          }
 
          w--; // we can't allow libmpeg to overwrite.
          QPoint roff = qt_screen->mapToDevice( p.offset(), QSize( qt_screen->width(), qt_screen->height() ) );
 
          int ox = roff.x() - height() + 2 + (height() - w) / 2;
          int oy = roff.y() + (width() - h) / 2;
          int sx = 0, sy = 0;
 
          uchar* fp = p.frameBuffer() + p.lineStep() * oy;
          fp += dd * ox / 8;
          uchar **jt = new uchar*[h];
 
          for ( int i = h; i; i-- )
          {
             jt[h - i] = fp;
             fp += p.lineStep();
          }
 
          result = mediaPlayerState->curDecoder()->videoReadScaledFrame( jt, sx, sy, sw, sh, w, h, format, 0) == 0;
 
          delete [] jt;
       }
       else
       {
 #endif
          QPainter p(this);
-
-         w = 320;
-         h = 240;
+				 w = d_width; //320;
+				h = d_height; //240;
 
          if ( mediaPlayerState->scaled() )
          {
             // maintain aspect ratio
             if ( w * sh > sw * h )
                w = sw * h / sh;
             else
                h = sh * w / sw;
          }
          else
          {
             w = sw;
             h = sh;
          }
 
          int bytes = ( dd == 16 ) ? 2 : 4;
          QImage tempFrame( w, h, bytes << 3 );
          result = mediaPlayerState->curDecoder()->videoReadScaledFrame( tempFrame.jumpTable(),
                                                                         0, 0, sw, sh, w, h, format, 0) == 0;
 
          if ( result && mediaPlayerState->fullscreen() )
          {
 
             int rw = h, rh = w;
             QImage rotatedFrame( rw, rh, bytes << 3 );
 
             ushort* in  = (ushort*)tempFrame.bits();
             ushort* out = (ushort*)rotatedFrame.bits();
             int spl = rotatedFrame.bytesPerLine() / bytes;
 
             for (int x=0; x<h; x++)
             {