summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/xinecontrol.cpp16
-rw-r--r--noncore/multimedia/opieplayer2/xinecontrol.h2
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,4 +1,4 @@
1 1#include <qtimer.h>
2#include "xinecontrol.h" 2#include "xinecontrol.h"
3#include "mediaplayerstate.h" 3#include "mediaplayerstate.h"
4 4
@@ -12,7 +12,7 @@ XineControl::XineControl( QObject *parent, const char *name )
12 connect( mediaPlayerState, SIGNAL( pausedToggled(bool) ), this, SLOT( pause(bool) ) ); 12 connect( mediaPlayerState, SIGNAL( pausedToggled(bool) ), this, SLOT( pause(bool) ) );
13 connect( this, SIGNAL( positionChanged( int position ) ), mediaPlayerState, SLOT( updatePosition( long p ) ) ); 13 connect( this, SIGNAL( positionChanged( int position ) ), mediaPlayerState, SLOT( updatePosition( long p ) ) );
14 connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), this, SLOT( stop( bool ) ) ); 14 connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), this, SLOT( stop( bool ) ) );
15 15 connect( mediaPlayerState, SIGNAL( fullscreenToggled( bool ) ), this, SLOT( setFullscreen( bool ) ) );
16} 16}
17 17
18XineControl::~XineControl() { 18XineControl::~XineControl() {
@@ -30,11 +30,12 @@ void XineControl::play( const QString& fileName ) {
30 return; 30 return;
31 } 31 }
32 32
33 // which gui (video / audio)
34 mediaPlayerState->setView( whichGui );
35
36 // determine if slider is shown 33 // determine if slider is shown
37 mediaPlayerState->setIsStreaming( mdetect.isStreaming( fileName ) ); 34 mediaPlayerState->setIsStreaming( mdetect.isStreaming( fileName ) );
35
36 // which gui (video / audio)
37 mediaPlayerState->setView( whichGui );
38
38} 39}
39 40
40void XineControl::stop( bool isSet ) { 41void XineControl::stop( bool isSet ) {
@@ -67,4 +68,9 @@ int XineControl::position() {
67 mediaPlayerState->setPosition( m_position ); 68 mediaPlayerState->setPosition( m_position );
68 return m_position; 69 return m_position;
69 emit positionChanged( m_position ); 70 emit positionChanged( m_position );
71 QTimer::singleShot( 1000, this, SLOT( position ) );
72}
73
74void XineControl::setFullscreen( bool isSet ) {
75 libXine-> showVideoFullScreen( isSet);
70} 76}
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
@@ -16,7 +16,7 @@ public slots:
16 void play( const QString& fileName ); 16 void play( const QString& fileName );
17 void stop( bool ); 17 void stop( bool );
18 void pause( bool ); 18 void pause( bool );
19 19 void setFullscreen( bool );
20 int currentTime(); 20 int currentTime();
21 21
22 // get length of media file and set it 22 // get length of media file and set it