3 files changed, 16 insertions, 15 deletions

diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp
index 23f4329..0e9e7ea 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.cpp
+++ b/noncore/multimedia/opieplayer2/audiowidget.cpp
@@ -55,145 +55,145 @@ void Ticker::drawContents( QPainter *p ) {
     pm.fill( colorGroup().base() );
     QPainter pmp( &pm );
     for ( int i = 0; i - pos < width() && (i < 1 || pixelLen > width()); i += pixelLen ) {
         pmp.drawText( i - pos, 0, INT_MAX, height(), AlignVCenter, scrollText );
     }
     p->drawPixmap( 0, 0, pm );
 }
 
 struct MediaButton {
    bool isToggle, isHeld, isDown;
 };
 
 //Layout information for the audioButtons (and if it is a toggle button or not)
 MediaButton audioButtons[] = {
    { TRUE,  FALSE, FALSE }, // play
    { FALSE, FALSE, FALSE }, // stop
    { TRUE,  FALSE, FALSE }, // pause
    { FALSE, FALSE, FALSE }, // next
    { FALSE, FALSE, FALSE }, // previous
    { FALSE, FALSE, FALSE }, // volume up
    { FALSE, FALSE, FALSE }, // volume down
    { TRUE,  FALSE, FALSE }, // repeat/loop
    { FALSE, FALSE, FALSE }, // playlist
    { FALSE, FALSE, FALSE }, // forward
-   { FALSE, FALSE, FALSE }  // back 
+   { FALSE, FALSE, FALSE }  // back
 };
 
 const char *skin_mask_file_names[11] = {
    "play", "stop", "pause", "next", "prev", "up",
    "down", "loop", "playlist", "forward", "back"
 };
 
 
 static void changeTextColor( QWidget *w ) {
    QPalette p = w->palette();
    p.setBrush( QColorGroup::Background, QColor( 167, 212, 167 ) );
    p.setBrush( QColorGroup::Base, QColor( 167, 212, 167 ) );
    w->setPalette( p );
 }
 
 static const int numButtons = (sizeof(audioButtons)/sizeof(MediaButton));
 
 
 AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
         QWidget( parent, name, f ), songInfo( this ), slider( Qt::Horizontal, this ),  time( this ) {
     setCaption( tr("OpiePlayer") );
-    
+
     Config cfg("OpiePlayer");
     cfg.setGroup("AudioWidget");
     skin = cfg.readEntry("Skin","default");
       //skin = "scaleTest";
 // color of background, frame, degree of transparency
 
     QString skinPath = "opieplayer/skins/" + skin;
     pixBg = new QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) );
     imgUp = new QImage( Resource::loadImage( QString("%1/skin_up").arg(skinPath) ) );
     imgDn = new QImage( Resource::loadImage( QString("%1/skin_down").arg(skinPath) ) );
 
     imgButtonMask = new QImage( imgUp->width(), imgUp->height(), 8, 255 );
     imgButtonMask->fill( 0 );
 
     for ( int i = 0; i < 11; i++ ) {
         QString filename = QString(getenv("OPIEDIR")) + "/pics/" + skinPath + "/skin_mask_" + skin_mask_file_names[i] + ".png";
         masks[i] = new QBitmap( filename );
 
         if ( !masks[i]->isNull() ) {
             QImage imgMask = masks[i]->convertToImage();
             uchar **dest = imgButtonMask->jumpTable();
             for ( int y = 0; y < imgUp->height(); y++ ) {
                 uchar *line = dest[y];
-                for ( int x = 0; x < imgUp->width(); x++ ) 
-                    if ( !qRed( imgMask.pixel( x, y ) ) ) 
+                for ( int x = 0; x < imgUp->width(); x++ )
+                    if ( !qRed( imgMask.pixel( x, y ) ) )
                         line[x] = i + 1;
             }
         }
 
     }
 
     for ( int i = 0; i < 11; i++ ) {
         buttonPixUp[i] = NULL;
         buttonPixDown[i] = NULL;
     }
 
     setBackgroundPixmap( *pixBg );
 
     songInfo.setFocusPolicy( QWidget::NoFocus );
     changeTextColor( &songInfo );
 
     slider.setFixedHeight( 20 );
     slider.setMinValue( 0 );
     slider.setMaxValue( 1 );
     slider.setFocusPolicy( QWidget::NoFocus );
     slider.setBackgroundPixmap( *pixBg );
 
     time.setFocusPolicy( QWidget::NoFocus );
     time.setAlignment( Qt::AlignCenter );
     time.setFrame(FALSE);
     changeTextColor( &time );
 
     resizeEvent( NULL );
 
     connect( &slider,           SIGNAL( sliderPressed() ),      this, SLOT( sliderPressed() ) );
     connect( &slider,           SIGNAL( sliderReleased() ),     this, SLOT( sliderReleased() ) );
 
     connect( mediaPlayerState, SIGNAL( lengthChanged(long) ),  this, SLOT( setLength(long) ) );
     connect( mediaPlayerState, SIGNAL( viewChanged(char) ),    this, SLOT( setView(char) ) );
     connect( mediaPlayerState, SIGNAL( loopingToggled(bool) ), this, SLOT( setLooping(bool) ) );
     connect( mediaPlayerState, SIGNAL( pausedToggled(bool) ),  this, SLOT( setPaused(bool) ) );
     connect( mediaPlayerState, SIGNAL( playingToggled(bool) ), this, SLOT( setPlaying(bool) ) );
- 
+
     // Intialise state
     setLength( mediaPlayerState->length() );
     setPosition( mediaPlayerState->position() );
     setLooping( mediaPlayerState->fullscreen() );
     setPaused( mediaPlayerState->paused() );
     setPlaying( mediaPlayerState->playing() );
 
 }
 
 AudioWidget::~AudioWidget() {
-    
+
     for ( int i = 0; i < 11; i++ ) {
         delete buttonPixUp[i];
         delete buttonPixDown[i];
     }
     delete pixBg;
     delete imgUp;
     delete imgDn;
     delete imgButtonMask;
     for ( int i = 0; i < 11; i++ ) {
         delete masks[i];
     }
 }
 
 QPixmap *combineImageWithBackground( QImage img, QPixmap bg, QPoint offset ) {
     QPixmap pix( img.width(), img.height() );
     QPainter p( &pix );
     p.drawTiledPixmap( pix.rect(), bg, offset );
     p.drawImage( 0, 0, img );
     return new QPixmap( pix );
 }
 
 
 QPixmap *maskPixToMask( QPixmap pix, QBitmap mask )
 {
@@ -253,74 +253,74 @@ void AudioWidget::sliderReleased() {
 void AudioWidget::setPosition( long i ) {
 //    qDebug("<<<<<<<<<<<<<<<<<<<<<<<<set position %d",i);
     updateSlider( i, mediaPlayerState->length() );
 }
 
 
 void AudioWidget::setLength( long max ) {
     updateSlider( mediaPlayerState->position(), max );
 }
 
 
 void AudioWidget::setView( char view ) {
         slider.show();
 
 // this isnt working for some reason
 
 //     if ( mediaPlayerState->streaming() ) {
 //         qDebug("<<<<<<<<<<<<<<file is STREAMING>>>>>>>>>>>>>>>>>>>");
 //         if( !slider.isHidden()) slider.hide();
 //         disconnect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) );
 //         disconnect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) );
 //     } else {
         // this stops the slider from being moved, thus
         // does not stop stream when it reaches the end
-        slider.show();
+        //    slider.show();
         connect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) );
         connect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) );
 //    }
 
     if ( view == 'a' ) {
         startTimer( 150 );
         showMaximized();
     } else {
         killTimers();
         hide();
     }
 }
 
 
 static QString timeAsString( long length ) {
     int minutes = length / 60;
     int seconds = length % 60;
     return QString("%1:%2%3").arg( minutes ).arg( seconds / 10 ).arg( seconds % 10 );
 }
 
 void AudioWidget::updateSlider( long i, long max ) {
 
     time.setText( timeAsString( i ) + " / " + timeAsString( max ) );
 //    qDebug( timeAsString( i ) + " / " + timeAsString( max ) ) ;
-    
+
     if ( max == 0 ) {
         return;
     }
     // Will flicker too much if we don't do this
     // Scale to something reasonable
     int width = slider.width();
     int val = int((double)i * width / max);
     if ( !audioSliderBeingMoved ) {
         if ( slider.value() != val ) {
             slider.setValue( val );
         }
 
         if ( slider.maxValue() != width ) {
             slider.setMaxValue( width );
         }
     }
 }
 
 
 void AudioWidget::setToggleButton( int i, bool down ) {
     if ( down != audioButtons[i].isDown ) {
         toggleButton( i );
     }
 }
@@ -339,58 +339,58 @@ void AudioWidget::paintButton( QPainter *p, int i ) {
     else
         p->drawPixmap( xoff, yoff, *buttonPixUp[i] );
 }
 
 
 void AudioWidget::timerEvent( QTimerEvent * ) {
 //     static int frame = 0;
 //     if ( !mediaPlayerState->paused() && audioButtons[ AudioPlay ].isDown ) {
 //         frame = frame >= 7 ? 0 : frame + 1;
 //     }
 }
 
 
 void AudioWidget::mouseMoveEvent( QMouseEvent *event ) {
     for ( int i = 0; i < numButtons; i++ ) {
         if ( event->state() == QMouseEvent::LeftButton ) {
 
               // The test to see if the mouse click is inside the button or not
             int x = event->pos().x() - xoff;
             int y = event->pos().y() - yoff;
 
             bool isOnButton = ( x > 0 && y > 0 && x < imgButtonMask->width()
                                 && y < imgButtonMask->height() && imgButtonMask->pixelIndex( x, y ) == i + 1 );
 
-            if ( isOnButton && i == AudioVolumeUp ) 
+            if ( isOnButton && i == AudioVolumeUp )
                 qDebug("on up");
 
             if ( isOnButton && !audioButtons[i].isHeld ) {
                 audioButtons[i].isHeld = TRUE;
                 toggleButton(i);
                 switch (i) {
-                  case AudioVolumeUp:   
+                  case AudioVolumeUp:
                       qDebug("more clicked");
-                      emit moreClicked(); 
+                      emit moreClicked();
                       return;
                   case AudioVolumeDown: emit lessClicked(); return;
                 }
             } else if ( !isOnButton && audioButtons[i].isHeld ) {
                 audioButtons[i].isHeld = FALSE;
                 toggleButton(i);
             }
         } else {
             if ( audioButtons[i].isHeld ) {
                 audioButtons[i].isHeld = FALSE;
                 if ( !audioButtons[i].isToggle )
                     setToggleButton( i, FALSE );
                 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 AudioNext:       mediaPlayerState->setNext(); return;
                   case AudioPrevious:   mediaPlayerState->setPrev(); return;
                   case AudioLoop:       mediaPlayerState->setLooping(audioButtons[i].isDown); return;
                   case AudioVolumeUp:   emit moreReleased(); return;
                   case AudioVolumeDown: emit lessReleased(); return;
                   case AudioPlayList:   mediaPlayerState->setList();  return;
                 }
             }
diff --git a/noncore/multimedia/opieplayer2/xinecontrol.cpp b/noncore/multimedia/opieplayer2/xinecontrol.cpp
index 33889d0..d08ff04 100644
--- a/noncore/multimedia/opieplayer2/xinecontrol.cpp
+++ b/noncore/multimedia/opieplayer2/xinecontrol.cpp
@@ -25,60 +25,60 @@
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 
 #include <qtimer.h>
 #include "xinecontrol.h"
 #include "mediaplayerstate.h"
 #include "videowidget.h"
 
 extern MediaPlayerState *mediaPlayerState;
 extern VideoWidget *videoUI;
 XineControl::XineControl( QObject *parent, const char *name )
     : QObject( parent, name ) {
     libXine = new XINE::Lib(videoUI->vidWidget() );
 
         connect ( videoUI, SIGNAL( videoResized ( const QSize & )), this, SLOT( videoResized ( const QSize & )));
     connect( mediaPlayerState, SIGNAL( pausedToggled(bool) ),  this, SLOT( pause(bool) ) );
     connect( this, SIGNAL( positionChanged( long ) ), mediaPlayerState, SLOT( updatePosition( long ) ) );
-    connect( this, SIGNAL( positionChanged( long ) ), mediaPlayerState, SLOT( setPosition( long ) ) );
     connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), this, SLOT( stop( bool ) ) );
     connect( mediaPlayerState, SIGNAL( fullscreenToggled( bool ) ), this, SLOT( setFullscreen( bool ) ) );
     connect( mediaPlayerState, SIGNAL( positionChanged( long ) ),  this,  SLOT( seekTo( long ) ) );
 
 }
 
 XineControl::~XineControl() {
     delete libXine;
 }
 
 void XineControl::play( const QString& fileName ) {
+    m_fileName = fileName;
     libXine->play( fileName );
     mediaPlayerState->setPlaying( true );
     // default to audio view until we know how to handle video
     //   MediaDetect mdetect;
     char whichGui = mdetect.videoOrAudio( fileName );
     if (whichGui == 'f') {
         qDebug("Nicht erkannter Dateityp");
         return;
     }
 
     if (whichGui == 'a') {
         libXine->setShowVideo( false );
     } else {
         libXine->setShowVideo( true );
     }
 
     // determine if slider is shown
     //    mediaPlayerState->setIsStreaming( mdetect.isStreaming( fileName ) );
     mediaPlayerState->setIsStreaming( libXine->isSeekable() );
     // which gui (video / audio)
     mediaPlayerState->setView( whichGui );
     length();
     position();
 }
@@ -90,47 +90,48 @@ void XineControl::stop( bool isSet ) {
         //mediaPlayerState->setPlaying( false );
     } else {
         // play again
     }
 }
 
 void XineControl::pause( bool isSet) {
     libXine->pause();
 }
 
 long XineControl::currentTime() {
     // todo: jede sekunde überprüfen
     m_currentTime =  libXine->currentTime();
     return m_currentTime;
     QTimer::singleShot( 1000, this, SLOT( currentTime() ) );
 }
 
 void  XineControl::length() {
     m_length = libXine->length();
     mediaPlayerState->setLength( m_length );
 }
 
 long XineControl::position() {
     m_position = ( currentTime()  );
-    mediaPlayerState->setPosition( m_position  );
+    mediaPlayerState->updatePosition( m_position  );
     long emitPos = (long)m_position;
     emit positionChanged( emitPos );
     if(mediaPlayerState->isPlaying)
     // needs to be stopped the media is stopped
     QTimer::singleShot( 1000, this, SLOT( position() ) );
 //    qDebug("POSITION : %d", m_position);
     return m_position;
 }
 
 void XineControl::setFullscreen( bool isSet ) {
     libXine->showVideoFullScreen( isSet);
 }
 
 void XineControl::seekTo( long second ) {
-    //  libXine->
+    qDebug("seek triggered!!");
+    libXine->play( m_fileName , 0, (int)second );
 }
 
 
 void XineControl::videoResized ( const QSize &s )
 {
         libXine-> resize ( s );
 }
diff --git a/noncore/multimedia/opieplayer2/xinecontrol.h b/noncore/multimedia/opieplayer2/xinecontrol.h
index 4a61f32..c7aefd4 100644
--- a/noncore/multimedia/opieplayer2/xinecontrol.h
+++ b/noncore/multimedia/opieplayer2/xinecontrol.h
@@ -42,32 +42,32 @@ class XineControl : public QObject  {
     Q_OBJECT
 public:
     XineControl( QObject *parent = 0, const char *name =0 );
     ~XineControl();
     int m_length;
 
 public slots:
     void play( const QString& fileName );
     void stop( bool );
     void pause( bool );
     void setFullscreen( bool );
     long currentTime();
     void seekTo( long );
     // get length of media file and set it
     void length();
     long position();
 
         void videoResized ( const QSize &s );
 
 private:
     XINE::Lib *libXine;
     MediaDetect mdetect;
     long m_currentTime;
     long m_position;
-
+    QString m_fileName;
 signals:
     void positionChanged( long );
 
 };
 
 
 #endif