-rw-r--r-- | core/multimedia/opieplayer/audiodevice.cpp | 16 | ||||
-rw-r--r-- | core/multimedia/opieplayer/audiowidget.cpp | 33 | ||||
-rw-r--r-- | core/multimedia/opieplayer/loopcontrol.cpp | 24 | ||||
-rw-r--r-- | core/multimedia/opieplayer/loopcontrol_threaded.cpp | 578 | ||||
-rw-r--r-- | core/multimedia/opieplayer/mediaplayer.cpp | 6 | ||||
-rw-r--r-- | core/multimedia/opieplayer/mediaplayerstate.cpp | 2 | ||||
-rw-r--r-- | core/multimedia/opieplayer/om3u.cpp | 60 | ||||
-rw-r--r-- | core/multimedia/opieplayer/playlistselection.cpp | 2 | ||||
-rw-r--r-- | core/multimedia/opieplayer/playlistwidget.cpp | 1300 | ||||
-rw-r--r-- | core/multimedia/opieplayer/videowidget.cpp | 16 |
10 files changed, 1006 insertions, 1031 deletions
diff --git a/core/multimedia/opieplayer/audiodevice.cpp b/core/multimedia/opieplayer/audiodevice.cpp index 73e41dc..d01d2ba 100644 --- a/core/multimedia/opieplayer/audiodevice.cpp +++ b/core/multimedia/opieplayer/audiodevice.cpp | |||
@@ -144,24 +144,24 @@ void AudioDevice::setVolume( unsigned int leftVolume, unsigned int rightVolume, | |||
144 | #endif | 144 | #endif |
145 | } | 145 | } |
146 | 146 | ||
147 | 147 | ||
148 | 148 | ||
149 | AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) { | 149 | AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) { |
150 | qDebug("creating new audio device"); | 150 | // qDebug("creating new audio device"); |
151 | // QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE; | 151 | // QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE; |
152 | d = new AudioDevicePrivate; | 152 | d = new AudioDevicePrivate; |
153 | d->frequency = f; | 153 | d->frequency = f; |
154 | d->channels = chs; | 154 | d->channels = chs; |
155 | d->bytesPerSample = bps; | 155 | d->bytesPerSample = bps; |
156 | qDebug("%d",bps); | 156 | // qDebug("%d",bps); |
157 | int format=0; | 157 | int format=0; |
158 | if( bps == 8) format = AFMT_U8; | 158 | if( bps == 8) format = AFMT_U8; |
159 | else if( bps <= 0) format = AFMT_S16_LE; | 159 | else if( bps <= 0) format = AFMT_S16_LE; |
160 | else format = AFMT_S16_LE; | 160 | else format = AFMT_S16_LE; |
161 | qDebug("AD- freq %d, channels %d, b/sample %d, bitrate %d",f,chs,bps,format); | 161 | // qDebug("AD- freq %d, channels %d, b/sample %d, bitrate %d",f,chs,bps,format); |
162 | connect( qApp, SIGNAL( volumeChanged(bool) ), this, SLOT( volumeChanged(bool) ) ); | 162 | connect( qApp, SIGNAL( volumeChanged(bool) ), this, SLOT( volumeChanged(bool) ) ); |
163 | 163 | ||
164 | int fragments = 0x10000 * 8 + sound_fragment_shift; | 164 | int fragments = 0x10000 * 8 + sound_fragment_shift; |
165 | int capabilities = 0; | 165 | int capabilities = 0; |
166 | 166 | ||
167 | 167 | ||
@@ -188,16 +188,16 @@ AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) { | |||
188 | if(ioctl( d->handle, SNDCTL_DSP_GETCAPS, &capabilities )==-1) | 188 | if(ioctl( d->handle, SNDCTL_DSP_GETCAPS, &capabilities )==-1) |
189 | perror("ioctl(\"SNDCTL_DSP_GETCAPS\")"); | 189 | perror("ioctl(\"SNDCTL_DSP_GETCAPS\")"); |
190 | if(ioctl( d->handle, SNDCTL_DSP_SETFRAGMENT, &fragments )==-1) | 190 | if(ioctl( d->handle, SNDCTL_DSP_SETFRAGMENT, &fragments )==-1) |
191 | perror("ioctl(\"SNDCTL_DSP_SETFRAGMENT\")"); | 191 | perror("ioctl(\"SNDCTL_DSP_SETFRAGMENT\")"); |
192 | if(ioctl( d->handle, SNDCTL_DSP_SETFMT, & format )==-1) | 192 | if(ioctl( d->handle, SNDCTL_DSP_SETFMT, & format )==-1) |
193 | perror("ioctl(\"SNDCTL_DSP_SETFMT\")"); | 193 | perror("ioctl(\"SNDCTL_DSP_SETFMT\")"); |
194 | qDebug("freq %d", d->frequency); | 194 | // qDebug("freq %d", d->frequency); |
195 | if(ioctl( d->handle, SNDCTL_DSP_SPEED, &d->frequency )==-1) | 195 | if(ioctl( d->handle, SNDCTL_DSP_SPEED, &d->frequency )==-1) |
196 | perror("ioctl(\"SNDCTL_DSP_SPEED\")"); | 196 | perror("ioctl(\"SNDCTL_DSP_SPEED\")"); |
197 | qDebug("channels %d",d->channels); | 197 | // qDebug("channels %d",d->channels); |
198 | if ( ioctl( d->handle, SNDCTL_DSP_CHANNELS, &d->channels ) == -1 ) { | 198 | if ( ioctl( d->handle, SNDCTL_DSP_CHANNELS, &d->channels ) == -1 ) { |
199 | d->channels = ( d->channels == 1 ) ? 2 : d->channels; | 199 | d->channels = ( d->channels == 1 ) ? 2 : d->channels; |
200 | if(ioctl( d->handle, SNDCTL_DSP_CHANNELS, &d->channels )==-1) | 200 | if(ioctl( d->handle, SNDCTL_DSP_CHANNELS, &d->channels )==-1) |
201 | perror("ioctl(\"SNDCTL_DSP_CHANNELS\")"); | 201 | perror("ioctl(\"SNDCTL_DSP_CHANNELS\")"); |
202 | } | 202 | } |
203 | // QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << FALSE; | 203 | // QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << FALSE; |
@@ -215,13 +215,13 @@ AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) { | |||
215 | //if ( capabilities & DSP_CAP_MMAP ) qDebug( "Sound card can mmap" ); | 215 | //if ( capabilities & DSP_CAP_MMAP ) qDebug( "Sound card can mmap" ); |
216 | 216 | ||
217 | } | 217 | } |
218 | 218 | ||
219 | 219 | ||
220 | AudioDevice::~AudioDevice() { | 220 | AudioDevice::~AudioDevice() { |
221 | qDebug("destryo audiodevice"); | 221 | // qDebug("destryo audiodevice"); |
222 | // QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE; | 222 | // QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE; |
223 | 223 | ||
224 | # ifndef KEEP_DEVICE_OPEN | 224 | # ifndef KEEP_DEVICE_OPEN |
225 | close( d->handle ); // Now it should be safe to shut the handle | 225 | close( d->handle ); // Now it should be safe to shut the handle |
226 | # endif | 226 | # endif |
227 | delete d->unwrittenBuffer; | 227 | delete d->unwrittenBuffer; |
@@ -239,13 +239,13 @@ void AudioDevice::volumeChanged( bool muted ) | |||
239 | 239 | ||
240 | void AudioDevice::write( char *buffer, unsigned int length ) | 240 | void AudioDevice::write( char *buffer, unsigned int length ) |
241 | { | 241 | { |
242 | int t = ::write( d->handle, buffer, length ); | 242 | int t = ::write( d->handle, buffer, length ); |
243 | if ( t<0 ) t = 0; | 243 | if ( t<0 ) t = 0; |
244 | if ( t != (int)length) { | 244 | if ( t != (int)length) { |
245 | qDebug("Ahhh!! memcpys 1"); | 245 | // qDebug("Ahhh!! memcpys 1"); |
246 | memcpy(d->unwrittenBuffer,buffer+t,length-t); | 246 | memcpy(d->unwrittenBuffer,buffer+t,length-t); |
247 | d->unwritten = length-t; | 247 | d->unwritten = length-t; |
248 | } | 248 | } |
249 | //#endif | 249 | //#endif |
250 | } | 250 | } |
251 | 251 | ||
@@ -302,12 +302,12 @@ unsigned int AudioDevice::canWrite() const | |||
302 | } | 302 | } |
303 | 303 | ||
304 | 304 | ||
305 | int AudioDevice::bytesWritten() { | 305 | int AudioDevice::bytesWritten() { |
306 | int buffered = 0; | 306 | int buffered = 0; |
307 | if ( ioctl( d->handle, SNDCTL_DSP_GETODELAY, &buffered ) ) { | 307 | if ( ioctl( d->handle, SNDCTL_DSP_GETODELAY, &buffered ) ) { |
308 | qDebug( "failed to get audio device position" ); | 308 | // qDebug( "failed to get audio device position" ); |
309 | return -1; | 309 | return -1; |
310 | } | 310 | } |
311 | return buffered; | 311 | return buffered; |
312 | } | 312 | } |
313 | 313 | ||
diff --git a/core/multimedia/opieplayer/audiowidget.cpp b/core/multimedia/opieplayer/audiowidget.cpp index a1973e9..b187cb4 100644 --- a/core/multimedia/opieplayer/audiowidget.cpp +++ b/core/multimedia/opieplayer/audiowidget.cpp | |||
@@ -73,13 +73,13 @@ static void changeTextColor( QWidget *w ) { | |||
73 | static const int numButtons = (sizeof(audioButtons)/sizeof(MediaButton)); | 73 | static const int numButtons = (sizeof(audioButtons)/sizeof(MediaButton)); |
74 | 74 | ||
75 | AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) : | 75 | AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) : |
76 | QWidget( parent, name, f ), songInfo( this ), slider( Qt::Horizontal, this ), time( this ) | 76 | QWidget( parent, name, f ), songInfo( this ), slider( Qt::Horizontal, this ), time( this ) |
77 | { | 77 | { |
78 | setCaption( tr("OpiePlayer") ); | 78 | setCaption( tr("OpiePlayer") ); |
79 | qDebug("<<<<<audioWidget"); | 79 | // qDebug("<<<<<audioWidget"); |
80 | 80 | ||
81 | Config cfg("OpiePlayer"); | 81 | Config cfg("OpiePlayer"); |
82 | cfg.setGroup("Options"); | 82 | cfg.setGroup("Options"); |
83 | skin = cfg.readEntry("Skin","default"); | 83 | skin = cfg.readEntry("Skin","default"); |
84 | //skin = "scaleTest"; | 84 | //skin = "scaleTest"; |
85 | // color of background, frame, degree of transparency | 85 | // color of background, frame, degree of transparency |
@@ -87,13 +87,13 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) : | |||
87 | // QString skinPath = "opieplayer/skins/" + skin; | 87 | // QString skinPath = "opieplayer/skins/" + skin; |
88 | QString skinPath; | 88 | QString skinPath; |
89 | skinPath = "opieplayer2/skins/" + skin; | 89 | skinPath = "opieplayer2/skins/" + skin; |
90 | if(!QDir(QString(getenv("OPIEDIR")) +"/pics/"+skinPath).exists()) | 90 | if(!QDir(QString(getenv("OPIEDIR")) +"/pics/"+skinPath).exists()) |
91 | skinPath = "opieplayer2/skins/default"; | 91 | skinPath = "opieplayer2/skins/default"; |
92 | 92 | ||
93 | qDebug("skin path " + skinPath); | 93 | // qDebug("skin path " + skinPath); |
94 | 94 | ||
95 | pixBg = new QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) ); | 95 | pixBg = new QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) ); |
96 | imgUp = new QImage( Resource::loadImage( QString("%1/skin_up").arg(skinPath) ) ); | 96 | imgUp = new QImage( Resource::loadImage( QString("%1/skin_up").arg(skinPath) ) ); |
97 | imgDn = new QImage( Resource::loadImage( QString("%1/skin_down").arg(skinPath) ) ); | 97 | imgDn = new QImage( Resource::loadImage( QString("%1/skin_down").arg(skinPath) ) ); |
98 | 98 | ||
99 | imgButtonMask = new QImage( imgUp->width(), imgUp->height(), 8, 255 ); | 99 | imgButtonMask = new QImage( imgUp->width(), imgUp->height(), 8, 255 ); |
@@ -157,28 +157,29 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) : | |||
157 | // Intialise state | 157 | // Intialise state |
158 | setLength( mediaPlayerState->length() ); | 158 | setLength( mediaPlayerState->length() ); |
159 | setPosition( mediaPlayerState->position() ); | 159 | setPosition( mediaPlayerState->position() ); |
160 | setLooping( mediaPlayerState->fullscreen() ); | 160 | setLooping( mediaPlayerState->fullscreen() ); |
161 | // setPaused( mediaPlayerState->paused() ); | 161 | // setPaused( mediaPlayerState->paused() ); |
162 | setPlaying( mediaPlayerState->playing() ); | 162 | setPlaying( mediaPlayerState->playing() ); |
163 | 163 | this->setFocus(); | |
164 | } | 164 | } |
165 | 165 | ||
166 | 166 | ||
167 | AudioWidget::~AudioWidget() { | 167 | AudioWidget::~AudioWidget() { |
168 | // setPlaying( false); | ||
168 | 169 | ||
169 | for ( int i = 0; i < 10; i++ ) { | 170 | for ( int i = 0; i < 10; i++ ) { |
170 | delete buttonPixUp[i]; | 171 | if(buttonPixUp[i]) delete buttonPixUp[i]; |
171 | delete buttonPixDown[i]; | 172 | if(buttonPixDown[i]) delete buttonPixDown[i]; |
172 | } | 173 | } |
173 | delete pixBg; | 174 | if(pixBg) delete pixBg; |
174 | delete imgUp; | 175 | if(imgUp) delete imgUp; |
175 | delete imgDn; | 176 | if(imgDn) delete imgDn; |
176 | delete imgButtonMask; | 177 | if(imgButtonMask) delete imgButtonMask; |
177 | for ( int i = 0; i < 10; i++ ) { | 178 | for ( int i = 0; i < 10; i++ ) { |
178 | delete masks[i]; | 179 | if(masks[i]) delete masks[i]; |
179 | } | 180 | } |
180 | } | 181 | } |
181 | 182 | ||
182 | 183 | ||
183 | QPixmap *combineImageWithBackground( QImage img, QPixmap bg, QPoint offset ) { | 184 | QPixmap *combineImageWithBackground( QImage img, QPixmap bg, QPoint offset ) { |
184 | QPixmap pix( img.width(), img.height() ); | 185 | QPixmap pix( img.width(), img.height() ); |
@@ -276,24 +277,26 @@ void AudioWidget::setView( char view ) { | |||
276 | // show(); | 277 | // show(); |
277 | showMaximized(); | 278 | showMaximized(); |
278 | } else { | 279 | } else { |
279 | killTimers(); | 280 | killTimers(); |
280 | hide(); | 281 | hide(); |
281 | } | 282 | } |
283 | |||
282 | } | 284 | } |
283 | 285 | ||
284 | 286 | ||
285 | static QString timeAsString( long length ) { | 287 | static QString timeAsString( long length ) { |
286 | length /= 44100; | 288 | length /= 44100; |
287 | int minutes = length / 60; | 289 | int minutes = length / 60; |
288 | int seconds = length % 60; | 290 | int seconds = length % 60; |
289 | return QString("%1:%2%3").arg( minutes ).arg( seconds / 10 ).arg( seconds % 10 ); | 291 | return QString("%1:%2%3").arg( minutes ).arg( seconds / 10 ).arg( seconds % 10 ); |
290 | } | 292 | } |
291 | 293 | ||
292 | void AudioWidget::updateSlider( long i, long max ) { | 294 | void AudioWidget::updateSlider( long i, long max ) { |
293 | time.setText( timeAsString( i ) + " / " + timeAsString( max ) ); | 295 | this->setFocus(); |
296 | time.setText( timeAsString( i ) + " / " + timeAsString( max ) ); | ||
294 | 297 | ||
295 | if ( max == 0 ) | 298 | if ( max == 0 ) |
296 | return; | 299 | return; |
297 | // Will flicker too much if we don't do this | 300 | // Will flicker too much if we don't do this |
298 | // Scale to something reasonable | 301 | // Scale to something reasonable |
299 | int width = slider.width(); | 302 | int width = slider.width(); |
@@ -354,25 +357,25 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) { | |||
354 | int x = event->pos().x() - xoff; | 357 | int x = event->pos().x() - xoff; |
355 | int y = event->pos().y() - yoff; | 358 | int y = event->pos().y() - yoff; |
356 | 359 | ||
357 | bool isOnButton = ( x > 0 && y > 0 && x < imgButtonMask->width() | 360 | bool isOnButton = ( x > 0 && y > 0 && x < imgButtonMask->width() |
358 | && y < imgButtonMask->height() && imgButtonMask->pixelIndex( x, y ) == i + 1 ); | 361 | && y < imgButtonMask->height() && imgButtonMask->pixelIndex( x, y ) == i + 1 ); |
359 | 362 | ||
360 | if ( isOnButton && i == AudioVolumeUp ) | 363 | // if ( isOnButton && i == AudioVolumeUp ) |
361 | qDebug("on up"); | 364 | // qDebug("on up"); |
362 | 365 | ||
363 | if ( isOnButton && !audioButtons[i].isHeld ) { | 366 | if ( isOnButton && !audioButtons[i].isHeld ) { |
364 | audioButtons[i].isHeld = TRUE; | 367 | audioButtons[i].isHeld = TRUE; |
365 | toggleButton(i); | 368 | toggleButton(i); |
366 | switch (i) { | 369 | switch (i) { |
367 | case AudioVolumeUp: | 370 | case AudioVolumeUp: |
368 | qDebug("more clicked"); | 371 | // qDebug("more clicked"); |
369 | emit moreClicked(); | 372 | emit moreClicked(); |
370 | return; | 373 | return; |
371 | case AudioVolumeDown: | 374 | case AudioVolumeDown: |
372 | qDebug("less clicked"); | 375 | // qDebug("less clicked"); |
373 | emit lessClicked(); | 376 | emit lessClicked(); |
374 | return; | 377 | return; |
375 | case AudioForward: | 378 | case AudioForward: |
376 | emit forwardClicked(); | 379 | emit forwardClicked(); |
377 | return; | 380 | return; |
378 | case AudioBack: | 381 | case AudioBack: |
diff --git a/core/multimedia/opieplayer/loopcontrol.cpp b/core/multimedia/opieplayer/loopcontrol.cpp index 8cf0a75..82242a3 100644 --- a/core/multimedia/opieplayer/loopcontrol.cpp +++ b/core/multimedia/opieplayer/loopcontrol.cpp | |||
@@ -97,30 +97,30 @@ Mutex *audioMutex; | |||
97 | 97 | ||
98 | 98 | ||
99 | LoopControl::LoopControl( QObject *parent, const char *name ) | 99 | LoopControl::LoopControl( QObject *parent, const char *name ) |
100 | : QObject( parent, name ) { | 100 | : QObject( parent, name ) { |
101 | isMuted = FALSE; | 101 | isMuted = FALSE; |
102 | connect( qApp, SIGNAL( volumeChanged(bool) ), this, SLOT( setMute(bool) ) ); | 102 | connect( qApp, SIGNAL( volumeChanged(bool) ), this, SLOT( setMute(bool) ) ); |
103 | qDebug("starting loopcontrol"); | 103 | //qDebug("starting loopcontrol"); |
104 | audioMutex = new Mutex; | 104 | audioMutex = new Mutex; |
105 | 105 | ||
106 | pthread_attr_init(&audio_attr); | 106 | pthread_attr_init(&audio_attr); |
107 | #define USE_REALTIME_AUDIO_THREAD | 107 | #define USE_REALTIME_AUDIO_THREAD |
108 | #ifdef USE_REALTIME_AUDIO_THREAD | 108 | #ifdef USE_REALTIME_AUDIO_THREAD |
109 | // Attempt to set it to real-time round robin | 109 | // Attempt to set it to real-time round robin |
110 | if ( pthread_attr_setschedpolicy( &audio_attr, SCHED_RR ) == 0 ) { | 110 | if ( pthread_attr_setschedpolicy( &audio_attr, SCHED_RR ) == 0 ) { |
111 | sched_param params; | 111 | sched_param params; |
112 | params.sched_priority = 50; | 112 | params.sched_priority = 50; |
113 | pthread_attr_setschedparam(&audio_attr,¶ms); | 113 | pthread_attr_setschedparam(&audio_attr,¶ms); |
114 | } else { | 114 | } else { |
115 | qDebug( "Error setting up a realtime thread, reverting to using a normal thread." ); | 115 | // qDebug( "Error setting up a realtime thread, reverting to using a normal thread." ); |
116 | pthread_attr_destroy(&audio_attr); | 116 | pthread_attr_destroy(&audio_attr); |
117 | pthread_attr_init(&audio_attr); | 117 | pthread_attr_init(&audio_attr); |
118 | } | 118 | } |
119 | #endif | 119 | #endif |
120 | qDebug("create audio thread"); | 120 | //qDebug("create audio thread"); |
121 | pthread_create(&audio_tid, &audio_attr, (void * (*)(void *))startAudioThread, this); | 121 | pthread_create(&audio_tid, &audio_attr, (void * (*)(void *))startAudioThread, this); |
122 | } | 122 | } |
123 | 123 | ||
124 | 124 | ||
125 | LoopControl::~LoopControl() { | 125 | LoopControl::~LoopControl() { |
126 | stop(); | 126 | stop(); |
@@ -224,27 +224,27 @@ void LoopControl::startAudio() { | |||
224 | if ( moreAudio ) { | 224 | if ( moreAudio ) { |
225 | 225 | ||
226 | if ( !isMuted && mediaPlayerState->curDecoder() ) { | 226 | if ( !isMuted && mediaPlayerState->curDecoder() ) { |
227 | 227 | ||
228 | currentSample = audioSampleCounter + 1; | 228 | currentSample = audioSampleCounter + 1; |
229 | 229 | ||
230 | if ( currentSample != audioSampleCounter + 1 ) | 230 | // if ( currentSample != audioSampleCounter + 1 ) |
231 | qDebug("out of sync with decoder %i %i", currentSample, audioSampleCounter); | 231 | // qDebug("out of sync with decoder %i %i", currentSample, audioSampleCounter); |
232 | 232 | ||
233 | long samplesRead = 0; | 233 | long samplesRead = 0; |
234 | bool readOk=mediaPlayerState->curDecoder()->audioReadSamples( (short*)audioBuffer, channels, 1024, samplesRead, stream ); | 234 | bool readOk=mediaPlayerState->curDecoder()->audioReadSamples( (short*)audioBuffer, channels, 1024, samplesRead, stream ); |
235 | long sampleWeShouldBeAt = long( playtime.elapsed() ) * freq / 1000; | 235 | long sampleWeShouldBeAt = long( playtime.elapsed() ) * freq / 1000; |
236 | long sampleWaitTime = currentSample - sampleWeShouldBeAt; | 236 | long sampleWaitTime = currentSample - sampleWeShouldBeAt; |
237 | 237 | ||
238 | // this causes drop outs not sure why its even here | 238 | // this causes drop outs not sure why its even here |
239 | if ( hasVideoChannel ) { | 239 | if ( hasVideoChannel ) { |
240 | if ( ( sampleWaitTime > 2000 ) && ( sampleWaitTime < 20000 ) ) { | 240 | if ( ( sampleWaitTime > 2000 ) && ( sampleWaitTime < 20000 ) ) { |
241 | usleep( (long)((double)sampleWaitTime * 1000000.0 / freq) ); | 241 | usleep( (long)((double)sampleWaitTime * 1000000.0 / freq) ); |
242 | } | 242 | } |
243 | else if ( sampleWaitTime <= -5000 ) { | 243 | else if ( sampleWaitTime <= -5000 ) { |
244 | qDebug("need to catch up by: %li (%i,%li)", -sampleWaitTime, currentSample, sampleWeShouldBeAt ); | 244 | // qDebug("need to catch up by: %li (%i,%li)", -sampleWaitTime, currentSample, sampleWeShouldBeAt ); |
245 | // //mediaPlayerState->curDecoder()->audioSetSample( sampleWeShouldBeAt, stream ); | 245 | // //mediaPlayerState->curDecoder()->audioSetSample( sampleWeShouldBeAt, stream ); |
246 | currentSample = sampleWeShouldBeAt; | 246 | currentSample = sampleWeShouldBeAt; |
247 | } | 247 | } |
248 | } | 248 | } |
249 | 249 | ||
250 | audioDevice->write( audioBuffer, samplesRead * 2 * channels ); | 250 | audioDevice->write( audioBuffer, samplesRead * 2 * channels ); |
@@ -358,13 +358,13 @@ bool LoopControl::init( const QString& filename ) { | |||
358 | audioMutex->lock(); | 358 | audioMutex->lock(); |
359 | 359 | ||
360 | fileName = filename; | 360 | fileName = filename; |
361 | stream = 0; // only play stream 0 for now | 361 | stream = 0; // only play stream 0 for now |
362 | current_frame = total_video_frames = total_audio_samples = 0; | 362 | current_frame = total_video_frames = total_audio_samples = 0; |
363 | 363 | ||
364 | qDebug( "Using the %s decoder", mediaPlayerState->curDecoder()->pluginName() ); | 364 | // qDebug( "Using the %s decoder", mediaPlayerState->curDecoder()->pluginName() ); |
365 | 365 | ||
366 | // ### Hack to use libmpeg3plugin to get the number of audio samples if we are using the libmad plugin | 366 | // ### Hack to use libmpeg3plugin to get the number of audio samples if we are using the libmad plugin |
367 | // if ( mediaPlayerState->curDecoder()->pluginName() == QString("LibMadPlugin") ) { | 367 | // if ( mediaPlayerState->curDecoder()->pluginName() == QString("LibMadPlugin") ) { |
368 | // if ( mediaPlayerState->libMpeg3Decoder() && mediaPlayerState->libMpeg3Decoder()->open( filename )) { | 368 | // if ( mediaPlayerState->libMpeg3Decoder() && mediaPlayerState->libMpeg3Decoder()->open( filename )) { |
369 | // total_audio_samples = mediaPlayerState->libMpeg3Decoder()->audioSamples( 0 ); | 369 | // total_audio_samples = mediaPlayerState->libMpeg3Decoder()->audioSamples( 0 ); |
370 | // mediaPlayerState->libMpeg3Decoder()->close(); | 370 | // mediaPlayerState->libMpeg3Decoder()->close(); |
@@ -384,29 +384,29 @@ bool LoopControl::init( const QString& filename ) { | |||
384 | 384 | ||
385 | if ( mediaPlayerState->curDecoder()->pluginName() == QString("LibMpeg3Plugin") ) | 385 | if ( mediaPlayerState->curDecoder()->pluginName() == QString("LibMpeg3Plugin") ) |
386 | channels = 2; //dont akx me why, but it needs this hack | 386 | channels = 2; //dont akx me why, but it needs this hack |
387 | else | 387 | else |
388 | channels = mediaPlayerState->curDecoder()->audioChannels( astream ); | 388 | channels = mediaPlayerState->curDecoder()->audioChannels( astream ); |
389 | 389 | ||
390 | qDebug( "LC- channels = %d", channels ); | 390 | // qDebug( "LC- channels = %d", channels ); |
391 | 391 | ||
392 | // if ( !total_audio_samples ) | 392 | // if ( !total_audio_samples ) |
393 | total_audio_samples = mediaPlayerState->curDecoder()->audioSamples( astream ); | 393 | total_audio_samples = mediaPlayerState->curDecoder()->audioSamples( astream ); |
394 | 394 | ||
395 | total_audio_samples += 1000; | 395 | total_audio_samples += 1000; |
396 | qDebug("total samples %d", total_audio_samples); | 396 | // qDebug("total samples %d", total_audio_samples); |
397 | mediaPlayerState->setLength( total_audio_samples ); | 397 | mediaPlayerState->setLength( total_audio_samples ); |
398 | 398 | ||
399 | freq = mediaPlayerState->curDecoder()->audioFrequency( astream ); | 399 | freq = mediaPlayerState->curDecoder()->audioFrequency( astream ); |
400 | qDebug( "LC- frequency = %d", freq ); | 400 | // qDebug( "LC- frequency = %d", freq ); |
401 | 401 | ||
402 | audioSampleCounter = 0; | 402 | audioSampleCounter = 0; |
403 | int bits_per_sample; | 403 | int bits_per_sample; |
404 | if ( mediaPlayerState->curDecoder()->pluginName() == QString("LibWavPlugin") ) { | 404 | if ( mediaPlayerState->curDecoder()->pluginName() == QString("LibWavPlugin") ) { |
405 | bits_per_sample =(int) mediaPlayerState->curDecoder()->getTime(); | 405 | bits_per_sample =(int) mediaPlayerState->curDecoder()->getTime(); |
406 | qDebug("using stupid hack"); | 406 | // qDebug("using stupid hack"); |
407 | } else { | 407 | } else { |
408 | bits_per_sample=0; | 408 | bits_per_sample=0; |
409 | } | 409 | } |
410 | 410 | ||
411 | audioDevice = new AudioDevice( freq, channels, bits_per_sample); | 411 | audioDevice = new AudioDevice( freq, channels, bits_per_sample); |
412 | audioBuffer = new char[ audioDevice->bufferSize() ]; | 412 | audioBuffer = new char[ audioDevice->bufferSize() ]; |
@@ -448,13 +448,13 @@ bool LoopControl::init( const QString& filename ) { | |||
448 | 448 | ||
449 | return TRUE; | 449 | return TRUE; |
450 | } | 450 | } |
451 | 451 | ||
452 | 452 | ||
453 | void LoopControl::play() { | 453 | void LoopControl::play() { |
454 | qDebug("LC- play"); | 454 | // qDebug("LC- play"); |
455 | mediaPlayerState->setPosition( 0); //uglyhack | 455 | mediaPlayerState->setPosition( 0); //uglyhack |
456 | 456 | ||
457 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) | 457 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) |
458 | if ( !disabledSuspendScreenSaver || previousSuspendMode != hasVideoChannel ) { | 458 | if ( !disabledSuspendScreenSaver || previousSuspendMode != hasVideoChannel ) { |
459 | disabledSuspendScreenSaver = TRUE; | 459 | disabledSuspendScreenSaver = TRUE; |
460 | previousSuspendMode = hasVideoChannel; | 460 | previousSuspendMode = hasVideoChannel; |
diff --git a/core/multimedia/opieplayer/loopcontrol_threaded.cpp b/core/multimedia/opieplayer/loopcontrol_threaded.cpp index e99c97b..364e77b 100644 --- a/core/multimedia/opieplayer/loopcontrol_threaded.cpp +++ b/core/multimedia/opieplayer/loopcontrol_threaded.cpp | |||
@@ -49,88 +49,88 @@ extern MediaPlayerState *mediaPlayerState; | |||
49 | 49 | ||
50 | 50 | ||
51 | #define DecodeLoopDebug(x) qDebug x | 51 | #define DecodeLoopDebug(x) qDebug x |
52 | //#define DecodeLoopDebug(x) | 52 | //#define DecodeLoopDebug(x) |
53 | 53 | ||
54 | 54 | ||
55 | static char *audioBuffer = NULL; | 55 | static char *audioBuffer = NULL; |
56 | static AudioDevice *audioDevice = NULL; | 56 | static AudioDevice *audioDevice = NULL; |
57 | static bool disabledSuspendScreenSaver = FALSE; | 57 | static bool disabledSuspendScreenSaver = FALSE; |
58 | 58 | ||
59 | 59 | ||
60 | pthread_tvideo_tid; | 60 | pthread_t video_tid; |
61 | pthread_attr_t video_attr; | 61 | pthread_attr_t video_attr; |
62 | pthread_taudio_tid; | 62 | pthread_t audio_tid; |
63 | pthread_attr_t audio_attr; | 63 | pthread_attr_t audio_attr; |
64 | 64 | ||
65 | 65 | ||
66 | bool emitPlayFinished = FALSE; | 66 | bool emitPlayFinished = FALSE; |
67 | bool emitChangePos = FALSE; | 67 | bool emitChangePos = FALSE; |
68 | 68 | ||
69 | 69 | ||
70 | class Mutex { | 70 | class Mutex { |
71 | public: | 71 | public: |
72 | Mutex() { | 72 | Mutex() { |
73 | pthread_mutexattr_t attr; | 73 | pthread_mutexattr_t attr; |
74 | pthread_mutexattr_init( &attr ); | 74 | pthread_mutexattr_init( &attr ); |
75 | pthread_mutex_init( &mutex, &attr ); | 75 | pthread_mutex_init( &mutex, &attr ); |
76 | pthread_mutexattr_destroy( &attr ); | 76 | pthread_mutexattr_destroy( &attr ); |
77 | } | 77 | } |
78 | 78 | ||
79 | ~Mutex() { | 79 | ~Mutex() { |
80 | pthread_mutex_destroy( &mutex ); | 80 | pthread_mutex_destroy( &mutex ); |
81 | } | 81 | } |
82 | 82 | ||
83 | void lock() { | 83 | void lock() { |
84 | pthread_mutex_lock( &mutex ); | 84 | pthread_mutex_lock( &mutex ); |
85 | } | 85 | } |
86 | 86 | ||
87 | void unlock() { | 87 | void unlock() { |
88 | pthread_mutex_unlock( &mutex ); | 88 | pthread_mutex_unlock( &mutex ); |
89 | } | 89 | } |
90 | /* | 90 | /* |
91 | bool locked() { | 91 | bool locked() { |
92 | switch ( pthread_mutex_trylock( &mutex ) ) { | 92 | switch ( pthread_mutex_trylock( &mutex ) ) { |
93 | case EBUSY: | 93 | case EBUSY: |
94 | return TRUE; | 94 | return TRUE; |
95 | case 0: | 95 | case 0: |
96 | pthread_mutex_unlock( &mutex ); | 96 | pthread_mutex_unlock( &mutex ); |
97 | default: | 97 | default: |
98 | return FALSE; | 98 | return FALSE; |
99 | } | 99 | } |
100 | } | 100 | } |
101 | */ | 101 | */ |
102 | private: | 102 | private: |
103 | pthread_mutex_t mutex; | 103 | pthread_mutex_t mutex; |
104 | }; | 104 | }; |
105 | 105 | ||
106 | 106 | ||
107 | class currentFrameObj { | 107 | class currentFrameObj { |
108 | public: | 108 | public: |
109 | currentFrameObj() : value( 0 ) { } | 109 | currentFrameObj() : value( 0 ) { } |
110 | void set( long f ) { | 110 | void set( long f ) { |
111 | mutex.lock(); | 111 | mutex.lock(); |
112 | value = f; | 112 | value = f; |
113 | mediaPlayerState->curDecoder()->videoSetFrame( f, 0 ); | 113 | mediaPlayerState->curDecoder()->videoSetFrame( f, 0 ); |
114 | mutex.unlock(); | 114 | mutex.unlock(); |
115 | } | 115 | } |
116 | long get() { | 116 | long get() { |
117 | return value; | 117 | return value; |
118 | } | 118 | } |
119 | private: | 119 | private: |
120 | long value; | 120 | long value; |
121 | Mutex mutex; | 121 | Mutex mutex; |
122 | }; | 122 | }; |
123 | 123 | ||
124 | 124 | ||
125 | Mutex *videoMutex; | 125 | Mutex *videoMutex; |
126 | Mutex *audioMutex; | 126 | Mutex *audioMutex; |
127 | Mutex *globalMutex; | 127 | Mutex *globalMutex; |
128 | 128 | ||
129 | 129 | ||
130 | clock_tbegin; | 130 | clock_t begin; |
131 | 131 | ||
132 | 132 | ||
133 | LoopControl::LoopControl( QObject *parent, const char *name ) | 133 | LoopControl::LoopControl( QObject *parent, const char *name ) |
134 | : QObject( parent, name ) { | 134 | : QObject( parent, name ) { |
135 | isMuted = FALSE; | 135 | isMuted = FALSE; |
136 | connect( qApp, SIGNAL( volumeChanged(bool) ), this, SLOT( setMute(bool) ) ); | 136 | connect( qApp, SIGNAL( volumeChanged(bool) ), this, SLOT( setMute(bool) ) ); |
@@ -155,76 +155,76 @@ static int currentSample = 0; | |||
155 | 155 | ||
156 | void LoopControl::timerEvent( QTimerEvent* ) { | 156 | void LoopControl::timerEvent( QTimerEvent* ) { |
157 | // We need to emit playFinished from the main thread, not one of the | 157 | // We need to emit playFinished from the main thread, not one of the |
158 | // decoding threads else we'll have all kinds of yucky things happen (reentrance). | 158 | // decoding threads else we'll have all kinds of yucky things happen (reentrance). |
159 | // playFinished will eventually call stop() which stops these threads. | 159 | // playFinished will eventually call stop() which stops these threads. |
160 | if ( emitPlayFinished ) { | 160 | if ( emitPlayFinished ) { |
161 | emitPlayFinished = FALSE; | 161 | emitPlayFinished = FALSE; |
162 | mediaPlayerState->setPlaying( FALSE ); | 162 | mediaPlayerState->setPlaying( FALSE ); |
163 | } | 163 | } |
164 | 164 | ||
165 | if ( emitChangePos ) { | 165 | if ( emitChangePos ) { |
166 | 166 | ||
167 | emitChangePos = FALSE; | 167 | emitChangePos = FALSE; |
168 | 168 | ||
169 | if ( hasVideoChannel && hasAudioChannel ) { | 169 | if ( hasVideoChannel && hasAudioChannel ) { |
170 | sendingNewPos = TRUE; | 170 | sendingNewPos = TRUE; |
171 | mediaPlayerState->setPosition( current_frame ); | 171 | mediaPlayerState->setPosition( current_frame ); |
172 | } else if ( hasVideoChannel ) { | 172 | } else if ( hasVideoChannel ) { |
173 | sendingNewPos = TRUE; | 173 | sendingNewPos = TRUE; |
174 | mediaPlayerState->setPosition( current_frame ); | 174 | mediaPlayerState->setPosition( current_frame ); |
175 | } else if ( hasAudioChannel ) { | 175 | } else if ( hasAudioChannel ) { |
176 | sendingNewPos = TRUE; | 176 | sendingNewPos = TRUE; |
177 | mediaPlayerState->setPosition( audioSampleCounter ); | 177 | mediaPlayerState->setPosition( audioSampleCounter ); |
178 | } | 178 | } |
179 | 179 | ||
180 | } | 180 | } |
181 | } | 181 | } |
182 | 182 | ||
183 | 183 | ||
184 | 184 | ||
185 | 185 | ||
186 | void LoopControl::setPosition( long pos ) { | 186 | void LoopControl::setPosition( long pos ) { |
187 | if ( sendingNewPos ) { | 187 | if ( sendingNewPos ) { |
188 | sendingNewPos = FALSE; | 188 | sendingNewPos = FALSE; |
189 | return; | 189 | return; |
190 | } | 190 | } |
191 | 191 | ||
192 | if ( hasVideoChannel && hasAudioChannel ) { | 192 | if ( hasVideoChannel && hasAudioChannel ) { |
193 | videoMutex->lock(); | 193 | videoMutex->lock(); |
194 | audioMutex->lock(); | 194 | audioMutex->lock(); |
195 | qDebug("setting position"); | 195 | //qDebug("setting position"); |
196 | playtime.restart(); | 196 | playtime.restart(); |
197 | playtime = playtime.addMSecs( -pos * 1000 / framerate ); | 197 | playtime = playtime.addMSecs( -pos * 1000 / framerate ); |
198 | //begin = clock() - (double)pos * CLOCKS_PER_SEC / framerate; | 198 | //begin = clock() - (double)pos * CLOCKS_PER_SEC / framerate; |
199 | current_frame = pos + 1; | 199 | current_frame = pos + 1; |
200 | mediaPlayerState->curDecoder()->videoSetFrame( current_frame, stream ); | 200 | mediaPlayerState->curDecoder()->videoSetFrame( current_frame, stream ); |
201 | prev_frame = current_frame - 1; | 201 | prev_frame = current_frame - 1; |
202 | currentSample = (int)( current_frame * freq / framerate ); | 202 | currentSample = (int)( current_frame * freq / framerate ); |
203 | mediaPlayerState->curDecoder()->audioSetSample( currentSample, stream ); | 203 | mediaPlayerState->curDecoder()->audioSetSample( currentSample, stream ); |
204 | audioSampleCounter = currentSample - 1; | 204 | audioSampleCounter = currentSample - 1; |
205 | audioMutex->unlock(); | 205 | audioMutex->unlock(); |
206 | videoMutex->unlock(); | 206 | videoMutex->unlock(); |
207 | } else if ( hasVideoChannel ) { | 207 | } else if ( hasVideoChannel ) { |
208 | videoMutex->lock(); | 208 | videoMutex->lock(); |
209 | playtime.restart(); | 209 | playtime.restart(); |
210 | playtime = playtime.addMSecs( -pos * 1000 / framerate ); | 210 | playtime = playtime.addMSecs( -pos * 1000 / framerate ); |
211 | //begin = clock() - (double)pos * CLOCKS_PER_SEC / framerate; | 211 | //begin = clock() - (double)pos * CLOCKS_PER_SEC / framerate; |
212 | current_frame = pos + 1; | 212 | current_frame = pos + 1; |
213 | mediaPlayerState->curDecoder()->videoSetFrame( current_frame, stream ); | 213 | mediaPlayerState->curDecoder()->videoSetFrame( current_frame, stream ); |
214 | videoMutex->unlock(); | 214 | videoMutex->unlock(); |
215 | prev_frame = current_frame - 1; | 215 | prev_frame = current_frame - 1; |
216 | } else if ( hasAudioChannel ) { | 216 | } else if ( hasAudioChannel ) { |
217 | audioMutex->lock(); | 217 | audioMutex->lock(); |
218 | playtime.restart(); | 218 | playtime.restart(); |
219 | playtime = playtime.addMSecs( -pos * 1000 / freq ); | 219 | playtime = playtime.addMSecs( -pos * 1000 / freq ); |
220 | //begin = clock() - (double)pos * CLOCKS_PER_SEC / freq; | 220 | //begin = clock() - (double)pos * CLOCKS_PER_SEC / freq; |
221 | currentSample = pos + 1; // (int)( current_frame * freq / framerate ); | 221 | currentSample = pos + 1; // (int)( current_frame * freq / framerate ); |
222 | mediaPlayerState->curDecoder()->audioSetSample( currentSample, stream ); | 222 | mediaPlayerState->curDecoder()->audioSetSample( currentSample, stream ); |
223 | audioSampleCounter = currentSample - 1; | 223 | audioSampleCounter = currentSample - 1; |
224 | audioMutex->unlock(); | 224 | audioMutex->unlock(); |
225 | } | 225 | } |
226 | } | 226 | } |
227 | 227 | ||
228 | 228 | ||
229 | void *startVideoThread( void *ptr ) { | 229 | void *startVideoThread( void *ptr ) { |
230 | LoopControl *mpegView = (LoopControl *)ptr; | 230 | LoopControl *mpegView = (LoopControl *)ptr; |
@@ -242,341 +242,341 @@ void LoopControl::startVideo() { | |||
242 | moreVideo = TRUE; | 242 | moreVideo = TRUE; |
243 | 243 | ||
244 | while ( moreVideo ) { | 244 | while ( moreVideo ) { |
245 | 245 | ||
246 | if ( mediaPlayerState->curDecoder() && hasVideoChannel ) { | 246 | if ( mediaPlayerState->curDecoder() && hasVideoChannel ) { |
247 | 247 | ||
248 | if ( hasAudioChannel && !isMuted ) { | 248 | if ( hasAudioChannel && !isMuted ) { |
249 | 249 | ||
250 | bool done = FALSE; | 250 | bool done = FALSE; |
251 | 251 | ||
252 | do { | 252 | do { |
253 | 253 | ||
254 | 254 | ||
255 | /* | 255 | /* |
256 | videoMutex->lock(); | 256 | videoMutex->lock(); |
257 | current_frame = int( (double)playtime.elapsed() * (double)framerate / 1000.0 ); | 257 | current_frame = int( (double)playtime.elapsed() * (double)framerate / 1000.0 ); |
258 | //current_frame = ( clock() - begin ) * (double)framerate / CLOCKS_PER_SEC; | 258 | //current_frame = ( clock() - begin ) * (double)framerate / CLOCKS_PER_SEC; |
259 | 259 | ||
260 | // Sync to Audio | 260 | // Sync to Audio |
261 | // current_frame = (long)((double)(audioSampleCounter - 1000) * framerate / (double)freq); | 261 | // current_frame = (long)((double)(audioSampleCounter - 1000) * framerate / (double)freq); |
262 | 262 | ||
263 | long mSecsToNextFrame = 0; | 263 | long mSecsToNextFrame = 0; |
264 | 264 | ||
265 | if ( current_frame == prev_frame ) { | 265 | if ( current_frame == prev_frame ) { |
266 | int nf = current_frame + 1; | 266 | int nf = current_frame + 1; |
267 | if ( nf > 0 && nf != total_video_frames ) | 267 | if ( nf > 0 && nf != total_video_frames ) |
268 | // mSecsToNextFrame = long(double(nf * CLOCKS_PER_SEC) / framerate) - ( clock() - begin ); | 268 | // mSecsToNextFrame = long(double(nf * CLOCKS_PER_SEC) / framerate) - ( clock() - begin ); |
269 | mSecsToNextFrame = long(double(nf * 1000) / framerate) - ( playtime.elapsed() ); | 269 | mSecsToNextFrame = long(double(nf * 1000) / framerate) - ( playtime.elapsed() ); |
270 | } | 270 | } |
271 | videoMutex->unlock(); | 271 | videoMutex->unlock(); |
272 | 272 | ||
273 | if ( mSecsToNextFrame ) { | 273 | if ( mSecsToNextFrame ) { |
274 | usleep( mSecsToNextFrame ); // wait a bit | 274 | usleep( mSecsToNextFrame ); // wait a bit |
275 | 275 | ||
276 | videoMutex->lock(); | 276 | videoMutex->lock(); |
277 | // This should now be the next frame | 277 | // This should now be the next frame |
278 | current_frame = int( (double)playtime.elapsed() * (double)framerate / 1000.0 ); | 278 | current_frame = int( (double)playtime.elapsed() * (double)framerate / 1000.0 ); |
279 | //current_frame = ( clock() - begin ) * (double)framerate / CLOCKS_PER_SEC; | 279 | //current_frame = ( clock() - begin ) * (double)framerate / CLOCKS_PER_SEC; |
280 | videoMutex->unlock(); | 280 | videoMutex->unlock(); |
281 | } | 281 | } |
282 | 282 | ||
283 | videoMutex->lock(); | 283 | videoMutex->lock(); |
284 | done = current_frame >= prev_frame; | 284 | done = current_frame >= prev_frame; |
285 | videoMutex->unlock(); | 285 | videoMutex->unlock(); |
286 | */ | 286 | */ |
287 | videoMutex->lock(); | 287 | videoMutex->lock(); |
288 | current_frame = int( (double)playtime.elapsed() * (double)framerate / 1000.0 ); | 288 | current_frame = int( (double)playtime.elapsed() * (double)framerate / 1000.0 ); |
289 | done = current_frame >= prev_frame; | 289 | done = current_frame >= prev_frame; |
290 | videoMutex->unlock(); | 290 | videoMutex->unlock(); |
291 | if ( !done ) | 291 | if ( !done ) |
292 | usleep( 1000 ); // wait a bit | 292 | usleep( 1000 ); // wait a bit |
293 | 293 | ||
294 | } while ( !done ); | 294 | } while ( !done ); |
295 | 295 | ||
296 | // qDebug("elapsed: %i %i (%f)", int( playtime.elapsed() ), current_frame, framerate ); | 296 | // qDebug("elapsed: %i %i (%f)", int( playtime.elapsed() ), current_frame, framerate ); |
297 | 297 | ||
298 | } else { | 298 | } else { |
299 | videoMutex->lock(); | 299 | videoMutex->lock(); |
300 | current_frame++; | 300 | current_frame++; |
301 | videoMutex->unlock(); | 301 | videoMutex->unlock(); |
302 | } | 302 | } |
303 | 303 | ||
304 | videoMutex->lock(); | 304 | videoMutex->lock(); |
305 | bool check = current_frame && current_frame > prev_frame; | 305 | bool check = current_frame && current_frame > prev_frame; |
306 | videoMutex->unlock(); | 306 | videoMutex->unlock(); |
307 | 307 | ||
308 | if ( check ) { | 308 | if ( check ) { |
309 | videoMutex->lock(); | 309 | videoMutex->lock(); |
310 | if ( current_frame > prev_frame + 1 ) { | 310 | if ( current_frame > prev_frame + 1 ) { |
311 | qDebug("skipped a frame"); | 311 | // qDebug("skipped a frame"); |
312 | mediaPlayerState->curDecoder()->videoSetFrame( current_frame, stream ); | 312 | mediaPlayerState->curDecoder()->videoSetFrame( current_frame, stream ); |
313 | } | 313 | } |
314 | prev_frame = current_frame; | 314 | prev_frame = current_frame; |
315 | if ( moreVideo = videoUI->playVideo() ) | 315 | if ( moreVideo = videoUI->playVideo() ) |
316 | emitChangePos = TRUE; | 316 | emitChangePos = TRUE; |
317 | videoMutex->unlock(); | 317 | videoMutex->unlock(); |
318 | } | 318 | } |
319 | 319 | ||
320 | } else | 320 | } else |
321 | moreVideo = FALSE; | 321 | moreVideo = FALSE; |
322 | 322 | ||
323 | } | 323 | } |
324 | 324 | ||
325 | if ( !moreVideo && !moreAudio ) | 325 | if ( !moreVideo && !moreAudio ) |
326 | emitPlayFinished = TRUE; | 326 | emitPlayFinished = TRUE; |
327 | 327 | ||
328 | pthread_exit(NULL); | 328 | pthread_exit(NULL); |
329 | } | 329 | } |
330 | 330 | ||
331 | void LoopControl::startAudio() { | 331 | void LoopControl::startAudio() { |
332 | moreAudio = TRUE; | 332 | moreAudio = TRUE; |
333 | 333 | ||
334 | while ( moreAudio ) { | 334 | while ( moreAudio ) { |
335 | 335 | ||
336 | if ( !isMuted && mediaPlayerState->curDecoder() && hasAudioChannel ) { | 336 | if ( !isMuted && mediaPlayerState->curDecoder() && hasAudioChannel ) { |
337 | 337 | ||
338 | audioMutex->lock(); | 338 | audioMutex->lock(); |
339 | currentSample = mediaPlayerState->curDecoder()->audioGetSample( stream ); | 339 | currentSample = mediaPlayerState->curDecoder()->audioGetSample( stream ); |
340 | 340 | ||
341 | if ( currentSample == 0 ) | 341 | if ( currentSample == 0 ) |
342 | currentSample = audioSampleCounter + 1; | 342 | currentSample = audioSampleCounter + 1; |
343 | 343 | ||
344 | if ( currentSample != audioSampleCounter + 1 ) | 344 | // if ( currentSample != audioSampleCounter + 1 ) |
345 | qDebug("out of sync with decoder %i %i", currentSample, audioSampleCounter); | 345 | // qDebug("out of sync with decoder %i %i", currentSample, audioSampleCounter); |
346 | audioMutex->unlock(); | 346 | audioMutex->unlock(); |
347 | 347 | ||
348 | /* | 348 | /* |
349 | int sampleWeShouldBeAt = int( playtime.elapsed() ) * freq / 1000; | 349 | int sampleWeShouldBeAt = int( playtime.elapsed() ) * freq / 1000; |
350 | 350 | ||
351 | if ( sampleWeShouldBeAt - currentSample > 20000 ) { | 351 | if ( sampleWeShouldBeAt - currentSample > 20000 ) { |
352 | mediaPlayerState->curDecoder()->audioSetSample( sampleWeShouldBeAt, stream ); | 352 | mediaPlayerState->curDecoder()->audioSetSample( sampleWeShouldBeAt, stream ); |
353 | currentSample = sampleWeShouldBeAt; | 353 | currentSample = sampleWeShouldBeAt; |
354 | } | 354 | } |
355 | */ | 355 | */ |
356 | long samplesRead = 0; | 356 | long samplesRead = 0; |
357 | 357 | ||
358 | const long samples = 1024; | 358 | const long samples = 1024; |
359 | 359 | ||
360 | moreAudio = !mediaPlayerState->curDecoder()->audioReadSamples( (short*)audioBuffer, channels, samples, samplesRead, stream ); | 360 | moreAudio = !mediaPlayerState->curDecoder()->audioReadSamples( (short*)audioBuffer, channels, samples, samplesRead, stream ); |
361 | 361 | ||
362 | audioMutex->lock(); | 362 | audioMutex->lock(); |
363 | long sampleWeShouldBeAt = long( playtime.elapsed() ) * freq / 1000; | 363 | long sampleWeShouldBeAt = long( playtime.elapsed() ) * freq / 1000; |
364 | //long sampleWeShouldBeAt = long( clock() - begin ) * (double) freq / CLOCKS_PER_SEC; | 364 | //long sampleWeShouldBeAt = long( clock() - begin ) * (double) freq / CLOCKS_PER_SEC; |
365 | long sampleWaitTime = currentSample - sampleWeShouldBeAt; | 365 | long sampleWaitTime = currentSample - sampleWeShouldBeAt; |
366 | audioMutex->unlock(); | 366 | audioMutex->unlock(); |
367 | 367 | ||
368 | if ( sampleWaitTime >= 0 && sampleWaitTime <= 2000 ) { | 368 | if ( sampleWaitTime >= 0 && sampleWaitTime <= 2000 ) { |
369 | //qDebug("sampleWaitTime: %i", sampleWaitTime); | 369 | //qDebug("sampleWaitTime: %i", sampleWaitTime); |
370 | usleep( ( sampleWaitTime * 1000000 ) / ( freq ) ); | 370 | usleep( ( sampleWaitTime * 1000000 ) / ( freq ) ); |
371 | } else { | 371 | } else { |
372 | audioMutex->lock(); | 372 | audioMutex->lock(); |
373 | if ( sampleWaitTime <= -2000 ) { | 373 | if ( sampleWaitTime <= -2000 ) { |
374 | qDebug("need to catch up by: %li (%i,%li)", -sampleWaitTime, currentSample, sampleWeShouldBeAt ); | 374 | // qDebug("need to catch up by: %li (%i,%li)", -sampleWaitTime, currentSample, sampleWeShouldBeAt ); |
375 | mediaPlayerState->curDecoder()->audioSetSample( sampleWeShouldBeAt, stream ); | 375 | mediaPlayerState->curDecoder()->audioSetSample( sampleWeShouldBeAt, stream ); |
376 | currentSample = sampleWeShouldBeAt; | 376 | currentSample = sampleWeShouldBeAt; |
377 | } | 377 | } |
378 | audioMutex->unlock(); | 378 | audioMutex->unlock(); |
379 | } | 379 | } |
380 | 380 | ||
381 | audioDevice->write( audioBuffer, samplesRead * 2 * channels ); | 381 | audioDevice->write( audioBuffer, samplesRead * 2 * channels ); |
382 | 382 | ||
383 | audioMutex->lock(); | 383 | audioMutex->lock(); |
384 | // audioSampleCounter += samplesRead; | 384 | // audioSampleCounter += samplesRead; |
385 | audioSampleCounter = currentSample + samplesRead - 1; | 385 | audioSampleCounter = currentSample + samplesRead - 1; |
386 | audioMutex->unlock(); | 386 | audioMutex->unlock(); |
387 | 387 | ||
388 | if ( !hasVideoChannel ) | 388 | if ( !hasVideoChannel ) |
389 | emitChangePos = TRUE; | 389 | emitChangePos = TRUE; |
390 | 390 | ||
391 | //qDebug("currentSample: %i audioSampleCounter: %i total_audio_samples: %i", currentSample, audioSampleCounter, total_audio_samples); | 391 | //qDebug("currentSample: %i audioSampleCounter: %i total_audio_samples: %i", currentSample, audioSampleCounter, total_audio_samples); |
392 | // qDebug("current: %i counter: %i total: %i", currentSample, audioSampleCounter, (int)total_audio_samples); | 392 | // qDebug("current: %i counter: %i total: %i", currentSample, audioSampleCounter, (int)total_audio_samples); |
393 | moreAudio = audioSampleCounter <= total_audio_samples; | 393 | moreAudio = audioSampleCounter <= total_audio_samples; |
394 | 394 | ||
395 | } else { | 395 | } else { |
396 | 396 | ||
397 | if ( mediaPlayerState->curDecoder() && hasAudioChannel ) | 397 | if ( mediaPlayerState->curDecoder() && hasAudioChannel ) |
398 | usleep( 100000 ); // Check every 1/10 sec to see if mute is off | 398 | usleep( 100000 ); // Check every 1/10 sec to see if mute is off |
399 | else | 399 | else |
400 | moreAudio = FALSE; | 400 | moreAudio = FALSE; |
401 | 401 | ||
402 | } | 402 | } |
403 | } | 403 | } |
404 | 404 | ||
405 | qDebug( "End of file" ); | 405 | // qDebug( "End of file" ); |
406 | 406 | ||
407 | if ( !moreVideo && !moreAudio ) | 407 | if ( !moreVideo && !moreAudio ) |
408 | emitPlayFinished = TRUE; | 408 | emitPlayFinished = TRUE; |
409 | 409 | ||
410 | pthread_exit(NULL); | 410 | pthread_exit(NULL); |
411 | } | 411 | } |
412 | 412 | ||
413 | void LoopControl::killTimers() { | 413 | void LoopControl::killTimers() { |
414 | if ( hasVideoChannel ) { | 414 | if ( hasVideoChannel ) { |
415 | if ( pthread_self() != video_tid ) { | 415 | if ( pthread_self() != video_tid ) { |
416 | if ( pthread_cancel(video_tid) == 0 ) { | 416 | if ( pthread_cancel(video_tid) == 0 ) { |
417 | void *thread_result = 0; | 417 | void *thread_result = 0; |
418 | if ( pthread_join(video_tid,&thread_result) != 0 ) | 418 | if ( pthread_join(video_tid,&thread_result) != 0 ) |
419 | qDebug("thread join error 1"); | 419 | // qDebug("thread join error 1"); |
420 | pthread_attr_destroy(&video_attr); | 420 | pthread_attr_destroy(&video_attr); |
421 | } | 421 | } |
422 | } | 422 | } |
423 | } | 423 | } |
424 | if ( hasAudioChannel ) { | 424 | if ( hasAudioChannel ) { |
425 | if ( pthread_self() != audio_tid ) { | 425 | if ( pthread_self() != audio_tid ) { |
426 | if ( pthread_cancel(audio_tid) == 0 ) { | 426 | if ( pthread_cancel(audio_tid) == 0 ) { |
427 | void *thread_result = 0; | 427 | void *thread_result = 0; |
428 | if ( pthread_join(audio_tid,&thread_result) != 0 ) | 428 | if ( pthread_join(audio_tid,&thread_result) != 0 ) |
429 | qDebug("thread join error 2"); | 429 | // qDebug("thread join error 2"); |
430 | pthread_attr_destroy(&audio_attr); | 430 | pthread_attr_destroy(&audio_attr); |
431 | } | 431 | } |
432 | } | 432 | } |
433 | } | 433 | } |
434 | } | 434 | } |
435 | 435 | ||
436 | void LoopControl::startTimers() { | 436 | void LoopControl::startTimers() { |
437 | moreVideo = FALSE; | 437 | moreVideo = FALSE; |
438 | moreAudio = FALSE; | 438 | moreAudio = FALSE; |
439 | 439 | ||
440 | if ( hasVideoChannel ) { | 440 | if ( hasVideoChannel ) { |
441 | moreVideo = TRUE; | 441 | moreVideo = TRUE; |
442 | pthread_attr_init(&video_attr); | 442 | pthread_attr_init(&video_attr); |
443 | pthread_create(&video_tid, &video_attr, (void * (*)(void *))startVideoThread, this); | 443 | pthread_create(&video_tid, &video_attr, (void * (*)(void *))startVideoThread, this); |
444 | } | 444 | } |
445 | 445 | ||
446 | if ( hasAudioChannel ) { | 446 | if ( hasAudioChannel ) { |
447 | moreAudio = TRUE; | 447 | moreAudio = TRUE; |
448 | pthread_attr_init(&audio_attr); | 448 | pthread_attr_init(&audio_attr); |
449 | #ifdef USE_REALTIME_AUDIO_THREAD | 449 | #ifdef USE_REALTIME_AUDIO_THREAD |
450 | pthread_attr_setschedpolicy(&audio_attr,SCHED_RR); // Real-time round robin | 450 | pthread_attr_setschedpolicy(&audio_attr,SCHED_RR); // Real-time round robin |
451 | //qDebug("min: %i, max: %i", sched_get_priority_min( SCHED_RR ), sched_get_priority_max( SCHED_RR ) ); | 451 | //qDebug("min: %i, max: %i", sched_get_priority_min( SCHED_RR ), sched_get_priority_max( SCHED_RR ) ); |
452 | sched_param params; | 452 | sched_param params; |
453 | params.sched_priority = 50; | 453 | params.sched_priority = 50; |
454 | pthread_attr_setschedparam(&audio_attr,¶ms); | 454 | pthread_attr_setschedparam(&audio_attr,¶ms); |
455 | #endif | 455 | #endif |
456 | pthread_create(&audio_tid, &audio_attr, (void * (*)(void *))startAudioThread, this); | 456 | pthread_create(&audio_tid, &audio_attr, (void * (*)(void *))startAudioThread, this); |
457 | } | 457 | } |
458 | } | 458 | } |
459 | 459 | ||
460 | 460 | ||
461 | 461 | ||
462 | 462 | ||
463 | void LoopControl::setPaused( bool pause ) { | 463 | void LoopControl::setPaused( bool pause ) { |
464 | static int whenPaused = 0; | 464 | static int whenPaused = 0; |
465 | 465 | ||
466 | if ( !mediaPlayerState->curDecoder() || !mediaPlayerState->curDecoder()->isOpen() ) | 466 | if ( !mediaPlayerState->curDecoder() || !mediaPlayerState->curDecoder()->isOpen() ) |
467 | return; | 467 | return; |
468 | 468 | ||
469 | if ( pause ) { | 469 | if ( pause ) { |
470 | // Remember where we are | 470 | // Remember where we are |
471 | whenPaused = playtime.elapsed(); | 471 | whenPaused = playtime.elapsed(); |
472 | killTimers(); | 472 | killTimers(); |
473 | } else { | 473 | } else { |
474 | // Just like we never stopped | 474 | // Just like we never stopped |
475 | playtime.restart(); | 475 | playtime.restart(); |
476 | playtime = playtime.addMSecs( -whenPaused ); | 476 | playtime = playtime.addMSecs( -whenPaused ); |
477 | whenPaused = 0; | 477 | whenPaused = 0; |
478 | startTimers(); | 478 | startTimers(); |
479 | } | 479 | } |
480 | } | 480 | } |
481 | 481 | ||
482 | 482 | ||
483 | void LoopControl::stop( bool willPlayAgainShortly ) { | 483 | void LoopControl::stop( bool willPlayAgainShortly ) { |
484 | 484 | ||
485 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) | 485 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) |
486 | if ( !willPlayAgainShortly && disabledSuspendScreenSaver ) { | 486 | if ( !willPlayAgainShortly && disabledSuspendScreenSaver ) { |
487 | disabledSuspendScreenSaver = FALSE; | 487 | disabledSuspendScreenSaver = FALSE; |
488 | // Re-enable the suspend mode | 488 | // Re-enable the suspend mode |
489 | QCopEnvelope("QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Enable; | 489 | QCopEnvelope("QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Enable; |
490 | } | 490 | } |
491 | #endif | 491 | #endif |
492 | 492 | ||
493 | if ( mediaPlayerState->curDecoder() && mediaPlayerState->curDecoder()->isOpen() ) { | 493 | if ( mediaPlayerState->curDecoder() && mediaPlayerState->curDecoder()->isOpen() ) { |
494 | 494 | ||
495 | killTimers(); | 495 | killTimers(); |
496 | 496 | ||
497 | mediaPlayerState->curDecoder()->close(); | 497 | mediaPlayerState->curDecoder()->close(); |
498 | 498 | ||
499 | if ( audioDevice ) { | 499 | if ( audioDevice ) { |
500 | delete audioDevice; | 500 | delete audioDevice; |
501 | delete audioBuffer; | 501 | delete audioBuffer; |
502 | audioDevice = 0; | 502 | audioDevice = 0; |
503 | audioBuffer = 0; | 503 | audioBuffer = 0; |
504 | } | 504 | } |
505 | 505 | ||
506 | } | 506 | } |
507 | } | 507 | } |
508 | 508 | ||
509 | 509 | ||
510 | bool LoopControl::init( const QString& filename ) { | 510 | bool LoopControl::init( const QString& filename ) { |
511 | stop(); | 511 | stop(); |
512 | fileName = filename; | 512 | fileName = filename; |
513 | stream = 0; // only play stream 0 for now | 513 | stream = 0; // only play stream 0 for now |
514 | current_frame = total_video_frames = total_audio_samples = 0; | 514 | current_frame = total_video_frames = total_audio_samples = 0; |
515 | 515 | ||
516 | qDebug( "Using the %s decoder", mediaPlayerState->curDecoder()->pluginName() ); | 516 | // qDebug( "Using the %s decoder", mediaPlayerState->curDecoder()->pluginName() ); |
517 | 517 | ||
518 | // ### Hack to use libmpeg3plugin to get the number of audio samples if we are using the libmad plugin | 518 | // ### Hack to use libmpeg3plugin to get the number of audio samples if we are using the libmad plugin |
519 | if ( mediaPlayerState->curDecoder()->pluginName() == QString("LibMadPlugin") ) { | 519 | if ( mediaPlayerState->curDecoder()->pluginName() == QString("LibMadPlugin") ) { |
520 | if ( mediaPlayerState->libMpeg3Decoder() && mediaPlayerState->libMpeg3Decoder()->open( filename ) ) { | 520 | if ( mediaPlayerState->libMpeg3Decoder() && mediaPlayerState->libMpeg3Decoder()->open( filename ) ) { |
521 | total_audio_samples = mediaPlayerState->libMpeg3Decoder()->audioSamples( 0 ); | 521 | total_audio_samples = mediaPlayerState->libMpeg3Decoder()->audioSamples( 0 ); |
522 | mediaPlayerState->libMpeg3Decoder()->close(); | 522 | mediaPlayerState->libMpeg3Decoder()->close(); |
523 | } | 523 | } |
524 | } | 524 | } |
525 | 525 | ||
526 | if ( !mediaPlayerState->curDecoder()|| !mediaPlayerState->curDecoder()->open( filename ) ) | 526 | if ( !mediaPlayerState->curDecoder()|| !mediaPlayerState->curDecoder()->open( filename ) ) |
527 | return FALSE; | 527 | return FALSE; |
528 | 528 | ||
529 | hasAudioChannel = mediaPlayerState->curDecoder()->audioStreams() > 0; | 529 | hasAudioChannel = mediaPlayerState->curDecoder()->audioStreams() > 0; |
530 | hasVideoChannel = mediaPlayerState->curDecoder()->videoStreams() > 0; | 530 | hasVideoChannel = mediaPlayerState->curDecoder()->videoStreams() > 0; |
531 | 531 | ||
532 | if ( hasAudioChannel ) { | 532 | if ( hasAudioChannel ) { |
533 | int astream = 0; | 533 | int astream = 0; |
534 | 534 | ||
535 | channels = mediaPlayerState->curDecoder()->audioChannels( astream ); | 535 | channels = mediaPlayerState->curDecoder()->audioChannels( astream ); |
536 | DecodeLoopDebug(( "channels = %d\n", channels )); | 536 | DecodeLoopDebug(( "channels = %d\n", channels )); |
537 | 537 | ||
538 | if ( !total_audio_samples ) | 538 | if ( !total_audio_samples ) |
539 | total_audio_samples = mediaPlayerState->curDecoder()->audioSamples( astream ); | 539 | total_audio_samples = mediaPlayerState->curDecoder()->audioSamples( astream ); |
540 | 540 | ||
541 | mediaPlayerState->setLength( total_audio_samples ); | 541 | mediaPlayerState->setLength( total_audio_samples ); |
542 | 542 | ||
543 | freq = mediaPlayerState->curDecoder()->audioFrequency( astream ); | 543 | freq = mediaPlayerState->curDecoder()->audioFrequency( astream ); |
544 | DecodeLoopDebug(( "frequency = %d\n", freq )); | 544 | DecodeLoopDebug(( "frequency = %d\n", freq )); |
545 | 545 | ||
546 | audioSampleCounter = 0; | 546 | audioSampleCounter = 0; |
547 | 547 | ||
548 | static const int bytes_per_sample = 2; //16 bit | 548 | static const int bytes_per_sample = 2; //16 bit |
549 | 549 | ||
550 | audioDevice = new AudioDevice( freq, channels, bytes_per_sample ); | 550 | audioDevice = new AudioDevice( freq, channels, bytes_per_sample ); |
551 | audioBuffer = new char[ audioDevice->bufferSize() ]; | 551 | audioBuffer = new char[ audioDevice->bufferSize() ]; |
552 | channels = audioDevice->channels(); | 552 | channels = audioDevice->channels(); |
553 | 553 | ||
554 | //### must check which frequency is actually used. | 554 | //### must check which frequency is actually used. |
555 | static const int size = 1; | 555 | static const int size = 1; |
556 | short int buf[size]; | 556 | short int buf[size]; |
557 | long samplesRead = 0; | 557 | long samplesRead = 0; |
558 | mediaPlayerState->curDecoder()->audioReadSamples( buf, channels, size, samplesRead, stream ); | 558 | mediaPlayerState->curDecoder()->audioReadSamples( buf, channels, size, samplesRead, stream ); |
559 | } | 559 | } |
560 | 560 | ||
561 | if ( hasVideoChannel ) { | 561 | if ( hasVideoChannel ) { |
562 | total_video_frames = mediaPlayerState->curDecoder()->videoFrames( stream ); | 562 | total_video_frames = mediaPlayerState->curDecoder()->videoFrames( stream ); |
563 | 563 | ||
564 | mediaPlayerState->setLength( total_video_frames ); | 564 | mediaPlayerState->setLength( total_video_frames ); |
565 | 565 | ||
566 | framerate = mediaPlayerState->curDecoder()->videoFrameRate( stream ); | 566 | framerate = mediaPlayerState->curDecoder()->videoFrameRate( stream ); |
567 | DecodeLoopDebug(( "Frame rate %g total %ld", framerate, total_video_frames )); | 567 | DecodeLoopDebug(( "Frame rate %g total %ld", framerate, total_video_frames )); |
568 | 568 | ||
569 | if ( framerate <= 1.0 ) { | 569 | if ( framerate <= 1.0 ) { |
570 | DecodeLoopDebug(( "Crazy frame rate, resetting to sensible" )); | 570 | DecodeLoopDebug(( "Crazy frame rate, resetting to sensible" )); |
571 | framerate = 25; | 571 | framerate = 25; |
572 | } | 572 | } |
573 | 573 | ||
574 | if ( total_video_frames == 1 ) { | 574 | if ( total_video_frames == 1 ) { |
575 | DecodeLoopDebug(( "Cannot seek to frame" )); | 575 | DecodeLoopDebug(( "Cannot seek to frame" )); |
576 | } | 576 | } |
577 | 577 | ||
578 | } | 578 | } |
579 | 579 | ||
580 | videoMutex->lock(); | 580 | videoMutex->lock(); |
581 | current_frame = 0; | 581 | current_frame = 0; |
582 | prev_frame = -1; | 582 | prev_frame = -1; |
@@ -591,35 +591,35 @@ bool LoopControl::init( const QString& filename ) { | |||
591 | 591 | ||
592 | 592 | ||
593 | void LoopControl::play() { | 593 | void LoopControl::play() { |
594 | 594 | ||
595 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) | 595 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) |
596 | if ( !disabledSuspendScreenSaver ) { | 596 | if ( !disabledSuspendScreenSaver ) { |
597 | disabledSuspendScreenSaver = TRUE; | 597 | disabledSuspendScreenSaver = TRUE; |
598 | // Stop the screen from blanking and power saving state | 598 | // Stop the screen from blanking and power saving state |
599 | QCopEnvelope("QPE/System", "setScreenSaverMode(int)" ) | 599 | QCopEnvelope("QPE/System", "setScreenSaverMode(int)" ) |
600 | << ( hasVideoChannel ? QPEApplication::Disable : QPEApplication::DisableSuspend ); | 600 | << ( hasVideoChannel ? QPEApplication::Disable : QPEApplication::DisableSuspend ); |
601 | } | 601 | } |
602 | #endif | 602 | #endif |
603 | 603 | ||
604 | //begin = clock(); | 604 | //begin = clock(); |
605 | playtime.start(); | 605 | playtime.start(); |
606 | startTimers(); | 606 | startTimers(); |
607 | //updateGeometry(); | 607 | //updateGeometry(); |
608 | } | 608 | } |
609 | 609 | ||
610 | 610 | ||
611 | void LoopControl::setMute( bool on ) { | 611 | void LoopControl::setMute( bool on ) { |
612 | if ( isMuted != on ) { | 612 | if ( isMuted != on ) { |
613 | isMuted = on; | 613 | isMuted = on; |
614 | if ( isMuted ) { | 614 | if ( isMuted ) { |
615 | } else { | 615 | } else { |
616 | int frame = current_frame; // mediaPlayerState->curDecoder()->videoGetFrame( stream ); | 616 | int frame = current_frame; // mediaPlayerState->curDecoder()->videoGetFrame( stream ); |
617 | playtime.restart(); | 617 | playtime.restart(); |
618 | playtime = playtime.addMSecs( -frame * 1000 / framerate ); | 618 | playtime = playtime.addMSecs( -frame * 1000 / framerate ); |
619 | //begin = clock() - (double)frame * CLOCKS_PER_SEC / framerate; | 619 | //begin = clock() - (double)frame * CLOCKS_PER_SEC / framerate; |
620 | mediaPlayerState->curDecoder()->audioSetSample( frame*freq/framerate, stream ); | 620 | mediaPlayerState->curDecoder()->audioSetSample( frame*freq/framerate, stream ); |
621 | } | 621 | } |
622 | } | 622 | } |
623 | } | 623 | } |
624 | 624 | ||
625 | 625 | ||
diff --git a/core/multimedia/opieplayer/mediaplayer.cpp b/core/multimedia/opieplayer/mediaplayer.cpp index 4f3823a..753b2e3 100644 --- a/core/multimedia/opieplayer/mediaplayer.cpp +++ b/core/multimedia/opieplayer/mediaplayer.cpp | |||
@@ -77,24 +77,24 @@ void MediaPlayer::play() { | |||
77 | mediaPlayerState->setPlaying( FALSE ); | 77 | mediaPlayerState->setPlaying( FALSE ); |
78 | mediaPlayerState->setPlaying( TRUE ); | 78 | mediaPlayerState->setPlaying( TRUE ); |
79 | } | 79 | } |
80 | 80 | ||
81 | 81 | ||
82 | void MediaPlayer::setPlaying( bool play ) { | 82 | void MediaPlayer::setPlaying( bool play ) { |
83 | qDebug("MediaPlayer setPlaying"); | 83 | // qDebug("MediaPlayer setPlaying %d", play); |
84 | if ( !play ) { | 84 | if ( !play ) { |
85 | mediaPlayerState->setPaused( FALSE ); | 85 | mediaPlayerState->setPaused( FALSE ); |
86 | loopControl->stop( FALSE ); | 86 | loopControl->stop( FALSE ); |
87 | return; | 87 | return; |
88 | } | 88 | } |
89 | 89 | ||
90 | if ( mediaPlayerState->paused() ) { | 90 | if ( mediaPlayerState->paused() ) { |
91 | mediaPlayerState->setPaused( FALSE ); | 91 | mediaPlayerState->setPaused( FALSE ); |
92 | return; | 92 | return; |
93 | } | 93 | } |
94 | qDebug("about to ctrash"); | 94 | // qDebug("about to ctrash"); |
95 | const DocLnk *playListCurrent = playList->current(); | 95 | const DocLnk *playListCurrent = playList->current(); |
96 | 96 | ||
97 | if ( playListCurrent != NULL ) { | 97 | if ( playListCurrent != NULL ) { |
98 | loopControl->stop( TRUE ); | 98 | loopControl->stop( TRUE ); |
99 | currentFile = playListCurrent; | 99 | currentFile = playListCurrent; |
100 | } | 100 | } |
@@ -253,13 +253,13 @@ void MediaPlayer::keyReleaseEvent( QKeyEvent *e) { | |||
253 | break; | 253 | break; |
254 | case Key_F10: //contacts | 254 | case Key_F10: //contacts |
255 | break; | 255 | break; |
256 | case Key_F11: //menu | 256 | case Key_F11: //menu |
257 | break; | 257 | break; |
258 | case Key_F12: //home | 258 | case Key_F12: //home |
259 | qDebug("Blank here"); | 259 | // qDebug("Blank here"); |
260 | break; | 260 | break; |
261 | case Key_F13: //mail | 261 | case Key_F13: //mail |
262 | break; | 262 | break; |
263 | } | 263 | } |
264 | } | 264 | } |
265 | 265 | ||
diff --git a/core/multimedia/opieplayer/mediaplayerstate.cpp b/core/multimedia/opieplayer/mediaplayerstate.cpp index cf166d6..6823076 100644 --- a/core/multimedia/opieplayer/mediaplayerstate.cpp +++ b/core/multimedia/opieplayer/mediaplayerstate.cpp | |||
@@ -124,13 +124,13 @@ MediaPlayerDecoder *MediaPlayerState::libMpeg3Decoder() { | |||
124 | // ### hack to get true sample count | 124 | // ### hack to get true sample count |
125 | // MediaPlayerDecoder *MediaPlayerState::libWavDecoder() { | 125 | // MediaPlayerDecoder *MediaPlayerState::libWavDecoder() { |
126 | // return libwavdecoder; | 126 | // return libwavdecoder; |
127 | // } | 127 | // } |
128 | 128 | ||
129 | void MediaPlayerState::loadPlugins() { | 129 | void MediaPlayerState::loadPlugins() { |
130 | qDebug("load plugins"); | 130 | // qDebug("load plugins"); |
131 | #ifndef QT_NO_COMPONENT | 131 | #ifndef QT_NO_COMPONENT |
132 | QValueList<MediaPlayerPlugin>::Iterator mit; | 132 | QValueList<MediaPlayerPlugin>::Iterator mit; |
133 | for ( mit = pluginList.begin(); mit != pluginList.end(); ++mit ) { | 133 | for ( mit = pluginList.begin(); mit != pluginList.end(); ++mit ) { |
134 | (*mit).iface->release(); | 134 | (*mit).iface->release(); |
135 | (*mit).library->unload(); | 135 | (*mit).library->unload(); |
136 | delete (*mit).library; | 136 | delete (*mit).library; |
diff --git a/core/multimedia/opieplayer/om3u.cpp b/core/multimedia/opieplayer/om3u.cpp index 3541e5f..8b92a8c 100644 --- a/core/multimedia/opieplayer/om3u.cpp +++ b/core/multimedia/opieplayer/om3u.cpp | |||
@@ -45,14 +45,14 @@ | |||
45 | #include <qtextstream.h> | 45 | #include <qtextstream.h> |
46 | #include <qstringlist.h> | 46 | #include <qstringlist.h> |
47 | #include <qcstring.h> | 47 | #include <qcstring.h> |
48 | 48 | ||
49 | static inline QString fullBaseName ( const QFileInfo &fi ) | 49 | static inline QString fullBaseName ( const QFileInfo &fi ) |
50 | { | 50 | { |
51 | QString str = fi. fileName ( ); | 51 | QString str = fi. fileName ( ); |
52 | return str. left ( str. findRev ( '.' )); | 52 | return str. left ( str. findRev ( '.' )); |
53 | } | 53 | } |
54 | 54 | ||
55 | 55 | ||
56 | //extern PlayListWidget *playList; | 56 | //extern PlayListWidget *playList; |
57 | 57 | ||
58 | Om3u::Om3u( const QString &filePath, int mode) | 58 | Om3u::Om3u( const QString &filePath, int mode) |
@@ -63,39 +63,39 @@ Om3u::Om3u( const QString &filePath, int mode) | |||
63 | } | 63 | } |
64 | 64 | ||
65 | Om3u::~Om3u(){} | 65 | Om3u::~Om3u(){} |
66 | 66 | ||
67 | void Om3u::readM3u() { | 67 | void Om3u::readM3u() { |
68 | // qDebug("<<<<<<reading m3u "+f.name()); | 68 | // qDebug("<<<<<<reading m3u "+f.name()); |
69 | QTextStream t(&f); | 69 | QTextStream t(&f); |
70 | QString s; | 70 | QString s; |
71 | while ( !t.atEnd() ) { | 71 | while ( !t.atEnd() ) { |
72 | s=t.readLine(); | 72 | s=t.readLine(); |
73 | qDebug(s); | 73 | // qDebug(s); |
74 | if( s.find( "#", 0, TRUE) == -1 ) { | 74 | if( s.find( "#", 0, TRUE) == -1 ) { |
75 | if( s.left(2) == "E:" || s.left(2) == "P:" ) { | 75 | if( s.left(2) == "E:" || s.left(2) == "P:" ) { |
76 | s = s.right( s.length() -2 ); | 76 | s = s.right( s.length() -2 ); |
77 | QFileInfo f( s ); | 77 | QFileInfo f( s ); |
78 | QString name = fullBaseName ( f ); | 78 | QString name = fullBaseName ( f ); |
79 | name = name.right( name.length() - name.findRev( "\\", -1, TRUE ) -1 ); | 79 | name = name.right( name.length() - name.findRev( "\\", -1, TRUE ) -1 ); |
80 | s=s.replace( QRegExp( "\\" ), "/" ); | 80 | s=s.replace( QRegExp( "\\" ), "/" ); |
81 | append(s); | 81 | append(s); |
82 | // qDebug(s); | 82 | // qDebug(s); |
83 | } else { // is url | 83 | } else { // is url |
84 | s.replace( QRegExp( "%20" )," " ); | 84 | s.replace( QRegExp( "%20" )," " ); |
85 | QString name; | 85 | QString name; |
86 | // if( name.left( 4 ) == "http" ) { | 86 | // if( name.left( 4 ) == "http" ) { |
87 | // name = s.right( s.length() - 7 ); | 87 | // name = s.right( s.length() - 7 ); |
88 | // } else { | 88 | // } else { |
89 | name = s; | 89 | name = s; |
90 | // } | 90 | // } |
91 | append(name); | 91 | append(name); |
92 | // qDebug(name); | 92 | // qDebug(name); |
93 | } | 93 | } |
94 | } | 94 | } |
95 | } | 95 | } |
96 | } | 96 | } |
97 | 97 | ||
98 | void Om3u::readPls() { //it's a pls file | 98 | void Om3u::readPls() { //it's a pls file |
99 | QTextStream t( &f ); | 99 | QTextStream t( &f ); |
100 | QString s; | 100 | QString s; |
101 | while ( !t.atEnd() ) { | 101 | while ( !t.atEnd() ) { |
@@ -132,13 +132,13 @@ void Om3u::readPls() { //it's a pls file | |||
132 | } | 132 | } |
133 | 133 | ||
134 | void Om3u::write() { //writes list to m3u file | 134 | void Om3u::write() { //writes list to m3u file |
135 | QString list; | 135 | QString list; |
136 | if(count()>0) { | 136 | if(count()>0) { |
137 | for ( QStringList::ConstIterator it = begin(); it != end(); ++it ) { | 137 | for ( QStringList::ConstIterator it = begin(); it != end(); ++it ) { |
138 | qDebug(*it); | 138 | // qDebug(*it); |
139 | list += *it+"\n"; | 139 | list += *it+"\n"; |
140 | } | 140 | } |
141 | f.writeBlock( list, list.length() ); | 141 | f.writeBlock( list, list.length() ); |
142 | } | 142 | } |
143 | // f.close(); | 143 | // f.close(); |
144 | } | 144 | } |
diff --git a/core/multimedia/opieplayer/playlistselection.cpp b/core/multimedia/opieplayer/playlistselection.cpp index 67187f8..94567f2 100644 --- a/core/multimedia/opieplayer/playlistselection.cpp +++ b/core/multimedia/opieplayer/playlistselection.cpp | |||
@@ -191,13 +191,13 @@ void PlayListSelection::unSelect() | |||
191 | 191 | ||
192 | void PlayListSelection::writeCurrent( Config& cfg ) { | 192 | void PlayListSelection::writeCurrent( Config& cfg ) { |
193 | cfg.setGroup("PlayList"); | 193 | cfg.setGroup("PlayList"); |
194 | QListViewItem *item = selectedItem(); | 194 | QListViewItem *item = selectedItem(); |
195 | if ( item ) | 195 | if ( item ) |
196 | cfg.writeEntry("current", item->text(0) ); | 196 | cfg.writeEntry("current", item->text(0) ); |
197 | qDebug(item->text(0)); | 197 | // qDebug(item->text(0)); |
198 | 198 | ||
199 | } | 199 | } |
200 | 200 | ||
201 | void PlayListSelection::setSelectedItem(const QString &strk ) { | 201 | void PlayListSelection::setSelectedItem(const QString &strk ) { |
202 | 202 | ||
203 | unSelect(); | 203 | unSelect(); |
diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp index 7ea95ab..1fc7dd8 100644 --- a/core/multimedia/opieplayer/playlistwidget.cpp +++ b/core/multimedia/opieplayer/playlistwidget.cpp | |||
@@ -304,19 +304,18 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) | |||
304 | QPEApplication::setStylusOperation( videoView->viewport(),QPEApplication::RightOnHold); | 304 | QPEApplication::setStylusOperation( videoView->viewport(),QPEApplication::RightOnHold); |
305 | 305 | ||
306 | tabWidget->insertTab( vTab,tr("Video")); | 306 | tabWidget->insertTab( vTab,tr("Video")); |
307 | 307 | ||
308 | QWidget *LTab; | 308 | QWidget *LTab; |
309 | LTab = new QWidget( tabWidget, "LTab" ); | 309 | LTab = new QWidget( tabWidget, "LTab" ); |
310 | playLists = new FileSelector( "playlist/plain", LTab, "fileselector" , FALSE, FALSE); //buggy | 310 | playLists = new FileSelector( "playlist/plain;audio/x-mpegurl", LTab, "fileselector" , FALSE, FALSE); |
311 | 311 | ||
312 | QGridLayout *layoutL = new QGridLayout( LTab ); | 312 | QGridLayout *layoutL = new QGridLayout( LTab ); |
313 | layoutL->setSpacing( 2); | 313 | layoutL->setSpacing( 2); |
314 | layoutL->setMargin( 2); | 314 | layoutL->setMargin( 2); |
315 | layoutL->addMultiCellWidget( playLists, 0, 0, 0, 1 ); | 315 | layoutL->addMultiCellWidget( playLists, 0, 0, 0, 1 ); |
316 | // playLists->setMinimumSize(233,260); | ||
317 | 316 | ||
318 | tabWidget->insertTab(LTab,tr("Lists")); | 317 | tabWidget->insertTab(LTab,tr("Lists")); |
319 | 318 | ||
320 | connect(tbDeletePlaylist,(SIGNAL(released())),SLOT( deletePlaylist())); | 319 | connect(tbDeletePlaylist,(SIGNAL(released())),SLOT( deletePlaylist())); |
321 | connect( fullScreenButton, SIGNAL(activated()), mediaPlayerState, SLOT(toggleFullscreen()) ); | 320 | connect( fullScreenButton, SIGNAL(activated()), mediaPlayerState, SLOT(toggleFullscreen()) ); |
322 | connect( scaleButton, SIGNAL(activated()), mediaPlayerState, SLOT(toggleScaled()) ); | 321 | connect( scaleButton, SIGNAL(activated()), mediaPlayerState, SLOT(toggleScaled()) ); |
@@ -355,18 +354,18 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) | |||
355 | connect( d->selectedFiles, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( playIt( QListViewItem *) ) ); | 354 | connect( d->selectedFiles, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( playIt( QListViewItem *) ) ); |
356 | 355 | ||
357 | setCentralWidget( vbox5 ); | 356 | setCentralWidget( vbox5 ); |
358 | 357 | ||
359 | Config cfg( "OpiePlayer" ); | 358 | Config cfg( "OpiePlayer" ); |
360 | readConfig( cfg ); | 359 | readConfig( cfg ); |
361 | QString currentPlaylist = cfg.readEntry("CurrentPlaylist","default"); | 360 | |
362 | loadList(DocLnk( currentPlaylist)); | 361 | currentPlayList = cfg.readEntry("CurrentPlaylist","default"); |
363 | setCaption(tr("OpiePlayer: ")+ fullBaseName ( QFileInfo(currentPlaylist))); | 362 | loadList(DocLnk( currentPlayList)); |
363 | setCaption(tr("OpiePlayer: ")+ fullBaseName ( QFileInfo(currentPlayList))); | ||
364 | 364 | ||
365 | initializeStates(); | 365 | initializeStates(); |
366 | // audioUI->setFocus(); | ||
367 | } | 366 | } |
368 | 367 | ||
369 | 368 | ||
370 | PlayListWidget::~PlayListWidget() { | 369 | PlayListWidget::~PlayListWidget() { |
371 | Config cfg( "OpiePlayer" ); | 370 | Config cfg( "OpiePlayer" ); |
372 | writeConfig( cfg ); | 371 | writeConfig( cfg ); |
@@ -418,21 +417,22 @@ void PlayListWidget::writeConfig( Config& cfg ) const { | |||
418 | cfg.writeEntry( entryName, lnk->linkFile() ); | 417 | cfg.writeEntry( entryName, lnk->linkFile() ); |
419 | // if this link does exist, add it so we have the file | 418 | // if this link does exist, add it so we have the file |
420 | // next time... | 419 | // next time... |
421 | if ( !QFile::exists( lnk->linkFile() ) ) { | 420 | if ( !QFile::exists( lnk->linkFile() ) ) { |
422 | // the way writing lnks doesn't really check for out | 421 | // the way writing lnks doesn't really check for out |
423 | // of disk space, but check it anyway. | 422 | // of disk space, but check it anyway. |
424 | if ( !lnk->writeLink() ) { | 423 | // if ( !lnk->writeLink() ) { |
425 | QMessageBox::critical( 0, tr("Out of space"), | 424 | // QMessageBox::critical( 0, tr("Out of space"), |
426 | tr( "There was a problem saving " | 425 | // tr( "There was a problem saving " |
427 | "the playlist.\n" | 426 | // "the playlist.\n" |
428 | "Your playlist " | 427 | // "Your playlist " |
429 | "may be missing some entries\n" | 428 | // "may be missing some entries\n" |
430 | "the next time you start it." ) | 429 | // "the next time you start it." ) |
431 | ); | 430 | // ); |
432 | } | 431 | // } |
432 | |||
433 | } | 433 | } |
434 | noOfFiles++; | 434 | noOfFiles++; |
435 | } | 435 | } |
436 | } | 436 | } |
437 | while ( d->selectedFiles->next() ); | 437 | while ( d->selectedFiles->next() ); |
438 | cfg.writeEntry("NumberOfFiles", noOfFiles ); | 438 | cfg.writeEntry("NumberOfFiles", noOfFiles ); |
@@ -444,18 +444,24 @@ void PlayListWidget::addToSelection( const DocLnk& lnk ) { | |||
444 | if ( mediaPlayerState->playlist() ) { | 444 | if ( mediaPlayerState->playlist() ) { |
445 | if(QFileInfo(lnk.file()).exists() || lnk.file().left(4) == "http" ) | 445 | if(QFileInfo(lnk.file()).exists() || lnk.file().left(4) == "http" ) |
446 | d->selectedFiles->addToSelection( lnk ); | 446 | d->selectedFiles->addToSelection( lnk ); |
447 | } | 447 | } |
448 | else | 448 | else |
449 | mediaPlayerState->setPlaying( true); | 449 | mediaPlayerState->setPlaying( true); |
450 | |||
450 | } | 451 | } |
451 | 452 | ||
452 | 453 | ||
453 | void PlayListWidget::clearList() { | 454 | void PlayListWidget::clearList() { |
454 | while ( first() ) | 455 | while ( first() ) |
455 | d->selectedFiles->removeSelected(); | 456 | d->selectedFiles->removeSelected(); |
457 | Config cfg( "OpiePlayer" ); | ||
458 | cfg.setGroup("PlayList"); | ||
459 | cfg.writeEntry("CurrentPlaylist",""); | ||
460 | currentPlayList=""; | ||
461 | |||
456 | } | 462 | } |
457 | 463 | ||
458 | 464 | ||
459 | void PlayListWidget::addAllToList() { | 465 | void PlayListWidget::addAllToList() { |
460 | DocLnkSet filesAll; | 466 | DocLnkSet filesAll; |
461 | Global::findDocuments(&filesAll, "video/*;audio/*"); | 467 | Global::findDocuments(&filesAll, "video/*;audio/*"); |
@@ -494,63 +500,68 @@ void PlayListWidget::addAllVideoToList() { | |||
494 | } | 500 | } |
495 | 501 | ||
496 | 502 | ||
497 | void PlayListWidget::setDocument(const QString& fileref) { | 503 | void PlayListWidget::setDocument(const QString& fileref) { |
498 | fromSetDocument = true; | 504 | fromSetDocument = true; |
499 | d->setDocumentUsed = TRUE; | 505 | d->setDocumentUsed = TRUE; |
500 | d->selectedFiles->setSelected(d->selectedFiles->firstChild(),true ); | 506 | setDocumentEx(fileref); |
501 | mediaPlayerState->setPlaying( FALSE ); | ||
502 | qApp->processEvents(); | ||
503 | mediaPlayerState->setPlaying( TRUE ); | ||
504 | } | 507 | } |
505 | 508 | ||
506 | void PlayListWidget::setDocumentEx(const QString& fileref) { | 509 | void PlayListWidget::setDocumentEx(const QString& fileref) { |
507 | 510 | qDebug("opieplayer receive "+fileref); | |
508 | QFileInfo fileInfo(fileref); | 511 | clearList(); |
509 | if ( !fileInfo.exists() ) { | 512 | DocLnk lnk; |
510 | QMessageBox::critical( 0, tr( "Invalid File" ), | 513 | QFileInfo fileInfo(fileref); |
511 | tr( "There was a problem in getting the file." ) ); | 514 | if ( !fileInfo.exists() ) { |
512 | return; | 515 | QMessageBox::critical( 0, tr( "Invalid File" ), |
513 | } | 516 | tr( "There was a problem in getting the file." ) ); |
514 | qDebug("setDocument "+fileref); | 517 | return; |
515 | QString extension = fileInfo.extension(false); | 518 | } |
516 | if( extension.find( "m3u", 0, false) != -1) { //is m3u | 519 | // qDebug("<<<<<<<<<<<<<<<<<<<<<<setDocument "+fileref); |
520 | QString extension = fileInfo.extension(false); | ||
521 | if( extension.find( "m3u", 0, false) != -1) { //is m3u | ||
517 | readm3u( fileref); | 522 | readm3u( fileref); |
518 | } | 523 | } |
519 | else if( extension.find( "pls", 0, false) != -1 ) { //is pls | 524 | else if( extension.find( "pls", 0, false) != -1 ) { //is pls |
520 | readPls( fileref); | 525 | readPls( fileref); |
521 | } | 526 | } |
522 | else if( fileref.find("playlist",0,TRUE) != -1) {//is playlist | 527 | else if( fileref.find("playlist",0,TRUE) != -1) {//is playlist |
523 | clearList(); | 528 | clearList(); |
524 | DocLnk lnk; | 529 | lnk.setName( fileInfo.baseName() ); //sets name |
525 | lnk.setName( fileInfo.baseName() ); //sets name | 530 | lnk.setFile( fileref ); //sets file name |
526 | lnk.setFile( fileref ); //sets file name | 531 | lnk.setIcon("Sound"); |
527 | //addToSelection( lnk ); | 532 | //addToSelection( lnk ); |
528 | 533 | ||
529 | loadList( lnk); | 534 | loadList( lnk); |
530 | d->selectedFiles->first(); | 535 | d->selectedFiles->first(); |
531 | } else { | 536 | } else { |
532 | clearList(); | 537 | if( fileref.find(".desktop",0,TRUE) != -1) { |
533 | DocLnk lnk; | 538 | lnk = DocLnk(fileref); |
534 | lnk.setName( fileInfo.baseName() ); //sets name | 539 | } else { |
535 | lnk.setFile( fileref ); //sets file name | 540 | lnk.setName( fileInfo.baseName() ); //sets name |
536 | addToSelection( lnk ); | 541 | lnk.setFile( fileref ); //sets file name |
537 | // addToSelection( DocLnk( fileref ) ); | 542 | lnk.setIcon("Sound"); |
538 | d->setDocumentUsed = TRUE; | 543 | } |
539 | mediaPlayerState->setPlaying( FALSE ); | 544 | |
540 | qApp->processEvents(); | 545 | addToSelection( lnk ); |
541 | mediaPlayerState->setPlaying( TRUE ); | 546 | // addToSelection( DocLnk( fileref ) ); |
542 | // qApp->processEvents(); | 547 | lnk.removeLinkFile(); |
543 | setCaption(tr("OpiePlayer")); | 548 | // qApp->processEvents(); |
544 | } | 549 | } |
550 | setCaption(tr("OpiePlayer")); | ||
551 | d->setDocumentUsed = TRUE; | ||
552 | d->selectedFiles->setSelected(d->selectedFiles->firstChild(),true ); | ||
553 | mediaPlayerState->setPlaying( FALSE ); | ||
554 | qApp->processEvents(); | ||
555 | mediaPlayerState->setPlaying( TRUE ); | ||
556 | |||
545 | } | 557 | } |
546 | 558 | ||
547 | 559 | ||
548 | void PlayListWidget::setActiveWindow() { | 560 | void PlayListWidget::setActiveWindow() { |
549 | qDebug("SETTING active window"); | 561 | // qDebug("SETTING active window"); |
550 | |||
551 | // When we get raised we need to ensure that it switches views | 562 | // When we get raised we need to ensure that it switches views |
552 | char origView = mediaPlayerState->view(); | 563 | char origView = mediaPlayerState->view(); |
553 | mediaPlayerState->setView( 'l' ); // invalidate | 564 | mediaPlayerState->setView( 'l' ); // invalidate |
554 | mediaPlayerState->setView( origView ); // now switch back | 565 | mediaPlayerState->setView( origView ); // now switch back |
555 | } | 566 | } |
556 | 567 | ||
@@ -558,492 +569,467 @@ void PlayListWidget::setActiveWindow() { | |||
558 | void PlayListWidget::useSelectedDocument() { | 569 | void PlayListWidget::useSelectedDocument() { |
559 | d->setDocumentUsed = FALSE; | 570 | d->setDocumentUsed = FALSE; |
560 | } | 571 | } |
561 | 572 | ||
562 | 573 | ||
563 | const DocLnk *PlayListWidget::current() { // this is fugly | 574 | const DocLnk *PlayListWidget::current() { // this is fugly |
564 | 575 | switch (tabWidget->currentPageIndex()) { | |
565 | // if( fromSetDocument) { | 576 | case 0: //playlist |
566 | // qDebug("from setDoc"); | 577 | { |
567 | // DocLnkSet files; | 578 | // qDebug("playlist"); |
568 | // Global::findDocuments(&files, "video/*;audio/*"); | 579 | if ( mediaPlayerState->playlist() ) { |
569 | // QListIterator<DocLnk> dit( files.children() ); | 580 | return d->selectedFiles->current(); |
570 | // for ( ; dit.current(); ++dit ) { | ||
571 | // if(dit.current()->linkFile() == setDocFileRef) { | ||
572 | // qDebug(setDocFileRef); | ||
573 | // return dit; | ||
574 | // } | ||
575 | // } | ||
576 | // } else | ||
577 | |||
578 | qDebug("current"); | ||
579 | |||
580 | switch (tabWidget->currentPageIndex()) { | ||
581 | case 0: //playlist | ||
582 | { | ||
583 | qDebug("playlist"); | ||
584 | if ( mediaPlayerState->playlist() ) { | ||
585 | return d->selectedFiles->current(); | ||
586 | } | ||
587 | else if ( d->setDocumentUsed && d->current ) { | ||
588 | return d->current; | ||
589 | } else { | ||
590 | return &(d->files->selectedDocument()); | ||
591 | } | ||
592 | } | 581 | } |
593 | break; | 582 | else if ( d->setDocumentUsed && d->current ) { |
594 | case 1://audio | 583 | return d->current; |
595 | { | 584 | } else { |
596 | qDebug("audioView"); | 585 | return &(d->files->selectedDocument()); |
597 | QListIterator<DocLnk> dit( files.children() ); | ||
598 | for ( ; dit.current(); ++dit ) { | ||
599 | if( dit.current()->name() == audioView->currentItem()->text(0) && !insanityBool) { | ||
600 | qDebug("here"); | ||
601 | insanityBool=TRUE; | ||
602 | return dit; | ||
603 | } | ||
604 | } | ||
605 | } | ||
606 | break; | ||
607 | case 2: // video | ||
608 | { | ||
609 | qDebug("videoView"); | ||
610 | QListIterator<DocLnk> Vdit( vFiles.children() ); | ||
611 | for ( ; Vdit.current(); ++Vdit ) { | ||
612 | if( Vdit.current()->name() == videoView->currentItem()->text(0) && !insanityBool) { | ||
613 | insanityBool=TRUE; | ||
614 | return Vdit; | ||
615 | } | ||
616 | } | ||
617 | } | 586 | } |
618 | break; | 587 | } |
619 | }; | 588 | break; |
620 | return 0; | 589 | case 1://audio |
590 | { | ||
591 | // qDebug("audioView"); | ||
592 | QListIterator<DocLnk> dit( files.children() ); | ||
593 | for ( ; dit.current(); ++dit ) { | ||
594 | if( dit.current()->name() == audioView->currentItem()->text(0) && !insanityBool) { | ||
595 | insanityBool=TRUE; | ||
596 | return dit; | ||
597 | } | ||
598 | } | ||
599 | } | ||
600 | break; | ||
601 | case 2: // video | ||
602 | { | ||
603 | QListIterator<DocLnk> Vdit( vFiles.children() ); | ||
604 | for ( ; Vdit.current(); ++Vdit ) { | ||
605 | if( Vdit.current()->name() == videoView->currentItem()->text(0) && !insanityBool) { | ||
606 | insanityBool=TRUE; | ||
607 | return Vdit; | ||
608 | } | ||
609 | } | ||
610 | } | ||
611 | break; | ||
612 | }; | ||
613 | return 0; | ||
621 | } | 614 | } |
622 | 615 | ||
623 | bool PlayListWidget::prev() { | 616 | bool PlayListWidget::prev() { |
624 | if ( mediaPlayerState->playlist() ) { | 617 | if ( mediaPlayerState->playlist() ) { |
625 | if ( mediaPlayerState->shuffled() ) { | 618 | if ( mediaPlayerState->shuffled() ) { |
626 | const DocLnk *cur = current(); | 619 | const DocLnk *cur = current(); |
627 | int j = 1 + (int)(97.0 * rand() / (RAND_MAX + 1.0)); | 620 | int j = 1 + (int)(97.0 * rand() / (RAND_MAX + 1.0)); |
628 | for ( int i = 0; i < j; i++ ) { | 621 | for ( int i = 0; i < j; i++ ) { |
629 | if ( !d->selectedFiles->next() ) | 622 | if ( !d->selectedFiles->next() ) |
630 | d->selectedFiles->first(); | 623 | d->selectedFiles->first(); |
624 | } | ||
625 | if ( cur == current() ) | ||
626 | if ( !d->selectedFiles->next() ) | ||
627 | d->selectedFiles->first(); | ||
628 | return TRUE; | ||
629 | } else { | ||
630 | if ( !d->selectedFiles->prev() ) { | ||
631 | if ( mediaPlayerState->looping() ) { | ||
632 | return d->selectedFiles->last(); | ||
633 | } else { | ||
634 | return FALSE; | ||
631 | } | 635 | } |
632 | if ( cur == current() ) | 636 | } |
633 | if ( !d->selectedFiles->next() ) | 637 | return TRUE; |
634 | d->selectedFiles->first(); | 638 | } |
635 | return TRUE; | 639 | } else { |
636 | } else { | 640 | return mediaPlayerState->looping(); |
637 | if ( !d->selectedFiles->prev() ) { | 641 | } |
638 | if ( mediaPlayerState->looping() ) { | ||
639 | return d->selectedFiles->last(); | ||
640 | } else { | ||
641 | return FALSE; | ||
642 | } | ||
643 | } | ||
644 | return TRUE; | ||
645 | } | ||
646 | } else { | ||
647 | return mediaPlayerState->looping(); | ||
648 | } | ||
649 | } | 642 | } |
650 | 643 | ||
651 | 644 | ||
652 | bool PlayListWidget::next() { | 645 | bool PlayListWidget::next() { |
653 | if ( mediaPlayerState->playlist() ) { | 646 | if ( mediaPlayerState->playlist() ) { |
654 | if ( mediaPlayerState->shuffled() ) { | 647 | if ( mediaPlayerState->shuffled() ) { |
655 | return prev(); | 648 | return prev(); |
656 | } else { | 649 | } else { |
657 | if ( !d->selectedFiles->next() ) { | 650 | if ( !d->selectedFiles->next() ) { |
658 | if ( mediaPlayerState->looping() ) { | 651 | if ( mediaPlayerState->looping() ) { |
659 | return d->selectedFiles->first(); | 652 | return d->selectedFiles->first(); |
660 | } else { | 653 | } else { |
661 | return FALSE; | 654 | return FALSE; |
662 | } | ||
663 | } | 655 | } |
664 | return TRUE; | 656 | } |
665 | } | 657 | return TRUE; |
666 | } else { | 658 | } |
667 | return mediaPlayerState->looping(); | 659 | } else { |
668 | } | 660 | return mediaPlayerState->looping(); |
661 | } | ||
669 | } | 662 | } |
670 | 663 | ||
671 | 664 | ||
672 | bool PlayListWidget::first() { | 665 | bool PlayListWidget::first() { |
673 | if ( mediaPlayerState->playlist() ) | 666 | if ( mediaPlayerState->playlist() ) |
674 | return d->selectedFiles->first(); | 667 | return d->selectedFiles->first(); |
675 | else | 668 | else |
676 | return mediaPlayerState->looping(); | 669 | return mediaPlayerState->looping(); |
677 | } | 670 | } |
678 | 671 | ||
679 | 672 | ||
680 | bool PlayListWidget::last() { | 673 | bool PlayListWidget::last() { |
681 | if ( mediaPlayerState->playlist() ) | 674 | if ( mediaPlayerState->playlist() ) |
682 | return d->selectedFiles->last(); | 675 | return d->selectedFiles->last(); |
683 | else | 676 | else |
684 | return mediaPlayerState->looping(); | 677 | return mediaPlayerState->looping(); |
685 | } | 678 | } |
686 | 679 | ||
687 | 680 | ||
688 | void PlayListWidget::saveList() { | 681 | void PlayListWidget::saveList() { |
689 | writem3u(); | 682 | writem3u(); |
690 | } | 683 | } |
691 | 684 | ||
692 | void PlayListWidget::loadList( const DocLnk & lnk) { | 685 | void PlayListWidget::loadList( const DocLnk & lnk) { |
693 | QString name = lnk.name(); | 686 | QString name = lnk.name(); |
694 | // qDebug("<<<<<<<<<<<<<<<<<<<<<<<<currentList is "+name); | 687 | // qDebug("<<<<<<<<<<<<<<<<<<<<<<<<currentList is "+name); |
695 | 688 | ||
696 | if( name.length()>0) { | 689 | if( name.length()>0) { |
697 | setCaption("OpiePlayer: "+name); | 690 | setCaption("OpiePlayer: "+name); |
698 | // qDebug("<<<<<<<<<<<<load list "+ lnk.file()); | 691 | // qDebug("<<<<<<<<<<<<load list "+ lnk.file()); |
699 | clearList(); | 692 | clearList(); |
700 | readm3u(lnk.file()); | 693 | readm3u(lnk.file()); |
701 | tabWidget->setCurrentPage(0); | 694 | tabWidget->setCurrentPage(0); |
702 | } | 695 | } |
703 | } | 696 | } |
704 | 697 | ||
705 | void PlayListWidget::setPlaylist( bool shown ) { | 698 | void PlayListWidget::setPlaylist( bool shown ) { |
706 | if ( shown ) | 699 | if ( shown ) |
707 | d->playListFrame->show(); | 700 | d->playListFrame->show(); |
708 | else | 701 | else |
709 | d->playListFrame->hide(); | 702 | d->playListFrame->hide(); |
710 | } | 703 | } |
711 | 704 | ||
712 | void PlayListWidget::setView( char view ) { | 705 | void PlayListWidget::setView( char view ) { |
713 | if ( view == 'l' ) | 706 | if ( view == 'l' ) |
714 | showMaximized(); | 707 | showMaximized(); |
715 | else | 708 | else |
716 | hide(); | 709 | hide(); |
717 | } | 710 | } |
718 | 711 | ||
719 | void PlayListWidget::addSelected() { | 712 | void PlayListWidget::addSelected() { |
720 | qDebug("addSelected"); | 713 | DocLnk lnk; |
721 | DocLnk lnk; | 714 | QString filename; |
722 | QString filename; | 715 | switch (tabWidget->currentPageIndex()) { |
723 | switch (tabWidget->currentPageIndex()) { | 716 | |
724 | 717 | case 0: //playlist | |
725 | case 0: //playlist | 718 | return; |
726 | return; | 719 | break; |
727 | break; | 720 | case 1: { //audio |
728 | case 1: { //audio | ||
729 | QListViewItemIterator it( audioView ); | 721 | QListViewItemIterator it( audioView ); |
730 | for ( ; it.current(); ++it ) { | 722 | for ( ; it.current(); ++it ) { |
731 | if ( it.current()->isSelected() ) { | 723 | if ( it.current()->isSelected() ) { |
732 | filename = it.current()->text(3); | 724 | filename = it.current()->text(3); |
733 | lnk.setName( QFileInfo(filename).baseName() ); //sets name | 725 | lnk.setName( QFileInfo(filename).baseName() ); //sets name |
734 | lnk.setFile( filename ); //sets file name | 726 | lnk.setFile( filename ); //sets file name |
735 | d->selectedFiles->addToSelection( lnk); | 727 | d->selectedFiles->addToSelection( lnk); |
736 | } | 728 | } |
737 | } | 729 | } |
738 | audioView->clearSelection(); | 730 | audioView->clearSelection(); |
739 | // d->selectedFiles->next(); | 731 | // d->selectedFiles->next(); |
740 | } | 732 | } |
741 | break; | 733 | break; |
742 | 734 | ||
743 | case 2: { // video | 735 | case 2: { // video |
744 | QListViewItemIterator it( videoView ); | 736 | QListViewItemIterator it( videoView ); |
745 | for ( ; it.current(); ++it ) { | 737 | for ( ; it.current(); ++it ) { |
746 | if ( it.current()->isSelected() ) { | 738 | if ( it.current()->isSelected() ) { |
747 | 739 | ||
748 | filename = it.current()->text(3); | 740 | filename = it.current()->text(3); |
749 | lnk.setName( QFileInfo(filename).baseName() ); //sets name | 741 | lnk.setName( QFileInfo(filename).baseName() ); //sets name |
750 | lnk.setFile( filename ); //sets file name | 742 | lnk.setFile( filename ); //sets file name |
751 | d->selectedFiles->addToSelection( lnk); | 743 | d->selectedFiles->addToSelection( lnk); |
752 | } | 744 | } |
753 | } | 745 | } |
754 | videoView->clearSelection(); | 746 | videoView->clearSelection(); |
755 | } | 747 | } |
756 | break; | 748 | break; |
757 | }; | 749 | }; |
758 | // tabWidget->setCurrentPage(0); | 750 | // tabWidget->setCurrentPage(0); |
759 | writeCurrentM3u(); | 751 | writeCurrentM3u(); |
760 | 752 | ||
761 | } | 753 | } |
762 | 754 | ||
763 | void PlayListWidget::removeSelected() { | 755 | void PlayListWidget::removeSelected() { |
764 | d->selectedFiles->removeSelected( ); | 756 | d->selectedFiles->removeSelected( ); |
765 | } | 757 | } |
766 | 758 | ||
767 | void PlayListWidget::playIt( QListViewItem *) { | 759 | void PlayListWidget::playIt( QListViewItem *) { |
768 | // d->setDocumentUsed = FALSE; | 760 | // d->setDocumentUsed = FALSE; |
769 | // mediaPlayerState->curPosition =0; | 761 | // mediaPlayerState->curPosition =0; |
770 | qDebug("playIt"); | 762 | // mediaPlayerState->setPlaying(FALSE); |
771 | // mediaPlayerState->setPlaying(FALSE); | 763 | mediaPlayerState->setPlaying(TRUE); |
772 | mediaPlayerState->setPlaying(TRUE); | 764 | d->selectedFiles->unSelect(); |
773 | d->selectedFiles->unSelect(); | ||
774 | } | 765 | } |
775 | 766 | ||
776 | void PlayListWidget::addToSelection( QListViewItem *it) { | 767 | void PlayListWidget::addToSelection( QListViewItem *it) { |
777 | d->setDocumentUsed = FALSE; | 768 | d->setDocumentUsed = FALSE; |
778 | 769 | ||
779 | if(it) { | 770 | if(it) { |
780 | switch ( tabWidget->currentPageIndex()) { | 771 | switch ( tabWidget->currentPageIndex()) { |
781 | case 0: //playlist | 772 | case 0: //playlist |
782 | return; | 773 | return; |
783 | break; | 774 | break; |
784 | }; | 775 | }; |
785 | // case 1: { | 776 | // case 1: { |
786 | DocLnk lnk; | 777 | DocLnk lnk; |
787 | QString filename; | 778 | QString filename; |
788 | 779 | ||
789 | filename=it->text(3); | 780 | filename=it->text(3); |
790 | lnk.setName( fullBaseName ( QFileInfo(filename)) ); //sets name | 781 | lnk.setName( fullBaseName ( QFileInfo(filename)) ); //sets name |
791 | lnk.setFile( filename ); //sets file name | 782 | lnk.setFile( filename ); //sets file name |
792 | d->selectedFiles->addToSelection( lnk); | 783 | d->selectedFiles->addToSelection( lnk); |
793 | 784 | ||
794 | if(tabWidget->currentPageIndex() == 0) | 785 | if(tabWidget->currentPageIndex() == 0) |
795 | writeCurrentM3u(); | 786 | writeCurrentM3u(); |
796 | // tabWidget->setCurrentPage(0); | 787 | // tabWidget->setCurrentPage(0); |
797 | 788 | ||
798 | } | 789 | } |
799 | } | 790 | } |
800 | 791 | ||
801 | void PlayListWidget::tabChanged(QWidget *) { | 792 | void PlayListWidget::tabChanged(QWidget *) { |
802 | 793 | ||
803 | switch ( tabWidget->currentPageIndex()) { | 794 | switch ( tabWidget->currentPageIndex()) { |
804 | case 0: | 795 | case 0: |
805 | { | 796 | { |
806 | if( !tbDeletePlaylist->isHidden()) | 797 | if( !tbDeletePlaylist->isHidden()) |
807 | tbDeletePlaylist->hide(); | 798 | tbDeletePlaylist->hide(); |
808 | d->tbRemoveFromList->setEnabled(TRUE); | 799 | d->tbRemoveFromList->setEnabled(TRUE); |
809 | d->tbAddToList->setEnabled(FALSE); | 800 | d->tbAddToList->setEnabled(FALSE); |
810 | } | 801 | } |
811 | break; | 802 | break; |
812 | case 1: | 803 | case 1: |
813 | { | 804 | { |
814 | audioView->clear(); | 805 | audioView->clear(); |
815 | populateAudioView(); | 806 | populateAudioView(); |
816 | 807 | ||
817 | if( !tbDeletePlaylist->isHidden()) | 808 | if( !tbDeletePlaylist->isHidden()) |
818 | tbDeletePlaylist->hide(); | 809 | tbDeletePlaylist->hide(); |
819 | d->tbRemoveFromList->setEnabled(FALSE); | 810 | d->tbRemoveFromList->setEnabled(FALSE); |
820 | d->tbAddToList->setEnabled(TRUE); | 811 | d->tbAddToList->setEnabled(TRUE); |
821 | } | 812 | } |
822 | break; | 813 | break; |
823 | case 2: | 814 | case 2: |
824 | { | 815 | { |
825 | videoView->clear(); | 816 | videoView->clear(); |
826 | populateVideoView(); | 817 | populateVideoView(); |
827 | if( !tbDeletePlaylist->isHidden()) | 818 | if( !tbDeletePlaylist->isHidden()) |
828 | tbDeletePlaylist->hide(); | 819 | tbDeletePlaylist->hide(); |
829 | d->tbRemoveFromList->setEnabled(FALSE); | 820 | d->tbRemoveFromList->setEnabled(FALSE); |
830 | d->tbAddToList->setEnabled(TRUE); | 821 | d->tbAddToList->setEnabled(TRUE); |
831 | } | 822 | } |
832 | break; | 823 | break; |
833 | case 3: | 824 | case 3: |
834 | { | 825 | { |
835 | if( tbDeletePlaylist->isHidden()) | 826 | if( tbDeletePlaylist->isHidden()) |
836 | tbDeletePlaylist->show(); | 827 | tbDeletePlaylist->show(); |
837 | playLists->reread(); | 828 | playLists->reread(); |
838 | } | 829 | } |
839 | break; | 830 | break; |
840 | }; | 831 | }; |
841 | } | 832 | } |
842 | 833 | ||
843 | void PlayListWidget::btnPlay(bool b) { | 834 | void PlayListWidget::btnPlay(bool b) { |
844 | qDebug("<<<<<<<<<<<<<<<BtnPlay %d", b); | 835 | // mediaPlayerState->setPlaying(b); |
845 | // mediaPlayerState->setPlaying(b); | 836 | switch ( tabWidget->currentPageIndex()) { |
846 | switch ( tabWidget->currentPageIndex()) { | 837 | case 0: |
847 | case 0: | 838 | { |
848 | { | 839 | // if( d->selectedFiles->current()->file().find(" ",0,TRUE) != -1 |
849 | qDebug("1"); | 840 | // if( d->selectedFiles->current()->file().find("%20",0,TRUE) != -1) { |
850 | // if( d->selectedFiles->current()->file().find(" ",0,TRUE) != -1 | 841 | // QMessageBox::message("Note","You are trying to play\na malformed url."); |
851 | // if( d->selectedFiles->current()->file().find("%20",0,TRUE) != -1) { | 842 | // } else { |
852 | // QMessageBox::message("Note","You are trying to play\na malformed url."); | 843 | mediaPlayerState->setPlaying(b); |
853 | // } else { | 844 | insanityBool=FALSE; |
854 | mediaPlayerState->setPlaying(b); | 845 | qDebug("insanity"); |
855 | insanityBool=FALSE; | 846 | // } |
856 | qDebug("insanity"); | 847 | } |
857 | // } | 848 | break; |
858 | } | 849 | case 1: |
859 | break; | 850 | { |
860 | case 1: | 851 | // d->selectedFiles->unSelect(); |
861 | { | 852 | addToSelection( audioView->currentItem() ); |
862 | qDebug("2"); | 853 | mediaPlayerState->setPlaying( b); |
863 | // d->selectedFiles->unSelect(); | 854 | d->selectedFiles->removeSelected( ); |
864 | addToSelection( audioView->currentItem() ); | 855 | d->selectedFiles->unSelect(); |
865 | mediaPlayerState->setPlaying( b); | 856 | tabWidget->setCurrentPage(1); |
866 | d->selectedFiles->removeSelected( ); | 857 | insanityBool=FALSE; |
867 | d->selectedFiles->unSelect(); | 858 | }// audioView->clearSelection(); |
868 | tabWidget->setCurrentPage(1); | 859 | break; |
869 | insanityBool=FALSE; | 860 | case 2: |
870 | }// audioView->clearSelection(); | 861 | { |
871 | break; | ||
872 | case 2: | ||
873 | { | ||
874 | qDebug("3"); | ||
875 | 862 | ||
876 | addToSelection( videoView->currentItem() ); | 863 | addToSelection( videoView->currentItem() ); |
877 | mediaPlayerState->setPlaying( b); | 864 | mediaPlayerState->setPlaying( b); |
878 | // qApp->processEvents(); | 865 | // qApp->processEvents(); |
879 | d->selectedFiles->removeSelected( ); | 866 | d->selectedFiles->removeSelected( ); |
880 | d->selectedFiles->unSelect(); | 867 | d->selectedFiles->unSelect(); |
881 | tabWidget->setCurrentPage(2); | 868 | tabWidget->setCurrentPage(2); |
882 | insanityBool=FALSE; | 869 | insanityBool=FALSE; |
883 | }// videoView->clearSelection(); | 870 | }// videoView->clearSelection(); |
884 | break; | 871 | break; |
885 | }; | 872 | }; |
886 | 873 | ||
887 | } | 874 | } |
888 | 875 | ||
889 | void PlayListWidget::deletePlaylist() { | 876 | void PlayListWidget::deletePlaylist() { |
890 | switch( QMessageBox::information( this, (tr("Remove Playlist?")), | 877 | switch( QMessageBox::information( this, (tr("Remove Playlist?")), |
891 | (tr("You really want to delete\nthis playlist?")), | 878 | (tr("You really want to delete\nthis playlist?")), |
892 | (tr("Yes")), (tr("No")), 0 )){ | 879 | (tr("Yes")), (tr("No")), 0 )){ |
893 | case 0: // Yes clicked, | 880 | case 0: // Yes clicked, |
894 | QFile().remove(playLists->selectedDocument().file()); | 881 | QFile().remove(playLists->selectedDocument().file()); |
895 | QFile().remove(playLists->selectedDocument().linkFile()); | 882 | QFile().remove(playLists->selectedDocument().linkFile()); |
896 | playLists->reread(); | 883 | playLists->reread(); |
897 | break; | 884 | break; |
898 | case 1: // Cancel | 885 | case 1: // Cancel |
899 | break; | 886 | break; |
900 | }; | 887 | }; |
901 | } | 888 | } |
902 | 889 | ||
903 | void PlayListWidget::viewPressed( int mouse, QListViewItem *, const QPoint&, int ) | 890 | void PlayListWidget::viewPressed( int mouse, QListViewItem *, const QPoint&, int ) |
904 | { | 891 | { |
905 | switch (mouse) { | 892 | switch (mouse) { |
906 | case 1: | 893 | case 1: |
907 | break; | 894 | break; |
908 | case 2:{ | 895 | case 2:{ |
909 | 896 | ||
910 | QPopupMenu m; | 897 | QPopupMenu m; |
911 | m.insertItem( tr( "Play" ), this, SLOT( playSelected() )); | 898 | m.insertItem( tr( "Play" ), this, SLOT( playSelected() )); |
912 | m.insertItem( tr( "Add to Playlist" ), this, SLOT( addSelected() )); | 899 | m.insertItem( tr( "Add to Playlist" ), this, SLOT( addSelected() )); |
913 | m.insertSeparator(); | 900 | m.insertSeparator(); |
914 | if( QFile(QPEApplication::qpeDir()+"lib/libopie.so").exists() ) | 901 | if( QFile(QPEApplication::qpeDir()+"lib/libopie.so").exists() ) |
915 | m.insertItem( tr( "Properties" ), this, SLOT( listDelete() )); | 902 | m.insertItem( tr( "Properties" ), this, SLOT( listDelete() )); |
916 | 903 | ||
917 | m.exec( QCursor::pos() ); | 904 | m.exec( QCursor::pos() ); |
918 | } | 905 | } |
919 | break; | 906 | break; |
920 | }; | 907 | }; |
921 | } | 908 | } |
922 | 909 | ||
923 | void PlayListWidget::playSelected() | 910 | void PlayListWidget::playSelected() |
924 | { | 911 | { |
925 | qDebug("playSelected"); | ||
926 | btnPlay( true); | 912 | btnPlay( true); |
927 | // d->selectedFiles->unSelect(); | 913 | // d->selectedFiles->unSelect(); |
928 | } | 914 | } |
929 | 915 | ||
930 | void PlayListWidget::playlistViewPressed( int mouse, QListViewItem *, const QPoint&, int) | 916 | void PlayListWidget::playlistViewPressed( int mouse, QListViewItem *, const QPoint&, int) |
931 | { | 917 | { |
932 | switch (mouse) { | 918 | switch (mouse) { |
933 | case 1: | 919 | case 1: |
934 | 920 | ||
935 | break; | ||
936 | case 2:{ | ||
937 | QPopupMenu m; | ||
938 | m.insertItem( tr( "Play Selected" ), this, SLOT( playSelected() )); | ||
939 | m.insertItem( tr( "Remove" ), this, SLOT( removeSelected() )); | ||
940 | // m.insertSeparator(); | ||
941 | // m.insertItem( tr( "Properties" ), this, SLOT( listDelete() )); | ||
942 | m.exec( QCursor::pos() ); | ||
943 | } | ||
944 | break; | 921 | break; |
945 | }; | 922 | case 2:{ |
923 | QPopupMenu m; | ||
924 | m.insertItem( tr( "Play Selected" ), this, SLOT( playSelected() )); | ||
925 | m.insertItem( tr( "Remove" ), this, SLOT( removeSelected() )); | ||
926 | // m.insertSeparator(); | ||
927 | // m.insertItem( tr( "Properties" ), this, SLOT( listDelete() )); | ||
928 | m.exec( QCursor::pos() ); | ||
929 | } | ||
930 | break; | ||
931 | }; | ||
946 | 932 | ||
947 | } | 933 | } |
948 | 934 | ||
949 | void PlayListWidget::listDelete() { | 935 | void PlayListWidget::listDelete() { |
950 | Config cfg( "OpiePlayer" ); | 936 | Config cfg( "OpiePlayer" ); |
951 | cfg.setGroup("PlayList"); | 937 | cfg.setGroup("PlayList"); |
952 | QString currentPlaylist = cfg.readEntry("CurrentPlaylist",""); | 938 | currentPlayList = cfg.readEntry("CurrentPlaylist",""); |
953 | QString file; | 939 | QString file; |
954 | // int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 ); | 940 | // int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 ); |
955 | switch ( tabWidget->currentPageIndex()) { | 941 | switch ( tabWidget->currentPageIndex()) { |
956 | case 0: | 942 | case 0: |
957 | break; | ||
958 | case 1: | ||
959 | { | ||
960 | file = audioView->currentItem()->text(0); | ||
961 | QListIterator<DocLnk> Pdit( files.children() ); | ||
962 | for ( ; Pdit.current(); ++Pdit ) { | ||
963 | if( Pdit.current()->name() == file) { | ||
964 | LnkProperties prop( Pdit.current() ); | ||
965 | prop.showMaximized(); | ||
966 | prop.exec(); | ||
967 | } | ||
968 | } | ||
969 | populateAudioView(); | ||
970 | } | ||
971 | break; | 943 | break; |
972 | case 2: | 944 | case 1: |
973 | { | 945 | { |
974 | // file = videoView->selectedItem()->text(0); | 946 | file = audioView->currentItem()->text(0); |
975 | // for ( int i = 0; i < noOfFiles; i++ ) { | 947 | QListIterator<DocLnk> Pdit( files.children() ); |
976 | // QString entryName; | 948 | for ( ; Pdit.current(); ++Pdit ) { |
977 | // entryName.sprintf( "File%i", i + 1 ); | 949 | if( Pdit.current()->name() == file) { |
978 | // QString linkFile = cfg.readEntry( entryName ); | 950 | LnkProperties prop( Pdit.current() ); |
979 | // AppLnk lnk( AppLnk(linkFile)); | 951 | prop.showMaximized(); |
980 | // if( lnk.name() == file ) { | 952 | prop.exec(); |
981 | // LnkProperties prop( &lnk); | 953 | } |
982 | // // connect(&prop, SIGNAL(select(const AppLnk *)), this, SLOT(externalSelected(const AppLnk *))); | ||
983 | // prop.showMaximized(); | ||
984 | // prop.exec(); | ||
985 | // } | ||
986 | // } | ||
987 | } | 954 | } |
988 | break; | 955 | populateAudioView(); |
989 | }; | 956 | } |
957 | break; | ||
958 | case 2: | ||
959 | { | ||
960 | // file = videoView->selectedItem()->text(0); | ||
961 | // for ( int i = 0; i < noOfFiles; i++ ) { | ||
962 | // QString entryName; | ||
963 | // entryName.sprintf( "File%i", i + 1 ); | ||
964 | // QString linkFile = cfg.readEntry( entryName ); | ||
965 | // AppLnk lnk( AppLnk(linkFile)); | ||
966 | // if( lnk.name() == file ) { | ||
967 | // LnkProperties prop( &lnk); | ||
968 | // // connect(&prop, SIGNAL(select(const AppLnk *)), this, SLOT(externalSelected(const AppLnk *))); | ||
969 | // prop.showMaximized(); | ||
970 | // prop.exec(); | ||
971 | // } | ||
972 | // } | ||
973 | } | ||
974 | break; | ||
975 | }; | ||
990 | } | 976 | } |
991 | 977 | ||
992 | void PlayListWidget::scanForAudio() { | 978 | void PlayListWidget::scanForAudio() { |
993 | // qDebug("scan for audio"); | 979 | // qDebug("scan for audio"); |
994 | files.detachChildren(); | 980 | files.detachChildren(); |
995 | QListIterator<DocLnk> sdit( files.children() ); | 981 | QListIterator<DocLnk> sdit( files.children() ); |
996 | for ( ; sdit.current(); ++sdit ) { | 982 | for ( ; sdit.current(); ++sdit ) { |
997 | delete sdit.current(); | 983 | delete sdit.current(); |
998 | } | 984 | } |
999 | Global::findDocuments( &files, audioMimes); | 985 | Global::findDocuments( &files, audioMimes); |
1000 | audioScan = true; | 986 | audioScan = true; |
1001 | } | 987 | } |
1002 | void PlayListWidget::scanForVideo() { | 988 | void PlayListWidget::scanForVideo() { |
1003 | // qDebug("scan for video"); | 989 | // qDebug("scan for video"); |
1004 | vFiles.detachChildren(); | 990 | vFiles.detachChildren(); |
1005 | QListIterator<DocLnk> sdit( vFiles.children() ); | 991 | QListIterator<DocLnk> sdit( vFiles.children() ); |
1006 | for ( ; sdit.current(); ++sdit ) { | 992 | for ( ; sdit.current(); ++sdit ) { |
1007 | delete sdit.current(); | 993 | delete sdit.current(); |
1008 | } | 994 | } |
1009 | Global::findDocuments(&vFiles, "video/*"); | 995 | Global::findDocuments(&vFiles, "video/*"); |
1010 | videoScan = true; | 996 | videoScan = true; |
1011 | } | 997 | } |
1012 | 998 | ||
1013 | void PlayListWidget::populateAudioView() { | 999 | void PlayListWidget::populateAudioView() { |
1014 | 1000 | ||
1015 | audioView->clear(); | 1001 | audioView->clear(); |
1016 | StorageInfo storageInfo; | 1002 | StorageInfo storageInfo; |
1017 | const QList<FileSystem> &fs = storageInfo.fileSystems(); | 1003 | const QList<FileSystem> &fs = storageInfo.fileSystems(); |
1018 | if(!audioScan) scanForAudio(); | 1004 | if(!audioScan) scanForAudio(); |
1019 | 1005 | ||
1020 | QListIterator<DocLnk> dit( files.children() ); | 1006 | QListIterator<DocLnk> dit( files.children() ); |
1021 | QListIterator<FileSystem> it ( fs ); | 1007 | QListIterator<FileSystem> it ( fs ); |
1022 | 1008 | ||
1023 | QString storage; | 1009 | QString storage; |
1024 | for ( ; dit.current(); ++dit ) { | 1010 | for ( ; dit.current(); ++dit ) { |
1025 | for( ; it.current(); ++it ){ | 1011 | for( ; it.current(); ++it ){ |
1026 | const QString name = (*it)->name(); | 1012 | const QString name = (*it)->name(); |
1027 | const QString path = (*it)->path(); | 1013 | const QString path = (*it)->path(); |
1028 | if(dit.current()->file().find(path) != -1 ) storage=name; | 1014 | if(dit.current()->file().find(path) != -1 ) storage=name; |
1029 | } | 1015 | } |
1030 | 1016 | ||
1031 | QListViewItem * newItem; | 1017 | QListViewItem * newItem; |
1032 | if ( QFile( dit.current()->file()).exists() || dit.current()->file().left(4) == "http" ) { | 1018 | if ( QFile( dit.current()->file()).exists() || dit.current()->file().left(4) == "http" ) { |
1033 | long size; | 1019 | long size; |
1034 | if( dit.current()->file().left(4) == "http" ) | 1020 | if( dit.current()->file().left(4) == "http" ) |
1035 | size=0; | 1021 | size=0; |
1036 | else | 1022 | else |
1037 | size = QFile( dit.current()->file() ).size(); | 1023 | size = QFile( dit.current()->file() ).size(); |
1038 | // qDebug(dit.current()->name()); | 1024 | // qDebug(dit.current()->name()); |
1039 | newItem= /*(void)*/ new QListViewItem( audioView, dit.current()->name(), | 1025 | newItem= /*(void)*/ new QListViewItem( audioView, dit.current()->name(), |
1040 | QString::number(size ), storage, dit.current()->file()); | 1026 | QString::number(size ), storage, dit.current()->file()); |
1041 | newItem->setPixmap(0, Resource::loadPixmap( "opieplayer/musicfile" )); | 1027 | newItem->setPixmap(0, Resource::loadPixmap( "opieplayer/musicfile" )); |
1042 | } | 1028 | } |
1043 | } | 1029 | } |
1044 | 1030 | ||
1045 | } | 1031 | } |
1046 | 1032 | ||
1047 | void PlayListWidget::populateVideoView() { | 1033 | void PlayListWidget::populateVideoView() { |
1048 | videoView->clear(); | 1034 | videoView->clear(); |
1049 | StorageInfo storageInfo; | 1035 | StorageInfo storageInfo; |
@@ -1070,249 +1056,239 @@ void PlayListWidget::populateVideoView() { | |||
1070 | newItem->setPixmap(0, Resource::loadPixmap( "opieplayer/videofile" )); | 1056 | newItem->setPixmap(0, Resource::loadPixmap( "opieplayer/videofile" )); |
1071 | } | 1057 | } |
1072 | } | 1058 | } |
1073 | } | 1059 | } |
1074 | 1060 | ||
1075 | void PlayListWidget::openFile() { | 1061 | void PlayListWidget::openFile() { |
1076 | qDebug("<<<<<<<<<OPEN File"); | 1062 | QString filename, name; |
1077 | QString filename, name; | 1063 | InputDialog *fileDlg; |
1078 | InputDialog *fileDlg; | 1064 | fileDlg = new InputDialog(this,tr("Open file or URL"),TRUE, 0); |
1079 | fileDlg = new InputDialog(this,tr("Open file or URL"),TRUE, 0); | 1065 | fileDlg->exec(); |
1080 | fileDlg->exec(); | 1066 | if( fileDlg->result() == 1 ) { |
1081 | if( fileDlg->result() == 1 ) { | 1067 | filename = fileDlg->text(); |
1082 | filename = fileDlg->text(); | 1068 | // qDebug( "Selected filename is " + filename ); |
1083 | qDebug( "Selected filename is " + filename ); | 1069 | DocLnk lnk; |
1084 | // Om3u *m3uList; | 1070 | Config cfg( "OpiePlayer" ); |
1085 | DocLnk lnk; | 1071 | cfg.setGroup("PlayList"); |
1086 | Config cfg( "OpiePlayer" ); | ||
1087 | cfg.setGroup("PlayList"); | ||
1088 | |||
1089 | QString m3uFile; | ||
1090 | m3uFile = filename; | ||
1091 | if(filename.left(4) == "http") { | ||
1092 | if(filename.find(":",8,TRUE) != -1) { //found a port | ||
1093 | |||
1094 | // m3uFile = filename.left( filename.find( ":",8,TRUE)); | ||
1095 | m3uFile = filename; | ||
1096 | if( m3uFile.right( 1 ).find( '/' ) == -1) { | ||
1097 | m3uFile += "/"; | ||
1098 | } | ||
1099 | filename = m3uFile; | ||
1100 | // qDebug("1 "+m3uFile); | ||
1101 | // } else if(filename.left(4) == "http"){ | ||
1102 | // m3uFile=filename; | ||
1103 | // m3uFile = m3uFile.right( m3uFile.length() - 7); | ||
1104 | // qDebug("2 "+m3uFile); | ||
1105 | // } else{ | ||
1106 | // m3uFile=filename; | ||
1107 | // qDebug("3 "+m3uFile); | ||
1108 | } | ||
1109 | lnk.setName( m3uFile ); //sets name | ||
1110 | lnk.setFile( filename ); //sets file name | ||
1111 | lnk.setIcon("opieplayer2/musicfile"); | ||
1112 | d->selectedFiles->addToSelection( lnk ); | ||
1113 | writeCurrentM3u(); | ||
1114 | } | ||
1115 | else if( filename.right( 3) == "m3u" ) { | ||
1116 | readm3u( filename ); | ||
1117 | 1072 | ||
1118 | } else if( filename.right(3) == "pls" ) { | 1073 | QString m3uFile; |
1119 | readPls( filename ); | 1074 | m3uFile = filename; |
1120 | } else { | 1075 | if(filename.left(4) == "http") { |
1121 | lnk.setName( fullBaseName ( QFileInfo(filename)) ); //sets name | 1076 | if(filename.find(":",8,TRUE) != -1) { //found a port |
1122 | lnk.setFile( filename ); //sets file name | 1077 | |
1123 | d->selectedFiles->addToSelection( lnk); | 1078 | m3uFile = filename; |
1124 | writeCurrentM3u(); | 1079 | if( m3uFile.right( 1 ).find( '/' ) == -1) { |
1125 | } | 1080 | m3uFile += "/"; |
1126 | } | 1081 | } |
1082 | filename = m3uFile; | ||
1083 | = } | ||
1084 | lnk.setName( m3uFile ); //sets name | ||
1085 | lnk.setFile( filename ); //sets file name | ||
1086 | lnk.setIcon("opieplayer2/musicfile"); | ||
1087 | d->selectedFiles->addToSelection( lnk ); | ||
1088 | writeCurrentM3u(); | ||
1089 | } | ||
1090 | else if( filename.right( 3) == "m3u" ) { | ||
1091 | readm3u( filename ); | ||
1092 | |||
1093 | } else if( filename.right(3) == "pls" ) { | ||
1094 | readPls( filename ); | ||
1095 | } else { | ||
1096 | lnk.setName( fullBaseName ( QFileInfo(filename)) ); //sets name | ||
1097 | lnk.setFile( filename ); //sets file name | ||
1098 | d->selectedFiles->addToSelection( lnk); | ||
1099 | lnk.removeLinkFile(); | ||
1100 | writeCurrentM3u(); | ||
1101 | } | ||
1102 | } | ||
1127 | 1103 | ||
1128 | if( fileDlg ) { | 1104 | if( fileDlg ) { |
1129 | delete fileDlg; | 1105 | delete fileDlg; |
1130 | } | 1106 | } |
1131 | } | 1107 | } |
1132 | 1108 | ||
1133 | 1109 | ||
1134 | /* | 1110 | /* |
1135 | reads m3u and shows files/urls to playlist widget */ | 1111 | reads m3u and shows files/urls to playlist widget */ |
1136 | void PlayListWidget::readm3u( const QString &filename ) { | 1112 | void PlayListWidget::readm3u( const QString &filename ) { |
1137 | qDebug( "read m3u filename " + filename ); | 1113 | // qDebug( "read m3u filename " + filename ); |
1138 | 1114 | ||
1139 | Om3u *m3uList; | 1115 | Om3u *m3uList; |
1140 | QString s, name; | 1116 | QString s, name; |
1141 | m3uList = new Om3u( filename, IO_ReadOnly ); | 1117 | m3uList = new Om3u( filename, IO_ReadOnly ); |
1142 | m3uList->readM3u(); | 1118 | m3uList->readM3u(); |
1143 | DocLnk lnk; | 1119 | DocLnk lnk; |
1144 | for ( QStringList::ConstIterator it = m3uList->begin(); it != m3uList->end(); ++it ) { | 1120 | for ( QStringList::ConstIterator it = m3uList->begin(); it != m3uList->end(); ++it ) { |
1145 | s = *it; | 1121 | s = *it; |
1146 | // qDebug("reading "+ s); | 1122 | // qDebug("reading "+ s); |
1147 | if(s.left(4)=="http") { | 1123 | if(s.left(4)=="http") { |
1148 | lnk.setName( s ); //sets file name | 1124 | lnk.setName( s ); //sets file name |
1149 | lnk.setIcon("opieplayer2/musicfile"); | 1125 | lnk.setIcon("opieplayer2/musicfile"); |
1150 | 1126 | ||
1151 | // if(s.right(4) != '.' || s.right(5) != '.') | 1127 | // if(s.right(4) != '.' || s.right(5) != '.') |
1152 | if(s.right(4) != '.' || s.right(5) != '.' ) | 1128 | if(s.right(4) != '.' || s.right(5) != '.' ) |
1153 | if( s.right(1) != "/") | 1129 | if( s.right(1) != "/") |
1154 | lnk.setFile( s+"/"); //if url with no extension | 1130 | lnk.setFile( s+"/"); //if url with no extension |
1155 | else | 1131 | else |
1156 | lnk.setFile( s ); //sets file name | 1132 | lnk.setFile( s ); //sets file name |
1157 | 1133 | ||
1158 | } else { | 1134 | } else { |
1159 | // if( QFileInfo( s ).exists() ) { | 1135 | // if( QFileInfo( s ).exists() ) { |
1160 | lnk.setName( fullBaseName ( QFileInfo(s))); | 1136 | lnk.setName( fullBaseName ( QFileInfo(s))); |
1161 | // if(s.right(4) == '.') {//if regular file | 1137 | // if(s.right(4) == '.') {//if regular file |
1162 | if(s.left(1) != "/") { | 1138 | if(s.left(1) != "/") { |
1163 | // qDebug("set link "+QFileInfo(filename).dirPath()+"/"+s); | 1139 | // qDebug("set link "+QFileInfo(filename).dirPath()+"/"+s); |
1164 | lnk.setFile( QFileInfo(filename).dirPath()+"/"+s); | 1140 | lnk.setFile( QFileInfo(filename).dirPath()+"/"+s); |
1165 | lnk.setIcon("SoundPlayer"); | 1141 | lnk.setIcon("SoundPlayer"); |
1166 | } else { | 1142 | } else { |
1167 | // qDebug("set link2 "+s); | 1143 | // qDebug("set link2 "+s); |
1168 | lnk.setFile( s); | 1144 | lnk.setFile( s); |
1169 | lnk.setIcon("SoundPlayer"); | 1145 | lnk.setIcon("SoundPlayer"); |
1170 | } | 1146 | } |
1171 | } | 1147 | } |
1172 | d->selectedFiles->addToSelection( lnk ); | 1148 | d->selectedFiles->addToSelection( lnk ); |
1173 | } | 1149 | } |
1174 | Config config( "OpiePlayer" ); | 1150 | Config config( "OpiePlayer" ); |
1175 | config.setGroup( "PlayList" ); | 1151 | config.setGroup( "PlayList" ); |
1176 | 1152 | ||
1177 | config.writeEntry("CurrentPlaylist",filename); | 1153 | config.writeEntry("CurrentPlaylist",filename); |
1178 | config.write(); | 1154 | config.write(); |
1179 | currentPlayList=filename; | 1155 | currentPlayList=filename; |
1180 | 1156 | ||
1181 | // m3uList->write(); | 1157 | // m3uList->write(); |
1182 | m3uList->close(); | 1158 | m3uList->close(); |
1183 | if(m3uList) delete m3uList; | 1159 | if(m3uList) delete m3uList; |
1184 | 1160 | ||
1185 | d->selectedFiles->setSelectedItem( s); | 1161 | d->selectedFiles->setSelectedItem( s); |
1186 | setCaption(tr("OpiePlayer: ")+ fullBaseName ( QFileInfo(filename))); | 1162 | setCaption(tr("OpiePlayer: ")+ fullBaseName ( QFileInfo(filename))); |
1187 | 1163 | ||
1188 | } | 1164 | } |
1189 | 1165 | ||
1190 | /* | 1166 | /* |
1191 | reads pls and adds files/urls to playlist */ | 1167 | reads pls and adds files/urls to playlist */ |
1192 | void PlayListWidget::readPls( const QString &filename ) { | 1168 | void PlayListWidget::readPls( const QString &filename ) { |
1193 | 1169 | ||
1194 | qDebug( "pls filename is " + filename ); | 1170 | // qDebug( "pls filename is " + filename ); |
1195 | Om3u *m3uList; | 1171 | Om3u *m3uList; |
1196 | QString s, name; | 1172 | QString s, name; |
1197 | m3uList = new Om3u( filename, IO_ReadOnly ); | 1173 | m3uList = new Om3u( filename, IO_ReadOnly ); |
1198 | m3uList->readPls(); | 1174 | m3uList->readPls(); |
1199 | 1175 | ||
1200 | for ( QStringList::ConstIterator it = m3uList->begin(); it != m3uList->end(); ++it ) { | 1176 | for ( QStringList::ConstIterator it = m3uList->begin(); it != m3uList->end(); ++it ) { |
1201 | s = *it; | 1177 | s = *it; |
1202 | // s.replace( QRegExp( "%20" )," " ); | 1178 | // s.replace( QRegExp( "%20" )," " ); |
1203 | DocLnk lnk( s ); | 1179 | DocLnk lnk( s ); |
1204 | QFileInfo f( s ); | 1180 | QFileInfo f( s ); |
1205 | QString name = fullBaseName ( f); | 1181 | QString name = fullBaseName ( f); |
1206 | 1182 | ||
1207 | if( name.left( 4 ) == "http" ) { | 1183 | if( name.left( 4 ) == "http" ) { |
1208 | name = s.right( s.length() - 7); | 1184 | name = s.right( s.length() - 7); |
1209 | } else { | 1185 | } else { |
1210 | name = s; | 1186 | name = s; |
1211 | } | 1187 | } |
1212 | 1188 | ||
1213 | name = name.right( name.length() - name.findRev( "\\", -1, TRUE) - 1 ); | 1189 | name = name.right( name.length() - name.findRev( "\\", -1, TRUE) - 1 ); |
1214 | 1190 | ||
1215 | lnk.setName( name ); | 1191 | lnk.setName( name ); |
1216 | if( s.at( s.length() - 4) == '.') {// if this is probably a file | 1192 | if( s.at( s.length() - 4) == '.') {// if this is probably a file |
1217 | lnk.setFile( s ); | 1193 | lnk.setFile( s ); |
1218 | } else { //if its a url | 1194 | } else { //if its a url |
1219 | if( name.right( 1 ).find( '/' ) == -1) { | 1195 | if( name.right( 1 ).find( '/' ) == -1) { |
1220 | s += "/"; | 1196 | s += "/"; |
1221 | } | 1197 | } |
1222 | lnk.setFile( s ); | 1198 | lnk.setFile( s ); |
1223 | } | 1199 | } |
1224 | lnk.setType( "audio/x-mpegurl" ); | 1200 | lnk.setType( "audio/x-mpegurl" ); |
1225 | 1201 | ||
1226 | lnk.writeLink(); | 1202 | lnk.writeLink(); |
1227 | d->selectedFiles->addToSelection( lnk ); | 1203 | d->selectedFiles->addToSelection( lnk ); |
1228 | } | 1204 | } |
1229 | 1205 | ||
1230 | m3uList->close(); | 1206 | m3uList->close(); |
1231 | if(m3uList) delete m3uList; | 1207 | if(m3uList) delete m3uList; |
1232 | } | 1208 | } |
1233 | 1209 | ||
1234 | /* | 1210 | /* |
1235 | writes current playlist to current m3u file */ | 1211 | writes current playlist to current m3u file */ |
1236 | void PlayListWidget::writeCurrentM3u() { | 1212 | void PlayListWidget::writeCurrentM3u() { |
1237 | qDebug("writing to current m3u"); | 1213 | // qDebug("writing to current m3u"); |
1238 | Config cfg( "OpiePlayer" ); | 1214 | Config cfg( "OpiePlayer" ); |
1239 | cfg.setGroup("PlayList"); | 1215 | cfg.setGroup("PlayList"); |
1240 | QString currentPlaylist = cfg.readEntry("CurrentPlaylist",""); | 1216 | currentPlayList = cfg.readEntry("CurrentPlaylist",""); |
1241 | Om3u *m3uList; | 1217 | Om3u *m3uList; |
1242 | m3uList = new Om3u( currentPlaylist, IO_ReadWrite | IO_Truncate ); | 1218 | m3uList = new Om3u( currentPlayList, IO_ReadWrite | IO_Truncate ); |
1243 | 1219 | ||
1244 | if( d->selectedFiles->first()) { | 1220 | if( d->selectedFiles->first()) { |
1245 | do { | 1221 | do { |
1246 | qDebug( "writeCurrentM3u " +d->selectedFiles->current()->file()); | 1222 | // qDebug( "writeCurrentM3u " +d->selectedFiles->current()->file()); |
1247 | m3uList->add( d->selectedFiles->current()->file() ); | 1223 | m3uList->add( d->selectedFiles->current()->file() ); |
1248 | } | 1224 | } |
1249 | while ( d->selectedFiles->next() ); | 1225 | while ( d->selectedFiles->next() ); |
1250 | qDebug( "<<<<<<<<<<<<>>>>>>>>>>>>>>>>>" ); | 1226 | // qDebug( "<<<<<<<<<<<<>>>>>>>>>>>>>>>>>" ); |
1251 | m3uList->write(); | 1227 | m3uList->write(); |
1252 | m3uList->close(); | 1228 | m3uList->close(); |
1253 | 1229 | ||
1254 | if(m3uList) delete m3uList; | 1230 | if(m3uList) delete m3uList; |
1255 | } | 1231 | } |
1256 | } | 1232 | } |
1257 | 1233 | ||
1258 | /* | 1234 | /* |
1259 | writes current playlist to m3u file */ | 1235 | writes current playlist to m3u file */ |
1260 | void PlayListWidget::writem3u() { | 1236 | void PlayListWidget::writem3u() { |
1261 | InputDialog *fileDlg; | 1237 | InputDialog *fileDlg; |
1262 | fileDlg = new InputDialog( this, tr( "Save m3u Playlist " ), TRUE, 0); | 1238 | fileDlg = new InputDialog( this, tr( "Save m3u Playlist " ), TRUE, 0); |
1263 | fileDlg->exec(); | 1239 | fileDlg->exec(); |
1264 | QString name, filename, list; | 1240 | QString name, filename, list; |
1265 | Om3u *m3uList; | 1241 | Om3u *m3uList; |
1266 | 1242 | ||
1267 | if( fileDlg->result() == 1 ) { | 1243 | if( fileDlg->result() == 1 ) { |
1268 | name = fileDlg->text(); | 1244 | name = fileDlg->text(); |
1269 | // qDebug( filename ); | 1245 | // qDebug( filename ); |
1270 | if( name.find("/",0,true) != -1) {// assume they specify a file path | 1246 | if( name.find("/",0,true) != -1) {// assume they specify a file path |
1271 | filename = name; | 1247 | filename = name; |
1272 | name = name.right(name.length()- name.findRev("/",-1,true) - 1 ); | 1248 | name = name.right(name.length()- name.findRev("/",-1,true) - 1 ); |
1273 | } | 1249 | } |
1274 | else //otherwise dump it somewhere noticable | 1250 | else //otherwise dump it somewhere noticable |
1275 | filename = QPEApplication::documentDir() + "/" + name; | 1251 | filename = QPEApplication::documentDir() + "/" + name; |
1276 | 1252 | ||
1277 | if( filename.right( 3 ) != "m3u" ) //needs filename extension | 1253 | if( filename.right( 3 ) != "m3u" ) //needs filename extension |
1278 | filename += ".m3u"; | 1254 | filename += ".m3u"; |
1279 | 1255 | ||
1280 | if( d->selectedFiles->first()) { | 1256 | if( d->selectedFiles->first()) { |
1281 | m3uList = new Om3u(filename, IO_ReadWrite | IO_Truncate); | 1257 | m3uList = new Om3u(filename, IO_ReadWrite | IO_Truncate); |
1282 | 1258 | ||
1283 | do { | 1259 | do { |
1284 | m3uList->add( d->selectedFiles->current()->file()); | 1260 | m3uList->add( d->selectedFiles->current()->file()); |
1285 | } | 1261 | } |
1286 | while ( d->selectedFiles->next() ); | 1262 | while ( d->selectedFiles->next() ); |
1287 | // qDebug( list ); | 1263 | // qDebug( list ); |
1288 | m3uList->write(); | 1264 | m3uList->write(); |
1289 | m3uList->close(); | 1265 | m3uList->close(); |
1290 | if(m3uList) delete m3uList; | 1266 | if(m3uList) delete m3uList; |
1291 | 1267 | ||
1292 | if(fileDlg) delete fileDlg; | 1268 | if(fileDlg) delete fileDlg; |
1293 | 1269 | ||
1294 | DocLnk lnk; | 1270 | DocLnk lnk; |
1295 | lnk.setFile( filename); | 1271 | lnk.setFile( filename); |
1296 | lnk.setIcon("opieplayer2/playlist2"); | 1272 | lnk.setIcon("opieplayer2/playlist2"); |
1297 | lnk.setName( name); //sets file name | 1273 | lnk.setName( name); //sets file name |
1298 | 1274 | ||
1299 | // qDebug(filename); | 1275 | // qDebug(filename); |
1300 | Config config( "OpiePlayer" ); | 1276 | Config config( "OpiePlayer" ); |
1301 | config.setGroup( "PlayList" ); | 1277 | config.setGroup( "PlayList" ); |
1302 | 1278 | ||
1303 | config.writeEntry("CurrentPlaylist",filename); | 1279 | config.writeEntry("CurrentPlaylist",filename); |
1304 | currentPlayList=filename; | 1280 | currentPlayList=filename; |
1305 | 1281 | ||
1306 | if(!lnk.writeLink()) { | 1282 | if(!lnk.writeLink()) { |
1307 | qDebug("Writing doclink did not work"); | 1283 | // qDebug("Writing doclink did not work"); |
1308 | } | 1284 | } |
1309 | 1285 | ||
1310 | setCaption(tr("OpiePlayer: ") + name); | 1286 | setCaption(tr("OpiePlayer: ") + name); |
1311 | } | 1287 | } |
1312 | } | 1288 | } |
1313 | } | 1289 | } |
1314 | 1290 | ||
1315 | 1291 | ||
1316 | void PlayListWidget::keyReleaseEvent( QKeyEvent *e) | 1292 | void PlayListWidget::keyReleaseEvent( QKeyEvent *e) |
1317 | { | 1293 | { |
1318 | switch ( e->key() ) { | 1294 | switch ( e->key() ) { |
@@ -1331,24 +1307,22 @@ void PlayListWidget::keyReleaseEvent( QKeyEvent *e) | |||
1331 | // doBlank(); | 1307 | // doBlank(); |
1332 | break; | 1308 | break; |
1333 | case Key_F13: //mail | 1309 | case Key_F13: //mail |
1334 | // doUnblank(); | 1310 | // doUnblank(); |
1335 | break; | 1311 | break; |
1336 | case Key_Q: //add to playlist | 1312 | case Key_Q: //add to playlist |
1337 | qDebug("Add"); | ||
1338 | addSelected(); | 1313 | addSelected(); |
1339 | break; | 1314 | break; |
1340 | case Key_R: //remove from playlist | 1315 | case Key_R: //remove from playlist |
1341 | removeSelected(); | 1316 | removeSelected(); |
1342 | break; | 1317 | break; |
1343 | // case Key_P: //play | 1318 | // case Key_P: //play |
1344 | // qDebug("Play"); | 1319 | // qDebug("Play"); |
1345 | // playSelected(); | 1320 | // playSelected(); |
1346 | // break; | 1321 | // break; |
1347 | case Key_Space: | 1322 | case Key_Space: |
1348 | qDebug("Play"); | ||
1349 | // playSelected(); puh | 1323 | // playSelected(); puh |
1350 | break; | 1324 | break; |
1351 | case Key_1: | 1325 | case Key_1: |
1352 | tabWidget->setCurrentPage(0); | 1326 | tabWidget->setCurrentPage(0); |
1353 | break; | 1327 | break; |
1354 | case Key_2: | 1328 | case Key_2: |
@@ -1395,76 +1369,76 @@ void PlayListWidget::keyPressEvent( QKeyEvent *) | |||
1395 | // playSelected(); | 1369 | // playSelected(); |
1396 | // break; | 1370 | // break; |
1397 | // } | 1371 | // } |
1398 | } | 1372 | } |
1399 | 1373 | ||
1400 | void PlayListWidget::doBlank() { | 1374 | void PlayListWidget::doBlank() { |
1401 | qDebug("do blanking"); | 1375 | // qDebug("do blanking"); |
1402 | fd=open("/dev/fb0",O_RDWR); | 1376 | fd=open("/dev/fb0",O_RDWR); |
1403 | if (fd != -1) { | 1377 | if (fd != -1) { |
1404 | ioctl(fd,FBIOBLANK,1); | 1378 | ioctl(fd,FBIOBLANK,1); |
1405 | // close(fd); | 1379 | // close(fd); |
1406 | } | 1380 | } |
1407 | } | 1381 | } |
1408 | 1382 | ||
1409 | void PlayListWidget::doUnblank() { | 1383 | void PlayListWidget::doUnblank() { |
1410 | // this crashes opieplayer with a segfault | 1384 | // this crashes opieplayer with a segfault |
1411 | // int fd; | 1385 | // int fd; |
1412 | // fd=open("/dev/fb0",O_RDWR); | 1386 | // fd=open("/dev/fb0",O_RDWR); |
1413 | qDebug("do unblanking"); | 1387 | // qDebug("do unblanking"); |
1414 | if (fd != -1) { | 1388 | if (fd != -1) { |
1415 | ioctl(fd,FBIOBLANK,0); | 1389 | ioctl(fd,FBIOBLANK,0); |
1416 | close(fd); | 1390 | close(fd); |
1417 | } | 1391 | } |
1418 | QCopEnvelope h("QPE/System", "setBacklight(int)"); | 1392 | QCopEnvelope h("QPE/System", "setBacklight(int)"); |
1419 | h <<-3;// v[1]; // -3 Force on | 1393 | h <<-3;// v[1]; // -3 Force on |
1420 | } | 1394 | } |
1421 | 1395 | ||
1422 | void PlayListWidget::populateSkinsMenu() { | 1396 | void PlayListWidget::populateSkinsMenu() { |
1423 | int item = 0; | 1397 | int item = 0; |
1424 | defaultSkinIndex = 0; | 1398 | defaultSkinIndex = 0; |
1425 | QString skinName; | 1399 | QString skinName; |
1426 | Config cfg( "OpiePlayer" ); | 1400 | Config cfg( "OpiePlayer" ); |
1427 | cfg.setGroup("Options" ); | 1401 | cfg.setGroup("Options" ); |
1428 | QString skin = cfg.readEntry( "Skin", "default" ); | 1402 | QString skin = cfg.readEntry( "Skin", "default" ); |
1429 | 1403 | ||
1430 | QDir skinsDir( QPEApplication::qpeDir() + "/pics/opieplayer2/skins" ); | 1404 | QDir skinsDir( QPEApplication::qpeDir() + "/pics/opieplayer2/skins" ); |
1431 | skinsDir.setFilter( QDir::Dirs ); | 1405 | skinsDir.setFilter( QDir::Dirs ); |
1432 | skinsDir.setSorting(QDir::Name ); | 1406 | skinsDir.setSorting(QDir::Name ); |
1433 | const QFileInfoList *skinslist = skinsDir.entryInfoList(); | 1407 | const QFileInfoList *skinslist = skinsDir.entryInfoList(); |
1434 | QFileInfoListIterator it( *skinslist ); | 1408 | QFileInfoListIterator it( *skinslist ); |
1435 | QFileInfo *fi; | 1409 | QFileInfo *fi; |
1436 | while ( ( fi = it.current() ) ) { | 1410 | while ( ( fi = it.current() ) ) { |
1437 | skinName = fi->fileName(); | 1411 | skinName = fi->fileName(); |
1438 | // qDebug( fi->fileName() ); | 1412 | // qDebug( fi->fileName() ); |
1439 | if( skinName != "." && skinName != ".." && skinName !="CVS" ) { | 1413 | if( skinName != "." && skinName != ".." && skinName !="CVS" ) { |
1440 | item = skinsMenu->insertItem( fi->fileName() ) ; | 1414 | item = skinsMenu->insertItem( fi->fileName() ) ; |
1441 | } | 1415 | } |
1442 | if( skinName == "default" ) { | 1416 | if( skinName == "default" ) { |
1443 | defaultSkinIndex = item; | 1417 | defaultSkinIndex = item; |
1444 | } | 1418 | } |
1445 | if( skinName == skin ) { | 1419 | if( skinName == skin ) { |
1446 | skinsMenu->setItemChecked( item, TRUE ); | 1420 | skinsMenu->setItemChecked( item, TRUE ); |
1447 | } | 1421 | } |
1448 | ++it; | 1422 | ++it; |
1449 | } | 1423 | } |
1450 | } | 1424 | } |
1451 | 1425 | ||
1452 | void PlayListWidget::skinsMenuActivated( int item ) { | 1426 | void PlayListWidget::skinsMenuActivated( int item ) { |
1453 | for( int i = defaultSkinIndex; i > defaultSkinIndex - skinsMenu->count(); i-- ) { | 1427 | for( int i = defaultSkinIndex; i > defaultSkinIndex - skinsMenu->count(); i-- ) { |
1454 | skinsMenu->setItemChecked( i, FALSE ); | 1428 | skinsMenu->setItemChecked( i, FALSE ); |
1455 | } | 1429 | } |
1456 | skinsMenu->setItemChecked( item, TRUE ); | 1430 | skinsMenu->setItemChecked( item, TRUE ); |
1457 | 1431 | ||
1458 | Config cfg( "OpiePlayer" ); | 1432 | Config cfg( "OpiePlayer" ); |
1459 | cfg.setGroup("Options"); | 1433 | cfg.setGroup("Options"); |
1460 | cfg.writeEntry("Skin", skinsMenu->text( item ) ); | 1434 | cfg.writeEntry("Skin", skinsMenu->text( item ) ); |
1461 | } | 1435 | } |
1462 | 1436 | ||
1463 | void PlayListWidget::qcopReceive(const QCString &msg, const QByteArray &data) { | 1437 | void PlayListWidget::qcopReceive(const QCString &msg, const QByteArray &data) { |
1464 | qDebug("qcop message "+msg ); | 1438 | // qDebug("qcop message "+msg ); |
1465 | QDataStream stream ( data, IO_ReadOnly ); | 1439 | QDataStream stream ( data, IO_ReadOnly ); |
1466 | if ( msg == "play()" ) { //plays current selection | 1440 | if ( msg == "play()" ) { //plays current selection |
1467 | btnPlay( true); | 1441 | btnPlay( true); |
1468 | } else if ( msg == "stop()" ) { | 1442 | } else if ( msg == "stop()" ) { |
1469 | mediaPlayerState->setPlaying( false); | 1443 | mediaPlayerState->setPlaying( false); |
1470 | } else if ( msg == "togglePause()" ) { | 1444 | } else if ( msg == "togglePause()" ) { |
@@ -1475,17 +1449,17 @@ void PlayListWidget::qcopReceive(const QCString &msg, const QByteArray &data) { | |||
1475 | mediaPlayerState->setPrev(); | 1449 | mediaPlayerState->setPrev(); |
1476 | } else if ( msg == "toggleLooping()" ) { //loop or not loop | 1450 | } else if ( msg == "toggleLooping()" ) { //loop or not loop |
1477 | mediaPlayerState->toggleLooping(); | 1451 | mediaPlayerState->toggleLooping(); |
1478 | } else if ( msg == "toggleShuffled()" ) { //shuffled or not shuffled | 1452 | } else if ( msg == "toggleShuffled()" ) { //shuffled or not shuffled |
1479 | mediaPlayerState->toggleShuffled(); | 1453 | mediaPlayerState->toggleShuffled(); |
1480 | } else if ( msg == "volUp()" ) { //volume more | 1454 | } else if ( msg == "volUp()" ) { //volume more |
1481 | // emit moreClicked(); | 1455 | // emit moreClicked(); |
1482 | // emit moreReleased(); | 1456 | // emit moreReleased(); |
1483 | } else if ( msg == "volDown()" ) { //volume less | 1457 | } else if ( msg == "volDown()" ) { //volume less |
1484 | // emit lessClicked(); | 1458 | // emit lessClicked(); |
1485 | // emit lessReleased(); | 1459 | // emit lessReleased(); |
1486 | } else if ( msg == "play(QString)" ) { //play this now | 1460 | } else if ( msg == "play(QString)" ) { //play this now |
1487 | QString file; | 1461 | QString file; |
1488 | stream >> file; | 1462 | stream >> file; |
1489 | setDocumentEx( (const QString &) file); | 1463 | setDocumentEx( (const QString &) file); |
1490 | } else if ( msg == "add(QString)" ) { //add to playlist | 1464 | } else if ( msg == "add(QString)" ) { //add to playlist |
1491 | QString file; | 1465 | QString file; |
@@ -1495,12 +1469,10 @@ void PlayListWidget::qcopReceive(const QCString &msg, const QByteArray &data) { | |||
1495 | lnk.setName( fileInfo.baseName() ); //sets name | 1469 | lnk.setName( fileInfo.baseName() ); //sets name |
1496 | lnk.setFile( file ); //sets file name | 1470 | lnk.setFile( file ); //sets file name |
1497 | addToSelection( lnk ); | 1471 | addToSelection( lnk ); |
1498 | } else if ( msg == "rem(QString)" ) { //remove from playlist | 1472 | } else if ( msg == "rem(QString)" ) { //remove from playlist |
1499 | QString file; | 1473 | QString file; |
1500 | stream >> file; | 1474 | stream >> file; |
1501 | |||
1502 | } else if ( msg == "setDocument(QString)" ) { //loop or not loop | 1475 | } else if ( msg == "setDocument(QString)" ) { //loop or not loop |
1503 | QCopEnvelope h("QPE/Application/opieplayer", "raise()"); | 1476 | QCopEnvelope h("QPE/Application/opieplayer", "raise()"); |
1504 | } | 1477 | } |
1505 | |||
1506 | } | 1478 | } |
diff --git a/core/multimedia/opieplayer/videowidget.cpp b/core/multimedia/opieplayer/videowidget.cpp index 48104ca..02c8568 100644 --- a/core/multimedia/opieplayer/videowidget.cpp +++ b/core/multimedia/opieplayer/videowidget.cpp | |||
@@ -83,13 +83,13 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) : | |||
83 | 83 | ||
84 | QString skinPath; | 84 | QString skinPath; |
85 | skinPath = "opieplayer2/skins/" + skin; | 85 | skinPath = "opieplayer2/skins/" + skin; |
86 | if(!QDir(QString(getenv("OPIEDIR")) +"/pics/"+skinPath).exists()) | 86 | if(!QDir(QString(getenv("OPIEDIR")) +"/pics/"+skinPath).exists()) |
87 | skinPath = "opieplayer2/skins/default"; | 87 | skinPath = "opieplayer2/skins/default"; |
88 | 88 | ||
89 | qDebug("skin path " + skinPath); | 89 | // qDebug("skin path " + skinPath); |
90 | 90 | ||
91 | // QString skinPath = "opieplayer2/skins/" + skin; | 91 | // QString skinPath = "opieplayer2/skins/" + skin; |
92 | 92 | ||
93 | pixBg = new QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) ); | 93 | pixBg = new QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) ); |
94 | imgUp = new QImage( Resource::loadImage( QString("%1/skinV_up").arg(skinPath) ) ); | 94 | imgUp = new QImage( Resource::loadImage( QString("%1/skinV_up").arg(skinPath) ) ); |
95 | imgDn = new QImage( Resource::loadImage( QString("%1/skinV_down").arg(skinPath) ) ); | 95 | imgDn = new QImage( Resource::loadImage( QString("%1/skinV_down").arg(skinPath) ) ); |
@@ -98,13 +98,13 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) : | |||
98 | imgButtonMask->fill( 0 ); | 98 | imgButtonMask->fill( 0 ); |
99 | 99 | ||
100 | for ( int i = 0; i < 7; i++ ) | 100 | for ( int i = 0; i < 7; i++ ) |
101 | { | 101 | { |
102 | QString filename = QString( QPEApplication::qpeDir() + "/pics/" + skinPath + | 102 | QString filename = QString( QPEApplication::qpeDir() + "/pics/" + skinPath + |
103 | "/skinV_mask_" + skinV_mask_file_names[i] + ".png" ); | 103 | "/skinV_mask_" + skinV_mask_file_names[i] + ".png" ); |
104 | qDebug("loading "+filename); | 104 | // qDebug("loading "+filename); |
105 | masks[i] = new QBitmap( filename ); | 105 | masks[i] = new QBitmap( filename ); |
106 | 106 | ||
107 | if ( !masks[i]->isNull() ) | 107 | if ( !masks[i]->isNull() ) |
108 | { | 108 | { |
109 | QImage imgMask = masks[i]->convertToImage(); | 109 | QImage imgMask = masks[i]->convertToImage(); |
110 | uchar **dest = imgButtonMask->jumpTable(); | 110 | uchar **dest = imgButtonMask->jumpTable(); |
@@ -116,13 +116,13 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) : | |||
116 | if ( !qRed( imgMask.pixel( x, y ) ) ) | 116 | if ( !qRed( imgMask.pixel( x, y ) ) ) |
117 | line[x] = i + 1; | 117 | line[x] = i + 1; |
118 | } | 118 | } |
119 | } | 119 | } |
120 | } | 120 | } |
121 | } | 121 | } |
122 | qDebug("finished loading first pics"); | 122 | // qDebug("finished loading first pics"); |
123 | for ( int i = 0; i < 7; i++ ) | 123 | for ( int i = 0; i < 7; i++ ) |
124 | { | 124 | { |
125 | buttonPixUp[i] = NULL; | 125 | buttonPixUp[i] = NULL; |
126 | buttonPixDown[i] = NULL; | 126 | buttonPixDown[i] = NULL; |
127 | } | 127 | } |
128 | 128 | ||
@@ -348,36 +348,36 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { | |||
348 | setToggleButton( i, FALSE ); | 348 | setToggleButton( i, FALSE ); |
349 | } | 349 | } |
350 | 350 | ||
351 | switch(i) { | 351 | switch(i) { |
352 | 352 | ||
353 | case VideoPlay: { | 353 | case VideoPlay: { |
354 | qDebug("play"); | 354 | // qDebug("play"); |
355 | if( !mediaPlayerState->playing()) { | 355 | if( !mediaPlayerState->playing()) { |
356 | mediaPlayerState->setPlaying( true); | 356 | mediaPlayerState->setPlaying( true); |
357 | setToggleButton( i-1, false ); | 357 | setToggleButton( i-1, false ); |
358 | setToggleButton( i, false ); | 358 | setToggleButton( i, false ); |
359 | return; | 359 | return; |
360 | } | 360 | } |
361 | if( mediaPlayerState->isPaused ) { | 361 | if( mediaPlayerState->isPaused ) { |
362 | qDebug("isPaused"); | 362 | // qDebug("isPaused"); |
363 | setToggleButton( i, FALSE ); | 363 | setToggleButton( i, FALSE ); |
364 | mediaPlayerState->setPaused( FALSE ); | 364 | mediaPlayerState->setPaused( FALSE ); |
365 | return; | 365 | return; |
366 | } else if( !mediaPlayerState->isPaused ) { | 366 | } else if( !mediaPlayerState->isPaused ) { |
367 | qDebug("is not paused"); | 367 | // qDebug("is not paused"); |
368 | setToggleButton( i, TRUE ); | 368 | setToggleButton( i, TRUE ); |
369 | mediaPlayerState->setPaused( TRUE ); | 369 | mediaPlayerState->setPaused( TRUE ); |
370 | return; | 370 | return; |
371 | } else { | 371 | } else { |
372 | return; | 372 | return; |
373 | } | 373 | } |
374 | } | 374 | } |
375 | 375 | ||
376 | case VideoStop: qDebug("stop"); mediaPlayerState->setPlaying( FALSE ); setToggleButton( i+1, true); setToggleButton( i, true ); return; | 376 | case VideoStop: mediaPlayerState->setPlaying( FALSE ); setToggleButton( i+1, true); setToggleButton( i, true ); return; |
377 | case VideoNext: mediaPlayerState->setNext(); return; | 377 | case VideoNext: mediaPlayerState->setNext(); return; |
378 | case VideoPrevious: mediaPlayerState->setPrev(); return; | 378 | case VideoPrevious: mediaPlayerState->setPrev(); return; |
379 | case VideoVolUp: emit moreReleased(); return; | 379 | case VideoVolUp: emit moreReleased(); return; |
380 | case VideoVolDown: emit lessReleased(); return; | 380 | case VideoVolDown: emit lessReleased(); return; |
381 | case VideoFullscreen: mediaPlayerState->setFullscreen( TRUE ); makeVisible(); return; | 381 | case VideoFullscreen: mediaPlayerState->setFullscreen( TRUE ); makeVisible(); return; |
382 | } | 382 | } |
383 | } | 383 | } |