1 files changed, 29 insertions, 23 deletions

diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp
index 5411a64..8d8e4e5 100644
--- a/noncore/multimedia/opieplayer2/mediaplayer.cpp
+++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp
@@ -13,2 +13,3 @@
 #include "audiowidget.h"
+#include "volumecontrol.h"
 
@@ -41,2 +42,4 @@ MediaPlayer::MediaPlayer( QObject *parent, const char *name )
 
+    volControl = new VolumeControl;
+
 }
@@ -44,2 +47,4 @@ MediaPlayer::MediaPlayer( QObject *parent, const char *name )
 MediaPlayer::~MediaPlayer() {
+    delete xineControl;
+    delete volControl;
 }
@@ -73,3 +78,3 @@ void MediaPlayer::setPlaying( bool play ) {
     }
-    
+
     xineControl->play( currentFile->file() );
@@ -94,3 +99,3 @@ void MediaPlayer::setPlaying( bool play ) {
     audioUI->setTickerText( currentFile->file( ) );
-    
+
 }
@@ -127,5 +132,3 @@ void MediaPlayer::startDecreasingVolume() {
     startTimer( 100 );
-    // da kommt demnächst osound denk ich mal
- /////////////////////////// lets just move those change volume here
-    //  AudioDevice::decreaseVolume();
+    volControl->decVol(2);
 }
@@ -136,3 +139,3 @@ void MediaPlayer::startIncreasingVolume() {
     startTimer( 100 );
-    //  AudioDevice::increaseVolume();
+    volControl->incVol(2);
 }
@@ -156,16 +159,17 @@ void MediaPlayer::stopChangingVolume() {
 void MediaPlayer::timerEvent( QTimerEvent * ) {
-    //    if ( volumeDirection == +1 )
-    //  AudioDevice::increaseVolume();
-    //    else if ( volumeDirection == -1 )
-        //       AudioDevice::decreaseVolume();
+    if ( volumeDirection == +1 ) {
+        volControl->incVol(2);
+    }  else if ( volumeDirection == -1 ) {
+        volControl->decVol(2);
+    }
 
-// Display an on-screen display volume
-    unsigned int l, r, v; bool m;
 
-// TODO FIXME
-//    AudioDevice::getVolume( l, r, m );
-//    v = ((l + r) * 11) / (2*0xFFFF);
+    // TODO FIXME
+    int v;
+    v = volControl->getVolume();
+    v = v / 10;
 
-    if ( drawnOnScreenDisplay && onScreenDisplayVolume == v )
-  return;
+   if ( drawnOnScreenDisplay && onScreenDisplayVolume == v ) {
+       return;
+   }
 
@@ -175,4 +179,5 @@ void MediaPlayer::timerEvent( QTimerEvent * ) {
     if ( drawnOnScreenDisplay ) {
-  if ( onScreenDisplayVolume > v )
-      audioUI->repaint( (w - 200) / 2 + v * 20 + 0, h - yoff + 40, (onScreenDisplayVolume - v) * 20 + 9, 30, FALSE );
+        if ( onScreenDisplayVolume > v ) {
+            audioUI->repaint( (w - 200) / 2 + v * 20 + 0, h - yoff + 40, (onScreenDisplayVolume - v) * 20 + 9, 30, FALSE );
+        }
     }
@@ -193,6 +198,7 @@ void MediaPlayer::timerEvent( QTimerEvent * ) {
     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 );
+        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 );
+        }
     }