works now also on retail sharp rom

5 files changed, 10 insertions, 10 deletions

diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp
index bf3590b..40e20e1 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.cpp
+++ b/noncore/multimedia/opieplayer2/audiowidget.cpp
@@ -127,49 +127,49 @@ static void changeTextColor( QWidget *w ) {
 static const int numButtons = (sizeof(audioButtons)/sizeof(MediaButton));
 
 
 AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
 
     QWidget( parent, name, f ), songInfo( this ), slider( Qt::Horizontal, this ),  time( this ) {
 
     setCaption( tr("OpiePlayer") );
 
     Config cfg("OpiePlayer");
     cfg.setGroup("Options");
     skin = cfg.readEntry("Skin","default");
     //skin = "scaleTest";
     // color of background, frame, degree of transparency
 
     QString skinPath = "opieplayer2/skins/" + skin;
     pixBg = new QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) );
     imgUp = new QImage( Resource::loadImage( QString("%1/skin_up").arg(skinPath) ) );
     imgDn = new QImage( Resource::loadImage( QString("%1/skin_down").arg(skinPath) ) );
 
     imgButtonMask = new QImage( imgUp->width(), imgUp->height(), 8, 255 );
     imgButtonMask->fill( 0 );
 
     for ( int i = 0; i < 10; i++ ) {
-        QString filename = QString(getenv("OPIEDIR")) + "/pics/" + skinPath + "/skin_mask_" + skin_mask_file_names[i] + ".png";
+        QString filename = QString( QPEApplication::qpeDir()  + "/pics/" + skinPath + "/skin_mask_" + skin_mask_file_names[i] + ".png" );
         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 < 10; i++ ) {
         buttonPixUp[i] = NULL;
         buttonPixDown[i] = NULL;
     }
 
     setBackgroundPixmap( *pixBg );
 
     songInfo.setFocusPolicy( QWidget::NoFocus );
     changeTextColor( &songInfo );
diff --git a/noncore/multimedia/opieplayer2/opieplayer2.pro b/noncore/multimedia/opieplayer2/opieplayer2.pro
index 8cbac06..3a47c06 100644
--- a/noncore/multimedia/opieplayer2/opieplayer2.pro
+++ b/noncore/multimedia/opieplayer2/opieplayer2.pro
@@ -1,23 +1,23 @@
 TEMPLATE  = app
-#CONFIG    = qt warn_on release
-CONFIG         = qt warn_on debug
+CONFIG    = qt warn_on release
+#CONFIG         = qt warn_on debug
 DESTDIR   = $(OPIEDIR)/bin
 HEADERS   = playlistselection.h mediaplayerstate.h xinecontrol.h mediadetect.h\
         videowidget.h audiowidget.h playlistwidget.h mediaplayer.h inputDialog.h \
         frame.h lib.h xinevideowidget.h volumecontrol.h\
               alphablend.h yuv2rgb.h
 SOURCES   = main.cpp \
         playlistselection.cpp mediaplayerstate.cpp xinecontrol.cpp mediadetect.cpp\
        videowidget.cpp audiowidget.cpp playlistwidget.cpp mediaplayer.cpp inputDialog.cpp \
    frame.cpp lib.cpp nullvideo.c xinevideowidget.cpp volumecontrol.cpp\
          alphablend.c yuv2rgb.c yuv2rgb_arm.c yuv2rgb_arm4l.S
 TARGET    = opieplayer2
-INCLUDEPATH += $(OPIEDIR)/include 
+INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include 
 LIBS            += -lqpe -lpthread -lopie -lxine -lxineutils
 MOC_DIR=qpeobj
 OBJECTS_DIR=qpeobj
 
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 
diff --git a/noncore/multimedia/opieplayer2/playlistselection.cpp b/noncore/multimedia/opieplayer2/playlistselection.cpp
index 85228a9..975dec3 100644
--- a/noncore/multimedia/opieplayer2/playlistselection.cpp
+++ b/noncore/multimedia/opieplayer2/playlistselection.cpp
@@ -163,49 +163,49 @@ bool PlayListSelection::first() {
     if ( item )
         setSelected( item, TRUE );
     else
   return FALSE;
     ensureItemVisible( selectedItem() );
     return TRUE;
 }
 
 
 bool PlayListSelection::last() {
     QListViewItem *prevItem = NULL;
     QListViewItem *item = firstChild();
     while ( ( item = item->nextSibling() ) )
   prevItem = item;
     if ( prevItem )
         setSelected( prevItem, TRUE );
     else
   return FALSE;
     ensureItemVisible( selectedItem() );
     return TRUE;
 }
 
 void PlayListSelection::unSelect()
 {
-    QListViewItem *item = selectedItem();
+    //QListViewItem *item = selectedItem();
     setSelected( currentItem(), FALSE);
 }
 
 void PlayListSelection::writeCurrent( Config& cfg ) {
     cfg.setGroup("PlayList");
     QListViewItem *item = selectedItem();
     if ( item )
         cfg.writeEntry("current", item->text(0) );
     qDebug(item->text(0));
 
 }
 
 void  PlayListSelection::setSelectedItem(const QString &strk ) {
 
     unSelect();
     QListViewItemIterator it( this );
     for ( ; it.current(); ++it ) {
 //        qDebug( it.current()->text(0));
         if( strk == it.current()->text(0)) {
 //             qDebug( "We have a match "+strk);
             setSelected( it.current(), TRUE);
             ensureItemVisible( it.current() );
             return;
         }
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index 262b685..6299328 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -125,49 +125,48 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
                                         this , SLOT(removeSelected()) );
   d->tbPlay    = new ToolButton( bar, tr( "Play" ), "opieplayer2/play",
                                  this , SLOT( btnPlay(bool) ), TRUE );
   d->tbShuffle = new ToolButton( bar, tr( "Randomize" ),"opieplayer2/shuffle",
                                  mediaPlayerState, SLOT(setShuffled(bool)), TRUE );
   d->tbLoop    = new ToolButton( bar, tr( "Loop" ),"opieplayer2/loop",
                                  mediaPlayerState, SLOT(setLooping(bool)), TRUE );
   tbDeletePlaylist->hide();
 
   QPopupMenu *pmPlayList = new QPopupMenu( this );
   menu->insertItem( tr( "File" ), pmPlayList );
   (void)new MenuItem( pmPlayList, tr( "Clear List" ), this, SLOT( clearList() ) );
   (void)new MenuItem( pmPlayList, tr( "Add all audio files" ), this, SLOT( addAllMusicToList() ) );
   (void)new MenuItem( pmPlayList, tr( "Add all video files" ), this, SLOT( addAllVideoToList() ) );
   (void)new MenuItem( pmPlayList, tr( "Add all files" ), this, SLOT( addAllToList() ) );
   pmPlayList->insertSeparator(-1);
   (void)new MenuItem( pmPlayList, tr( "Save PlayList" ), this, SLOT( saveList() ) );
   (void)new MenuItem( pmPlayList, tr( "Export playlist to m3u" ), this, SLOT(writem3u() ) );
   pmPlayList->insertSeparator(-1);
   (void)new MenuItem( pmPlayList, tr( "Open File or URL" ), this,SLOT( openFile() ) );
   pmPlayList->insertSeparator(-1);
   (void)new MenuItem( pmPlayList, tr( "Rescan for Audio Files" ), this,SLOT( scanForAudio() ) );
   (void)new MenuItem( pmPlayList, tr( "Rescan for Video Files" ), this,SLOT( scanForVideo() ) );
 
-
   pmView = new QPopupMenu( this );
   menu->insertItem( tr( "View" ), pmView );
   pmView->isCheckable();
 
   pmView->insertItem(  Resource::loadPixmap("fullscreen") , tr( "Full Screen"), mediaPlayerState, SLOT( toggleFullscreen() ) );
 
   Config cfg( "OpiePlayer" );
   bool b= cfg.readBoolEntry("FullScreen", 0);
   mediaPlayerState->setFullscreen(  b );
   pmView->setItemChecked( -16, b );
 
   //    pmView->insertItem(  Resource::loadPixmap("opieplayer/scale") , tr( "Scale"), mediaPlayerState, SLOT(toggleScaled() ) );
 
   pmView->insertSeparator(-1);
 
   skinsMenu = new QPopupMenu( this );
   pmView->insertItem( tr( "Skins" ), skinsMenu );
   skinsMenu->isCheckable();
   populateSkinsMenu();
 
   QVBox *vbox5 = new QVBox( this ); vbox5->setBackgroundMode( PaletteButton );
   QVBox *vbox4 = new QVBox( vbox5 ); vbox4->setBackgroundMode( PaletteButton );
 
   QHBox *hbox6 = new QHBox( vbox4 ); hbox6->setBackgroundMode( PaletteButton );
@@ -563,49 +562,49 @@ bool PlayListWidget::next() {
     return mediaPlayerState->looping();
   }
 }
 
 
 bool PlayListWidget::first() {
   if ( mediaPlayerState->playlist() )
     return d->selectedFiles->first();
   else
     return mediaPlayerState->looping();
 }
 
 
 bool PlayListWidget::last() {
   if ( mediaPlayerState->playlist() )
     return d->selectedFiles->last();
   else
     return mediaPlayerState->looping();
 }
 
 
 void PlayListWidget::saveList() {
 
   QString filename;
-  InputDialog *fileDlg;
+  InputDialog *fileDlg = 0l;
   fileDlg = new InputDialog(this,tr("Save Playlist"),TRUE, 0);
   fileDlg->exec();
   if( fileDlg->result() == 1 ) {
     if ( d->current )
       delete d->current;
     filename = fileDlg->LineEdit1->text();//+".playlist";
     //         qDebug("saving playlist "+filename+".playlist");
     Config cfg( filename +".playlist");
     writeConfig( cfg );
 
     DocLnk lnk;
     lnk.setFile(QDir::homeDirPath()+"/Settings/"+filename+".playlist.conf"); //sets File property
     lnk.setType("playlist/plain");// hey is this a REGISTERED mime type?!?!? ;D
     lnk.setIcon("opieplayer2/playlist2");
     lnk.setName( filename); //sets file name
     // qDebug(filename);
     if(!lnk.writeLink()) {
       qDebug("Writing doclink did not work");
     }
   }
   Config config( "OpiePlayer" );
   config.writeEntry("CurrentPlaylist",filename);
   setCaption(tr("OpiePlayer: ")+filename);
   d->selectedFiles->first();
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp
index 60a3563..5b53568 100644
--- a/noncore/multimedia/opieplayer2/videowidget.cpp
+++ b/noncore/multimedia/opieplayer2/videowidget.cpp
@@ -10,48 +10,49 @@
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
+#include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 #include <qpe/mediaplayerplugininterface.h>
 #include <qpe/config.h>
 
 
 #include <qwidget.h>
 #include <qpainter.h>
 #include <qpixmap.h>
 #include <qslider.h>
 #include <qdrawutil.h>
 #include "videowidget.h"
 #include "mediaplayerstate.h"
 
 
 #ifdef Q_WS_QWS
 # define USE_DIRECT_PAINTER
 # include <qdirectpainter_qws.h>
 # include <qgfxraster_qws.h>
 #endif
 
 
 extern MediaPlayerState *mediaPlayerState;
 
 
@@ -83,49 +84,49 @@ 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 ) {
 
 
     setCaption( tr("OpiePlayer - Video") );
 
     videoFrame = new XineVideoWidget ( this, "Video frame" );
 
     connect ( videoFrame, SIGNAL( videoResized ( const QSize & )), this, SIGNAL( videoResized ( const QSize & )));
     connect ( videoFrame,  SIGNAL( clicked () ),  this,  SLOT ( backToNormal() ) );
 
     Config cfg("OpiePlayer");
     cfg.setGroup("Options");
     skin = cfg.readEntry("Skin","default");
 
     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(getenv("OPIEDIR")) + "/pics/" + skinPath + "/skinV_mask_" + skinV_mask_file_names[i] + ".png";
+        QString filename = QString( QPEApplication::qpeDir() + "/pics/" + skinPath + "/skinV_mask_" + skinV_mask_file_names[i] + ".png" );
         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;
     }
 
     setBackgroundPixmap( *pixBg );
 
     slider = new QSlider( Qt::Horizontal, this );
     slider->setMinValue( 0 );
@@ -161,50 +162,50 @@ VideoWidget::~VideoWidget() {
     delete imgButtonMask;
     for ( int i = 0; i < 7; i++ ) {
         delete masks[i];
     }
 
 }
 
 QPixmap *combineVImageWithBackground( QImage img, QPixmap bg, QPoint offset ) {
     QPixmap pix( img.width(), img.height() );
     QPainter p( &pix );
     p.drawTiledPixmap( pix.rect(), bg, offset );
     p.drawImage( 0, 0, img );
     return new QPixmap( pix );
 }
 
 QPixmap *maskVPixToMask( QPixmap pix, QBitmap mask ) {
     QPixmap *pixmap = new QPixmap( pix );
     pixmap->setMask( mask );
     return pixmap;
 }
 
 void VideoWidget::resizeEvent( QResizeEvent * ) {
     int h = height();
     int w = width();
-    int Vh = 160;
-    int Vw = 220;
+    //int Vh = 160;
+    //int Vw = 220;
 
     slider->setFixedWidth( w - 20 );
     slider->setGeometry( QRect( 15, h - 30, w - 90, 20 ) );
     slider->setBackgroundOrigin( QWidget::ParentOrigin );
     slider->setFocusPolicy( QWidget::NoFocus );
     slider->setBackgroundPixmap( *pixBg );
 
     xoff = 0;// ( imgUp->width() ) / 2;
     yoff = 185;//(( Vh  - imgUp->height() ) / 2) - 10;
     QPoint p( xoff, yoff );
 
     QPixmap *pixUp = combineVImageWithBackground( *imgUp, *pixBg, p );
     QPixmap *pixDn = combineVImageWithBackground( *imgDn, *pixBg, p );
 
     for ( int i = 0; i < 7; i++ ) {
         if ( !masks[i]->isNull() ) {
             delete buttonPixUp[i];
             delete buttonPixDown[i];
             buttonPixUp[i] = maskVPixToMask( *pixUp, *masks[i] );
             buttonPixDown[i] = maskVPixToMask( *pixDn, *masks[i] );
         }
     }
 
     delete pixUp;