-rw-r--r-- | core/multimedia/opieplayer/audiodevice.cpp | 162 | ||||
-rw-r--r-- | core/multimedia/opieplayer/audiowidget.cpp | 2 | ||||
-rw-r--r-- | core/multimedia/opieplayer/loopcontrol.cpp | 26 | ||||
-rw-r--r-- | core/multimedia/opieplayer/mediaplayer.cpp | 1 | ||||
-rw-r--r-- | core/multimedia/opieplayer/mediaplayerstate.cpp | 0 | ||||
-rw-r--r-- | core/multimedia/opieplayer/playlistwidget.cpp | 39 |
6 files changed, 120 insertions, 110 deletions
diff --git a/core/multimedia/opieplayer/audiodevice.cpp b/core/multimedia/opieplayer/audiodevice.cpp index 3262e38..4c5f12d 100644 --- a/core/multimedia/opieplayer/audiodevice.cpp +++ b/core/multimedia/opieplayer/audiodevice.cpp | |||
@@ -30,12 +30,11 @@ | |||
30 | #include "qpe/qcopenvelope_qws.h" | 30 | #include "qpe/qcopenvelope_qws.h" |
31 | #endif | 31 | #endif |
32 | 32 | ||
33 | #ifdef Q_WS_WIN | 33 | // #ifdef Q_WS_WIN |
34 | #include <windows.h> | 34 | // #include <windows.h> |
35 | #include <mmsystem.h> | 35 | // #include <mmsystem.h> |
36 | #include <mmreg.h> | 36 | // #include <mmreg.h> |
37 | #endif | 37 | // #endif |
38 | |||
39 | #if defined(Q_WS_X11) || defined(Q_WS_QWS) | 38 | #if defined(Q_WS_X11) || defined(Q_WS_QWS) |
40 | #include <fcntl.h> | 39 | #include <fcntl.h> |
41 | #include <sys/ioctl.h> | 40 | #include <sys/ioctl.h> |
@@ -46,18 +45,18 @@ | |||
46 | #include <unistd.h> | 45 | #include <unistd.h> |
47 | #endif | 46 | #endif |
48 | 47 | ||
49 | #if defined(Q_OS_WIN32) | 48 | // #if defined(Q_OS_WIN32) |
50 | static const int expectedBytesPerMilliSecond = 2 * 2 * 44000 / 1000; | 49 | // static const int expectedBytesPerMilliSecond = 2 * 2 * 44000 / 1000; |
51 | static const int timerResolutionMilliSeconds = 30; | 50 | // static const int timerResolutionMilliSeconds = 30; |
52 | static const int sound_fragment_bytes = timerResolutionMilliSeconds * expectedBytesPerMilliSecond; | 51 | // static const int sound_fragment_bytes = timerResolutionMilliSeconds * expectedBytesPerMilliSecond; |
53 | #else | 52 | // #else |
54 | # if defined(QT_QWS_IPAQ) | 53 | # if defined(QT_QWS_IPAQ) |
55 | static const int sound_fragment_shift = 14; | 54 | static const int sound_fragment_shift = 14; |
56 | # else | 55 | # else |
57 | static const int sound_fragment_shift = 16; | 56 | static const int sound_fragment_shift = 16; |
58 | # endif | 57 | # endif |
59 | static const int sound_fragment_bytes = (1<<sound_fragment_shift); | 58 | static const int sound_fragment_bytes = (1<<sound_fragment_shift); |
60 | #endif | 59 | //#endif |
61 | 60 | ||
62 | 61 | ||
63 | class AudioDevicePrivate { | 62 | class AudioDevicePrivate { |
@@ -67,11 +66,11 @@ public: | |||
67 | unsigned int channels; | 66 | unsigned int channels; |
68 | unsigned int bytesPerSample; | 67 | unsigned int bytesPerSample; |
69 | unsigned int bufferSize; | 68 | unsigned int bufferSize; |
70 | #ifndef Q_OS_WIN32 | 69 | //#ifndef Q_OS_WIN32 |
71 | bool can_GETOSPACE; | 70 | bool can_GETOSPACE; |
72 | char* unwrittenBuffer; | 71 | char* unwrittenBuffer; |
73 | unsigned int unwritten; | 72 | unsigned int unwritten; |
74 | #endif | 73 | //#endif |
75 | 74 | ||
76 | static int dspFd; | 75 | static int dspFd; |
77 | static bool muted; | 76 | static bool muted; |
@@ -97,23 +96,23 @@ unsigned int AudioDevicePrivate::rightVolume = 0; | |||
97 | void AudioDevice::getVolume( unsigned int& leftVolume, unsigned int& rightVolume, bool &muted ) { | 96 | void AudioDevice::getVolume( unsigned int& leftVolume, unsigned int& rightVolume, bool &muted ) { |
98 | muted = AudioDevicePrivate::muted; | 97 | muted = AudioDevicePrivate::muted; |
99 | unsigned int volume; | 98 | unsigned int volume; |
100 | #ifdef Q_OS_WIN32 | 99 | // #ifdef Q_OS_WIN32 |
101 | HWAVEOUT handle; | 100 | // HWAVEOUT handle; |
102 | WAVEFORMATEX formatData; | 101 | // WAVEFORMATEX formatData; |
103 | formatData.cbSize = sizeof(WAVEFORMATEX); | 102 | // formatData.cbSize = sizeof(WAVEFORMATEX); |
104 | formatData.wFormatTag = WAVE_FORMAT_PCM; | 103 | // formatData.wFormatTag = WAVE_FORMAT_PCM; |
105 | formatData.nAvgBytesPerSec = 4 * 44000; | 104 | // formatData.nAvgBytesPerSec = 4 * 44000; |
106 | formatData.nBlockAlign = 4; | 105 | // formatData.nBlockAlign = 4; |
107 | formatData.nChannels = 2; | 106 | // formatData.nChannels = 2; |
108 | formatData.nSamplesPerSec = 44000; | 107 | // formatData.nSamplesPerSec = 44000; |
109 | formatData.wBitsPerSample = 16; | 108 | // formatData.wBitsPerSample = 16; |
110 | waveOutOpen(&handle, WAVE_MAPPER, &formatData, 0L, 0L, CALLBACK_NULL); | 109 | // waveOutOpen(&handle, WAVE_MAPPER, &formatData, 0L, 0L, CALLBACK_NULL); |
111 | if ( waveOutGetVolume( handle, (LPDWORD)&volume ) ) | 110 | // if ( waveOutGetVolume( handle, (LPDWORD)&volume ) ) |
112 | // qDebug( "get volume of audio device failed" ); | 111 | // // qDebug( "get volume of audio device failed" ); |
113 | waveOutClose( handle ); | 112 | // waveOutClose( handle ); |
114 | leftVolume = volume & 0xFFFF; | 113 | // leftVolume = volume & 0xFFFF; |
115 | rightVolume = volume >> 16; | 114 | // rightVolume = volume >> 16; |
116 | #else | 115 | // #else |
117 | int mixerHandle = open( "/dev/mixer", O_RDWR ); | 116 | int mixerHandle = open( "/dev/mixer", O_RDWR ); |
118 | if ( mixerHandle >= 0 ) { | 117 | if ( mixerHandle >= 0 ) { |
119 | if(ioctl( mixerHandle, MIXER_READ(0), &volume )==-1) | 118 | if(ioctl( mixerHandle, MIXER_READ(0), &volume )==-1) |
@@ -123,7 +122,7 @@ void AudioDevice::getVolume( unsigned int& leftVolume, unsigned int& rightVolume | |||
123 | perror("open(\"/dev/mixer\")"); | 122 | perror("open(\"/dev/mixer\")"); |
124 | leftVolume = ((volume & 0x00FF) << 16) / 101; | 123 | leftVolume = ((volume & 0x00FF) << 16) / 101; |
125 | rightVolume = ((volume & 0xFF00) << 8) / 101; | 124 | rightVolume = ((volume & 0xFF00) << 8) / 101; |
126 | #endif | 125 | //#endif |
127 | } | 126 | } |
128 | 127 | ||
129 | 128 | ||
@@ -138,22 +137,22 @@ void AudioDevice::setVolume( unsigned int leftVolume, unsigned int rightVolume, | |||
138 | leftVolume = ( (int) leftVolume < 0 ) ? 0 : (( leftVolume > 0xFFFF ) ? 0xFFFF : leftVolume ); | 137 | leftVolume = ( (int) leftVolume < 0 ) ? 0 : (( leftVolume > 0xFFFF ) ? 0xFFFF : leftVolume ); |
139 | rightVolume = ( (int)rightVolume < 0 ) ? 0 : (( rightVolume > 0xFFFF ) ? 0xFFFF : rightVolume ); | 138 | rightVolume = ( (int)rightVolume < 0 ) ? 0 : (( rightVolume > 0xFFFF ) ? 0xFFFF : rightVolume ); |
140 | } | 139 | } |
141 | #ifdef Q_OS_WIN32 | 140 | // #ifdef Q_OS_WIN32 |
142 | HWAVEOUT handle; | 141 | // HWAVEOUT handle; |
143 | WAVEFORMATEX formatData; | 142 | // WAVEFORMATEX formatData; |
144 | formatData.cbSize = sizeof(WAVEFORMATEX); | 143 | // formatData.cbSize = sizeof(WAVEFORMATEX); |
145 | formatData.wFormatTag = WAVE_FORMAT_PCM; | 144 | // formatData.wFormatTag = WAVE_FORMAT_PCM; |
146 | formatData.nAvgBytesPerSec = 4 * 44000; | 145 | // formatData.nAvgBytesPerSec = 4 * 44000; |
147 | formatData.nBlockAlign = 4; | 146 | // formatData.nBlockAlign = 4; |
148 | formatData.nChannels = 2; | 147 | // formatData.nChannels = 2; |
149 | formatData.nSamplesPerSec = 44000; | 148 | // formatData.nSamplesPerSec = 44000; |
150 | formatData.wBitsPerSample = 16; | 149 | // formatData.wBitsPerSample = 16; |
151 | waveOutOpen(&handle, WAVE_MAPPER, &formatData, 0L, 0L, CALLBACK_NULL); | 150 | // waveOutOpen(&handle, WAVE_MAPPER, &formatData, 0L, 0L, CALLBACK_NULL); |
152 | unsigned int volume = (rightVolume << 16) | leftVolume; | 151 | // unsigned int volume = (rightVolume << 16) | leftVolume; |
153 | if ( waveOutSetVolume( handle, volume ) ) | 152 | // if ( waveOutSetVolume( handle, volume ) ) |
154 | // qDebug( "set volume of audio device failed" ); | 153 | // // qDebug( "set volume of audio device failed" ); |
155 | waveOutClose( handle ); | 154 | // waveOutClose( handle ); |
156 | #else | 155 | // #else |
157 | // Volume can be from 0 to 100 which is 101 distinct values | 156 | // Volume can be from 0 to 100 which is 101 distinct values |
158 | unsigned int rV = (rightVolume * 101) >> 16; | 157 | unsigned int rV = (rightVolume * 101) >> 16; |
159 | 158 | ||
@@ -176,7 +175,7 @@ void AudioDevice::setVolume( unsigned int leftVolume, unsigned int rightVolume, | |||
176 | cfg.writeEntry("Volume",(int)rV); | 175 | cfg.writeEntry("Volume",(int)rV); |
177 | # endif | 176 | # endif |
178 | 177 | ||
179 | #endif | 178 | //#endif |
180 | // qDebug( "setting volume to: 0x%x", volume ); | 179 | // qDebug( "setting volume to: 0x%x", volume ); |
181 | #if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP) | 180 | #if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP) |
182 | // Send notification that the volume has changed | 181 | // Send notification that the volume has changed |
@@ -256,15 +255,16 @@ AudioDevice::~AudioDevice() { | |||
256 | qDebug("destryo audiodevice"); | 255 | qDebug("destryo audiodevice"); |
257 | QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE; | 256 | QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE; |
258 | 257 | ||
259 | #ifdef Q_OS_WIN32 | 258 | // #ifdef Q_OS_WIN32 |
260 | waveOutClose( (HWAVEOUT)d->handle ); | 259 | // waveOutClose( (HWAVEOUT)d->handle ); |
261 | #else | 260 | // #else |
262 | # ifndef KEEP_DEVICE_OPEN | 261 | # ifndef KEEP_DEVICE_OPEN |
263 | close( d->handle ); // Now it should be safe to shut the handle | 262 | close( d->handle ); // Now it should be safe to shut the handle |
264 | # endif | 263 | # endif |
265 | delete d->unwrittenBuffer; | 264 | delete d->unwrittenBuffer; |
266 | delete d; | 265 | delete d; |
267 | #endif | 266 | //#endif |
267 | QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << FALSE; | ||
268 | 268 | ||
269 | } | 269 | } |
270 | 270 | ||
@@ -277,20 +277,20 @@ void AudioDevice::volumeChanged( bool muted ) | |||
277 | 277 | ||
278 | void AudioDevice::write( char *buffer, unsigned int length ) | 278 | void AudioDevice::write( char *buffer, unsigned int length ) |
279 | { | 279 | { |
280 | #ifdef Q_OS_WIN32 | 280 | // #ifdef Q_OS_WIN32 |
281 | // returns immediately and (to be implemented) emits completedIO() when finished writing | 281 | // // returns immediately and (to be implemented) emits completedIO() when finished writing |
282 | WAVEHDR *lpWaveHdr = (WAVEHDR *)malloc( sizeof(WAVEHDR) ); | 282 | // WAVEHDR *lpWaveHdr = (WAVEHDR *)malloc( sizeof(WAVEHDR) ); |
283 | // maybe the buffer should be copied so that this fool proof, but its a performance hit | 283 | // // maybe the buffer should be copied so that this fool proof, but its a performance hit |
284 | lpWaveHdr->lpData = buffer; | 284 | // lpWaveHdr->lpData = buffer; |
285 | lpWaveHdr->dwBufferLength = length; | 285 | // lpWaveHdr->dwBufferLength = length; |
286 | lpWaveHdr->dwFlags = 0L; | 286 | // lpWaveHdr->dwFlags = 0L; |
287 | lpWaveHdr->dwLoops = 0L; | 287 | // lpWaveHdr->dwLoops = 0L; |
288 | waveOutPrepareHeader( (HWAVEOUT)d->handle, lpWaveHdr, sizeof(WAVEHDR) ); | 288 | // waveOutPrepareHeader( (HWAVEOUT)d->handle, lpWaveHdr, sizeof(WAVEHDR) ); |
289 | // waveOutWrite returns immediately. the data is sent in the background. | 289 | // // waveOutWrite returns immediately. the data is sent in the background. |
290 | if ( waveOutWrite( (HWAVEOUT)d->handle, lpWaveHdr, sizeof(WAVEHDR) ) ) | 290 | // if ( waveOutWrite( (HWAVEOUT)d->handle, lpWaveHdr, sizeof(WAVEHDR) ) ) |
291 | qDebug( "failed to write block to audio device" ); | 291 | // qDebug( "failed to write block to audio device" ); |
292 | // emit completedIO(); | 292 | // // emit completedIO(); |
293 | #else | 293 | // #else |
294 | int t = ::write( d->handle, buffer, length ); | 294 | int t = ::write( d->handle, buffer, length ); |
295 | if ( t<0 ) t = 0; | 295 | if ( t<0 ) t = 0; |
296 | if ( t != (int)length) { | 296 | if ( t != (int)length) { |
@@ -298,7 +298,7 @@ void AudioDevice::write( char *buffer, unsigned int length ) | |||
298 | memcpy(d->unwrittenBuffer,buffer+t,length-t); | 298 | memcpy(d->unwrittenBuffer,buffer+t,length-t); |
299 | d->unwritten = length-t; | 299 | d->unwritten = length-t; |
300 | } | 300 | } |
301 | #endif | 301 | //#endif |
302 | } | 302 | } |
303 | 303 | ||
304 | 304 | ||
@@ -327,9 +327,9 @@ unsigned int AudioDevice::bufferSize() const | |||
327 | 327 | ||
328 | unsigned int AudioDevice::canWrite() const | 328 | unsigned int AudioDevice::canWrite() const |
329 | { | 329 | { |
330 | #ifdef Q_OS_WIN32 | 330 | // #ifdef Q_OS_WIN32 |
331 | return bufferSize(); // Any better? | 331 | // return bufferSize(); // Any better? |
332 | #else | 332 | // #else |
333 | audio_buf_info info; | 333 | audio_buf_info info; |
334 | if ( d->can_GETOSPACE && ioctl(d->handle,SNDCTL_DSP_GETOSPACE,&info) ) { | 334 | if ( d->can_GETOSPACE && ioctl(d->handle,SNDCTL_DSP_GETOSPACE,&info) ) { |
335 | d->can_GETOSPACE = FALSE; | 335 | d->can_GETOSPACE = FALSE; |
@@ -354,25 +354,25 @@ unsigned int AudioDevice::canWrite() const | |||
354 | else | 354 | else |
355 | return d->bufferSize; | 355 | return d->bufferSize; |
356 | } | 356 | } |
357 | #endif | 357 | //#endif |
358 | } | 358 | } |
359 | 359 | ||
360 | 360 | ||
361 | int AudioDevice::bytesWritten() { | 361 | int AudioDevice::bytesWritten() { |
362 | #ifdef Q_OS_WIN32 | 362 | // #ifdef Q_OS_WIN32 |
363 | MMTIME pmmt = { TIME_BYTES, 0 }; | 363 | // MMTIME pmmt = { TIME_BYTES, 0 }; |
364 | if ( ( waveOutGetPosition( (HWAVEOUT)d->handle, &pmmt, sizeof(MMTIME) ) != MMSYSERR_NOERROR ) || ( pmmt.wType != TIME_BYTES ) ) { | 364 | // if ( ( waveOutGetPosition( (HWAVEOUT)d->handle, &pmmt, sizeof(MMTIME) ) != MMSYSERR_NOERROR ) || ( pmmt.wType != TIME_BYTES ) ) { |
365 | qDebug( "failed to get audio device position" ); | 365 | // qDebug( "failed to get audio device position" ); |
366 | return -1; | 366 | // return -1; |
367 | } | 367 | // } |
368 | return pmmt.u.cb; | 368 | // return pmmt.u.cb; |
369 | #else | 369 | // #else |
370 | int buffered = 0; | 370 | int buffered = 0; |
371 | if ( ioctl( d->handle, SNDCTL_DSP_GETODELAY, &buffered ) ) { | 371 | if ( ioctl( d->handle, SNDCTL_DSP_GETODELAY, &buffered ) ) { |
372 | qDebug( "failed to get audio device position" ); | 372 | qDebug( "failed to get audio device position" ); |
373 | return -1; | 373 | return -1; |
374 | } | 374 | } |
375 | return buffered; | 375 | return buffered; |
376 | #endif | 376 | //#endif |
377 | } | 377 | } |
378 | 378 | ||
diff --git a/core/multimedia/opieplayer/audiowidget.cpp b/core/multimedia/opieplayer/audiowidget.cpp index ac8c935..54e7ceb 100644 --- a/core/multimedia/opieplayer/audiowidget.cpp +++ b/core/multimedia/opieplayer/audiowidget.cpp | |||
@@ -143,6 +143,7 @@ void AudioWidget::sliderReleased() { | |||
143 | 143 | ||
144 | 144 | ||
145 | void AudioWidget::setPosition( long i ) { | 145 | void AudioWidget::setPosition( long i ) { |
146 | // qDebug("set position %d",i); | ||
146 | updateSlider( i, mediaPlayerState->length() ); | 147 | updateSlider( i, mediaPlayerState->length() ); |
147 | } | 148 | } |
148 | 149 | ||
@@ -153,7 +154,6 @@ void AudioWidget::setLength( long max ) { | |||
153 | 154 | ||
154 | 155 | ||
155 | void AudioWidget::setView( char view ) { | 156 | void AudioWidget::setView( char view ) { |
156 | |||
157 | if (mediaPlayerState->isStreaming) { | 157 | if (mediaPlayerState->isStreaming) { |
158 | if( !slider->isHidden()) slider->hide(); | 158 | if( !slider->isHidden()) slider->hide(); |
159 | disconnect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); | 159 | disconnect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); |
diff --git a/core/multimedia/opieplayer/loopcontrol.cpp b/core/multimedia/opieplayer/loopcontrol.cpp index 3171c4b..70e4a78 100644 --- a/core/multimedia/opieplayer/loopcontrol.cpp +++ b/core/multimedia/opieplayer/loopcontrol.cpp | |||
@@ -153,7 +153,7 @@ void LoopControl::timerEvent( QTimerEvent *te ) { | |||
153 | 153 | ||
154 | void LoopControl::setPosition( long pos ) { | 154 | void LoopControl::setPosition( long pos ) { |
155 | audioMutex->lock(); | 155 | audioMutex->lock(); |
156 | 156 | // qDebug("Loop control %d", pos); | |
157 | if ( hasVideoChannel && hasAudioChannel ) { | 157 | if ( hasVideoChannel && hasAudioChannel ) { |
158 | playtime.restart(); | 158 | playtime.restart(); |
159 | playtime = playtime.addMSecs( long((double)-pos * 1000.0 / framerate) ); | 159 | playtime = playtime.addMSecs( long((double)-pos * 1000.0 / framerate) ); |
@@ -220,7 +220,6 @@ void LoopControl::startVideo() { | |||
220 | 220 | ||
221 | void LoopControl::startAudio() { | 221 | void LoopControl::startAudio() { |
222 | 222 | ||
223 | //qDebug("start audio"); | ||
224 | audioMutex->lock(); | 223 | audioMutex->lock(); |
225 | if ( moreAudio ) { | 224 | if ( moreAudio ) { |
226 | 225 | ||
@@ -237,14 +236,14 @@ void LoopControl::startAudio() { | |||
237 | long sampleWaitTime = currentSample - sampleWeShouldBeAt; | 236 | long sampleWaitTime = currentSample - sampleWeShouldBeAt; |
238 | 237 | ||
239 | // this causes drop outs not sure why its even here | 238 | // this causes drop outs not sure why its even here |
240 | if ( ( sampleWaitTime > 2000 ) && ( sampleWaitTime < 20000 ) ) { | 239 | // if ( ( sampleWaitTime > 2000 ) && ( sampleWaitTime < 20000 ) ) { |
241 | usleep( (long)((double)sampleWaitTime * 1000000.0 / freq) ); | 240 | // usleep( (long)((double)sampleWaitTime * 1000000.0 / freq) ); |
242 | } | 241 | // } |
243 | else if ( sampleWaitTime <= -5000 ) { | 242 | // else if ( sampleWaitTime <= -5000 ) { |
244 | qDebug("need to catch up by: %li (%i,%li)", -sampleWaitTime, currentSample, sampleWeShouldBeAt ); | 243 | // qDebug("need to catch up by: %li (%i,%li)", -sampleWaitTime, currentSample, sampleWeShouldBeAt ); |
245 | // //mediaPlayerState->curDecoder()->audioSetSample( sampleWeShouldBeAt, stream ); | 244 | // // //mediaPlayerState->curDecoder()->audioSetSample( sampleWeShouldBeAt, stream ); |
246 | currentSample = sampleWeShouldBeAt; | 245 | // currentSample = sampleWeShouldBeAt; |
247 | } | 246 | // } |
248 | 247 | ||
249 | audioDevice->write( audioBuffer, samplesRead * 2 * channels ); | 248 | audioDevice->write( audioBuffer, samplesRead * 2 * channels ); |
250 | 249 | ||
@@ -345,14 +344,15 @@ void LoopControl::stop( bool willPlayAgainShortly ) { | |||
345 | } | 344 | } |
346 | 345 | ||
347 | audioMutex->unlock(); | 346 | audioMutex->unlock(); |
348 | |||
349 | } | 347 | } |
348 | audioSampleCounter=0; | ||
349 | current_frame=0; | ||
350 | total_audio_samples=0; | ||
350 | } | 351 | } |
351 | 352 | ||
352 | 353 | ||
353 | bool LoopControl::init( const QString& filename ) { | 354 | bool LoopControl::init( const QString& filename ) { |
354 | stop(); | 355 | stop(); |
355 | |||
356 | audioMutex->lock(); | 356 | audioMutex->lock(); |
357 | 357 | ||
358 | fileName = filename; | 358 | fileName = filename; |
@@ -450,6 +450,8 @@ bool LoopControl::init( const QString& filename ) { | |||
450 | 450 | ||
451 | void LoopControl::play() { | 451 | void LoopControl::play() { |
452 | qDebug("LC- play"); | 452 | qDebug("LC- play"); |
453 | mediaPlayerState->setPosition( 0); //uglyhack | ||
454 | |||
453 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) | 455 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) |
454 | if ( !disabledSuspendScreenSaver || previousSuspendMode != hasVideoChannel ) { | 456 | if ( !disabledSuspendScreenSaver || previousSuspendMode != hasVideoChannel ) { |
455 | disabledSuspendScreenSaver = TRUE; | 457 | disabledSuspendScreenSaver = TRUE; |
diff --git a/core/multimedia/opieplayer/mediaplayer.cpp b/core/multimedia/opieplayer/mediaplayer.cpp index b9e438b..64fdc01 100644 --- a/core/multimedia/opieplayer/mediaplayer.cpp +++ b/core/multimedia/opieplayer/mediaplayer.cpp | |||
@@ -62,6 +62,7 @@ MediaPlayer::MediaPlayer( QObject *parent, const char *name ) | |||
62 | 62 | ||
63 | 63 | ||
64 | MediaPlayer::~MediaPlayer() { | 64 | MediaPlayer::~MediaPlayer() { |
65 | |||
65 | } | 66 | } |
66 | 67 | ||
67 | 68 | ||
diff --git a/core/multimedia/opieplayer/mediaplayerstate.cpp b/core/multimedia/opieplayer/mediaplayerstate.cpp index 3ac9ac4..cf166d6 100644 --- a/core/multimedia/opieplayer/mediaplayerstate.cpp +++ b/core/multimedia/opieplayer/mediaplayerstate.cpp | |||
diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp index 200ec16..35208e4 100644 --- a/core/multimedia/opieplayer/playlistwidget.cpp +++ b/core/multimedia/opieplayer/playlistwidget.cpp | |||
@@ -157,7 +157,6 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) | |||
157 | tbDeletePlaylist = new QPushButton( Resource::loadIconSet("trash"),"",bar,"close"); | 157 | tbDeletePlaylist = new QPushButton( Resource::loadIconSet("trash"),"",bar,"close"); |
158 | tbDeletePlaylist->setFlat(TRUE); | 158 | tbDeletePlaylist->setFlat(TRUE); |
159 | tbDeletePlaylist->setFixedSize(20,20); | 159 | tbDeletePlaylist->setFixedSize(20,20); |
160 | connect(tbDeletePlaylist,(SIGNAL(released())),SLOT( deletePlaylist())); | ||
161 | 160 | ||
162 | d->tbAddToList = new ToolButton( bar, tr( "Add to Playlist" ), "opieplayer/add_to_playlist", | 161 | d->tbAddToList = new ToolButton( bar, tr( "Add to Playlist" ), "opieplayer/add_to_playlist", |
163 | this , SLOT(addSelected()) ); | 162 | this , SLOT(addSelected()) ); |
@@ -190,10 +189,8 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) | |||
190 | menu->insertItem( tr( "View" ), pmView ); | 189 | menu->insertItem( tr( "View" ), pmView ); |
191 | 190 | ||
192 | fullScreenButton = new QAction(tr("Full Screen"), Resource::loadPixmap("fullscreen"), QString::null, 0, this, 0); | 191 | fullScreenButton = new QAction(tr("Full Screen"), Resource::loadPixmap("fullscreen"), QString::null, 0, this, 0); |
193 | connect( fullScreenButton, SIGNAL(activated()), mediaPlayerState, SLOT(toggleFullscreen()) ); | ||
194 | fullScreenButton->addTo(pmView); | 192 | fullScreenButton->addTo(pmView); |
195 | scaleButton = new QAction(tr("Scale"), Resource::loadPixmap("opieplayer/scale"), QString::null, 0, this, 0); | 193 | scaleButton = new QAction(tr("Scale"), Resource::loadPixmap("opieplayer/scale"), QString::null, 0, this, 0); |
196 | connect( scaleButton, SIGNAL(activated()), mediaPlayerState, SLOT(toggleScaled()) ); | ||
197 | scaleButton->addTo(pmView); | 194 | scaleButton->addTo(pmView); |
198 | 195 | ||
199 | QVBox *vbox5 = new QVBox( this ); vbox5->setBackgroundMode( PaletteButton ); | 196 | QVBox *vbox5 = new QVBox( this ); vbox5->setBackgroundMode( PaletteButton ); |
@@ -224,8 +221,6 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) | |||
224 | 221 | ||
225 | QPEApplication::setStylusOperation( d->selectedFiles->viewport(),QPEApplication::RightOnHold); | 222 | QPEApplication::setStylusOperation( d->selectedFiles->viewport(),QPEApplication::RightOnHold); |
226 | 223 | ||
227 | connect( d->selectedFiles, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)), | ||
228 | this,SLOT( playlistViewPressed(int, QListViewItem *, const QPoint&, int)) ); | ||
229 | 224 | ||
230 | 225 | ||
231 | QVBox *stretch1 = new QVBox( vbox1 ); stretch1->setBackgroundMode( PaletteButton ); // add stretch | 226 | QVBox *stretch1 = new QVBox( vbox1 ); stretch1->setBackgroundMode( PaletteButton ); // add stretch |
@@ -251,11 +246,6 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) | |||
251 | tabWidget->insertTab(aTab,tr("Audio")); | 246 | tabWidget->insertTab(aTab,tr("Audio")); |
252 | 247 | ||
253 | QPEApplication::setStylusOperation( audioView->viewport(),QPEApplication::RightOnHold); | 248 | QPEApplication::setStylusOperation( audioView->viewport(),QPEApplication::RightOnHold); |
254 | connect( audioView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)), | ||
255 | this,SLOT( viewPressed(int, QListViewItem *, const QPoint&, int)) ); | ||
256 | |||
257 | connect( audioView, SIGNAL( returnPressed( QListViewItem *)), | ||
258 | this,SLOT( playIt( QListViewItem *)) ); | ||
259 | 249 | ||
260 | // audioView | 250 | // audioView |
261 | // populateAudioView(); | 251 | // populateAudioView(); |
@@ -277,11 +267,6 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) | |||
277 | 267 | ||
278 | QPEApplication::setStylusOperation( videoView->viewport(),QPEApplication::RightOnHold); | 268 | QPEApplication::setStylusOperation( videoView->viewport(),QPEApplication::RightOnHold); |
279 | 269 | ||
280 | connect( videoView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)), | ||
281 | this,SLOT( viewPressed(int, QListViewItem *, const QPoint&, int)) ); | ||
282 | connect( videoView, SIGNAL( returnPressed( QListViewItem *)), | ||
283 | this,SLOT( playIt( QListViewItem *)) ); | ||
284 | |||
285 | tabWidget->insertTab( vTab,tr("Video")); | 270 | tabWidget->insertTab( vTab,tr("Video")); |
286 | // populateVideoView(); | 271 | // populateVideoView(); |
287 | 272 | ||
@@ -292,7 +277,6 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) | |||
292 | playLists->setMinimumSize(233,260); | 277 | playLists->setMinimumSize(233,260); |
293 | tabWidget->insertTab(LTab,tr("Lists")); | 278 | tabWidget->insertTab(LTab,tr("Lists")); |
294 | 279 | ||
295 | connect( playLists, SIGNAL( fileSelected( const DocLnk &) ), this, SLOT( loadList( const DocLnk & ) ) ); | ||
296 | // connect( playLists, SIGNAL( newSelected( const DocLnk &) ), this, SLOT( newFile( const DocLnk & ) ) ); | 280 | // connect( playLists, SIGNAL( newSelected( const DocLnk &) ), this, SLOT( newFile( const DocLnk & ) ) ); |
297 | 281 | ||
298 | // add the library area | 282 | // add the library area |
@@ -305,10 +289,30 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) | |||
305 | // connect( audioView, SIGNAL( clicked( QListViewItem *) ), this, SLOT( fauxPlay( QListViewItem *) ) ); | 289 | // connect( audioView, SIGNAL( clicked( QListViewItem *) ), this, SLOT( fauxPlay( QListViewItem *) ) ); |
306 | // connect( videoView, SIGNAL( clicked( QListViewItem *) ), this, SLOT( fauxPlay( QListViewItem *) ) ); | 290 | // connect( videoView, SIGNAL( clicked( QListViewItem *) ), this, SLOT( fauxPlay( QListViewItem *) ) ); |
307 | 291 | ||
292 | connect(tbDeletePlaylist,(SIGNAL(released())),SLOT( deletePlaylist())); | ||
293 | connect( fullScreenButton, SIGNAL(activated()), mediaPlayerState, SLOT(toggleFullscreen()) ); | ||
294 | connect( scaleButton, SIGNAL(activated()), mediaPlayerState, SLOT(toggleScaled()) ); | ||
295 | connect( d->selectedFiles, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)), | ||
296 | this,SLOT( playlistViewPressed(int, QListViewItem *, const QPoint&, int)) ); | ||
297 | |||
298 | connect( audioView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)), | ||
299 | this,SLOT( viewPressed(int, QListViewItem *, const QPoint&, int)) ); | ||
300 | |||
301 | connect( audioView, SIGNAL( returnPressed( QListViewItem *)), | ||
302 | this,SLOT( playIt( QListViewItem *)) ); | ||
308 | connect( audioView, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( addToSelection( QListViewItem *) ) ); | 303 | connect( audioView, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( addToSelection( QListViewItem *) ) ); |
304 | |||
305 | connect( videoView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)), | ||
306 | this,SLOT( viewPressed(int, QListViewItem *, const QPoint&, int)) ); | ||
307 | connect( videoView, SIGNAL( returnPressed( QListViewItem *)), | ||
308 | this,SLOT( playIt( QListViewItem *)) ); | ||
309 | connect( videoView, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( addToSelection( QListViewItem *) ) ); | 309 | connect( videoView, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( addToSelection( QListViewItem *) ) ); |
310 | 310 | ||
311 | connect( playLists, SIGNAL( fileSelected( const DocLnk &) ), this, SLOT( loadList( const DocLnk & ) ) ); | ||
312 | |||
313 | |||
311 | connect( tabWidget, SIGNAL (currentChanged(QWidget*)),this,SLOT(tabChanged(QWidget*))); | 314 | connect( tabWidget, SIGNAL (currentChanged(QWidget*)),this,SLOT(tabChanged(QWidget*))); |
315 | |||
312 | connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), d->tbPlay, SLOT( setOn( bool ) ) ); | 316 | connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), d->tbPlay, SLOT( setOn( bool ) ) ); |
313 | connect( mediaPlayerState, SIGNAL( loopingToggled( bool ) ), d->tbLoop, SLOT( setOn( bool ) ) ); | 317 | connect( mediaPlayerState, SIGNAL( loopingToggled( bool ) ), d->tbLoop, SLOT( setOn( bool ) ) ); |
314 | connect( mediaPlayerState, SIGNAL( shuffledToggled( bool ) ), d->tbShuffle, SLOT( setOn( bool ) ) ); | 318 | connect( mediaPlayerState, SIGNAL( shuffledToggled( bool ) ), d->tbShuffle, SLOT( setOn( bool ) ) ); |
@@ -752,6 +756,8 @@ void PlayListWidget::removeSelected() { | |||
752 | 756 | ||
753 | void PlayListWidget::playIt( QListViewItem *it) { | 757 | void PlayListWidget::playIt( QListViewItem *it) { |
754 | // d->setDocumentUsed = FALSE; | 758 | // d->setDocumentUsed = FALSE; |
759 | // mediaPlayerState->curPosition =0; | ||
760 | qDebug("playIt"); | ||
755 | mediaPlayerState->setPlaying(FALSE); | 761 | mediaPlayerState->setPlaying(FALSE); |
756 | mediaPlayerState->setPlaying(TRUE); | 762 | mediaPlayerState->setPlaying(TRUE); |
757 | d->selectedFiles->unSelect(); | 763 | d->selectedFiles->unSelect(); |
@@ -835,6 +841,7 @@ void PlayListWidget::btnPlay(bool b) { | |||
835 | switch ( tabWidget->currentPageIndex()) { | 841 | switch ( tabWidget->currentPageIndex()) { |
836 | case 0: | 842 | case 0: |
837 | { | 843 | { |
844 | |||
838 | mediaPlayerState->setPlaying(b); | 845 | mediaPlayerState->setPlaying(b); |
839 | } | 846 | } |
840 | break; | 847 | break; |