added useAudio() and useVideo()

3 files changed, 59 insertions, 6 deletions

diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp
index a3238f0..51fbb8b 100644
--- a/noncore/multimedia/opieplayer2/mediaplayer.cpp
+++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp
@@ -13,2 +13,3 @@
 #include "audiowidget.h"
+#include "videowidget.h"
 #include "volumecontrol.h"
@@ -20,2 +21,3 @@
 extern AudioWidget *audioUI;
+extern VideoWidget *videoUI;
 extern PlayListWidget *playList;
@@ -44,2 +46,7 @@ MediaPlayer::MediaPlayer( QObject *parent, const char *name )
 
+    connect( videoUI,  SIGNAL( moreClicked() ), this, SLOT( startIncreasingVolume() ) );
+    connect( videoUI,  SIGNAL( lessClicked() ),  this, SLOT( startDecreasingVolume() ) );
+    connect( videoUI,  SIGNAL( moreReleased() ), this, SLOT( stopChangingVolume() ) );
+    connect( videoUI,  SIGNAL( lessReleased() ), this, SLOT( stopChangingVolume() ) );
+    
     volControl = new VolumeControl;
@@ -153,5 +160,13 @@ void MediaPlayer::stopChangingVolume() {
     onScreenDisplayVolume = 0;
-    int w = audioUI->width();
-    int h = audioUI->height();
+    int w=0;
+    int h=0;
+    if( !xineControl->hasVideo()) {
+        w = audioUI->width();
+        h = audioUI->height();
     audioUI->repaint( (w - 200) / 2, h - yoff, 200 + 9, 70, FALSE );
+    } else {
+        w = videoUI->width();
+        h = videoUI->height();
+        videoUI->repaint( (w - 200) / 2, h - yoff, 200 + 9, 70, FALSE );
+    }
 }
@@ -176,4 +191,6 @@ void MediaPlayer::timerEvent( QTimerEvent * ) {
 
-    int w = audioUI->width();
-    int h = audioUI->height();
+    int w=0; int h=0;
+    if( !xineControl->hasVideo()) {
+        w = audioUI->width();
+        h = audioUI->height();
 
@@ -184,6 +201,4 @@ void MediaPlayer::timerEvent( QTimerEvent * ) {
     }
-
     drawnOnScreenDisplay = TRUE;
     onScreenDisplayVolume = v;
-
     QPainter p( audioUI );
@@ -205,2 +220,31 @@ void MediaPlayer::timerEvent( QTimerEvent * ) {
     }
+    } else {
+        w = videoUI->width();
+        h = videoUI->height();
+
+        if ( drawnOnScreenDisplay ) {
+            if ( onScreenDisplayVolume > v ) {
+                videoUI->repaint( (w - 200) / 2 + v * 20 + 0, h - yoff + 40, (onScreenDisplayVolume - v) * 20 + 9, 30, FALSE );
+            }
+        }
+        drawnOnScreenDisplay = TRUE;
+        onScreenDisplayVolume = v;
+        QPainter p( videoUI );
+        p.setPen( QColor( 0x10, 0xD0, 0x10 ) );
+        p.setBrush( QColor( 0x10, 0xD0, 0x10 ) );
+
+        QFont f;
+        f.setPixelSize( 20 );
+        f.setBold( TRUE );
+        p.setFont( f );
+        p.drawText( (w - 200) / 2, h - yoff + 20, tr("Volume") );
+
+        for ( unsigned int i = 0; i < 10; i++ ) {
+            if ( v > i ) {
+                p.drawRect( (w - 200) / 2 + i * 20 + 0, h - yoff + 40, 9, 30 );
+            } else {
+                p.drawRect( (w - 200) / 2 + i * 20 + 3, h - yoff + 50, 3, 10 );
+            }
+        }
+    }
 }
diff --git a/noncore/multimedia/opieplayer2/xinecontrol.cpp b/noncore/multimedia/opieplayer2/xinecontrol.cpp
index 84ef3f3..17112a2 100644
--- a/noncore/multimedia/opieplayer2/xinecontrol.cpp
+++ b/noncore/multimedia/opieplayer2/xinecontrol.cpp
@@ -70,2 +70,4 @@ XineControl::~XineControl() {
 void XineControl::play( const QString& fileName ) {
+    hasVideoChannel=FALSE;
+    hasAudioChannel=FALSE;
     m_fileName = fileName;
@@ -83,4 +85,6 @@ void XineControl::play( const QString& fileName ) {
         libXine->setShowVideo( false );
+        hasAudioChannel=TRUE;
     } else {
         libXine->setShowVideo( true );
+        hasVideoChannel=TRUE;
     }
diff --git a/noncore/multimedia/opieplayer2/xinecontrol.h b/noncore/multimedia/opieplayer2/xinecontrol.h
index 9ad221e..88458be 100644
--- a/noncore/multimedia/opieplayer2/xinecontrol.h
+++ b/noncore/multimedia/opieplayer2/xinecontrol.h
@@ -47,2 +47,5 @@ public:
 
+    bool hasVideo() const { return hasVideoChannel; }
+    bool hasAudio() const { return hasAudioChannel; }
+
 public slots:
@@ -67,2 +70,4 @@ private:
     bool disabledSuspendScreenSaver;
+    bool hasVideoChannel;
+    bool hasAudioChannel;
 signals: