fix crash #1408

1 files changed, 14 insertions, 14 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
@@ -86,9 +86,8 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) :
    skinPath = "opieplayer2/skins/" + skin;
     if(!QDir(QString(getenv("OPIEDIR")) +"/pics/"+skinPath).exists())
       skinPath = "opieplayer2/skins/default";
 
-    //   odebug << "skin path " + skinPath << oendl;
 
 //     QString skinPath = "opieplayer2/skins/" + skin;
 
    pixBg = new QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) );
@@ -115,33 +114,30 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) :
             }
          }
       }
    }
-   //   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 );
 
+		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->setBackgroundPixmap( *pixBg );
    slider->setFocusPolicy( QWidget::NoFocus );
 //    slider->setGeometry( QRect( 7, 250, 220, 20 ) );
 
    connect( slider,         SIGNAL( sliderPressed() ),      this, SLOT( sliderPressed() ) );
@@ -157,10 +153,11 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) :
    // Intialise state
    setLength( mediaPlayerState->length() );
    setPosition( mediaPlayerState->position() );
    setFullscreen( mediaPlayerState->fullscreen() );
-//   setPaused( mediaPlayerState->paused() );
-   setPlaying( mediaPlayerState->playing() );
+//   setPlaying( mediaPlayerState->playing() );
+// 		if(this->x() < 0 || this->y() < 0)
+// 			this->move(0,0);
 }
 
 
 VideoWidget::~VideoWidget() {
@@ -471,8 +468,12 @@ bool VideoWidget::playVideo() {
    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() )
    {
@@ -482,10 +483,10 @@ bool VideoWidget::playVideo() {
       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
@@ -524,11 +525,10 @@ bool VideoWidget::playVideo() {
       else
       {
 #endif
          QPainter p(this);
-
-         w = 320;
-         h = 240;
+				 w = d_width; //320;
+				h = d_height; //240;
 
          if ( mediaPlayerState->scaled() )
          {
             // maintain aspect ratio