author | kergoth <kergoth> | 2003-08-09 16:24:58 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2003-08-09 16:24:58 (UTC) |
commit | e16d333ec2e8509fc665921ca106c25325bae9e0 (patch) (unidiff) | |
tree | 9e9068190a15bc9b2a52ab33b40881128f732c0e /noncore/multimedia/opieplayer2/xinecontrol.cpp | |
parent | 1c58d1407f9584fedcdae390a04e2b37e5853361 (diff) | |
download | opie-e16d333ec2e8509fc665921ca106c25325bae9e0.zip opie-e16d333ec2e8509fc665921ca106c25325bae9e0.tar.gz opie-e16d333ec2e8509fc665921ca106c25325bae9e0.tar.bz2 |
Merge from BRANCH_1_0
Diffstat (limited to 'noncore/multimedia/opieplayer2/xinecontrol.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/xinecontrol.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/noncore/multimedia/opieplayer2/xinecontrol.cpp b/noncore/multimedia/opieplayer2/xinecontrol.cpp index 1c489e3..a392f4a 100644 --- a/noncore/multimedia/opieplayer2/xinecontrol.cpp +++ b/noncore/multimedia/opieplayer2/xinecontrol.cpp | |||
@@ -33,12 +33,13 @@ | |||
33 | 33 | ||
34 | 34 | ||
35 | #include <qtimer.h> | 35 | #include <qtimer.h> |
36 | #include <qmessagebox.h> | 36 | #include <qmessagebox.h> |
37 | #include <qpe/qcopenvelope_qws.h> | 37 | #include <qpe/qcopenvelope_qws.h> |
38 | #include <qpe/qpeapplication.h> | 38 | #include <qpe/qpeapplication.h> |
39 | |||
39 | #include "xinecontrol.h" | 40 | #include "xinecontrol.h" |
40 | #include "mediaplayerstate.h" | 41 | #include "mediaplayerstate.h" |
41 | #include "xinevideowidget.h" | 42 | #include "xinevideowidget.h" |
42 | 43 | ||
43 | XineControl::XineControl( XineVideoWidget *xineWidget, | 44 | XineControl::XineControl( XineVideoWidget *xineWidget, |
44 | MediaPlayerState &_mediaPlayerState, | 45 | MediaPlayerState &_mediaPlayerState, |
@@ -85,12 +86,13 @@ XineControl::~XineControl() { | |||
85 | } | 86 | } |
86 | #endif | 87 | #endif |
87 | delete libXine; | 88 | delete libXine; |
88 | } | 89 | } |
89 | 90 | ||
90 | void XineControl::play( const QString& fileName ) { | 91 | void XineControl::play( const QString& fileName ) { |
92 | |||
91 | hasVideoChannel = FALSE; | 93 | hasVideoChannel = FALSE; |
92 | hasAudioChannel = FALSE; | 94 | hasAudioChannel = FALSE; |
93 | m_fileName = fileName; | 95 | m_fileName = fileName; |
94 | 96 | ||
95 | qDebug("<<FILENAME: " + fileName + ">>>>"); | 97 | qDebug("<<FILENAME: " + fileName + ">>>>"); |
96 | 98 | ||
@@ -100,13 +102,12 @@ void XineControl::play( const QString& fileName ) { | |||
100 | mediaPlayerState.setPlaying( false ); | 102 | mediaPlayerState.setPlaying( false ); |
101 | return; | 103 | return; |
102 | } | 104 | } |
103 | mediaPlayerState.setPlaying( true ); | 105 | mediaPlayerState.setPlaying( true ); |
104 | 106 | ||
105 | MediaPlayerState::DisplayType displayType; | 107 | MediaPlayerState::DisplayType displayType; |
106 | // qDebug( QString( "libXine->hasVideo() return : %1 ").arg( libXine->hasVideo() ) ); | ||
107 | if ( !libXine->hasVideo() ) { | 108 | if ( !libXine->hasVideo() ) { |
108 | displayType = MediaPlayerState::Audio; | 109 | displayType = MediaPlayerState::Audio; |
109 | qDebug("HAS AUDIO"); | 110 | qDebug("HAS AUDIO"); |
110 | libXine->setShowVideo( false ); | 111 | libXine->setShowVideo( false ); |
111 | hasAudioChannel = TRUE; | 112 | hasAudioChannel = TRUE; |
112 | } else { | 113 | } else { |
@@ -194,13 +195,12 @@ long XineControl::position() { | |||
194 | long emitPos = (long)m_position; | 195 | long emitPos = (long)m_position; |
195 | emit positionChanged( emitPos ); | 196 | emit positionChanged( emitPos ); |
196 | if( mediaPlayerState.isPlaying() ) { | 197 | if( mediaPlayerState.isPlaying() ) { |
197 | // needs to be stopped the media is stopped | 198 | // needs to be stopped the media is stopped |
198 | QTimer::singleShot( 1000, this, SLOT( position() ) ); | 199 | QTimer::singleShot( 1000, this, SLOT( position() ) ); |
199 | } | 200 | } |
200 | // qDebug("POSITION : %d", m_position); | ||
201 | return m_position; | 201 | return m_position; |
202 | } | 202 | } |
203 | 203 | ||
204 | /** | 204 | /** |
205 | * Set videoplayback to fullscreen | 205 | * Set videoplayback to fullscreen |
206 | * @param isSet | 206 | * @param isSet |