summaryrefslogtreecommitdiff
authorharlekin <harlekin>2002-09-04 10:27:35 (UTC)
committer harlekin <harlekin>2002-09-04 10:27:35 (UTC)
commit04da91b7a4451366cb005c1e2bb4f649283cc7f9 (patch) (unidiff)
treecb3a963e49adf96fa90e5a042ba0e411819d56c0
parentab38f9c573c39be3c5ea909dd4eafed319fa9dff (diff)
downloadopie-04da91b7a4451366cb005c1e2bb4f649283cc7f9.zip
opie-04da91b7a4451366cb005c1e2bb4f649283cc7f9.tar.gz
opie-04da91b7a4451366cb005c1e2bb4f649283cc7f9.tar.bz2
do not go to playlist in between 2 audio streams
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/xinecontrol.cpp8
1 files changed, 0 insertions, 8 deletions
diff --git a/noncore/multimedia/opieplayer2/xinecontrol.cpp b/noncore/multimedia/opieplayer2/xinecontrol.cpp
index d18fde5..0137ae5 100644
--- a/noncore/multimedia/opieplayer2/xinecontrol.cpp
+++ b/noncore/multimedia/opieplayer2/xinecontrol.cpp
@@ -77,14 +77,11 @@ void XineControl::play( const QString& fileName ) {
77 77
78 libXine->play( fileName ); 78 libXine->play( fileName );
79 mediaPlayerState->setPlaying( true ); 79 mediaPlayerState->setPlaying( true );
80 // default to audio view until we know how to handle video
81 // MediaDetect mdetect;
82 char whichGui = mdetect.videoOrAudio( fileName ); 80 char whichGui = mdetect.videoOrAudio( fileName );
83 if (whichGui == 'f') { 81 if (whichGui == 'f') {
84 qDebug("Nicht erkannter Dateityp"); 82 qDebug("Nicht erkannter Dateityp");
85 return; 83 return;
86 } 84 }
87
88 if (whichGui == 'a') { 85 if (whichGui == 'a') {
89 libXine->setShowVideo( false ); 86 libXine->setShowVideo( false );
90 hasAudioChannel=TRUE; 87 hasAudioChannel=TRUE;
@@ -92,7 +89,6 @@ void XineControl::play( const QString& fileName ) {
92 libXine->setShowVideo( true ); 89 libXine->setShowVideo( true );
93 hasVideoChannel=TRUE; 90 hasVideoChannel=TRUE;
94 } 91 }
95
96 // determine if slider is shown 92 // determine if slider is shown
97 mediaPlayerState->setIsStreaming( !libXine->isSeekable() ); 93 mediaPlayerState->setIsStreaming( !libXine->isSeekable() );
98 // which gui (video / audio) 94 // which gui (video / audio)
@@ -122,8 +118,6 @@ void XineControl::setGamma( int value ) {
122void XineControl::stop( bool isSet ) { 118void XineControl::stop( bool isSet ) {
123 if ( !isSet) { 119 if ( !isSet) {
124 libXine->stop( ); 120 libXine->stop( );
125 mediaPlayerState->setList();
126 // mediaPlayerState->setPlaying( false );
127 121
128#if defined(Q_WS_QWS) && !defined(QT_NO_COP) 122#if defined(Q_WS_QWS) && !defined(QT_NO_COP)
129 if ( disabledSuspendScreenSaver ) { 123 if ( disabledSuspendScreenSaver ) {
@@ -133,8 +127,6 @@ void XineControl::stop( bool isSet ) {
133 } 127 }
134#endif 128#endif
135 129
136 } else {
137 // play again
138 } 130 }
139} 131}
140 132