summaryrefslogtreecommitdiff
Unidiff
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
@@ -68,40 +68,36 @@ XineControl::~XineControl() {
68 delete libXine; 68 delete libXine;
69} 69}
70 70
71void XineControl::play( const QString& fileName ) { 71void XineControl::play( const QString& fileName ) {
72 hasVideoChannel=FALSE; 72 hasVideoChannel=FALSE;
73 hasAudioChannel=FALSE; 73 hasAudioChannel=FALSE;
74 m_fileName = fileName; 74 m_fileName = fileName;
75 75
76 //qDebug("<<FILENAME: " + fileName + ">>>>"); 76 //qDebug("<<FILENAME: " + 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;
91 } else { 88 } else {
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)
99 mediaPlayerState->setView( whichGui ); 95 mediaPlayerState->setView( whichGui );
100 96
101#if defined(Q_WS_QWS) && !defined(QT_NO_COP) 97#if defined(Q_WS_QWS) && !defined(QT_NO_COP)
102 if ( !disabledSuspendScreenSaver ) { 98 if ( !disabledSuspendScreenSaver ) {
103 disabledSuspendScreenSaver = TRUE; 99 disabledSuspendScreenSaver = TRUE;
104 // Stop the screen from blanking and power saving state 100 // Stop the screen from blanking and power saving state
105 QCopEnvelope("QPE/System", "setScreenSaverMode(int)" ) 101 QCopEnvelope("QPE/System", "setScreenSaverMode(int)" )
106 << ( whichGui == 'v' ? QPEApplication::Disable : QPEApplication::DisableSuspend ); 102 << ( whichGui == 'v' ? QPEApplication::Disable : QPEApplication::DisableSuspend );
107 } 103 }
@@ -113,37 +109,33 @@ void XineControl::play( const QString& fileName ) {
113 109
114void XineControl::nextMedia() { 110void XineControl::nextMedia() {
115 mediaPlayerState->setNext(); 111 mediaPlayerState->setNext();
116} 112}
117 113
118void XineControl::setGamma( int value ) { 114void XineControl::setGamma( int value ) {
119 libXine->setGamma( value ); 115 libXine->setGamma( value );
120} 116}
121 117
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 ) {
130 disabledSuspendScreenSaver = FALSE; 124 disabledSuspendScreenSaver = FALSE;
131 // Re-enable the suspend mode 125 // Re-enable the suspend mode
132 QCopEnvelope("QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Enable; 126 QCopEnvelope("QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Enable;
133 } 127 }
134#endif 128#endif
135 129
136 } else {
137 // play again
138 } 130 }
139} 131}
140 132
141/** 133/**
142 * Pause playback 134 * Pause playback
143 * @isSet 135 * @isSet
144 */ 136 */
145void XineControl::pause( bool isSet) { 137void XineControl::pause( bool isSet) {
146 if (isSet) { 138 if (isSet) {
147 libXine->pause(); 139 libXine->pause();
148 } else { 140 } else {
149 libXine->play( m_fileName, 0, m_currentTime); 141 libXine->play( m_fileName, 0, m_currentTime);