2 files changed, 26 insertions, 26 deletions

diff --git a/core/multimedia/opieplayer/audiowidget.cpp b/core/multimedia/opieplayer/audiowidget.cpp
index cda3f77..3212001 100644
--- a/core/multimedia/opieplayer/audiowidget.cpp
+++ b/core/multimedia/opieplayer/audiowidget.cpp
@@ -56,40 +56,40 @@ MediaButton audioButtons[] = {
     {    1*30+xo,    1*30+yo, 0, FALSE, FALSE, FALSE, FALSE }  // playlist
 };
 
 
 static const int numButtons = (sizeof(audioButtons)/sizeof(MediaButton));
 
 
 AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
     QWidget( parent, name, f )
 {
 //    QPEApplication::grabKeyboard();
     setCaption( tr("OpiePlayer") );
-    setBackgroundPixmap( Resource::loadPixmap( "mpegplayer/metalFinish" ) );
-    pixmaps[0] = new QPixmap( Resource::loadPixmap( "mpegplayer/mediaButtonsAll" ) );
-    pixmaps[1] = new QPixmap( Resource::loadPixmap( "mpegplayer/mediaButtonsBig" ) );
-    pixmaps[2] = new QPixmap( Resource::loadPixmap( "mpegplayer/mediaControls" ) );
-    pixmaps[3] = new QPixmap( Resource::loadPixmap( "mpegplayer/animatedButton" ) );
+    setBackgroundPixmap( Resource::loadPixmap( "opieplayer/metalFinish" ) );
+    pixmaps[0] = new QPixmap( Resource::loadPixmap( "opieplayer/mediaButtonsAll" ) );
+    pixmaps[1] = new QPixmap( Resource::loadPixmap( "opieplayer/mediaButtonsBig" ) );
+    pixmaps[2] = new QPixmap( Resource::loadPixmap( "opieplayer/mediaControls" ) );
+    pixmaps[3] = new QPixmap( Resource::loadPixmap( "opieplayer/animatedButton" ) );
 
     songInfo = new Ticker( this );
     songInfo->setFocusPolicy( QWidget::NoFocus );
     songInfo->setGeometry( QRect( 7, 3, 220, 20 ) );
 
     slider = new QSlider( Qt::Horizontal, this );
     slider->setFixedWidth( 220 );
     slider->setFixedHeight( 20 );
     slider->setMinValue( 0 );
     slider->setMaxValue( 1 );
-    slider->setBackgroundPixmap( Resource::loadPixmap( "mpegplayer/metalFinish" ) );
+    slider->setBackgroundPixmap( Resource::loadPixmap( "opieplayer/metalFinish" ) );
     slider->setFocusPolicy( QWidget::NoFocus );
     slider->setGeometry( QRect( 7, 262, 220, 20 ) );
 
     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( loopingToggled(bool) ), this, SLOT( setLooping(bool) ) );
     connect( mediaPlayerState, SIGNAL( pausedToggled(bool) ),  this, SLOT( setPaused(bool) ) );
@@ -144,25 +144,25 @@ void AudioWidget::setView( char view ) {
   showMaximized();
     } else {
   killTimers();
   hide();
     }
 }
 
 
 void AudioWidget::updateSlider( long i, long max ) {
     if ( max == 0 )
   return;
     // Will flicker too much if we don't do this
-    // Scale to something reasonable 
+    // Scale to something reasonable
     int width = slider->width();
     int val = int((double)i * width / max);
     if ( !audioSliderBeingMoved ) {
   if ( slider->value() != val )
       slider->setValue( val );
   if ( slider->maxValue() != width )
       slider->setMaxValue( width );
     }
 }
 
 
 void AudioWidget::setToggleButton( int i, bool down ) {
@@ -324,15 +324,15 @@ void AudioWidget::keyReleaseEvent( QKeyEvent *e)
       case Key_Right:
 //            toggleButton(3);
           mediaPlayerState->setNext();
 //            toggleButton(3);
           break;
       case Key_Left:
 //            toggleButton(4);
           mediaPlayerState->setPrev();
 //            toggleButton(4);
           break;
       case Key_Escape:
           break;
-        
+
     };
 }
diff --git a/core/multimedia/opieplayer/videowidget.cpp b/core/multimedia/opieplayer/videowidget.cpp
index 23b36e5..70b4a95 100644
--- a/core/multimedia/opieplayer/videowidget.cpp
+++ b/core/multimedia/opieplayer/videowidget.cpp
@@ -58,34 +58,34 @@ MediaButton videoButtons[] = {
     { 5+4*32+xo, 200+yo, FALSE, FALSE, FALSE, 3 }, // next
     { 5+5*32+xo, 200+yo, FALSE, FALSE, FALSE, 8 }, // playlist
     { 5+6*32+xo, 200+yo,  TRUE, FALSE, FALSE, 9 }  // fullscreen
 };
 
 
 static const int numButtons = (sizeof(videoButtons)/sizeof(MediaButton));
 
 
 VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) :
     QWidget( parent, name, f ), scaledWidth( 0 ), scaledHeight( 0 ) {
     setCaption( tr("OpiePlayer") );
-    setBackgroundPixmap( Resource::loadPixmap( "mpegplayer/metalFinish" ) );
-    pixmaps[0] = new QPixmap( Resource::loadPixmap( "mpegplayer/mediaButton0a" ) );
-    pixmaps[1] = new QPixmap( Resource::loadPixmap( "mpegplayer/mediaButton0b" ) );
-    pixmaps[2] = new QPixmap( Resource::loadPixmap( "mpegplayer/mediaControls0" ) );
+    setBackgroundPixmap( Resource::loadPixmap( "opieplayer/metalFinish" ) );
+    pixmaps[0] = new QPixmap( Resource::loadPixmap( "opieplayer/mediaButton0a" ) );
+    pixmaps[1] = new QPixmap( Resource::loadPixmap( "opieplayer/mediaButton0b" ) );
+    pixmaps[2] = new QPixmap( Resource::loadPixmap( "opieplayer/mediaControls0" ) );
     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( "mpegplayer/metalFinish" ) );
+    slider->setBackgroundPixmap( Resource::loadPixmap( "opieplayer/metalFinish" ) );
     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( 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) ) );
@@ -192,77 +192,77 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) {
             int radius = 16;
             QPoint center = QPoint( x + radius, y + radius );
             QPoint dXY = center - event->pos();
             int dist = dXY.x() * dXY.x() + dXY.y() * dXY.y();
             bool isOnButton = dist <= (radius * radius);
             if ( isOnButton != videoButtons[i].isHeld ) {
                 videoButtons[i].isHeld = isOnButton;
                 toggleButton(i);
             }
         } else {
             if ( videoButtons[i].isHeld ) {
                 videoButtons[i].isHeld = FALSE;
-                if ( !videoButtons[i].isToggle ) 
+                if ( !videoButtons[i].isToggle )
                     setToggleButton( i, FALSE );
             }
         }
         switch (i) {
           case VideoPlay:       mediaPlayerState->setPlaying(videoButtons[i].isDown); return;
           case VideoStop:       mediaPlayerState->setPlaying(FALSE); return;
           case VideoPause:      mediaPlayerState->setPaused(videoButtons[i].isDown); return;
           case VideoNext:       mediaPlayerState->setNext(); return;
           case VideoPrevious:   mediaPlayerState->setPrev(); return;
           case VideoPlayList:   mediaPlayerState->setList(); return;
           case VideoFullscreen: mediaPlayerState->setFullscreen( TRUE ); makeVisible(); return;
         }
-        
+
     }
 }
 
 
 void VideoWidget::mousePressEvent( QMouseEvent *event ) {
     mouseMoveEvent( event );
 }
 
 
 void VideoWidget::mouseReleaseEvent( QMouseEvent *event ) {
     if ( mediaPlayerState->fullscreen() ) {
   mediaPlayerState->setFullscreen( FALSE );
   makeVisible();
- 
+
   mouseMoveEvent( event );
     }
 }
 
 
 void VideoWidget::makeVisible() {
     if ( mediaPlayerState->fullscreen() ) {
   setBackgroundMode( QWidget::NoBackground );
   showFullScreen();
   resize( qApp->desktop()->size() );
   slider->hide();
     } else {
-  setBackgroundPixmap( Resource::loadPixmap( "mpegplayer/metalFinish" ) );
+  setBackgroundPixmap( Resource::loadPixmap( "opieplayer/metalFinish" ) );
   showNormal();
   showMaximized();
   slider->show();
     }
 }
 
 
 void VideoWidget::paintEvent( QPaintEvent * ) {
     QPainter p( this );
 
     if ( mediaPlayerState->fullscreen() ) {
-  // Clear the background 
+  // Clear the background
   p.setBrush( QBrush( Qt::black ) );
   p.drawRect( rect() );
 
   // Draw the current frame
   //p.drawImage( ); // If using directpainter we won't have a copy except whats on the screen
     } else {
   // draw border
   qDrawShadePanel( &p, 4, 15, 230, 170, colorGroup(), TRUE, 5, NULL );
 
   // Clear the movie screen first
   p.setBrush( QBrush( Qt::black ) );
   p.drawRect( 9, 20, 220, 160 );
@@ -279,89 +279,89 @@ void VideoWidget::paintEvent( QPaintEvent * ) {
     }
 }
 
 
 void VideoWidget::closeEvent( QCloseEvent* ) {
     mediaPlayerState->setList();
 }
 
 
 bool VideoWidget::playVideo() {
     bool result = FALSE;
 
-    int stream = 0; 
+    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();
 
     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;
 
       if ( mediaPlayerState->scaled() ) {
     // maintain aspect ratio
-    if ( w * sh > sw * h ) 
+    if ( w * sh > sw * h )
         w = sw * h / sh;
     else
         h = sh * w / sw;
       } else  {
     w = sw;
-    h = sh;     
+    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;
 
       if ( mediaPlayerState->scaled() ) {
     // maintain aspect ratio
-    if ( w * sh > sw * h ) 
+    if ( w * sh > sw * h )
         w = sw * h / sh;
     else
         h = sh * w / sw;
       } else  {
     w = sw;
-    h = sh;     
+    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();
@@ -385,25 +385,25 @@ bool VideoWidget::playVideo() {
 
     p.drawImage( (240 - rw) / 2, (320 - rh) / 2, rotatedFrame, 0, 0, rw, rh );
       }
 #ifdef USE_DIRECT_PAINTER
   }
 #endif
     } else {
 
   w = 220;
   h = 160;
 
   // maintain aspect ratio
-  if ( w * sh > sw * h ) 
+  if ( w * sh > sw * h )
       w = sw * h / sh;
   else
       h = sh * w / sw;
 
   result = mediaPlayerState->curDecoder()->videoReadScaledFrame( currentFrame->jumpTable(), 0, 0, sw, sh, w, h, format, 0) == 0;
 
   QPainter p( this );
 
   // Image changed size, therefore need to blank the possibly unpainted regions first
   if ( scaledWidth != w || scaledHeight != h ) {
       p.setBrush( QBrush( Qt::black ) );
       p.drawRect( 9, 20, 220, 160 );
@@ -458,15 +458,15 @@ void VideoWidget::keyReleaseEvent( QKeyEvent *e)
 //             emit moreClicked();
 //             emit moreReleased();
 //             toggleButton(5);
            break;
       case Key_Right:
           mediaPlayerState->setNext();
           break;
       case Key_Left:
           mediaPlayerState->setPrev();
           break;
       case Key_Escape:
           break;
-        
+
     };
 }