fixes

12 files changed, 45 insertions, 29 deletions

diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp
index 40e20e1..a718826 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.cpp
+++ b/noncore/multimedia/opieplayer2/audiowidget.cpp
@@ -167,4 +167,4 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
     for ( int i = 0; i < 10; i++ ) {
-        buttonPixUp[i] = NULL;
-        buttonPixDown[i] = NULL;
+        buttonPixUp[i] = 0l;
+        buttonPixDown[i] = 0l;
     }
@@ -229,2 +229,4 @@ AudioWidget::~AudioWidget() {
 
+namespace {
+
 QPixmap *combineImageWithBackground( QImage img, QPixmap bg, QPoint offset ) {
@@ -244,3 +246,3 @@ QPixmap *maskPixToMask( QPixmap pix, QBitmap mask ) {
 
-
+};
 
diff --git a/noncore/multimedia/opieplayer2/audiowidget.h b/noncore/multimedia/opieplayer2/audiowidget.h
index 626004a..c544882 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.h
+++ b/noncore/multimedia/opieplayer2/audiowidget.h
@@ -48,2 +48,4 @@ class QPixmap;
 
+namespace {
+
 enum AudioButtons {
@@ -60,3 +62,3 @@ enum AudioButtons {
 };
-
+};
 
@@ -142,2 +144,3 @@ private:
     int xoff, yoff;
+    bool isStreaming : 1;
 };
diff --git a/noncore/multimedia/opieplayer2/inputDialog.cpp b/noncore/multimedia/opieplayer2/inputDialog.cpp
index c13ea63..9edb1d3 100644
--- a/noncore/multimedia/opieplayer2/inputDialog.cpp
+++ b/noncore/multimedia/opieplayer2/inputDialog.cpp
@@ -28,3 +28,8 @@ InputDialog::InputDialog( QWidget* parent,  const char* name, bool modal, WFlags
 }
-
+/*
+ * return the current text(input)
+ */
+QString InputDialog::text() const {
+   return LineEdit1->text(); 
+}
 /*
@@ -33,3 +38,2 @@ InputDialog::InputDialog( QWidget* parent,  const char* name, bool modal, WFlags
 InputDialog::~InputDialog() {
-    inputText= LineEdit1->text();
 }
diff --git a/noncore/multimedia/opieplayer2/inputDialog.h b/noncore/multimedia/opieplayer2/inputDialog.h
index d4f5e12..0f36ea4 100644
--- a/noncore/multimedia/opieplayer2/inputDialog.h
+++ b/noncore/multimedia/opieplayer2/inputDialog.h
@@ -15,4 +15,7 @@ public:
     ~InputDialog();
-    QString inputText;
+    QString text()const;
+    
+private:
     QLineEdit* LineEdit1;
+    
 protected slots:
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp
index 18caaad..0f8242b 100644
--- a/noncore/multimedia/opieplayer2/mediaplayer.cpp
+++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp
@@ -182,4 +182,4 @@ void MediaPlayer::timerEvent( QTimerEvent * ) {
       // TODO FIXME
-    unsigned int v;
-    v = volControl->getVolume();
+    unsigned int v= 0;
+    v = volControl->volume();
     v = v / 10;
diff --git a/noncore/multimedia/opieplayer2/mediaplayerstate.cpp b/noncore/multimedia/opieplayer2/mediaplayerstate.cpp
index 8366ab4..eaedaa5 100644
--- a/noncore/multimedia/opieplayer2/mediaplayerstate.cpp
+++ b/noncore/multimedia/opieplayer2/mediaplayerstate.cpp
@@ -18,3 +18,3 @@ MediaPlayerState::MediaPlayerState( QObject *parent, const char *name )
     readConfig( cfg );
-
+    isStreaming = false;
 }
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index 10f1792..251c2e5 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -591,3 +591,3 @@ void PlayListWidget::saveList() {
       delete d->current;
-    filename = fileDlg->LineEdit1->text();//+".playlist";
+    filename = fileDlg->text();//+".playlist";
     //         qDebug("saving playlist "+filename+".playlist");
@@ -950,3 +950,3 @@ void PlayListWidget::openFile() {
   if( fileDlg->result() == 1 ) {
-    filename = fileDlg->LineEdit1->text();
+    filename = fileDlg->text();
 
@@ -1125,3 +1125,3 @@ void PlayListWidget::writem3u() {
   if( fileDlg->result() == 1 ) {
-    filename = fileDlg->LineEdit1->text();
+    filename = fileDlg->text();
     qDebug(filename);
diff --git a/noncore/multimedia/opieplayer2/volumecontrol.cpp b/noncore/multimedia/opieplayer2/volumecontrol.cpp
index a795f3b..271b84e 100644
--- a/noncore/multimedia/opieplayer2/volumecontrol.cpp
+++ b/noncore/multimedia/opieplayer2/volumecontrol.cpp
@@ -8,9 +8,8 @@
 
-int VolumeControl::getVolume() {
-    int volumePerc;
+int VolumeControl::volume() {
     Config cfg( "qpe" );
     cfg. setGroup( "Volume" );
-    volumePerc = cfg. readNumEntry( "VolumePercent", 50 );
-    m_volumePerc = volumePerc;
-    return volumePerc;
+    m_volumePerc = cfg. readNumEntry( "VolumePercent", 50 );
+    
+    return m_volumePerc;
 }
@@ -37,3 +36,3 @@ void VolumeControl::setVolume( int volumePerc ) {
 void VolumeControl::incVol( int ammount ) {
-    int oldVol = getVolume();
+    int oldVol = volume();
     setVolume( oldVol + ammount);
@@ -42,3 +41,3 @@ void VolumeControl::incVol( int ammount ) {
 void VolumeControl::decVol( int ammount ) {
-     int oldVol = getVolume();
+     int oldVol = volume();
     setVolume( oldVol - ammount);
@@ -48,3 +47,3 @@ void VolumeControl::decVol( int ammount ) {
 VolumeControl::VolumeControl( ) {
-    getVolume();
+    volume();
 }
diff --git a/noncore/multimedia/opieplayer2/volumecontrol.h b/noncore/multimedia/opieplayer2/volumecontrol.h
index d0d34a2..040f978 100644
--- a/noncore/multimedia/opieplayer2/volumecontrol.h
+++ b/noncore/multimedia/opieplayer2/volumecontrol.h
@@ -27,3 +27,3 @@ public:
      */
-    int getVolume();
+    int volume();
 
diff --git a/noncore/multimedia/opieplayer2/xinecontrol.cpp b/noncore/multimedia/opieplayer2/xinecontrol.cpp
index 766ece2..12d80ba 100644
--- a/noncore/multimedia/opieplayer2/xinecontrol.cpp
+++ b/noncore/multimedia/opieplayer2/xinecontrol.cpp
@@ -73,3 +73,5 @@ void XineControl::play( const QString& fileName ) {
     m_fileName = fileName;
+    
     qDebug("<<FILENAME: " + fileName  + ">>>>");
+    
     libXine->play( fileName );
diff --git a/noncore/multimedia/opieplayer2/xinecontrol.h b/noncore/multimedia/opieplayer2/xinecontrol.h
index 88458be..4263b36 100644
--- a/noncore/multimedia/opieplayer2/xinecontrol.h
+++ b/noncore/multimedia/opieplayer2/xinecontrol.h
@@ -45,3 +45,2 @@ public:
     ~XineControl();
-    int m_length;
 
@@ -66,8 +65,9 @@ private:
     MediaDetect mdetect;
-    long m_currentTime;
+    long m_currentTime;    
     long m_position;
+    int m_length;
     QString m_fileName;
-    bool disabledSuspendScreenSaver;
-    bool hasVideoChannel;
-    bool hasAudioChannel;
+    bool disabledSuspendScreenSaver : 1;
+    bool hasVideoChannel : 1;
+    bool hasAudioChannel : 1;
 signals:
diff --git a/noncore/multimedia/opieplayer2/xinevideowidget.cpp b/noncore/multimedia/opieplayer2/xinevideowidget.cpp
index 3e28e54..bc95d86 100644
--- a/noncore/multimedia/opieplayer2/xinevideowidget.cpp
+++ b/noncore/multimedia/opieplayer2/xinevideowidget.cpp
@@ -143,2 +143,3 @@ void XineVideoWidget::paintEvent ( QPaintEvent * )
           case 3: src += ( (( clip. y ( ) - framerect. y ( )) * m_bytes_per_pixel ) + (( clip. x ( ) - framerect. x ( )) * m_bytes_per_line_frame ) ); break;
+          default: break;
         }
@@ -171,2 +172,3 @@ void XineVideoWidget::paintEvent ( QPaintEvent * )
                 case 3: memcpy_step_rev ( dst + leftfill, src, framefill, m_bytes_per_line_frame ); break;
+                default: break;
               }
@@ -184,2 +186,3 @@ void XineVideoWidget::paintEvent ( QPaintEvent * )
             case 3: src += m_bytes_per_pixel;      break;
+            default: break;
           }
@@ -246,3 +249,3 @@ void XineVideoWidget::resizeEvent ( QResizeEvent * )
 
-void XineVideoWidget::mousePressEvent ( QMouseEvent *me )
+void XineVideoWidget::mousePressEvent ( QMouseEvent * /*me*/ )
 {
@@ -258,3 +261,3 @@ void XineVideoWidget::mousePressEvent ( QMouseEvent *me )
 
-void XineVideoWidget::mouseReleaseEvent ( QMouseEvent *me )
+void XineVideoWidget::mouseReleaseEvent ( QMouseEvent * /*me*/ )
 {