From 6c0751d0d1869089066269430b4664655e1dbe68 Mon Sep 17 00:00:00 2001
From: harlekin <harlekin>
Date: Mon, 19 Aug 2002 20:39:26 +0000
Subject: works now also on retail sharp rom

---
(limited to 'noncore/multimedia/opieplayer2')

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
@@ -148,7 +148,7 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
     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() ) {
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,6 +1,6 @@
 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 \
@@ -12,7 +12,7 @@ SOURCES   = main.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
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
@@ -184,7 +184,7 @@ bool PlayListSelection::last() {
 
 void PlayListSelection::unSelect()
 {
-    QListViewItem *item = selectedItem();
+    //QListViewItem *item = selectedItem();
     setSelected( currentItem(), FALSE);
 }
 
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
@@ -146,7 +146,6 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
   (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();
@@ -584,7 +583,7 @@ bool PlayListWidget::last() {
 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 ) {
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
@@ -31,6 +31,7 @@
 
 */
 
+#include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 #include <qpe/mediaplayerplugininterface.h>
 #include <qpe/config.h>
@@ -104,7 +105,7 @@ QWidget( parent, name, f ), scaledWidth( 0 ), scaledHeight( 0 ) {
     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() ) {
@@ -182,8 +183,8 @@ QPixmap *maskVPixToMask( QPixmap pix, QBitmap mask ) {
 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 ) );
--
cgit v0.9.0.2