9 files changed, 156 insertions, 58 deletions

diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp
index 0e9e7ea..955169c 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.cpp
+++ b/noncore/multimedia/opieplayer2/audiowidget.cpp
@@ -68,7 +68,7 @@ struct MediaButton {
 MediaButton audioButtons[] = {
    { TRUE,  FALSE, FALSE }, // play
    { FALSE, FALSE, FALSE }, // stop
-   { TRUE,  FALSE, FALSE }, // pause
+   { FALSE,  FALSE, FALSE }, // pause
    { FALSE, FALSE, FALSE }, // next
    { FALSE, FALSE, FALSE }, // previous
    { FALSE, FALSE, FALSE }, // volume up
@@ -342,10 +342,6 @@ void AudioWidget::paintButton( QPainter *p, int i ) {
 
 
 void AudioWidget::timerEvent( QTimerEvent * ) {
-//     static int frame = 0;
-//     if ( !mediaPlayerState->paused() && audioButtons[ AudioPlay ].isDown ) {
-//         frame = frame >= 7 ? 0 : frame + 1;
-//     }
 }
 
 
@@ -371,7 +367,9 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) {
                       qDebug("more clicked");
                       emit moreClicked();
                       return;
-                  case AudioVolumeDown: emit lessClicked(); return;
+                  case AudioVolumeDown:
+                      emit lessClicked();
+                      return;
                 }
             } else if ( !isOnButton && audioButtons[i].isHeld ) {
                 audioButtons[i].isHeld = FALSE;
@@ -380,12 +378,14 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) {
         } else {
             if ( audioButtons[i].isHeld ) {
                 audioButtons[i].isHeld = FALSE;
-                if ( !audioButtons[i].isToggle )
+                if ( !audioButtons[i].isToggle ) {
                     setToggleButton( i, FALSE );
+                       qDebug("button toggled3  %d",i);
+                }
                 switch (i) {
                   case AudioPlay:       mediaPlayerState->setPlaying(audioButtons[i].isDown); return;
                   case AudioStop:       mediaPlayerState->setPlaying(FALSE); return;
-                  case AudioPause:      mediaPlayerState->setPaused(audioButtons[i].isDown); return;
+                  case AudioPause:      mediaPlayerState->setPaused( audioButtons[i].isDown); return;
                   case AudioNext:       mediaPlayerState->setNext(); return;
                   case AudioPrevious:   mediaPlayerState->setPrev(); return;
                   case AudioLoop:       mediaPlayerState->setLooping(audioButtons[i].isDown); return;
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
@@ -11,6 +11,7 @@
 #include "mediaplayer.h"
 #include "playlistwidget.h"
 #include "audiowidget.h"
+#include "volumecontrol.h"
 
 #include "mediaplayerstate.h"
 
@@ -39,9 +40,13 @@ MediaPlayer::MediaPlayer( QObject *parent, const char *name )
     connect( audioUI,  SIGNAL( moreReleased() ), this, SLOT( stopChangingVolume() ) );
     connect( audioUI,  SIGNAL( lessReleased() ), this, SLOT( stopChangingVolume() ) );
 
+    volControl = new VolumeControl;
+
 }
 
 MediaPlayer::~MediaPlayer() {
+    delete xineControl;
+    delete volControl;
 }
 
 void MediaPlayer::pauseCheck( bool b ) {
@@ -71,7 +76,7 @@ void MediaPlayer::setPlaying( bool play ) {
     if ( playListCurrent != NULL ) {
         currentFile = playListCurrent;
     }
-    
+
     xineControl->play( currentFile->file() );
 
     xineControl->length();
@@ -92,7 +97,7 @@ void MediaPlayer::setPlaying( bool play ) {
 //     audioUI->setTickerText( tickerText + "." );
 
     audioUI->setTickerText( currentFile->file( ) );
-    
+
 }
 
 
@@ -125,16 +130,14 @@ void MediaPlayer::next() {
 void MediaPlayer::startDecreasingVolume() {
     volumeDirection = -1;
     startTimer( 100 );
-    // da kommt demnächst osound denk ich mal
- /////////////////////////// lets just move those change volume here
-    //  AudioDevice::decreaseVolume();
+    volControl->decVol(2);
 }
 
 
 void MediaPlayer::startIncreasingVolume() {
     volumeDirection = +1;
     startTimer( 100 );
-    //  AudioDevice::increaseVolume();
+    volControl->incVol(2);
 }
 
 
@@ -154,27 +157,29 @@ 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;
+   }
 
     int w = audioUI->width();
     int h = audioUI->height();
 
     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 );
+        }
     }
 
     drawnOnScreenDisplay = TRUE;
@@ -191,10 +196,11 @@ void MediaPlayer::timerEvent( QTimerEvent * ) {
     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 );
+        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/mediaplayer.h b/noncore/multimedia/opieplayer2/mediaplayer.h
index 7b79066..16213b5 100644
--- a/noncore/multimedia/opieplayer2/mediaplayer.h
+++ b/noncore/multimedia/opieplayer2/mediaplayer.h
@@ -10,7 +10,7 @@
 #include "xinecontrol.h"
 
 class DocLnk;
-
+class VolumeControl;
 
 class MediaPlayer : public QObject {
     Q_OBJECT
@@ -38,7 +38,7 @@ private:
     int     volumeDirection;
     const DocLnk  *currentFile;
     XineControl *xineControl;
-
+    VolumeControl *volControl;
 };
 
 
diff --git a/noncore/multimedia/opieplayer2/opieplayer2.pro b/noncore/multimedia/opieplayer2/opieplayer2.pro
index fee9242..edc4624 100644
--- a/noncore/multimedia/opieplayer2/opieplayer2.pro
+++ b/noncore/multimedia/opieplayer2/opieplayer2.pro
@@ -4,12 +4,12 @@ CONFIG    = qt warn_on release
 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 \
+        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 \
+   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 
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index 9065d63..b43d9f7 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -164,7 +164,7 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
     fullScreenButton = new QAction(tr("Full Screen"), Resource::loadPixmap("fullscreen"), QString::null, 0, this, 0);
     fullScreenButton->addTo(pmView);
     scaleButton = new QAction(tr("Scale"), Resource::loadPixmap("opieplayer/scale"), QString::null, 0, this, 0);
-    scaleButton->addTo(pmView);
+    //scaleButton->addTo(pmView);
 
     QVBox *vbox5 = new QVBox( this ); vbox5->setBackgroundMode( PaletteButton );
     QVBox *vbox4 = new QVBox( vbox5 ); vbox4->setBackgroundMode( PaletteButton );
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp
index af06079..188b18d 100644
--- a/noncore/multimedia/opieplayer2/videowidget.cpp
+++ b/noncore/multimedia/opieplayer2/videowidget.cpp
@@ -32,7 +32,6 @@
 */
 
 #include <qpe/resource.h>
-#include <qpe/mediaplayerplugininterface.h>
 #include <qpe/config.h>
 
 #include <qwidget.h>
@@ -87,7 +86,6 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) :
     cfg.setGroup("VideoWidget");
 
     QString Button0aPix, Button0bPix, controlsPix;
-    //backgroundPix=cfg.readEntry( "backgroundPix", "opieplayer/metalFinish");
     Button0aPix=cfg.readEntry( "Button0aPix", "opieplayer/mediaButton0a");
     Button0bPix=cfg.readEntry( "Button0bPix","opieplayer/mediaButton0b");
     controlsPix=cfg.readEntry( "controlsPix","opieplayer/mediaControls0" );
@@ -106,13 +104,15 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) :
     slider = new QSlider( Qt::Horizontal, this );
     slider->setMinValue( 0 );
     slider->setMaxValue( 1 );
-    slider->setBackgroundPixmap( Resource::loadPixmap( backgroundPix ) );
+
+    slider->setBackgroundPixmap( *this->backgroundPixmap () ); //Resource::loadPixmap( backgroundPix ) );
+    slider->setBackgroundOrigin( QWidget::ParentOrigin);
     slider->setFocusPolicy( QWidget::NoFocus );
     slider->setGeometry( QRect( 7, 250, 220, 20 ) );
 
     videoFrame = new XineVideoWidget ( this, "Video frame" );
 
-        connect ( videoFrame, SIGNAL( videoResized ( const QSize & )), this, SIGNAL( videoResized ( const QSize & )));
+    connect ( videoFrame, SIGNAL( videoResized ( const QSize & )), this, SIGNAL( videoResized ( const QSize & )));
 
     connect( slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) );
     connect( slider, SIGNAL( sliderReleased() ), this, SLOT( sliderReleased() ) );
@@ -244,7 +244,9 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) {
                 videoButtons[i].isHeld = FALSE;
                 if ( !videoButtons[i].isToggle )
                     setToggleButton( i, FALSE );
+                qDebug("button toggled3  %d",i);
             }
+
         }
         switch (i) {
           case VideoPlay:       mediaPlayerState->setPlaying(videoButtons[i].isDown); return;
@@ -319,21 +321,6 @@ void VideoWidget::closeEvent( QCloseEvent* ) {
 }
 
 
-bool VideoWidget::playVideo() {
-    bool result = FALSE;
-
-    int stream = 0;
-
-    int sw = 240;
-    int sh = 320;
-    int dd = QPixmap::defaultDepth();
-    int w = height();
-    int h = width();
-
-    return true;
-}
-
-
 
 void VideoWidget::keyReleaseEvent( QKeyEvent *e)
 {
@@ -389,6 +376,6 @@ XineVideoWidget* VideoWidget::vidWidget() {
 
 
 void VideoWidget::setFullscreen ( bool b )
-{ 
+{
         setToggleButton( VideoFullscreen, b );
-}
\ No newline at end of file
+}
diff --git a/noncore/multimedia/opieplayer2/videowidget.h b/noncore/multimedia/opieplayer2/videowidget.h
index fc53f89..04e810e 100644
--- a/noncore/multimedia/opieplayer2/videowidget.h
+++ b/noncore/multimedia/opieplayer2/videowidget.h
@@ -56,7 +56,6 @@ public:
     VideoWidget( QWidget* parent=0, const char* name=0, WFlags f=0 );
     ~VideoWidget();
 
-    bool playVideo();
     XineVideoWidget* vidWidget();
 public slots:
     void updateSlider( long, long );
diff --git a/noncore/multimedia/opieplayer2/volumecontrol.cpp b/noncore/multimedia/opieplayer2/volumecontrol.cpp
new file mode 100644
index 0000000..b8ec0df
--- a/dev/null
+++ b/noncore/multimedia/opieplayer2/volumecontrol.cpp
@@ -0,0 +1,59 @@
+
+#include <qpe/qpeapplication.h>
+#include <qpe/config.h>
+#include "qpe/qcopenvelope_qws.h"
+#include <qmessagebox.h>
+
+#include "volumecontrol.h"
+
+int VolumeControl::getVolume() {
+    int volumePerc;
+    Config cfg( "qpe" );
+    cfg. setGroup( "Volume" );
+    volumePerc = cfg. readNumEntry( "VolumePercent", 50 );
+    m_volumePerc = volumePerc;
+    return volumePerc;
+}
+
+
+void VolumeControl::setVolume( int volumePerc ) {
+     Config cfg("qpe");
+    cfg.setGroup("Volume");
+
+    if ( volumePerc > 100 ) {
+        volumePerc = 100;
+    }
+    if ( volumePerc < 0 ) {
+        volumePerc = 0;
+    }
+
+    m_volumePerc = volumePerc;
+    cfg.writeEntry("VolumePercent", volumePerc );
+    QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << false;
+}
+
+
+void VolumeControl::incVol( int ammount ) {
+    int oldVol = getVolume();
+    setVolume( oldVol + ammount);
+}
+
+void VolumeControl::decVol( int ammount ) {
+     int oldVol = getVolume();
+    setVolume( oldVol - ammount);
+}
+
+
+VolumeControl::VolumeControl( ) {
+    getVolume();
+}
+
+VolumeControl::~VolumeControl() {
+    QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << false;
+}
+
+
+
+
+
+
diff --git a/noncore/multimedia/opieplayer2/volumecontrol.h b/noncore/multimedia/opieplayer2/volumecontrol.h
new file mode 100644
index 0000000..37be398
--- a/dev/null
+++ b/noncore/multimedia/opieplayer2/volumecontrol.h
@@ -0,0 +1,47 @@
+/*************
+ * this is only a quick hack and will be later replaced by osound
+ *
+ **********/
+
+
+#ifndef VOLUMECONTROL_H
+#define VOLUMECONTROL_H
+
+
+
+#include <qobject.h>
+
+class VolumeControl : public QObject {
+    Q_OBJECT
+public:
+    VolumeControl();
+    ~VolumeControl();
+
+    // increase by "ammount"
+    void incVol( int ammount );
+    void decVol( int ammount );
+
+    /**
+     * Get the volume in percent
+     * @return volume percentage
+     */
+    int getVolume();
+
+public slots:
+
+    /**
+     * Set the volume in percent
+     * @value volumePerc between 0 and 100
+     */
+    void setVolume( int volumePerc );
+
+
+
+private:
+
+    int m_volumePerc;
+
+};
+
+#endif
+