fullscreen toogle connected

2 files changed, 12 insertions, 6 deletions

diff --git a/noncore/multimedia/opieplayer2/xinecontrol.cpp b/noncore/multimedia/opieplayer2/xinecontrol.cpp
index 7407e4e..497636a 100644
--- a/noncore/multimedia/opieplayer2/xinecontrol.cpp
+++ b/noncore/multimedia/opieplayer2/xinecontrol.cpp
@@ -1,70 +1,76 @@
-
+#include <qtimer.h>
 #include "xinecontrol.h"
 #include "mediaplayerstate.h"
 
 
 extern MediaPlayerState *mediaPlayerState;
 
 XineControl::XineControl( QObject *parent, const char *name )
     : QObject( parent, name ) {
     libXine = new XINE::Lib();
 
     connect( mediaPlayerState, SIGNAL( pausedToggled(bool) ),  this, SLOT( pause(bool) ) );
     connect( this, SIGNAL( positionChanged( int position ) ),  mediaPlayerState, SLOT( updatePosition( long p ) ) );
     connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), this, SLOT( stop( bool ) ) );
-
+    connect( mediaPlayerState, SIGNAL( fullscreenToggled( bool ) ), this, SLOT( setFullscreen( bool ) ) );
 }
 
 XineControl::~XineControl() {
     delete libXine;
 }
 
 void XineControl::play( const QString& 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;
     }
 
-    // which gui (video / audio)
-    mediaPlayerState->setView(  whichGui  );
-
     // determine if slider is shown
     mediaPlayerState->setIsStreaming( mdetect.isStreaming( fileName ) );
+
+    // which gui (video / audio)
+    mediaPlayerState->setView( whichGui );
+
 }
 
 void XineControl::stop( bool isSet ) {
     if ( !isSet) {
         libXine->stop();
         mediaPlayerState->setList();
         //mediaPlayerState->setPlaying( false );
     } else {
         // play again
     }
 }
 
 void XineControl::pause( bool isSet) {
     libXine->pause();
 }
 
 int XineControl::currentTime() {
     // todo: jede sekunde überprüfen
     m_currentTime =  libXine->currentTime();
     return m_currentTime;
 }
 
 void  XineControl::length() {
     m_length = libXine->length();
     mediaPlayerState->setLength( m_length );
 }
 
 int XineControl::position() {
     m_position = (m_currentTime/m_length*100);
     mediaPlayerState->setPosition( m_position  );
     return m_position;
     emit positionChanged( m_position );
+    QTimer::singleShot( 1000, this, SLOT( position ) );
+}
+
+void XineControl::setFullscreen( bool isSet ) {
+    libXine-> showVideoFullScreen( isSet);
 }
diff --git a/noncore/multimedia/opieplayer2/xinecontrol.h b/noncore/multimedia/opieplayer2/xinecontrol.h
index aab00cd..145cd0c 100644
--- a/noncore/multimedia/opieplayer2/xinecontrol.h
+++ b/noncore/multimedia/opieplayer2/xinecontrol.h
@@ -1,40 +1,40 @@
 
 #ifndef XINECONTROL_H
 #define XINECONTROL_H
 
 #include "lib.h"
 #include "mediadetect.h"
 #include <qobject.h>
 
 class XineControl : public QObject  {
     Q_OBJECT
 public:
     XineControl( QObject *parent = 0, const char *name =0 );
     ~XineControl();
 
 public slots:
     void play( const QString& fileName );
     void stop( bool );
     void pause( bool );
-
+    void setFullscreen( bool );
     int currentTime();
 
     // get length of media file and set it
     void length();
 
     int position();
 
 private:
     XINE::Lib *libXine;
     MediaDetect mdetect;
     int m_length;
     int m_currentTime;
     int m_position;
 
 signals:
     void positionChanged( int position  );
 
 };
 
 
 #endif