summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-02-25 05:10:32 (UTC)
committer llornkcor <llornkcor>2002-02-25 05:10:32 (UTC)
commit1bebd27631a6c9d1ab967cbb32dd4e796b3b0402 (patch) (unidiff)
tree8ce49800cba26f6f2c33de74a71d4efe0338843f
parentd948361c1b475fab4660b28fbf5ec21fd34d923f (diff)
downloadopie-1bebd27631a6c9d1ab967cbb32dd4e796b3b0402.zip
opie-1bebd27631a6c9d1ab967cbb32dd4e796b3b0402.tar.gz
opie-1bebd27631a6c9d1ab967cbb32dd4e796b3b0402.tar.bz2
fixed 2
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/multimedia/opieplayer/Makefile.in30
-rw-r--r--core/multimedia/opieplayer/audiodevice.cpp155
-rw-r--r--core/multimedia/opieplayer/audiodevice.h10
-rw-r--r--core/multimedia/opieplayer/audiowidget.cpp126
-rw-r--r--core/multimedia/opieplayer/audiowidget.h4
-rw-r--r--core/multimedia/opieplayer/libmad/Makefile.in2
-rw-r--r--core/multimedia/opieplayer/libmad/libmad.pro18
-rw-r--r--core/multimedia/opieplayer/libmad/libmadplugin.cpp302
-rw-r--r--core/multimedia/opieplayer/libmad/libmadplugin.h4
-rw-r--r--core/multimedia/opieplayer/libmad/libmadpluginimpl.h4
-rw-r--r--core/multimedia/opieplayer/libmpeg3/Makefile.in6
-rw-r--r--core/multimedia/opieplayer/libmpeg3/libmpeg3.pro79
-rw-r--r--core/multimedia/opieplayer/libmpeg3/libmpeg3plugin.h4
-rw-r--r--core/multimedia/opieplayer/libmpeg3/libmpeg3pluginimpl.h3
-rw-r--r--core/multimedia/opieplayer/loopcontrol.cpp353
-rw-r--r--core/multimedia/opieplayer/loopcontrol.h8
-rw-r--r--core/multimedia/opieplayer/loopcontrol_threaded.cpp8
-rw-r--r--core/multimedia/opieplayer/loopcontrol_threaded.h6
-rw-r--r--core/multimedia/opieplayer/mediaplayerplugininterface.h9
-rw-r--r--core/multimedia/opieplayer/mediaplayerstate.cpp67
-rw-r--r--core/multimedia/opieplayer/mpegplayer.pro29
-rw-r--r--core/multimedia/opieplayer/playlistselection.cpp49
-rw-r--r--core/multimedia/opieplayer/playlistselection.h6
-rw-r--r--core/multimedia/opieplayer/playlistwidget.cpp510
-rw-r--r--core/multimedia/opieplayer/playlistwidget.h37
-rw-r--r--core/multimedia/opieplayer/videowidget.cpp363
-rw-r--r--core/multimedia/opieplayer/wavplugin/Makefile.in4
27 files changed, 1223 insertions, 973 deletions
diff --git a/core/multimedia/opieplayer/Makefile.in b/core/multimedia/opieplayer/Makefile.in
index 1d2ff5e..e8ccc34 100644
--- a/core/multimedia/opieplayer/Makefile.in
+++ b/core/multimedia/opieplayer/Makefile.in
@@ -138,2 +138,4 @@ main.o: main.cpp \
138 $(OPIEDIR)/include/qpe/qpeapplication.h \ 138 $(OPIEDIR)/include/qpe/qpeapplication.h \
139 $(OPIEDIR)/include/qpedecoration_qws.h \
140 $(OPIEDIR)/include/timestring.h \
139 mediaplayerstate.h \ 141 mediaplayerstate.h \
@@ -147,3 +149,4 @@ main.o: main.cpp \
147 $(OPIEDIR)/include/qpe/qcom.h \ 149 $(OPIEDIR)/include/qpe/qcom.h \
148 $(OPIEDIR)/include/qpe/quuid.h 150 $(OPIEDIR)/include/qpe/quuid.h \
151 $(OPIEDIR)/include/qpe/mediaplayerplugininterface.h
149 152
@@ -151,3 +154,4 @@ loopcontrol.o: loopcontrol.cpp \
151 $(OPIEDIR)/include/qpe/qpeapplication.h \ 154 $(OPIEDIR)/include/qpe/qpeapplication.h \
152 $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \ 155 $(OPIEDIR)/include/qpedecoration_qws.h \
156 $(OPIEDIR)/include/timestring.h \
153 loopcontrol.h \ 157 loopcontrol.h \
@@ -167,2 +171,4 @@ mediaplayerstate.o: mediaplayerstate.cpp \
167 $(OPIEDIR)/include/qpe/qpeapplication.h \ 171 $(OPIEDIR)/include/qpe/qpeapplication.h \
172 $(OPIEDIR)/include/qpedecoration_qws.h \
173 $(OPIEDIR)/include/timestring.h \
168 $(OPIEDIR)/include/qpe/qlibrary.h \ 174 $(OPIEDIR)/include/qpe/qlibrary.h \
@@ -171,2 +177,3 @@ mediaplayerstate.o: mediaplayerstate.cpp \
171 $(OPIEDIR)/include/qpe/config.h \ 177 $(OPIEDIR)/include/qpe/config.h \
178 mediaplayerplugininterface.h \
172 mediaplayerstate.h \ 179 mediaplayerstate.h \
@@ -178,2 +185,5 @@ videowidget.o: videowidget.cpp \
178 $(OPIEDIR)/include/qpe/resource.h \ 185 $(OPIEDIR)/include/qpe/resource.h \
186 mediaplayerplugininterface.h \
187 $(OPIEDIR)/include/qpe/qcom.h \
188 $(OPIEDIR)/include/qpe/quuid.h \
179 videowidget.h \ 189 videowidget.h \
@@ -190,2 +200,7 @@ playlistwidget.o: playlistwidget.cpp \
190 $(OPIEDIR)/include/qpe/fileselector.h \ 200 $(OPIEDIR)/include/qpe/fileselector.h \
201 $(OPIEDIR)/include/filemanager.h \
202 $(OPIEDIR)/include/applnk.h \
203 $(OPIEDIR)/include/qpe/qpeapplication.h \
204 $(OPIEDIR)/include/qpedecoration_qws.h \
205 $(OPIEDIR)/include/timestring.h \
191 $(OPIEDIR)/include/qpe/applnk.h \ 206 $(OPIEDIR)/include/qpe/applnk.h \
@@ -200,2 +215,4 @@ mediaplayer.o: mediaplayer.cpp \
200 $(OPIEDIR)/include/qpe/qpeapplication.h \ 215 $(OPIEDIR)/include/qpe/qpeapplication.h \
216 $(OPIEDIR)/include/qpedecoration_qws.h \
217 $(OPIEDIR)/include/timestring.h \
201 $(OPIEDIR)/include/qpe/qlibrary.h \ 218 $(OPIEDIR)/include/qpe/qlibrary.h \
@@ -206,2 +223,3 @@ mediaplayer.o: mediaplayer.cpp \
206 mediaplayer.h \ 223 mediaplayer.h \
224 $(OPIEDIR)/include/qpe/mediaplayerplugininterface.h \
207 playlistwidget.h \ 225 playlistwidget.h \
@@ -215,5 +233,6 @@ audiodevice.o: audiodevice.cpp \
215 $(OPIEDIR)/include/qpe/qpeapplication.h \ 233 $(OPIEDIR)/include/qpe/qpeapplication.h \
234 $(OPIEDIR)/include/qpedecoration_qws.h \
235 $(OPIEDIR)/include/timestring.h \
216 $(OPIEDIR)/include/qpe/config.h \ 236 $(OPIEDIR)/include/qpe/config.h \
217 audiodevice.h \ 237 audiodevice.h
218 $(OPIEDIR)/include/qpe/qcopenvelope_qws.h
219 238
@@ -243,3 +262,4 @@ moc_mediaplayer.o: moc_mediaplayer.cpp \
243 $(OPIEDIR)/include/qpe/qcom.h \ 262 $(OPIEDIR)/include/qpe/qcom.h \
244 $(OPIEDIR)/include/qpe/quuid.h 263 $(OPIEDIR)/include/qpe/quuid.h \
264 $(OPIEDIR)/include/qpe/mediaplayerplugininterface.h
245 265
diff --git a/core/multimedia/opieplayer/audiodevice.cpp b/core/multimedia/opieplayer/audiodevice.cpp
index 7b3700a..9a10eb4 100644
--- a/core/multimedia/opieplayer/audiodevice.cpp
+++ b/core/multimedia/opieplayer/audiodevice.cpp
@@ -1,5 +1,5 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. 2** Copyright (C) 2000 Trolltech AS. All rights reserved.
3** 3**
4** This file is part of the Qtopia Environment. 4** This file is part of Qtopia Environment.
5** 5**
@@ -19,4 +19,6 @@
19**********************************************************************/ 19**********************************************************************/
20// L.J.Potter added better error code Fri 02-15-2002 14:37:47
20 21
21#include <stdlib.h> 22#include <stdlib.h>
23#include <stdio.h>
22#include <qpe/qpeapplication.h> 24#include <qpe/qpeapplication.h>
@@ -108,3 +110,3 @@ void AudioDevice::getVolume( unsigned int& leftVolume, unsigned int& rightVolume
108 if ( waveOutGetVolume( handle, (LPDWORD)&volume ) ) 110 if ( waveOutGetVolume( handle, (LPDWORD)&volume ) )
109 qDebug( "get volume of audio device failed" ); 111// qDebug( "get volume of audio device failed" );
110 waveOutClose( handle ); 112 waveOutClose( handle );
@@ -115,6 +117,7 @@ void AudioDevice::getVolume( unsigned int& leftVolume, unsigned int& rightVolume
115 if ( mixerHandle >= 0 ) { 117 if ( mixerHandle >= 0 ) {
116 ioctl( mixerHandle, MIXER_READ(0), &volume ); 118 if(ioctl( mixerHandle, MIXER_READ(0), &volume )==-1)
119 perror("ioctl(\"MIXER_READ\")");
117 close( mixerHandle ); 120 close( mixerHandle );
118 } else 121 } else
119 qDebug( "get volume of audio device failed" ); 122 perror("open(\"/dev/mixer\")");
120 leftVolume = ((volume & 0x00FF) << 16) / 101; 123 leftVolume = ((volume & 0x00FF) << 16) / 101;
@@ -128,9 +131,9 @@ void AudioDevice::setVolume( unsigned int leftVolume, unsigned int rightVolume,
128 if ( muted ) { 131 if ( muted ) {
129 AudioDevicePrivate::leftVolume = leftVolume; 132 AudioDevicePrivate::leftVolume = leftVolume;
130 AudioDevicePrivate::rightVolume = rightVolume; 133 AudioDevicePrivate::rightVolume = rightVolume;
131 leftVolume = 0; 134 leftVolume = 0;
132 rightVolume = 0; 135 rightVolume = 0;
133 } else { 136 } else {
134 leftVolume = ( (int) leftVolume < 0 ) ? 0 : (( leftVolume > 0xFFFF ) ? 0xFFFF : leftVolume ); 137 leftVolume = ( (int) leftVolume < 0 ) ? 0 : (( leftVolume > 0xFFFF ) ? 0xFFFF : leftVolume );
135 rightVolume = ( (int)rightVolume < 0 ) ? 0 : (( rightVolume > 0xFFFF ) ? 0xFFFF : rightVolume ); 138 rightVolume = ( (int)rightVolume < 0 ) ? 0 : (( rightVolume > 0xFFFF ) ? 0xFFFF : rightVolume );
136 } 139 }
@@ -149,3 +152,3 @@ void AudioDevice::setVolume( unsigned int leftVolume, unsigned int rightVolume,
149 if ( waveOutSetVolume( handle, volume ) ) 152 if ( waveOutSetVolume( handle, volume ) )
150 qDebug( "set volume of audio device failed" ); 153// qDebug( "set volume of audio device failed" );
151 waveOutClose( handle ); 154 waveOutClose( handle );
@@ -160,6 +163,8 @@ void AudioDevice::setVolume( unsigned int leftVolume, unsigned int rightVolume,
160 if ( ( mixerHandle = open( "/dev/mixer", O_RDWR ) ) >= 0 ) { 163 if ( ( mixerHandle = open( "/dev/mixer", O_RDWR ) ) >= 0 ) {
161 ioctl( mixerHandle, MIXER_WRITE(0), &volume ); 164 if(ioctl( mixerHandle, MIXER_WRITE(0), &volume ) ==-1)
165 perror("ioctl(\"MIXER_WRITE\")");
162 close( mixerHandle ); 166 close( mixerHandle );
163 } else 167 } else
164 qDebug( "set volume of audio device failed" ); 168 perror("open(\"/dev/mixer\")");
169
165# else 170# else
@@ -188,41 +193,13 @@ AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) {
188 d->bytesPerSample = bps; 193 d->bytesPerSample = bps;
194// qDebug("%d",bps);
195 int format=0;
196 if( bps == 8) format = AFMT_U8;
197 else if( bps <= 0) format = AFMT_S16_LE;
198 else format = AFMT_S16_LE;
189 199
200// qDebug("AD- freq %d, channels %d, b/sample %d, bitrate %d",f,chs,bps,format);
190 connect( qApp, SIGNAL( volumeChanged(bool) ), this, SLOT( volumeChanged(bool) ) ); 201 connect( qApp, SIGNAL( volumeChanged(bool) ), this, SLOT( volumeChanged(bool) ) );
191 202
192#ifdef Q_OS_WIN32
193 UINT result;
194 WAVEFORMATEX formatData;
195 formatData.cbSize = sizeof(WAVEFORMATEX);
196/*
197 // Other possible formats windows supports
198 formatData.wFormatTag = WAVE_FORMAT_MPEG;
199 formatData.wFormatTag = WAVE_FORMAT_MPEGLAYER3;
200 formatData.wFormatTag = WAVE_FORMAT_ADPCM;
201*/
202 formatData.wFormatTag = WAVE_FORMAT_PCM;
203 formatData.nAvgBytesPerSec = bps * chs * f;
204 formatData.nBlockAlign = bps * chs;
205 formatData.nChannels = chs;
206 formatData.nSamplesPerSec = f;
207 formatData.wBitsPerSample = bps * 8;
208 // Open a waveform device for output
209 if (result = waveOutOpen((LPHWAVEOUT)&d->handle, WAVE_MAPPER, &formatData, 0L, 0L, CALLBACK_NULL)) {
210 QString errorMsg = "error opening audio device.\nReason: %i - ";
211 switch (result) {
212 case MMSYSERR_ALLOCATED:errorMsg += "Specified resource is already allocated."; break;
213 case MMSYSERR_BADDEVICEID:errorMsg += "Specified device identifier is out of range."; break;
214 case MMSYSERR_NODRIVER:errorMsg += "No device driver is present."; break;
215 case MMSYSERR_NOMEM:errorMsg += "Unable to allocate or lock memory."; break;
216 case WAVERR_BADFORMAT:errorMsg += "Attempted to open with an unsupported waveform-audio format."; break;
217 case WAVERR_SYNC: errorMsg += "The device is synchronous but waveOutOpen was called without using the WAVE_ALLOWSYNC flag."; break;
218 default: errorMsg += "Undefined error"; break;
219 }
220 qDebug( errorMsg, result );
221 }
222
223 d->bufferSize = sound_fragment_bytes;
224#else
225 203
226 int fragments = 0x10000 * 8 + sound_fragment_shift; 204 int fragments = 0x10000 * 8 + sound_fragment_shift;
227 int format = AFMT_S16_LE;
228 int capabilities = 0; 205 int capabilities = 0;
@@ -233,7 +210,7 @@ AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) {
233 if ( ( d->handle = ::open( "/dev/dsp", O_WRONLY ) ) < 0 ) { 210 if ( ( d->handle = ::open( "/dev/dsp", O_WRONLY ) ) < 0 ) {
234 qDebug( "error opening audio device /dev/dsp, sending data to /dev/null instead" ); 211 perror("open(\"/dev/dsp\") sending to /dev/null instead");
235 d->handle = ::open( "/dev/null", O_WRONLY ); 212 d->handle = ::open( "/dev/null", O_WRONLY );
236 } 213 }
237#ifdef KEEP_DEVICE_OPEN 214#ifdef KEEP_DEVICE_OPEN
238 AudioDevicePrivate::dspFd = d->handle; 215 AudioDevicePrivate::dspFd = d->handle;
239 } else { 216 } else {
@@ -243,9 +220,16 @@ AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) {
243 220
244 ioctl( d->handle, SNDCTL_DSP_GETCAPS, &capabilities ); 221 if(ioctl( d->handle, SNDCTL_DSP_GETCAPS, &capabilities )==-1)
245 ioctl( d->handle, SNDCTL_DSP_SETFRAGMENT, &fragments ); 222 perror("ioctl(\"SNDCTL_DSP_GETCAPS\")");
246 ioctl( d->handle, SNDCTL_DSP_SETFMT, &format ); 223 if(ioctl( d->handle, SNDCTL_DSP_SETFRAGMENT, &fragments )==-1)
247 ioctl( d->handle, SNDCTL_DSP_SPEED, &d->frequency ); 224 perror("ioctl(\"SNDCTL_DSP_SETFRAGMENT\")");
225 if(ioctl( d->handle, SNDCTL_DSP_SETFMT, & format )==-1)
226 perror("ioctl(\"SNDCTL_DSP_SETFMT\")");
227 qDebug("freq %d", d->frequency);
228 if(ioctl( d->handle, SNDCTL_DSP_SPEED, &d->frequency )==-1)
229 perror("ioctl(\"SNDCTL_DSP_SPEED\")");
230 qDebug("channels %d",d->channels);
248 if ( ioctl( d->handle, SNDCTL_DSP_CHANNELS, &d->channels ) == -1 ) { 231 if ( ioctl( d->handle, SNDCTL_DSP_CHANNELS, &d->channels ) == -1 ) {
249 d->channels = ( d->channels == 1 ) ? 2 : d->channels; 232 d->channels = ( d->channels == 1 ) ? 2 : d->channels;
250 ioctl( d->handle, SNDCTL_DSP_CHANNELS, &d->channels ); 233 if(ioctl( d->handle, SNDCTL_DSP_CHANNELS, &d->channels )==-1)
234 perror("ioctl(\"SNDCTL_DSP_CHANNELS\")");
251 } 235 }
@@ -257,4 +241,4 @@ AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) {
257 241
258 //if ( chs != d->channels ) qDebug( "Wanted %d, got %d channels", chs, d->channels ); 242 //if ( chs != d->channels ) qDebug( "Wanted %d, got %d channels", chs, d->channels );
259 //if ( f != d->frequency ) qDebug( "wanted %dHz, got %dHz", f, d->frequency ); 243 //if ( f != d->frequency ) qDebug( "wanted %dHz, got %dHz", f, d->frequency );
260 //if ( capabilities & DSP_CAP_BATCH ) qDebug( "Sound card has local buffer" ); 244 //if ( capabilities & DSP_CAP_BATCH ) qDebug( "Sound card has local buffer" );
@@ -263,3 +247,2 @@ AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) {
263 //if ( capabilities & DSP_CAP_MMAP ) qDebug( "Sound card can mmap" ); 247 //if ( capabilities & DSP_CAP_MMAP ) qDebug( "Sound card can mmap" );
264#endif
265} 248}
@@ -272,3 +255,3 @@ AudioDevice::~AudioDevice() {
272# ifndef KEEP_DEVICE_OPEN 255# ifndef KEEP_DEVICE_OPEN
273 close( d->handle ); // Now it should be safe to shut the handle 256 close( d->handle ); // Now it should be safe to shut the handle
274# endif 257# endif
@@ -299,3 +282,3 @@ void AudioDevice::write( char *buffer, unsigned int length )
299 if ( waveOutWrite( (HWAVEOUT)d->handle, lpWaveHdr, sizeof(WAVEHDR) ) ) 282 if ( waveOutWrite( (HWAVEOUT)d->handle, lpWaveHdr, sizeof(WAVEHDR) ) )
300 qDebug( "failed to write block to audio device" ); 283 qDebug( "failed to write block to audio device" );
301 // emit completedIO(); 284 // emit completedIO();
@@ -305,5 +288,5 @@ void AudioDevice::write( char *buffer, unsigned int length )
305 if ( t != (int)length) { 288 if ( t != (int)length) {
306 qDebug("Ahhh!! memcpys 1"); 289 qDebug("Ahhh!! memcpys 1");
307 memcpy(d->unwrittenBuffer,buffer+t,length-t); 290 memcpy(d->unwrittenBuffer,buffer+t,length-t);
308 d->unwritten = length-t; 291 d->unwritten = length-t;
309 } 292 }
@@ -343,23 +326,23 @@ unsigned int AudioDevice::canWrite() const
343 if ( d->can_GETOSPACE && ioctl(d->handle,SNDCTL_DSP_GETOSPACE,&info) ) { 326 if ( d->can_GETOSPACE && ioctl(d->handle,SNDCTL_DSP_GETOSPACE,&info) ) {
344 d->can_GETOSPACE = FALSE; 327 d->can_GETOSPACE = FALSE;
345 fcntl( d->handle, F_SETFL, O_NONBLOCK ); 328 fcntl( d->handle, F_SETFL, O_NONBLOCK );
346 } 329 }
347 if ( d->can_GETOSPACE ) { 330 if ( d->can_GETOSPACE ) {
348 int t = info.fragments * sound_fragment_bytes; 331 int t = info.fragments * sound_fragment_bytes;
349 return QMIN(t,(int)bufferSize()); 332 return QMIN(t,(int)bufferSize());
350 } else { 333 } else {
351 if ( d->unwritten ) { 334 if ( d->unwritten ) {
352 int t = ::write( d->handle, d->unwrittenBuffer, d->unwritten ); 335 int t = ::write( d->handle, d->unwrittenBuffer, d->unwritten );
353 if ( t<0 ) t = 0; 336 if ( t<0 ) t = 0;
354 if ( (unsigned)t!=d->unwritten ) { 337 if ( (unsigned)t!=d->unwritten ) {
355 memcpy(d->unwrittenBuffer,d->unwrittenBuffer+t,d->unwritten-t); 338 memcpy(d->unwrittenBuffer,d->unwrittenBuffer+t,d->unwritten-t);
356 d->unwritten -= t; 339 d->unwritten -= t;
357 } else { 340 } else {
358 d->unwritten = 0; 341 d->unwritten = 0;
359 } 342 }
360 } 343 }
361 if ( d->unwritten ) 344 if ( d->unwritten )
362 return 0; 345 return 0;
363 else 346 else
364 return d->bufferSize; 347 return d->bufferSize;
365 } 348 }
@@ -373,4 +356,4 @@ int AudioDevice::bytesWritten() {
373 if ( ( waveOutGetPosition( (HWAVEOUT)d->handle, &pmmt, sizeof(MMTIME) ) != MMSYSERR_NOERROR ) || ( pmmt.wType != TIME_BYTES ) ) { 356 if ( ( waveOutGetPosition( (HWAVEOUT)d->handle, &pmmt, sizeof(MMTIME) ) != MMSYSERR_NOERROR ) || ( pmmt.wType != TIME_BYTES ) ) {
374 qDebug( "failed to get audio device position" ); 357 qDebug( "failed to get audio device position" );
375 return -1; 358 return -1;
376 } 359 }
@@ -380,4 +363,4 @@ int AudioDevice::bytesWritten() {
380 if ( ioctl( d->handle, SNDCTL_DSP_GETODELAY, &buffered ) ) { 363 if ( ioctl( d->handle, SNDCTL_DSP_GETODELAY, &buffered ) ) {
381 qDebug( "failed to get audio device position" ); 364 qDebug( "failed to get audio device position" );
382 return -1; 365 return -1;
383 } 366 }
diff --git a/core/multimedia/opieplayer/audiodevice.h b/core/multimedia/opieplayer/audiodevice.h
index ec70788..d59c388 100644
--- a/core/multimedia/opieplayer/audiodevice.h
+++ b/core/multimedia/opieplayer/audiodevice.h
@@ -1,5 +1,5 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. 2** Copyright (C) 2000 Trolltech AS. All rights reserved.
3** 3**
4** This file is part of the Qtopia Environment. 4** This file is part of Qtopia Environment.
5** 5**
@@ -19,2 +19,4 @@
19**********************************************************************/ 19**********************************************************************/
20// L.J.Potter added changes Fri 02-15-2002
21
20#ifndef AUDIODEVICE_H 22#ifndef AUDIODEVICE_H
@@ -22,3 +24,5 @@
22 24
25
23#include <qobject.h> 26#include <qobject.h>
27#include <sys/soundcard.h>
24 28
@@ -31,3 +35,3 @@ class AudioDevice : public QObject {
31public: 35public:
32 AudioDevice( unsigned int freq = 44000, unsigned int channels = 2, unsigned int bytesPerSample = 2 ); 36 AudioDevice( unsigned int freq = 44000, unsigned int channels = 2, unsigned int bytesPerSample = AFMT_S16_LE );
33 ~AudioDevice(); 37 ~AudioDevice();
diff --git a/core/multimedia/opieplayer/audiowidget.cpp b/core/multimedia/opieplayer/audiowidget.cpp
index 1e0757f..582660c 100644
--- a/core/multimedia/opieplayer/audiowidget.cpp
+++ b/core/multimedia/opieplayer/audiowidget.cpp
@@ -1,5 +1,5 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. 2** Copyright (C) 2000 Trolltech AS. All rights reserved.
3** 3**
4** This file is part of the Qtopia Environment. 4** This file is part of Qtopia Environment.
5** 5**
@@ -62,3 +62,3 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
62{ 62{
63 setCaption( tr("MediaPlayer") ); 63 setCaption( tr("OpiePlayer") );
64 setBackgroundPixmap( Resource::loadPixmap( "mpegplayer/metalFinish" ) ); 64 setBackgroundPixmap( Resource::loadPixmap( "mpegplayer/metalFinish" ) );
@@ -105,3 +105,3 @@ AudioWidget::~AudioWidget() {
105 for ( int i = 0; i < 4; i++ ) 105 for ( int i = 0; i < 4; i++ )
106 delete pixmaps[i]; 106 delete pixmaps[i];
107} 107}
@@ -120,3 +120,3 @@ void AudioWidget::sliderReleased() {
120 if ( slider->width() == 0 ) 120 if ( slider->width() == 0 )
121 return; 121 return;
122 long val = long((double)slider->value() * mediaPlayerState->length() / slider->width()); 122 long val = long((double)slider->value() * mediaPlayerState->length() / slider->width());
@@ -138,7 +138,7 @@ void AudioWidget::setView( char view ) {
138 if ( view == 'a' ) { 138 if ( view == 'a' ) {
139 startTimer( 150 ); 139 startTimer( 150 );
140 showMaximized(); 140 showMaximized();
141 } else { 141 } else {
142 killTimers(); 142 killTimers();
143 hide(); 143 hide();
144 } 144 }
@@ -149,3 +149,3 @@ void AudioWidget::updateSlider( long i, long max ) {
149 if ( max == 0 ) 149 if ( max == 0 )
150 return; 150 return;
151 // Will flicker too much if we don't do this 151 // Will flicker too much if we don't do this
@@ -155,6 +155,6 @@ void AudioWidget::updateSlider( long i, long max ) {
155 if ( !audioSliderBeingMoved ) { 155 if ( !audioSliderBeingMoved ) {
156 if ( slider->value() != val ) 156 if ( slider->value() != val )
157 slider->setValue( val ); 157 slider->setValue( val );
158 if ( slider->maxValue() != width ) 158 if ( slider->maxValue() != width )
159 slider->setMaxValue( width ); 159 slider->setMaxValue( width );
160 } 160 }
@@ -165,3 +165,3 @@ void AudioWidget::setToggleButton( int i, bool down ) {
165 if ( down != audioButtons[i].isDown ) 165 if ( down != audioButtons[i].isDown )
166 toggleButton( i ); 166 toggleButton( i );
167} 167}
@@ -189,9 +189,9 @@ void AudioWidget::timerEvent( QTimerEvent * ) {
189 if ( !mediaPlayerState->paused() && audioButtons[ AudioPlay ].isDown ) { 189 if ( !mediaPlayerState->paused() && audioButtons[ AudioPlay ].isDown ) {
190 frame = frame >= 7 ? 0 : frame + 1; 190 frame = frame >= 7 ? 0 : frame + 1;
191 int x = audioButtons[AudioPlay].xPos; 191 int x = audioButtons[AudioPlay].xPos;
192 int y = audioButtons[AudioPlay].yPos; 192 int y = audioButtons[AudioPlay].yPos;
193 QPainter p( this ); 193 QPainter p( this );
194 // Optimize to only draw the little bit of the changing images which is different 194 // Optimize to only draw the little bit of the changing images which is different
195 p.drawPixmap( x + 14, y + 8, *pixmaps[3], 32 * frame, 0, 32, 32 ); 195 p.drawPixmap( x + 14, y + 8, *pixmaps[3], 32 * frame, 0, 32, 32 );
196 p.drawPixmap( x + 37, y + 37, *pixmaps[2], 18 * AudioPlay, 0, 6, 3 ); 196 p.drawPixmap( x + 37, y + 37, *pixmaps[2], 18 * AudioPlay, 0, 6, 3 );
197 } 197 }
@@ -202,44 +202,44 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) {
202 for ( int i = 0; i < numButtons; i++ ) { 202 for ( int i = 0; i < numButtons; i++ ) {
203 int size = audioButtons[i].isBig; 203 int size = audioButtons[i].isBig;
204 int x = audioButtons[i].xPos; 204 int x = audioButtons[i].xPos;
205 int y = audioButtons[i].yPos; 205 int y = audioButtons[i].yPos;
206 if ( event->state() == QMouseEvent::LeftButton ) { 206 if ( event->state() == QMouseEvent::LeftButton ) {
207 // The test to see if the mouse click is inside the circular button or not 207 // The test to see if the mouse click is inside the circular button or not
208 // (compared with the radius squared to avoid a square-root of our distance) 208 // (compared with the radius squared to avoid a square-root of our distance)
209 int radius = 32 + 13 * size; 209 int radius = 32 + 13 * size;
210 QPoint center = QPoint( x + radius, y + radius ); 210 QPoint center = QPoint( x + radius, y + radius );
211 QPoint dXY = center - event->pos(); 211 QPoint dXY = center - event->pos();
212 int dist = dXY.x() * dXY.x() + dXY.y() * dXY.y(); 212 int dist = dXY.x() * dXY.x() + dXY.y() * dXY.y();
213 bool isOnButton = dist <= (radius * radius); 213 bool isOnButton = dist <= (radius * radius);
214 // QRect r( x, y, 64 + 22*size, 64 + 22*size ); 214// QRect r( x, y, 64 + 22*size, 64 + 22*size );
215 // bool isOnButton = r.contains( event->pos() ); // Rectangular Button code 215// bool isOnButton = r.contains( event->pos() ); // Rectangular Button code
216 if ( isOnButton && !audioButtons[i].isHeld ) { 216 if ( isOnButton && !audioButtons[i].isHeld ) {
217 audioButtons[i].isHeld = TRUE; 217 audioButtons[i].isHeld = TRUE;
218 toggleButton(i); 218 toggleButton(i);
219 switch (i) { 219 switch (i) {
220 case AudioVolumeUp: emit moreClicked(); return; 220 case AudioVolumeUp: emit moreClicked(); return;
221 case AudioVolumeDown: emit lessClicked(); return; 221 case AudioVolumeDown: emit lessClicked(); return;
222 } 222 }
223 } else if ( !isOnButton && audioButtons[i].isHeld ) { 223 } else if ( !isOnButton && audioButtons[i].isHeld ) {
224 audioButtons[i].isHeld = FALSE; 224 audioButtons[i].isHeld = FALSE;
225 toggleButton(i); 225 toggleButton(i);
226 } 226 }
227 } else { 227 } else {
228 if ( audioButtons[i].isHeld ) { 228 if ( audioButtons[i].isHeld ) {
229 audioButtons[i].isHeld = FALSE; 229 audioButtons[i].isHeld = FALSE;
230 if ( !audioButtons[i].isToggle ) 230 if ( !audioButtons[i].isToggle )
231 setToggleButton( i, FALSE ); 231 setToggleButton( i, FALSE );
232 switch (i) { 232 switch (i) {
233 case AudioPlay: mediaPlayerState->setPlaying(audioButtons[i].isDown); return; 233 case AudioPlay: mediaPlayerState->setPlaying(audioButtons[i].isDown); return;
234 case AudioStop: mediaPlayerState->setPlaying(FALSE); return; 234 case AudioStop: mediaPlayerState->setPlaying(FALSE); return;
235 case AudioPause: mediaPlayerState->setPaused(audioButtons[i].isDown); return; 235 case AudioPause: mediaPlayerState->setPaused(audioButtons[i].isDown); return;
236 case AudioNext: mediaPlayerState->setNext(); return; 236 case AudioNext: mediaPlayerState->setNext(); return;
237 case AudioPrevious: mediaPlayerState->setPrev(); return; 237 case AudioPrevious: mediaPlayerState->setPrev(); return;
238 case AudioLoop: mediaPlayerState->setLooping(audioButtons[i].isDown); return; 238 case AudioLoop: mediaPlayerState->setLooping(audioButtons[i].isDown); return;
239 case AudioVolumeUp: emit moreReleased(); return; 239 case AudioVolumeUp: emit moreReleased(); return;
240 case AudioVolumeDown: emit lessReleased(); return; 240 case AudioVolumeDown: emit lessReleased(); return;
241 case AudioPlayList: mediaPlayerState->setList(); return; 241 case AudioPlayList: mediaPlayerState->setList(); return;
242 } 242 }
243 } 243 }
244 } 244 }
245 } 245 }
@@ -272,3 +272,3 @@ void AudioWidget::paintEvent( QPaintEvent * ) {
272 for ( int i = 0; i < numButtons; i++ ) 272 for ( int i = 0; i < numButtons; i++ )
273 paintButton( &p, i ); 273 paintButton( &p, i );
274} 274}
diff --git a/core/multimedia/opieplayer/audiowidget.h b/core/multimedia/opieplayer/audiowidget.h
index 95f5322..53e84b3 100644
--- a/core/multimedia/opieplayer/audiowidget.h
+++ b/core/multimedia/opieplayer/audiowidget.h
@@ -1,5 +1,5 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. 2** Copyright (C) 2000 Trolltech AS. All rights reserved.
3** 3**
4** This file is part of the Qtopia Environment. 4** This file is part of Qtopia Environment.
5** 5**
diff --git a/core/multimedia/opieplayer/libmad/Makefile.in b/core/multimedia/opieplayer/libmad/Makefile.in
index e9f74e7..552043c 100644
--- a/core/multimedia/opieplayer/libmad/Makefile.in
+++ b/core/multimedia/opieplayer/libmad/Makefile.in
@@ -216,2 +216,3 @@ libmadplugin.o: libmadplugin.cpp \
216 libmadplugin.h \ 216 libmadplugin.h \
217 ../mediaplayerplugininterface.h \
217 mad.h 218 mad.h
@@ -220,2 +221,3 @@ libmadpluginimpl.o: libmadpluginimpl.cpp \
220 libmadplugin.h \ 221 libmadplugin.h \
222 ../mediaplayerplugininterface.h \
221 libmadpluginimpl.h 223 libmadpluginimpl.h
diff --git a/core/multimedia/opieplayer/libmad/libmad.pro b/core/multimedia/opieplayer/libmad/libmad.pro
index 6c40a15..06e19e4 100644
--- a/core/multimedia/opieplayer/libmad/libmad.pro
+++ b/core/multimedia/opieplayer/libmad/libmad.pro
@@ -1,9 +1,9 @@
1 TEMPLATE= lib 1TEMPLATE = lib
2 CONFIG += qt warn_on release 2CONFIG += qt warn_on release
3 HEADERS = libmad_version.h fixed.h bit.h timer.h stream.h frame.h synth.h decoder.h \ 3HEADERS = libmad_version.h fixed.h bit.h timer.h stream.h frame.h synth.h decoder.h \
4 layer12.h layer3.h huffman.h libmad_global.h mad.h libmadplugin.h libmadpluginimpl.h 4 layer12.h layer3.h huffman.h libmad_global.h mad.h libmadplugin.h libmadpluginimpl.h
5 SOURCES = version.c fixed.c bit.c timer.c stream.c frame.c synth.c decoder.c \ 5SOURCES = version.c fixed.c bit.c timer.c stream.c frame.c synth.c decoder.c \
6 layer12.c layer3.c huffman.c libmadplugin.cpp libmadpluginimpl.cpp 6 layer12.c layer3.c huffman.c libmadplugin.cpp libmadpluginimpl.cpp
7 TARGET = madplugin 7TARGET = madplugin
8 DESTDIR = ../../plugins/codecs 8DESTDIR = ../../plugins/codecs
9INCLUDEPATH += $(OPIEDIR)/include .. 9INCLUDEPATH += $(OPIEDIR)/include ..
@@ -11,2 +11,2 @@ DEPENDPATH += ../$(OPIEDIR)/include ..
11LIBS += -lqpe -lm 11LIBS += -lqpe -lm
12 VERSION = 1.0.0 12VERSION = 1.0.0
diff --git a/core/multimedia/opieplayer/libmad/libmadplugin.cpp b/core/multimedia/opieplayer/libmad/libmadplugin.cpp
index 9d04f7e..9f8ba65 100644
--- a/core/multimedia/opieplayer/libmad/libmadplugin.cpp
+++ b/core/multimedia/opieplayer/libmad/libmadplugin.cpp
@@ -49,3 +49,3 @@ extern "C" {
49#define MPEG_BUFFER_SIZE 65536 49#define MPEG_BUFFER_SIZE 65536
50 //#define debugMsg(a) qDebug(a) 50//#define debugMsg(a) qDebug(a)
51#define debugMsg(a) 51#define debugMsg(a)
@@ -147,3 +147,3 @@ bool LibMadPlugin::isFileSupported( const QString& path ) {
147 // Mpeg file extensions 147 // Mpeg file extensions
148 //"mp2","mp3","m1v","m2v","m2s","mpg","vob","mpeg","ac3" 148 // "mp2","mp3","m1v","m2v","m2s","mpg","vob","mpeg","ac3"
149 // Other media extensions 149 // Other media extensions
@@ -155,6 +155,6 @@ bool LibMadPlugin::isFileSupported( const QString& path ) {
155 if ( ext ) { 155 if ( ext ) {
156 if ( strncasecmp(ext, ".mp2", 4) == 0 ) 156 if ( strncasecmp(ext, ".mp2", 4) == 0 )
157 return TRUE; 157 return TRUE;
158 if ( strncasecmp(ext, ".mp3", 4) == 0 ) 158 if ( strncasecmp(ext, ".mp3", 4) == 0 )
159 return TRUE; 159 return TRUE;
160 } 160 }
@@ -178,3 +178,3 @@ bool LibMadPlugin::open( const QString& path ) {
178 qDebug("error opening %s", d->input.path ); 178 qDebug("error opening %s", d->input.path );
179 return FALSE; 179 return FALSE;
180 } 180 }
@@ -186,11 +186,11 @@ bool LibMadPlugin::open( const QString& path ) {
186 if (fstat(d->input.fd, &stat) == -1) { 186 if (fstat(d->input.fd, &stat) == -1) {
187 qDebug("error calling fstat"); return FALSE; 187 qDebug("error calling fstat"); return FALSE;
188 } 188 }
189 if (S_ISREG(stat.st_mode) && stat.st_size > 0) { 189 if (S_ISREG(stat.st_mode) && stat.st_size > 0) {
190 d->input.length = stat.st_size; 190 d->input.length = stat.st_size;
191 d->input.fdm = map_file(d->input.fd, &d->input.length); 191 d->input.fdm = map_file(d->input.fd, &d->input.length);
192 if (d->input.fdm == 0) { 192 if (d->input.fdm == 0) {
193 qDebug("error mmapping file"); return FALSE; 193 qDebug("error mmapping file"); return FALSE;
194 } 194 }
195 d->input.data = (unsigned char *)d->input.fdm; 195 d->input.data = (unsigned char *)d->input.fdm;
196 } 196 }
@@ -199,8 +199,8 @@ bool LibMadPlugin::open( const QString& path ) {
199 if (d->input.data == 0) { 199 if (d->input.data == 0) {
200 d->input.data = (unsigned char *)malloc(MPEG_BUFFER_SIZE); 200 d->input.data = (unsigned char *)malloc(MPEG_BUFFER_SIZE);
201 if (d->input.data == 0) { 201 if (d->input.data == 0) {
202 qDebug("error allocating input buffer"); 202 qDebug("error allocating input buffer");
203 return FALSE; 203 return FALSE;
204 } 204 }
205 d->input.length = 0; 205 d->input.length = 0;
206 } 206 }
@@ -228,8 +228,8 @@ bool LibMadPlugin::close() {
228 if (d->input.fdm) { 228 if (d->input.fdm) {
229 if (unmap_file(d->input.fdm, d->input.length) == -1) { 229 if (unmap_file(d->input.fdm, d->input.length) == -1) {
230 qDebug("error munmapping file"); 230 qDebug("error munmapping file");
231 result = FALSE; 231 result = FALSE;
232 } 232 }
233 d->input.fdm = 0; 233 d->input.fdm = 0;
234 d->input.data = 0; 234 d->input.data = 0;
235 } 235 }
@@ -239,3 +239,3 @@ bool LibMadPlugin::close() {
239 free(d->input.data); 239 free(d->input.data);
240 d->input.data = 0; 240 d->input.data = 0;
241 } 241 }
@@ -244,3 +244,3 @@ bool LibMadPlugin::close() {
244 qDebug("error closing file %s", d->input.path); 244 qDebug("error closing file %s", d->input.path);
245 result = FALSE; 245 result = FALSE;
246 } 246 }
@@ -325,3 +325,3 @@ bool LibMadPlugin::read() {
325 if (d->input.eof) 325 if (d->input.eof)
326 return FALSE; 326 return FALSE;
327 327
@@ -329,34 +329,34 @@ bool LibMadPlugin::read() {
329 if (d->input.fdm) { 329 if (d->input.fdm) {
330 unsigned long skip = 0; 330 unsigned long skip = 0;
331 331
332 if (d->stream.next_frame) { 332 if (d->stream.next_frame) {
333 struct stat stat; 333 struct stat stat;
334 334
335 if (fstat(d->input.fd, &stat) == -1) 335 if (fstat(d->input.fd, &stat) == -1)
336 return FALSE; 336 return FALSE;
337 337
338 if (stat.st_size + MAD_BUFFER_GUARD <= (signed)d->input.length) 338 if (stat.st_size + MAD_BUFFER_GUARD <= (signed)d->input.length)
339 return FALSE; 339 return FALSE;
340 340
341 // file size changed; update memory map 341 // file size changed; update memory map
342 skip = d->stream.next_frame - d->input.data; 342 skip = d->stream.next_frame - d->input.data;
343 343
344 if (unmap_file(d->input.fdm, d->input.length) == -1) { 344 if (unmap_file(d->input.fdm, d->input.length) == -1) {
345 d->input.fdm = 0; 345 d->input.fdm = 0;
346 d->input.data = 0; 346 d->input.data = 0;
347 return FALSE; 347 return FALSE;
348 } 348 }
349 349
350 d->input.length = stat.st_size; 350 d->input.length = stat.st_size;
351 351
352 d->input.fdm = map_file(d->input.fd, &d->input.length); 352 d->input.fdm = map_file(d->input.fd, &d->input.length);
353 if (d->input.fdm == 0) { 353 if (d->input.fdm == 0) {
354 d->input.data = 0; 354 d->input.data = 0;
355 return FALSE; 355 return FALSE;
356 } 356 }
357 357
358 d->input.data = (unsigned char *)d->input.fdm; 358 d->input.data = (unsigned char *)d->input.fdm;
359 } 359 }
360 360
361 mad_stream_buffer(&d->stream, d->input.data + skip, d->input.length - skip); 361 mad_stream_buffer(&d->stream, d->input.data + skip, d->input.length - skip);
362 362
@@ -365,26 +365,26 @@ bool LibMadPlugin::read() {
365 { 365 {
366 if (d->stream.next_frame) { 366 if (d->stream.next_frame) {
367 memmove(d->input.data, d->stream.next_frame, 367 memmove(d->input.data, d->stream.next_frame,
368 d->input.length = &d->input.data[d->input.length] - d->stream.next_frame); 368 d->input.length = &d->input.data[d->input.length] - d->stream.next_frame);
369 } 369 }
370 370
371 do { 371 do {
372 len = ::read(d->input.fd, d->input.data + d->input.length, MPEG_BUFFER_SIZE - d->input.length); 372 len = ::read(d->input.fd, d->input.data + d->input.length, MPEG_BUFFER_SIZE - d->input.length);
373 } 373 }
374 while (len == -1 && errno == EINTR); 374 while (len == -1 && errno == EINTR);
375 375
376 if (len == -1) { 376 if (len == -1) {
377 qDebug("error reading audio"); 377 qDebug("error reading audio");
378 return FALSE; 378 return FALSE;
379 } 379 }
380 else if (len == 0) { 380 else if (len == 0) {
381 d->input.eof = 1; 381 d->input.eof = 1;
382 382
383 assert(MPEG_BUFFER_SIZE - d->input.length >= MAD_BUFFER_GUARD); 383 assert(MPEG_BUFFER_SIZE - d->input.length >= MAD_BUFFER_GUARD);
384 384
385 while (len < MAD_BUFFER_GUARD) 385 while (len < MAD_BUFFER_GUARD)
386 d->input.data[d->input.length + len++] = 0; 386 d->input.data[d->input.length + len++] = 0;
387 } 387 }
388 388
389 mad_stream_buffer(&d->stream, d->input.data, d->input.length += len); 389 mad_stream_buffer(&d->stream, d->input.data, d->input.length += len);
390 } 390 }
@@ -413,12 +413,12 @@ inline void audio_pcm( short *data, unsigned int nsamples, mad_fixed_t *left, ma
413 if ( right ) { 413 if ( right ) {
414 while (nsamples--) { 414 while (nsamples--) {
415 data[0] = audio_linear_dither( *left++, left_err ); 415 data[0] = audio_linear_dither( *left++, left_err );
416 data[1] = audio_linear_dither( *right++, right_err ); 416 data[1] = audio_linear_dither( *right++, right_err );
417 data += 2; 417 data += 2;
418 } 418 }
419 } else { 419 } else {
420 while (nsamples--) { 420 while (nsamples--) {
421 data[0] = data[1] = audio_linear_dither( *left++, left_err ); 421 data[0] = data[1] = audio_linear_dither( *left++, left_err );
422 data += 2; 422 data += 2;
423 } 423 }
424 } 424 }
@@ -438,8 +438,8 @@ bool LibMadPlugin::decode( short *output, long samples, long& samplesMade ) {
438 if ( samples > maxBuffered ) 438 if ( samples > maxBuffered )
439 samples = maxBuffered; 439 samples = maxBuffered;
440 440
441 if ( d->flush ) { 441 if ( d->flush ) {
442 buffered = 0; 442 buffered = 0;
443 offset = 0; 443 offset = 0;
444 d->flush = FALSE; 444 d->flush = FALSE;
445 } 445 }
@@ -448,22 +448,22 @@ bool LibMadPlugin::decode( short *output, long samples, long& samplesMade ) {
448 448
449 while (mad_frame_decode(&d->frame, &d->stream) == -1) { 449 while (mad_frame_decode(&d->frame, &d->stream) == -1) {
450 if (!MAD_RECOVERABLE(d->stream.error)) { 450 if (!MAD_RECOVERABLE(d->stream.error)) {
451 debugMsg( "feed me" ); 451 debugMsg( "feed me" );
452 return FALSE; // Feed me 452 return FALSE; // Feed me
453 } 453 }
454 if ( d->stream.error == MAD_ERROR_BADCRC ) { 454 if ( d->stream.error == MAD_ERROR_BADCRC ) {
455 mad_frame_mute(&d->frame); 455 mad_frame_mute(&d->frame);
456 qDebug( "error decoding, bad crc" ); 456 qDebug( "error decoding, bad crc" );
457 } 457 }
458 } 458 }
459 459
460 mad_synth_frame(&d->synth, &d->frame); 460 mad_synth_frame(&d->synth, &d->frame);
461 int decodedSamples = d->synth.pcm.length; 461 int decodedSamples = d->synth.pcm.length;
462 memcpy( &(buffer[0][offset]), d->synth.pcm.samples[0], decodedSamples * sizeof(mad_fixed_t) ); 462 memcpy( &(buffer[0][offset]), d->synth.pcm.samples[0], decodedSamples * sizeof(mad_fixed_t) );
463 if ( d->synth.pcm.channels == 2 ) 463 if ( d->synth.pcm.channels == 2 )
464 memcpy( &(buffer[1][offset]), d->synth.pcm.samples[1], decodedSamples * sizeof(mad_fixed_t) ); 464 memcpy( &(buffer[1][offset]), d->synth.pcm.samples[1], decodedSamples * sizeof(mad_fixed_t) );
465 offset += decodedSamples; 465 offset += decodedSamples;
466 buffered += decodedSamples; 466 buffered += decodedSamples;
467 } 467 }
468 468//qApp->processEvents();
469 audio_pcm( output, samples, buffer[0], (d->synth.pcm.channels == 2) ? buffer[1] : 0 ); 469 audio_pcm( output, samples, buffer[0], (d->synth.pcm.channels == 2) ? buffer[1] : 0 );
@@ -495,19 +495,19 @@ bool LibMadPlugin::audioReadSamples( short *output, int /*channels*/, long sampl
495 if ( samples == 0 ) 495 if ( samples == 0 )
496 return FALSE; 496 return FALSE;
497 497
498 do { 498 do {
499 if ( needInput ) 499 if ( needInput )
500 if ( !read() ) { 500 if ( !read() ) {
501 // if ( d->input.eof ) 501// if ( d->input.eof )
502 // needInput = FALSE; 502// needInput = FALSE;
503 // else 503// else
504 return FALSE; 504 return FALSE;
505 } 505 }
506 506
507 needInput = FALSE; 507 needInput = FALSE;
508 508
509 if ( decode( output, samples, samplesMade ) ) 509 if ( decode( output, samples, samplesMade ) )
510 return TRUE; 510 return TRUE;
511 else 511 else
512 needInput = TRUE; 512 needInput = TRUE;
513 } 513 }
@@ -518,5 +518,5 @@ bool LibMadPlugin::audioReadSamples( short *output, int /*channels*/, long sampl
518 if ( firstTimeThru ) { 518 if ( firstTimeThru ) {
519 firstTimeThru = FALSE; 519 firstTimeThru = FALSE;
520 decode( output, samples, samplesMade ); 520 decode( output, samples, samplesMade );
521 return FALSE; 521 return FALSE;
522 } else 522 } else
@@ -539,4 +539,4 @@ void LibMadPlugin::printID3Tags() {
539 if ( ::lseek( d->input.fd, -128, SEEK_END ) == -1 ) { 539 if ( ::lseek( d->input.fd, -128, SEEK_END ) == -1 ) {
540 qDebug( "error seeking to id3 tags" ); 540 qDebug( "error seeking to id3 tags" );
541 return; 541 return;
542 } 542 }
@@ -544,4 +544,4 @@ void LibMadPlugin::printID3Tags() {
544 if ( ::read( d->input.fd, id3v1, 128 ) != 128 ) { 544 if ( ::read( d->input.fd, id3v1, 128 ) != 128 ) {
545 qDebug( "error reading in id3 tags" ); 545 qDebug( "error reading in id3 tags" );
546 return; 546 return;
547 } 547 }
@@ -549,23 +549,23 @@ void LibMadPlugin::printID3Tags() {
549 if ( ::strncmp( (const char *)id3v1, "TAG", 3 ) != 0 ) { 549 if ( ::strncmp( (const char *)id3v1, "TAG", 3 ) != 0 ) {
550 debugMsg( "sorry, no id3 tags" ); 550 debugMsg( "sorry, no id3 tags" );
551 } else { 551 } else {
552 int len[5] = { 30, 30, 30, 4, 30 }; 552 int len[5] = { 30, 30, 30, 4, 30 };
553 QString label[5] = { tr( "Title" ), tr( "Artist" ), tr( "Album" ), tr( "Year" ), tr( "Comment" ) }; 553 QString label[5] = { tr( "Title" ), tr( "Artist" ), tr( "Album" ), tr( "Year" ), tr( "Comment" ) };
554 char *ptr = id3v1 + 3, *ptr2 = ptr + len[0]; 554 char *ptr = id3v1 + 3, *ptr2 = ptr + len[0];
555 qDebug( "ID3 tags in file:" ); 555 qDebug( "ID3 tags in file:" );
556 info = ""; 556 info = "";
557 for ( int i = 0; i < 5; ptr += len[i], i++, ptr2 += len[i] ) { 557 for ( int i = 0; i < 5; ptr += len[i], i++, ptr2 += len[i] ) {
558 char push = *ptr2; 558 char push = *ptr2;
559 *ptr2 = '\0'; 559 *ptr2 = '\0';
560 char *ptr3 = ptr2; 560 char *ptr3 = ptr2;
561 while ( ptr3-1 >= ptr && isspace(ptr3[-1]) ) ptr3--; 561 while ( ptr3-1 >= ptr && isspace(ptr3[-1]) ) ptr3--;
562 char push2 = *ptr3; *ptr3 = '\0'; 562 char push2 = *ptr3; *ptr3 = '\0';
563 if ( strcmp( ptr, "" ) ) 563 if ( strcmp( ptr, "" ) )
564 info += ( i != 0 ? ", " : "" ) + label[i] + ": " + ptr; 564 info += ( i != 0 ? ", " : "" ) + label[i] + ": " + ptr;
565 //qDebug( info.latin1() ); 565 //qDebug( info.latin1() );
566 *ptr3 = push2; 566 *ptr3 = push2;
567 *ptr2 = push; 567 *ptr2 = push;
568 } 568 }
569 if (id3v1[126] == 0 && id3v1[127] != 0) 569 if (id3v1[126] == 0 && id3v1[127] != 0)
570 info += tr( ", Track: " ) + id3v1[127]; 570 info += tr( ", Track: " ) + id3v1[127];
571 } 571 }
@@ -573,3 +573,3 @@ void LibMadPlugin::printID3Tags() {
573 if ( ::lseek(d->input.fd, 0, SEEK_SET) == -1 ) { 573 if ( ::lseek(d->input.fd, 0, SEEK_SET) == -1 ) {
574 qDebug( "error seeking back to beginning" ); 574 qDebug( "error seeking back to beginning" );
575 return; 575 return;
diff --git a/core/multimedia/opieplayer/libmad/libmadplugin.h b/core/multimedia/opieplayer/libmad/libmadplugin.h
index d85e0d4..d163458 100644
--- a/core/multimedia/opieplayer/libmad/libmadplugin.h
+++ b/core/multimedia/opieplayer/libmad/libmadplugin.h
@@ -23,3 +23,4 @@
23#include <qstring.h> 23#include <qstring.h>
24#include <qpe/mediaplayerplugininterface.h> 24//#include <qpe/mediaplayerplugininterface.h>
25#include "../mediaplayerplugininterface.h"
25 26
@@ -54,2 +55,3 @@ public:
54 bool audioSetSample( long sample, int stream ); 55 bool audioSetSample( long sample, int stream );
56 int audioBitsPerSample(int) {return 0;}
55 long audioGetSample( int stream ); 57 long audioGetSample( int stream );
diff --git a/core/multimedia/opieplayer/libmad/libmadpluginimpl.h b/core/multimedia/opieplayer/libmad/libmadpluginimpl.h
index 2c5ed3b..bc864ee 100644
--- a/core/multimedia/opieplayer/libmad/libmadpluginimpl.h
+++ b/core/multimedia/opieplayer/libmad/libmadpluginimpl.h
@@ -22,3 +22,4 @@
22 22
23#include <qpe/mediaplayerplugininterface.h> 23//#include <qpe/mediaplayerplugininterface.h>
24#include "../mediaplayerplugininterface.h"
24 25
@@ -43,3 +44,2 @@ public:
43 virtual MediaPlayerEncoder *encoder(); 44 virtual MediaPlayerEncoder *encoder();
44
45private: 45private:
diff --git a/core/multimedia/opieplayer/libmpeg3/Makefile.in b/core/multimedia/opieplayer/libmpeg3/Makefile.in
index 154f85d..d255e4f 100644
--- a/core/multimedia/opieplayer/libmpeg3/Makefile.in
+++ b/core/multimedia/opieplayer/libmpeg3/Makefile.in
@@ -178,3 +178,4 @@ libmpeg3plugin.o: libmpeg3plugin.cpp \
178 video/mpeg3video.h \ 178 video/mpeg3video.h \
179 mpeg3protos.h 179 mpeg3protos.h \
180 ../mediaplayerplugininterface.h
180 181
@@ -194,2 +195,3 @@ libmpeg3pluginimpl.o: libmpeg3pluginimpl.cpp \
194 mpeg3protos.h \ 195 mpeg3protos.h \
196 ../mediaplayerplugininterface.h \
195 libmpeg3pluginimpl.h 197 libmpeg3pluginimpl.h
@@ -416,3 +418,3 @@ audio/layer2.o: audio/layer2.c \
416audio/layer3.o: audio/layer3.c \ 418audio/layer3.o: audio/layer3.c \
417 audio/huffman.h \ 419 huffman.h \
418 audio/mpeg3audio.h \ 420 audio/mpeg3audio.h \
diff --git a/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro b/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro
index b1426d1..e50aa4e 100644
--- a/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro
+++ b/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro
@@ -1,39 +1,40 @@
1 TEMPLATE= lib 1TEMPLATE = lib
2 CONFIG += qt warn_on release 2CONFIG += qt warn_on release
3 HEADERS = libmpeg3plugin.h libmpeg3pluginimpl.h 3HEADERS = libmpeg3plugin.h libmpeg3pluginimpl.h
4 SOURCES = libmpeg3plugin.cpp libmpeg3pluginimpl.cpp \ 4SOURCES = libmpeg3plugin.cpp libmpeg3pluginimpl.cpp \
5 bitstream.c \ 5 bitstream.c \
6 libmpeg3.c \ 6 libmpeg3.c \
7 mpeg3atrack.c \ 7 mpeg3atrack.c \
8 mpeg3css.c \ 8 mpeg3css.c \
9 mpeg3demux.c \ 9 mpeg3demux.c \
10 mpeg3io.c \ 10 mpeg3io.c \
11 mpeg3title.c \ 11 mpeg3title.c \
12 mpeg3vtrack.c \ 12 mpeg3vtrack.c \
13 audio/ac3.c \ 13 audio/ac3.c \
14 audio/bit_allocation.c \ 14 audio/bit_allocation.c \
15 audio/dct.c \ 15 audio/dct.c \
16 audio/exponents.c \ 16 audio/exponents.c \
17 audio/header.c \ 17 audio/header.c \
18 audio/layer2.c \ 18 audio/layer2.c \
19 audio/layer3.c \ 19 audio/layer3.c \
20 audio/mantissa.c \ 20 audio/mantissa.c \
21 audio/mpeg3audio.c \ 21 audio/mpeg3audio.c \
22 audio/pcm.c \ 22 audio/pcm.c \
23 audio/synthesizers.c \ 23 audio/synthesizers.c \
24 audio/tables.c \ 24 audio/tables.c \
25 video/getpicture.c \ 25 video/getpicture.c \
26 video/headers.c \ 26 video/headers.c \
27 video/idct.c \ 27 video/idct.c \
28 video/macroblocks.c \ 28 video/macroblocks.c \
29 video/mmxtest.c \ 29 video/mmxtest.c \
30 video/motion.c \ 30 video/motion.c \
31 video/mpeg3video.c \ 31 video/mpeg3video.c \
32 video/output.c \ 32 video/output.c \
33 video/reconstruct.c \ 33 video/reconstruct.c \
34 video/seek.c \ 34 video/seek.c \
35 video/slice.c \ 35 video/slice.c \
36 video/vlc.c 36 video/vlc.c
37 TARGET = mpeg3plugin 37TARGET = mpeg3plugin
38 DESTDIR = ../../plugins/codecs 38TMAKE_CC=g++
39DESTDIR = ../../plugins/codecs
39INCLUDEPATH += $(OPIEDIR)/include .. 40INCLUDEPATH += $(OPIEDIR)/include ..
@@ -41,2 +42,2 @@ DEPENDPATH += ../$(OPIEDIR)/include ..
41LIBS += -lqpe -lpthread -lm 42LIBS += -lqpe -lpthread -lm
42 VERSION = 1.0.0 43VERSION = 1.0.0
diff --git a/core/multimedia/opieplayer/libmpeg3/libmpeg3plugin.h b/core/multimedia/opieplayer/libmpeg3/libmpeg3plugin.h
index e0eb930..bd31706 100644
--- a/core/multimedia/opieplayer/libmpeg3/libmpeg3plugin.h
+++ b/core/multimedia/opieplayer/libmpeg3/libmpeg3plugin.h
@@ -26,3 +26,4 @@
26#include "mpeg3protos.h" 26#include "mpeg3protos.h"
27#include <qpe/mediaplayerplugininterface.h> 27//#include <qpe/mediaplayerplugininterface.h>
28#include "../mediaplayerplugininterface.h"
28 29
@@ -52,2 +53,3 @@ public:
52 int audioFrequency( int stream ) { return file ? mpeg3_sample_rate( file, stream ) : 0; } 53 int audioFrequency( int stream ) { return file ? mpeg3_sample_rate( file, stream ) : 0; }
54 int audioBitsPerSample(int) { return 0;}
53 int audioSamples( int stream ) { return file ? mpeg3_audio_samples( file, stream ) : 0; } 55 int audioSamples( int stream ) { return file ? mpeg3_audio_samples( file, stream ) : 0; }
diff --git a/core/multimedia/opieplayer/libmpeg3/libmpeg3pluginimpl.h b/core/multimedia/opieplayer/libmpeg3/libmpeg3pluginimpl.h
index e9926f4..a2f5211 100644
--- a/core/multimedia/opieplayer/libmpeg3/libmpeg3pluginimpl.h
+++ b/core/multimedia/opieplayer/libmpeg3/libmpeg3pluginimpl.h
@@ -22,3 +22,4 @@
22 22
23#include <qpe/mediaplayerplugininterface.h> 23//#include <qpe/mediaplayerplugininterface.h>
24#include "../mediaplayerplugininterface.h"
24 25
diff --git a/core/multimedia/opieplayer/loopcontrol.cpp b/core/multimedia/opieplayer/loopcontrol.cpp
index dd466ed..90a7cc6 100644
--- a/core/multimedia/opieplayer/loopcontrol.cpp
+++ b/core/multimedia/opieplayer/loopcontrol.cpp
@@ -1,5 +1,5 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. 2** Copyright (C) 2000 Trolltech AS. All rights reserved.
3** 3**
4** This file is part of the Qtopia Environment. 4** This file is part of Qtopia Environment.
5** 5**
@@ -19,8 +19,10 @@
19**********************************************************************/ 19**********************************************************************/
20// L.J.Potter added changes Fri 02-15-2002
21
22
20#include <qpe/qpeapplication.h> 23#include <qpe/qpeapplication.h>
21#ifdef Q_WS_QWS
22 24
25#ifdef Q_WS_QWS
23#include <qpe/qcopenvelope_qws.h> 26#include <qpe/qcopenvelope_qws.h>
24#endif 27#endif
25#include <qpe/mediaplayerplugininterface.h>
26#include <stdio.h> 28#include <stdio.h>
@@ -34,2 +36,3 @@
34#include "audiodevice.h" 36#include "audiodevice.h"
37#include "mediaplayerplugininterface.h"
35#include "mediaplayerstate.h" 38#include "mediaplayerstate.h"
@@ -45,9 +48,9 @@ extern MediaPlayerState *mediaPlayerState;
45 48
46 static char *audioBuffer = NULL; 49static char *audioBuffer = NULL;
47static AudioDevice *audioDevice = NULL; 50static AudioDevice *audioDevice = NULL;
48 static bool disabledSuspendScreenSaver = FALSE; 51static bool disabledSuspendScreenSaver = FALSE;
49 static bool previousSuspendMode = FALSE; 52static bool previousSuspendMode = FALSE;
50 53
51 54
52 pthread_taudio_tid; 55pthread_t audio_tid;
53pthread_attr_t audio_attr; 56pthread_attr_t audio_attr;
@@ -59,6 +62,6 @@ public:
59 Mutex() { 62 Mutex() {
60 pthread_mutexattr_t attr; 63 pthread_mutexattr_t attr;
61 pthread_mutexattr_init( &attr ); 64 pthread_mutexattr_init( &attr );
62 pthread_mutex_init( &mutex, &attr ); 65 pthread_mutex_init( &mutex, &attr );
63 pthread_mutexattr_destroy( &attr ); 66 pthread_mutexattr_destroy( &attr );
64 } 67 }
@@ -66,3 +69,3 @@ public:
66 ~Mutex() { 69 ~Mutex() {
67 pthread_mutex_destroy( &mutex ); 70 pthread_mutex_destroy( &mutex );
68 } 71 }
@@ -70,3 +73,3 @@ public:
70 void lock() { 73 void lock() {
71 pthread_mutex_lock( &mutex ); 74 pthread_mutex_lock( &mutex );
72 } 75 }
@@ -74,3 +77,3 @@ public:
74 void unlock() { 77 void unlock() {
75 pthread_mutex_unlock( &mutex ); 78 pthread_mutex_unlock( &mutex );
76 } 79 }
@@ -84,6 +87,6 @@ void *startAudioThread( void *ptr ) {
84 while ( TRUE ) { 87 while ( TRUE ) {
85 if ( threadOkToGo && mpegView->moreAudio ) 88 if ( threadOkToGo && mpegView->moreAudio )
86 mpegView->startAudio(); 89 mpegView->startAudio();
87 else 90 else
88 usleep( 10000 ); // Semi-buzy-wait till we are playing again 91 usleep( 10000 ); // Semi-buzy-wait till we are playing again
89 } 92 }
@@ -104,20 +107,15 @@ LoopControl::LoopControl( QObject *parent, const char *name )
104 pthread_attr_init(&audio_attr); 107 pthread_attr_init(&audio_attr);
105 108#define USE_REALTIME_AUDIO_THREAD
106 if ( getuid() == 0 ) { 109#ifdef USE_REALTIME_AUDIO_THREAD
107 printf("true, guid = %i\n", getuid()); 110 // Attempt to set it to real-time round robin
108 111 if ( pthread_attr_setschedpolicy( &audio_attr, SCHED_RR ) == 0 ) {
109 // Attempt to set it to real-time round robin 112 sched_param params;
110 if ( pthread_attr_setschedpolicy( &audio_attr, SCHED_RR ) == 0 ) { 113 params.sched_priority = 50;
111 sched_param params; 114 pthread_attr_setschedparam(&audio_attr,&params);
112 params.sched_priority = 50; 115 } else {
113 pthread_attr_setschedparam(&audio_attr,&params); 116 qDebug( "Error setting up a realtime thread, reverting to using a normal thread." );
114 } else { 117 pthread_attr_destroy(&audio_attr);
115 qDebug( "Error setting up a realtime thread, reverting to using a normal thread." ); 118 pthread_attr_init(&audio_attr);
116 pthread_attr_destroy(&audio_attr);
117 pthread_attr_init(&audio_attr);
118 }
119 } 119 }
120// printf("false, guid = %i\n", getuid()); 120#endif
121 usleep( 100 );
122
123 pthread_create(&audio_tid, &audio_attr, (void * (*)(void *))startAudioThread, this); 121 pthread_create(&audio_tid, &audio_attr, (void * (*)(void *))startAudioThread, this);
@@ -138,10 +136,10 @@ void LoopControl::timerEvent( QTimerEvent *te ) {
138 if ( te->timerId() == videoId ) 136 if ( te->timerId() == videoId )
139 startVideo(); 137 startVideo();
140 138
141 if ( te->timerId() == sliderId ) { 139 if ( te->timerId() == sliderId ) {
142 if ( hasAudioChannel && !hasVideoChannel && moreAudio ) { 140 if ( hasAudioChannel && !hasVideoChannel && moreAudio ) {
143 mediaPlayerState->updatePosition( audioSampleCounter ); 141 mediaPlayerState->updatePosition( audioSampleCounter );
144 } else if ( hasVideoChannel && moreVideo ) { 142 } else if ( hasVideoChannel && moreVideo ) {
145 mediaPlayerState->updatePosition( current_frame ); 143 mediaPlayerState->updatePosition( current_frame );
146 } 144 }
147 } 145 }
@@ -159,22 +157,22 @@ void LoopControl::setPosition( long pos ) {
159 if ( hasVideoChannel && hasAudioChannel ) { 157 if ( hasVideoChannel && hasAudioChannel ) {
160 playtime.restart(); 158 playtime.restart();
161 playtime = playtime.addMSecs( long((double)-pos * 1000.0 / framerate) ); 159 playtime = playtime.addMSecs( long((double)-pos * 1000.0 / framerate) );
162 current_frame = pos + 1; 160 current_frame = pos + 1;
163 mediaPlayerState->curDecoder()->videoSetFrame( current_frame, stream ); 161 mediaPlayerState->curDecoder()->videoSetFrame( current_frame, stream );
164 prev_frame = current_frame - 1; 162 prev_frame = current_frame - 1;
165 currentSample = (int)( (double)current_frame * freq / framerate ); 163 currentSample = (int)( (double)current_frame * freq / framerate );
166 mediaPlayerState->curDecoder()->audioSetSample( currentSample, stream ); 164 mediaPlayerState->curDecoder()->audioSetSample( currentSample, stream );
167 audioSampleCounter = currentSample - 1; 165 audioSampleCounter = currentSample - 1;
168 } else if ( hasVideoChannel ) { 166 } else if ( hasVideoChannel ) {
169 playtime.restart(); 167 playtime.restart();
170 playtime = playtime.addMSecs( long((double)-pos * 1000.0 / framerate) ); 168 playtime = playtime.addMSecs( long((double)-pos * 1000.0 / framerate) );
171 current_frame = pos + 1; 169 current_frame = pos + 1;
172 mediaPlayerState->curDecoder()->videoSetFrame( current_frame, stream ); 170 mediaPlayerState->curDecoder()->videoSetFrame( current_frame, stream );
173 prev_frame = current_frame - 1; 171 prev_frame = current_frame - 1;
174 } else if ( hasAudioChannel ) { 172 } else if ( hasAudioChannel ) {
175 playtime.restart(); 173 playtime.restart();
176 playtime = playtime.addMSecs( long((double)-pos * 1000.0 / freq) ); 174 playtime = playtime.addMSecs( long((double)-pos * 1000.0 / freq) );
177 currentSample = pos + 1; 175 currentSample = pos + 1;
178 mediaPlayerState->curDecoder()->audioSetSample( currentSample, stream ); 176 mediaPlayerState->curDecoder()->audioSetSample( currentSample, stream );
179 audioSampleCounter = currentSample - 1; 177 audioSampleCounter = currentSample - 1;
180 } 178 }
@@ -191,28 +189,28 @@ void LoopControl::startVideo() {
191 189
192 if ( hasAudioChannel && !isMuted ) { 190 if ( hasAudioChannel && !isMuted ) {
193 191
194 current_frame = long( playtime.elapsed() * framerate / 1000 ); 192 current_frame = long( playtime.elapsed() * framerate / 1000 );
195 193
196 if ( prev_frame != -1 && current_frame <= prev_frame ) 194 if ( prev_frame != -1 && current_frame <= prev_frame )
197 return; 195 return;
198 196
199 } else { 197 } else {
200 // Don't skip 198 // Don't skip
201 current_frame++; 199 current_frame++;
202 } 200 }
203 201
204 if ( prev_frame == -1 || current_frame > prev_frame ) { 202 if ( prev_frame == -1 || current_frame > prev_frame ) {
205 if ( current_frame > prev_frame + 1 ) { 203 if ( current_frame > prev_frame + 1 ) {
206 mediaPlayerState->curDecoder()->videoSetFrame( current_frame, stream ); 204 mediaPlayerState->curDecoder()->videoSetFrame( current_frame, stream );
207 } 205 }
208 moreVideo = videoUI->playVideo(); 206 moreVideo = videoUI->playVideo();
209 prev_frame = current_frame; 207 prev_frame = current_frame;
210 } 208 }
211 209
212 } else { 210 } else {
213 211
214 moreVideo = FALSE; 212 moreVideo = FALSE;
215 killTimer( videoId ); 213 killTimer( videoId );
216 214
217 } 215 }
218 216
@@ -228,32 +226,33 @@ void LoopControl::startAudio() {
228 226
229 if ( !isMuted && mediaPlayerState->curDecoder() ) { 227 if ( !isMuted && mediaPlayerState->curDecoder() ) {
230 228
231 currentSample = audioSampleCounter + 1; 229 currentSample = audioSampleCounter + 1;
232 230
233 if ( currentSample != audioSampleCounter + 1 ) 231 if ( currentSample != audioSampleCounter + 1 )
234 qDebug("out of sync with decoder %i %i", currentSample, audioSampleCounter); 232 qDebug("out of sync with decoder %i %i", currentSample, audioSampleCounter);
235 233
236 long samplesRead = 0; 234 long samplesRead = 0;
237 mediaPlayerState->curDecoder()->audioReadSamples( (short*)audioBuffer, channels, 1024, samplesRead, stream ); 235 bool readOk=mediaPlayerState->curDecoder()->audioReadSamples( (short*)audioBuffer, channels, 1024, samplesRead, stream );
238 long sampleWeShouldBeAt = long( playtime.elapsed() ) * freq / 1000; 236 long sampleWeShouldBeAt = long( playtime.elapsed() ) * freq / 1000;
239 long sampleWaitTime = currentSample - sampleWeShouldBeAt; 237 long sampleWaitTime = currentSample - sampleWeShouldBeAt;
240 238
241 if ( ( sampleWaitTime > 2000 ) && ( sampleWaitTime < 20000 ) ) { 239 if ( ( sampleWaitTime > 2000 ) && ( sampleWaitTime < 20000 ) ) {
242 usleep( (long)((double)sampleWaitTime * 1000000.0 / freq) ); 240 usleep( (long)((double)sampleWaitTime * 1000000.0 / freq) );
243 } else if ( sampleWaitTime <= -5000 ) { 241 }
244 qDebug("need to catch up by: %li (%i,%li)", -sampleWaitTime, currentSample, sampleWeShouldBeAt ); 242 else if ( sampleWaitTime <= -5000 ) {
245 //mediaPlayerState->curDecoder()->audioSetSample( sampleWeShouldBeAt, stream ); 243 qDebug("need to catch up by: %li (%i,%li)", -sampleWaitTime, currentSample, sampleWeShouldBeAt );
246 currentSample = sampleWeShouldBeAt; 244 //mediaPlayerState->curDecoder()->audioSetSample( sampleWeShouldBeAt, stream );
247 } 245 currentSample = sampleWeShouldBeAt;
246 }
248 247
249 audioDevice->write( audioBuffer, samplesRead * 2 * channels ); 248 audioDevice->write( audioBuffer, samplesRead * 2 * channels );
250 audioSampleCounter = currentSample + samplesRead - 1; 249 audioSampleCounter = currentSample + samplesRead - 1;
251 250
252 moreAudio = audioSampleCounter <= total_audio_samples; 251 moreAudio = readOk && (audioSampleCounter <= total_audio_samples);
253 252
254 } else { 253 } else {
255 254
256 moreAudio = FALSE; 255 moreAudio = FALSE;
257 256
258 } 257 }
259 258
@@ -270,3 +269,3 @@ void LoopControl::killTimers() {
270 if ( hasVideoChannel ) 269 if ( hasVideoChannel )
271 killTimer( videoId ); 270 killTimer( videoId );
272 killTimer( sliderId ); 271 killTimer( sliderId );
@@ -286,5 +285,5 @@ void LoopControl::startTimers() {
286 if ( hasVideoChannel ) { 285 if ( hasVideoChannel ) {
287 moreVideo = TRUE; 286 moreVideo = TRUE;
288 int mSecsBetweenFrames = (int)(100 / framerate); // 10% of the real value 287 int mSecsBetweenFrames = (int)(100 / framerate); // 10% of the real value
289 videoId = startTimer( mSecsBetweenFrames ); 288 videoId = startTimer( mSecsBetweenFrames );
290 } 289 }
@@ -292,4 +291,4 @@ void LoopControl::startTimers() {
292 if ( hasAudioChannel ) { 291 if ( hasAudioChannel ) {
293 moreAudio = TRUE; 292 moreAudio = TRUE;
294 threadOkToGo = TRUE; 293 threadOkToGo = TRUE;
295 } 294 }
@@ -305,12 +304,12 @@ void LoopControl::setPaused( bool pause ) {
305 if ( !mediaPlayerState->curDecoder() || !mediaPlayerState->curDecoder()->isOpen() ) 304 if ( !mediaPlayerState->curDecoder() || !mediaPlayerState->curDecoder()->isOpen() )
306 return; 305 return;
307 306
308 if ( pause ) { 307 if ( pause ) {
309 killTimers(); 308 killTimers();
310 } else { 309 } else {
311 // Force an update of the position 310 // Force an update of the position
312 mediaPlayerState->setPosition( mediaPlayerState->position() + 1 ); 311 mediaPlayerState->setPosition( mediaPlayerState->position() + 1 );
313 mediaPlayerState->setPosition( mediaPlayerState->position() - 1 ); 312 mediaPlayerState->setPosition( mediaPlayerState->position() - 1 );
314 // Just like we never stopped 313 // Just like we never stopped
315 startTimers(); 314 startTimers();
316 } 315 }
@@ -323,5 +322,5 @@ void LoopControl::stop( bool willPlayAgainShortly ) {
323 if ( !willPlayAgainShortly && disabledSuspendScreenSaver ) { 322 if ( !willPlayAgainShortly && disabledSuspendScreenSaver ) {
324 disabledSuspendScreenSaver = FALSE; 323 disabledSuspendScreenSaver = FALSE;
325 // Re-enable the suspend mode 324 // Re-enable the suspend mode
326 QCopEnvelope("QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Enable; 325 QCopEnvelope("QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Enable;
327 } 326 }
@@ -331,16 +330,16 @@ void LoopControl::stop( bool willPlayAgainShortly ) {
331 330
332 killTimers(); 331 killTimers();
333 332
334 audioMutex->lock(); 333 audioMutex->lock();
335 334
336 mediaPlayerState->curDecoder()->close(); 335 mediaPlayerState->curDecoder()->close();
337 336
338 if ( audioDevice ) { 337 if ( audioDevice ) {
339 delete audioDevice; 338 delete audioDevice;
340 delete audioBuffer; 339 delete audioBuffer;
341 audioDevice = 0; 340 audioDevice = 0;
342 audioBuffer = 0; 341 audioBuffer = 0;
343 } 342 }
344 343
345 audioMutex->unlock(); 344 audioMutex->unlock();
346 345
@@ -363,11 +362,11 @@ bool LoopControl::init( const QString& filename ) {
363 if ( mediaPlayerState->curDecoder()->pluginName() == QString("LibMadPlugin") ) { 362 if ( mediaPlayerState->curDecoder()->pluginName() == QString("LibMadPlugin") ) {
364 if ( mediaPlayerState->libMpeg3Decoder() && mediaPlayerState->libMpeg3Decoder()->open( filename ) ) { 363 if ( mediaPlayerState->libMpeg3Decoder() && mediaPlayerState->libMpeg3Decoder()->open( filename ) ) {
365 total_audio_samples = mediaPlayerState->libMpeg3Decoder()->audioSamples( 0 ); 364 total_audio_samples = mediaPlayerState->libMpeg3Decoder()->audioSamples( 0 );
366 mediaPlayerState->libMpeg3Decoder()->close(); 365 mediaPlayerState->libMpeg3Decoder()->close();
367 } 366 }
368 } 367 }
369 368
370 if ( !mediaPlayerState->curDecoder()|| !mediaPlayerState->curDecoder()->open( filename ) ) { 369 if ( !mediaPlayerState->curDecoder()|| !mediaPlayerState->curDecoder()->open( filename ) ) {
371 audioMutex->unlock(); 370 audioMutex->unlock();
372 return FALSE; 371 return FALSE;
373 } 372 }
@@ -378,30 +377,30 @@ bool LoopControl::init( const QString& filename ) {
378 if ( hasAudioChannel ) { 377 if ( hasAudioChannel ) {
379 int astream = 0; 378 int astream = 0;
380 379
381 channels = mediaPlayerState->curDecoder()->audioChannels( astream ); 380 channels = mediaPlayerState->curDecoder()->audioChannels( astream );
382 DecodeLoopDebug(( "channels = %d\n", channels )); 381 qDebug( "LC- channels = %d", channels );
383 382
384 if ( !total_audio_samples ) 383 if ( !total_audio_samples )
385 total_audio_samples = mediaPlayerState->curDecoder()->audioSamples( astream ); 384 total_audio_samples = mediaPlayerState->curDecoder()->audioSamples( astream );
386 385
387 total_audio_samples += 1000; 386// total_audio_samples += 1000;
388 387
389 mediaPlayerState->setLength( total_audio_samples ); 388 mediaPlayerState->setLength( total_audio_samples );
390 389
391 freq = mediaPlayerState->curDecoder()->audioFrequency( astream ); 390 freq = mediaPlayerState->curDecoder()->audioFrequency( astream );
392 DecodeLoopDebug(( "frequency = %d\n", freq )); 391 qDebug( "LC- frequency = %d", freq );
393 392
394 audioSampleCounter = 0; 393 audioSampleCounter = 0;
395 394
396 static const int bytes_per_sample = 2; //16 bit 395 int bits_per_sample = mediaPlayerState->curDecoder()->audioBitsPerSample( astream);
397 396
398 audioDevice = new AudioDevice( freq, channels, bytes_per_sample ); 397 audioDevice = new AudioDevice( freq, channels, bits_per_sample);
399 audioBuffer = new char[ audioDevice->bufferSize() ]; 398 audioBuffer = new char[ audioDevice->bufferSize() ];
400 channels = audioDevice->channels(); 399 channels = audioDevice->channels();
401 400
402 //### must check which frequency is actually used. 401 //### must check which frequency is actually used.
403 static const int size = 1; 402 static const int size = 1;
404 short int buf[size]; 403 short int buf[size];
405 long samplesRead = 0; 404 long samplesRead = 0;
406 mediaPlayerState->curDecoder()->audioReadSamples( buf, channels, size, samplesRead, stream ); 405 mediaPlayerState->curDecoder()->audioReadSamples( buf, channels, size, samplesRead, stream );
407 } 406 }
@@ -409,17 +408,17 @@ bool LoopControl::init( const QString& filename ) {
409 if ( hasVideoChannel ) { 408 if ( hasVideoChannel ) {
410 total_video_frames = mediaPlayerState->curDecoder()->videoFrames( stream ); 409 total_video_frames = mediaPlayerState->curDecoder()->videoFrames( stream );
411 410
412 mediaPlayerState->setLength( total_video_frames ); 411 mediaPlayerState->setLength( total_video_frames );
413 412
414 framerate = mediaPlayerState->curDecoder()->videoFrameRate( stream ); 413 framerate = mediaPlayerState->curDecoder()->videoFrameRate( stream );
415 DecodeLoopDebug(( "Frame rate %g total %ld", framerate, total_video_frames )); 414 DecodeLoopDebug(( "Frame rate %g total %ld", framerate, total_video_frames ));
416 415
417 if ( framerate <= 1.0 ) { 416 if ( framerate <= 1.0 ) {
418 DecodeLoopDebug(( "Crazy frame rate, resetting to sensible" )); 417 DecodeLoopDebug(( "Crazy frame rate, resetting to sensible" ));
419 framerate = 25; 418 framerate = 25;
420 } 419 }
421 420
422 if ( total_video_frames == 1 ) { 421 if ( total_video_frames == 1 ) {
423 DecodeLoopDebug(( "Cannot seek to frame" )); 422 DecodeLoopDebug(( "Cannot seek to frame" ));
424 } 423 }
425 424
@@ -443,7 +442,7 @@ void LoopControl::play() {
443 if ( !disabledSuspendScreenSaver || previousSuspendMode != hasVideoChannel ) { 442 if ( !disabledSuspendScreenSaver || previousSuspendMode != hasVideoChannel ) {
444 disabledSuspendScreenSaver = TRUE; 443 disabledSuspendScreenSaver = TRUE;
445 previousSuspendMode = hasVideoChannel; 444 previousSuspendMode = hasVideoChannel;
446 // Stop the screen from blanking and power saving state 445 // Stop the screen from blanking and power saving state
447 QCopEnvelope("QPE/System", "setScreenSaverMode(int)" ) 446 QCopEnvelope("QPE/System", "setScreenSaverMode(int)" )
448 << ( hasVideoChannel ? QPEApplication::Disable : QPEApplication::DisableSuspend ); 447 << ( hasVideoChannel ? QPEApplication::Disable : QPEApplication::DisableSuspend );
449 } 448 }
@@ -458,10 +457,10 @@ void LoopControl::setMute( bool on ) {
458 if ( on != isMuted ) { 457 if ( on != isMuted ) {
459 isMuted = on; 458 isMuted = on;
460 if ( !on ) { 459 if ( !on ) {
461 // Force an update of the position 460 // Force an update of the position
462 mediaPlayerState->setPosition( mediaPlayerState->position() + 1 ); 461 mediaPlayerState->setPosition( mediaPlayerState->position() + 1 );
463 mediaPlayerState->setPosition( mediaPlayerState->position() - 1 ); 462 mediaPlayerState->setPosition( mediaPlayerState->position() - 1 );
464 // Resume playing audio 463 // Resume playing audio
465 moreAudio = TRUE; 464 moreAudio = TRUE;
466 } 465 }
467 } 466 }
diff --git a/core/multimedia/opieplayer/loopcontrol.h b/core/multimedia/opieplayer/loopcontrol.h
index 3191259..f4a7fcd 100644
--- a/core/multimedia/opieplayer/loopcontrol.h
+++ b/core/multimedia/opieplayer/loopcontrol.h
@@ -1,5 +1,5 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. 2** Copyright (C) 2000 Trolltech AS. All rights reserved.
3** 3**
4** This file is part of the Qtopia Environment. 4** This file is part of Qtopia Environment.
5** 5**
@@ -19,2 +19,5 @@
19**********************************************************************/ 19**********************************************************************/
20// L.J.Potter added changes Fri 02-15-2002
21
22
20#ifndef MPEGVIEW_H 23#ifndef MPEGVIEW_H
@@ -22,2 +25,3 @@
22 25
26
23#include <qwidget.h> 27#include <qwidget.h>
diff --git a/core/multimedia/opieplayer/loopcontrol_threaded.cpp b/core/multimedia/opieplayer/loopcontrol_threaded.cpp
index eb89b85..c7dc7a8 100644
--- a/core/multimedia/opieplayer/loopcontrol_threaded.cpp
+++ b/core/multimedia/opieplayer/loopcontrol_threaded.cpp
@@ -1,5 +1,5 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. 2** Copyright (C) 2000 Trolltech AS. All rights reserved.
3** 3**
4** This file is part of the Qtopia Environment. 4** This file is part of Qtopia Environment.
5** 5**
@@ -19,6 +19,4 @@
19**********************************************************************/ 19**********************************************************************/
20
21#define _REENTRANT 20#define _REENTRANT
22 21
23
24#include <qpe/qpeapplication.h> 22#include <qpe/qpeapplication.h>
@@ -29,3 +27,3 @@
29#endif 27#endif
30#include <qpe/mediaplayerplugininterface.h> 28#include "mediaplayerplugininterface.h"
31#include <stdio.h> 29#include <stdio.h>
diff --git a/core/multimedia/opieplayer/loopcontrol_threaded.h b/core/multimedia/opieplayer/loopcontrol_threaded.h
index ced6ac8..1031169 100644
--- a/core/multimedia/opieplayer/loopcontrol_threaded.h
+++ b/core/multimedia/opieplayer/loopcontrol_threaded.h
@@ -1,5 +1,5 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. 2** Copyright (C) 2000 Trolltech AS. All rights reserved.
3** 3**
4** This file is part of the Qtopia Environment. 4** This file is part of Qtopia Environment.
5** 5**
@@ -22,4 +22,2 @@
22 22
23
24
25#include <qwidget.h> 23#include <qwidget.h>
diff --git a/core/multimedia/opieplayer/mediaplayerplugininterface.h b/core/multimedia/opieplayer/mediaplayerplugininterface.h
index aeeffde..339b2e4 100644
--- a/core/multimedia/opieplayer/mediaplayerplugininterface.h
+++ b/core/multimedia/opieplayer/mediaplayerplugininterface.h
@@ -22,3 +22,2 @@
22 22
23
24#include <qpe/qcom.h> 23#include <qpe/qcom.h>
@@ -64,8 +63,3 @@ public:
64 virtual long audioGetSample( int stream ) = 0; 63 virtual long audioGetSample( int stream ) = 0;
65// virtual bool audioReadMonoSamples( short *samples, long samples, long& samplesRead, int stream ) = 0;
66// virtual bool audioReadStereoSamples( short *samples, long samples, long& samplesRead, int stream ) = 0;
67 virtual bool audioReadSamples( short *samples, int channels, long samples, long& samplesRead, int stream ) = 0; 64 virtual bool audioReadSamples( short *samples, int channels, long samples, long& samplesRead, int stream ) = 0;
68 // Libmpeg3 functions, perhaps good for reading an audio file with 5 channels or something!
69// virtual bool audioReadSamples( short *samples, int channel, long samples, int stream ) = 0;
70// virtual bool audioReReadSamples( short *samples, int channel, long samples, int stream ) = 0;
71 65
@@ -99,2 +93,5 @@ public:
99 93
94 // File Properies
95 virtual long getPlayTime() { return -1; }
96 virtual int audioBitsPerSample( int stream ) = 0;
100}; 97};
diff --git a/core/multimedia/opieplayer/mediaplayerstate.cpp b/core/multimedia/opieplayer/mediaplayerstate.cpp
index 7e82166..13741f6 100644
--- a/core/multimedia/opieplayer/mediaplayerstate.cpp
+++ b/core/multimedia/opieplayer/mediaplayerstate.cpp
@@ -1,5 +1,5 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. 2** Copyright (C) 2000 Trolltech AS. All rights reserved.
3** 3**
4** This file is part of the Qtopia Environment. 4** This file is part of Qtopia Environment.
5** 5**
@@ -21,3 +21,2 @@
21#include <qpe/qlibrary.h> 21#include <qpe/qlibrary.h>
22#include <qpe/mediaplayerplugininterface.h>
23#include <qpe/config.h> 22#include <qpe/config.h>
@@ -26,4 +25,6 @@
26#include <qdir.h> 25#include <qdir.h>
26#include "mediaplayerplugininterface.h"
27#include "mediaplayerstate.h" 27#include "mediaplayerstate.h"
28 28
29
29#ifdef QT_NO_COMPONENT 30#ifdef QT_NO_COMPONENT
@@ -36,4 +37,4 @@
36 37
37 #define MediaPlayerDebug(x)qDebug x 38//#define MediaPlayerDebug(x) qDebug x
38//#define MediaPlayerDebug(x) 39#define MediaPlayerDebug(x)
39 40
@@ -97,6 +98,6 @@ MediaPlayerDecoder *MediaPlayerState::newDecoder( const QString& file ) {
97 for ( it = pluginList.begin(); it != pluginList.end(); ++it ) { 98 for ( it = pluginList.begin(); it != pluginList.end(); ++it ) {
98 if ( (*it).decoder->isFileSupported( file ) ) { 99 if ( (*it).decoder->isFileSupported( file ) ) {
99 tmpDecoder = (*it).decoder; 100 tmpDecoder = (*it).decoder;
100 break; 101 break;
101 } 102 }
102 } 103 }
@@ -116,2 +117,6 @@ MediaPlayerDecoder *MediaPlayerState::libMpeg3Decoder() {
116 117
118// ### hack to get true sample count
119// MediaPlayerDecoder *MediaPlayerState::libWavDecoder() {
120// return libwavdecoder;
121// }
117 122
@@ -122,5 +127,5 @@ void MediaPlayerState::loadPlugins() {
122 for ( mit = pluginList.begin(); mit != pluginList.end(); ++mit ) { 127 for ( mit = pluginList.begin(); mit != pluginList.end(); ++mit ) {
123 (*mit).iface->release(); 128 (*mit).iface->release();
124 (*mit).library->unload(); 129 (*mit).library->unload();
125 delete (*mit).library; 130 delete (*mit).library;
126 } 131 }
@@ -133,25 +138,25 @@ void MediaPlayerState::loadPlugins() {
133 for ( it = list.begin(); it != list.end(); ++it ) { 138 for ( it = list.begin(); it != list.end(); ++it ) {
134 MediaPlayerPluginInterface *iface = 0; 139 MediaPlayerPluginInterface *iface = 0;
135 QLibrary *lib = new QLibrary( path + "/" + *it ); 140 QLibrary *lib = new QLibrary( path + "/" + *it );
136 141
137 MediaPlayerDebug(( "querying: %s", QString( path + "/" + *it ).latin1() )); 142 MediaPlayerDebug(( "querying: %s", QString( path + "/" + *it ).latin1() ));
138 143
139 if ( lib->queryInterface( IID_MediaPlayerPlugin, (QUnknownInterface**)&iface ) == QS_OK ) { 144 if ( lib->queryInterface( IID_MediaPlayerPlugin, (QUnknownInterface**)&iface ) == QS_OK ) {
140 145
141 MediaPlayerDebug(( "loading: %s", QString( path + "/" + *it ).latin1() )); 146 MediaPlayerDebug(( "loading: %s", QString( path + "/" + *it ).latin1() ));
142 147
143 MediaPlayerPlugin plugin; 148 MediaPlayerPlugin plugin;
144 plugin.library = lib; 149 plugin.library = lib;
145 plugin.iface = iface; 150 plugin.iface = iface;
146 plugin.decoder = plugin.iface->decoder(); 151 plugin.decoder = plugin.iface->decoder();
147 plugin.encoder = plugin.iface->encoder(); 152 plugin.encoder = plugin.iface->encoder();
148 pluginList.append( plugin ); 153 pluginList.append( plugin );
149 154
150 // ### hack to get true sample count 155 // ### hack to get true sample count
151 if ( plugin.decoder->pluginName() == QString("LibMpeg3Plugin") ) 156 if ( plugin.decoder->pluginName() == QString("LibMpeg3Plugin") )
152 libmpeg3decoder = plugin.decoder; 157 libmpeg3decoder = plugin.decoder;
153 158
154 } else { 159 } else {
155 delete lib; 160 delete lib;
156 } 161 }
157 } 162 }
@@ -180,5 +185,5 @@ void MediaPlayerState::loadPlugins() {
180 if ( pluginList.count() ) 185 if ( pluginList.count() )
181 MediaPlayerDebug(( "%i decoders found", pluginList.count() )); 186 MediaPlayerDebug(( "%i decoders found", pluginList.count() ));
182 else 187 else
183 MediaPlayerDebug(( "No decoders found" )); 188 MediaPlayerDebug(( "No decoders found" ));
184} 189}
diff --git a/core/multimedia/opieplayer/mpegplayer.pro b/core/multimedia/opieplayer/mpegplayer.pro
index 3b8d4b0..41f2de0 100644
--- a/core/multimedia/opieplayer/mpegplayer.pro
+++ b/core/multimedia/opieplayer/mpegplayer.pro
@@ -1,15 +1,16 @@
1 TEMPLATE= app 1TEMPLATE = app
2 CONFIG = qt warn_on release 2CONFIG = qt warn_on release
3 DESTDIR = $(OPIEDIR)/bin 3#release
4 HEADERS = loopcontrol.h mediaplayerplugininterface.h playlistselection.h mediaplayerstate.h \ 4DESTDIR = $(OPIEDIR)/bin
5 videowidget.h audiowidget.h playlistwidget.h mediaplayer.h audiodevice.h 5HEADERS = loopcontrol.h mediaplayerplugininterface.h playlistselection.h mediaplayerstate.h \
6 SOURCES = main.cpp \ 6 videowidget.h audiowidget.h playlistwidget.h mediaplayer.h audiodevice.h
7 loopcontrol.cpp playlistselection.cpp mediaplayerstate.cpp \ 7SOURCES = main.cpp \
8 videowidget.cpp audiowidget.cpp playlistwidget.cpp mediaplayer.cpp audiodevice.cpp 8 loopcontrol.cpp playlistselection.cpp mediaplayerstate.cpp \
9 TARGET = mpegplayer 9 videowidget.cpp audiowidget.cpp playlistwidget.cpp mediaplayer.cpp audiodevice.cpp
10 INCLUDEPATH+= $(OPIEDIR)/include 10TARGET = mpegplayer
11 DEPENDPATH+= $(OPIEDIR)/include 11INCLUDEPATH += $(OPIEDIR)/include
12DEPENDPATH += $(OPIEDIR)/include
12LIBS += -lqpe -lpthread 13LIBS += -lqpe -lpthread
13 14
14 # INTERFACES= 15# INTERFACES =
15# INCLUDEPATH += $(OPIEDIR)/include 16# INCLUDEPATH += $(OPIEDIR)/include
@@ -17,4 +18,4 @@ LIBS += -lqpe -lpthread
17# TMAKE_CXXFLAGS += -DQPIM_STANDALONE 18# TMAKE_CXXFLAGS += -DQPIM_STANDALONE
18 # LIBS += libmpeg3/libmpeg3.a -lpthread 19# LIBS += libmpeg3/libmpeg3.a -lpthread
19 # LIBS += $(OPIEDIR)/plugins/codecs/liblibmadplugin.so 20# LIBS += $(OPIEDIR)/plugins/codecs/liblibmadplugin.so
20 21
diff --git a/core/multimedia/opieplayer/playlistselection.cpp b/core/multimedia/opieplayer/playlistselection.cpp
index a82b594..2c62e86 100644
--- a/core/multimedia/opieplayer/playlistselection.cpp
+++ b/core/multimedia/opieplayer/playlistselection.cpp
@@ -35,4 +35,4 @@ public:
35 PlayListSelectionItem( QListView *parent, const DocLnk *f ) : QListViewItem( parent ), fl( f ) { 35 PlayListSelectionItem( QListView *parent, const DocLnk *f ) : QListViewItem( parent ), fl( f ) {
36 setText( 0, f->name() ); 36 setText( 0, f->name() );
37 setPixmap( 0, f->pixmap() ); 37 setPixmap( 0, f->pixmap() );
38 } 38 }
@@ -52,6 +52,8 @@ PlayListSelection::PlayListSelection( QWidget *parent, const char *name )
52{ 52{
53#ifdef USE_PLAYLIST_BACKGROUND 53// #ifdef USE_PLAYLIST_BACKGROUND
54 setStaticBackground( TRUE ); 54 setStaticBackground( TRUE );
55 setBackgroundPixmap( Resource::loadPixmap( "mpegplayer/background" ) ); 55// setBackgroundPixmap( Resource::loadPixmap( "mpegplayer/background" ) );
56#endif 56 setBackgroundPixmap( Resource::loadPixmap( "opielogo" ) );
57// #endif
58 addColumn("Title",236);
57 setAllColumnsShowFocus( TRUE ); 59 setAllColumnsShowFocus( TRUE );
@@ -67,10 +69,11 @@ PlayListSelection::~PlayListSelection() {
67 69
68#ifdef USE_PLAYLIST_BACKGROUND 70// #ifdef USE_PLAYLIST_BACKGROUND
69void PlayListSelection::drawBackground( QPainter *p, const QRect &r ) { 71void PlayListSelection::drawBackground( QPainter *p, const QRect &r ) {
70 p->fillRect( r, QBrush( white ) ); 72 p->fillRect( r, QBrush( white ) );
71 QImage logo = Resource::loadImage( "mpegplayer/background" ); 73// QImage logo = Resource::loadImage( "mpegplayer/background" );
74 QImage logo = Resource::loadImage( "opielogo" );
72 if ( !logo.isNull() ) 75 if ( !logo.isNull() )
73 p->drawImage( (width() - logo.width()) / 2, (height() - logo.height()) / 2, logo ); 76 p->drawImage( (width() - logo.width()) / 2, (height() - logo.height()) / 2, logo );
74} 77}
75#endif 78// #endif
76 79
@@ -79,8 +82,8 @@ void PlayListSelection::contentsMouseMoveEvent( QMouseEvent *event ) {
79 if ( event->state() == QMouseEvent::LeftButton ) { 82 if ( event->state() == QMouseEvent::LeftButton ) {
80 QListViewItem *currentItem = selectedItem(); 83 QListViewItem *currentItem = selectedItem();
81 QListViewItem *itemUnder = itemAt( QPoint( event->pos().x(), event->pos().y() - contentsY() ) ); 84 QListViewItem *itemUnder = itemAt( QPoint( event->pos().x(), event->pos().y() - contentsY() ) );
82 if ( currentItem && currentItem->itemAbove() == itemUnder ) 85 if ( currentItem && currentItem->itemAbove() == itemUnder )
83 moveSelectedUp(); 86 moveSelectedUp();
84 else if ( currentItem && currentItem->itemBelow() == itemUnder ) 87 else if ( currentItem && currentItem->itemBelow() == itemUnder )
85 moveSelectedDown(); 88 moveSelectedDown();
86 } 89 }
@@ -92,3 +95,3 @@ const DocLnk *PlayListSelection::current() {
92 if ( item ) 95 if ( item )
93 return item->file(); 96 return item->file();
94 return NULL; 97 return NULL;
@@ -110,3 +113,3 @@ void PlayListSelection::removeSelected() {
110 if ( item ) 113 if ( item )
111 delete item; 114 delete item;
112 setSelected( currentItem(), TRUE ); 115 setSelected( currentItem(), TRUE );
@@ -119,3 +122,3 @@ void PlayListSelection::moveSelectedUp() {
119 if ( item && item->itemAbove() ) 122 if ( item && item->itemAbove() )
120 item->itemAbove()->moveItem( item ); 123 item->itemAbove()->moveItem( item );
121 ensureItemVisible( selectedItem() ); 124 ensureItemVisible( selectedItem() );
@@ -137,3 +140,3 @@ bool PlayListSelection::prev() {
137 else 140 else
138 return FALSE; 141 return FALSE;
139 ensureItemVisible( selectedItem() ); 142 ensureItemVisible( selectedItem() );
@@ -148,3 +151,3 @@ bool PlayListSelection::next() {
148 else 151 else
149 return FALSE; 152 return FALSE;
150 ensureItemVisible( selectedItem() ); 153 ensureItemVisible( selectedItem() );
@@ -159,3 +162,3 @@ bool PlayListSelection::first() {
159 else 162 else
160 return FALSE; 163 return FALSE;
161 ensureItemVisible( selectedItem() ); 164 ensureItemVisible( selectedItem() );
@@ -169,3 +172,3 @@ bool PlayListSelection::last() {
169 while ( ( item = item->nextSibling() ) ) 172 while ( ( item = item->nextSibling() ) )
170 prevItem = item; 173 prevItem = item;
171 if ( prevItem ) 174 if ( prevItem )
@@ -173,3 +176,3 @@ bool PlayListSelection::last() {
173 else 176 else
174 return FALSE; 177 return FALSE;
175 ensureItemVisible( selectedItem() ); 178 ensureItemVisible( selectedItem() );
diff --git a/core/multimedia/opieplayer/playlistselection.h b/core/multimedia/opieplayer/playlistselection.h
index 22d3c74..57e10f1 100644
--- a/core/multimedia/opieplayer/playlistselection.h
+++ b/core/multimedia/opieplayer/playlistselection.h
@@ -22,4 +22,2 @@
22 22
23
24
25#include <qlist.h> 23#include <qlist.h>
@@ -49,6 +47,6 @@ protected:
49 virtual void contentsMouseMoveEvent(QMouseEvent *); 47 virtual void contentsMouseMoveEvent(QMouseEvent *);
50#ifdef USE_PLAYLIST_BACKGROUND 48/* #ifdef USE_PLAYLIST_BACKGROUND */
51 virtual void drawBackground( QPainter *p, const QRect &r ); 49 virtual void drawBackground( QPainter *p, const QRect &r );
52 virtual void paintEmptyArea( QPainter *p, const QRect &r ) { drawBackground( p, r ); }; 50 virtual void paintEmptyArea( QPainter *p, const QRect &r ) { drawBackground( p, r ); };
53#endif 51/* #endif */
54 52
diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp
index 0423e7a..202f351 100644
--- a/core/multimedia/opieplayer/playlistwidget.cpp
+++ b/core/multimedia/opieplayer/playlistwidget.cpp
@@ -1,5 +1,5 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. 2** Copyright (C) 2000 Trolltech AS. All rights reserved.
3** 3**
4** This file is part of the Qtopia Environment. 4** This file is part of Qtopia Environment.
5** 5**
@@ -23,2 +23,4 @@
23#include <qpe/fileselector.h> 23#include <qpe/fileselector.h>
24#include <qpe/qpeapplication.h>
25
24#include <qpe/applnk.h> 26#include <qpe/applnk.h>
@@ -37,2 +39,6 @@
37#include <qtoolbutton.h> 39#include <qtoolbutton.h>
40#include <qtabwidget.h>
41#include <qlistview.h>
42#include <qpoint.h>
43//#include <qtimer.h>
38 44
@@ -44,2 +50,5 @@
44 50
51#define BUTTONS_ON_TOOLBAR
52#define SIDE_BUTTONS
53#define CAN_SAVE_LOAD_PLAYLISTS
45 54
@@ -47,11 +56,8 @@ extern MediaPlayerState *mediaPlayerState;
47 56
57// class myFileSelector {
48 58
59// };
49class PlayListWidgetPrivate { 60class PlayListWidgetPrivate {
50public: 61public:
51 QToolButton *tbPlay; 62 QToolButton *tbPlay, *tbFull, *tbLoop, *tbScale, *tbShuffle, *tbAddToList, *tbRemoveFromList, *tbMoveUp, *tbMoveDown, *tbRemove;
52 QToolButton *tbFull;
53 QToolButton *tbLoop;
54 QToolButton *tbScale;
55 QToolButton *tbShuffle;
56
57 QFrame *playListFrame; 63 QFrame *playListFrame;
@@ -67,10 +73,10 @@ public:
67 ToolButton( QWidget *parent, const char *name, const QString& icon, QObject *handler, const QString& slot, bool t = FALSE ) 73 ToolButton( QWidget *parent, const char *name, const QString& icon, QObject *handler, const QString& slot, bool t = FALSE )
68 : QToolButton( parent, name ) { 74 : QToolButton( parent, name ) {
69 setTextLabel( name ); 75 setTextLabel( name );
70 setPixmap( Resource::loadPixmap( icon ) ); 76 setPixmap( Resource::loadPixmap( icon ) );
71 setAutoRaise( TRUE ); 77 setAutoRaise( TRUE );
72 setFocusPolicy( QWidget::NoFocus ); 78 setFocusPolicy( QWidget::NoFocus );
73 setToggleButton( t ); 79 setToggleButton( t );
74 connect( this, t ? SIGNAL( toggled(bool) ) : SIGNAL( clicked() ), handler, slot ); 80 connect( this, t ? SIGNAL( toggled(bool) ) : SIGNAL( clicked() ), handler, slot );
75 QPEMenuToolFocusManager::manager()->addWidget( this ); 81 QPEMenuToolFocusManager::manager()->addWidget( this );
76 } 82 }
@@ -82,5 +88,5 @@ public:
82 MenuItem( QWidget *parent, const QString& text, QObject *handler, const QString& slot ) 88 MenuItem( QWidget *parent, const QString& text, QObject *handler, const QString& slot )
83 : QAction( text, QString::null, 0, 0 ) { 89 : QAction( text, QString::null, 0, 0 ) {
84 connect( this, SIGNAL( activated() ), handler, slot ); 90 connect( this, SIGNAL( activated() ), handler, slot );
85 addTo( parent ); 91 addTo( parent );
86 } 92 }
@@ -95,2 +101,4 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
95 d->current = NULL; 101 d->current = NULL;
102// menuTimer = new QTimer( this ,"menu timer"),
103// connect( menuTimer, SIGNAL( timeout() ), SLOT( addSelected() ) );
96 104
@@ -98,3 +106,3 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
98 106
99 setCaption( tr("MediaPlayer") ); 107 setCaption( tr("OpiePlayer") );
100 setIcon( Resource::loadPixmap( "MPEGPlayer" ) ); 108 setIcon( Resource::loadPixmap( "MPEGPlayer" ) );
@@ -113,67 +121,129 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
113 bar->setLabel( tr( "Play Operations" ) ); 121 bar->setLabel( tr( "Play Operations" ) );
114#ifdef BUTTONS_ON_TOOLBAR 122 d->tbAddToList = new ToolButton( bar, tr( "Add to Playlist" ),"mpegplayer/add_to_playlist",this , SLOT(addSelected()) );
115 d->tbPlay = new ToolButton( bar, tr( "Play" ), "mpegplayer/play", mediaPlayerState, SLOT(setPlaying(bool)), TRUE ); 123 d->tbRemoveFromList = new ToolButton( bar, tr( "Remove from Playlist" ), "mpegplayer/remove_from_playlist", this , SLOT(removeSelected()) );
116 d->tbShuffle = new ToolButton( bar, tr( "Randomize" ), "mpegplayer/shuffle", mediaPlayerState, SLOT(setShuffled(bool)), TRUE ); 124 d->tbPlay = new ToolButton( bar, tr( "Play" ),"mpegplayer/play", mediaPlayerState, SLOT( setPlaying(bool)), TRUE );
117#endif 125 d->tbShuffle = new ToolButton( bar, tr( "Randomize" ), "mpegplayer/shuffle", mediaPlayerState, SLOT(setShuffled(bool)), TRUE );
118 d->tbLoop = new ToolButton( bar, tr( "Loop" ), "mpegplayer/loop", mediaPlayerState, SLOT(setLooping(bool)), TRUE ); 126 d->tbLoop = new ToolButton( bar, tr( "Loop" ),"mpegplayer/loop", mediaPlayerState, SLOT(setLooping(bool)), TRUE );
119 d->tbFull = new ToolButton( bar, tr( "Fullscreen" ), "fullscreen", mediaPlayerState, SLOT(setFullscreen(bool)), TRUE );
120 d->tbScale = new ToolButton( bar, tr( "Scale" ), "mpegplayer/scale", mediaPlayerState, SLOT(setScaled(bool)), TRUE );
121 127
122 QPopupMenu *pmPlayList = new QPopupMenu( this ); 128 QPopupMenu *pmPlayList = new QPopupMenu( this );
123 menu->insertItem( tr( "PlayList" ), pmPlayList ); 129 menu->insertItem( tr( "File" ), pmPlayList );
124 new MenuItem( pmPlayList, tr( "Toggle PlayList" ), mediaPlayerState, SLOT( togglePlaylist() ) );
125 new MenuItem( pmPlayList, tr( "Clear List" ), this, SLOT( clearList() ) ); 130 new MenuItem( pmPlayList, tr( "Clear List" ), this, SLOT( clearList() ) );
126 new MenuItem( pmPlayList, tr( "Add all music files" ), this, SLOT( addAllMusicToList() ) ); 131 new MenuItem( pmPlayList, tr( "Add all audio files" ), this, SLOT( addAllMusicToList() ) );
127 new MenuItem( pmPlayList, tr( "Add all video files" ), this, SLOT( addAllVideoToList() ) ); 132 new MenuItem( pmPlayList, tr( "Add all video files" ), this, SLOT( addAllVideoToList() ) );
128 new MenuItem( pmPlayList, tr( "Add all files" ), this, SLOT( addAllToList() ) ); 133 new MenuItem( pmPlayList, tr( "Add all files" ), this, SLOT( addAllToList() ) );
129#ifdef CAN_SAVE_LOAD_PLAYLISTS
130 new MenuItem( pmPlayList, tr( "Save PlayList" ), this, SLOT( saveList() ) ); 134 new MenuItem( pmPlayList, tr( "Save PlayList" ), this, SLOT( saveList() ) );
131 new MenuItem( pmPlayList, tr( "Load PlayList" ), this, SLOT( loadList() ) ); 135 new MenuItem( pmPlayList, tr( "Load PlayList" ), this, SLOT( loadList() ) );
132#endif 136
137 QPopupMenu *pmView = new QPopupMenu( this );
138 menu->insertItem( tr( "View" ), pmView );
139
140 fullScreenButton = new QAction(tr("Full Screen"), Resource::loadPixmap("fullscreen"), QString::null, 0, this, 0);
141 connect( fullScreenButton, SIGNAL(activated()), mediaPlayerState, SLOT(toggleFullscreen()) );
142 fullScreenButton->addTo(pmView);
143 scaleButton = new QAction(tr("Scale"), Resource::loadPixmap("mpegplayer/scale"), QString::null, 0, this, 0);
144 connect( scaleButton, SIGNAL(activated()), mediaPlayerState, SLOT(toggleScaled()) );
145 scaleButton->addTo(pmView);
133 146
134 QVBox *vbox5 = new QVBox( this ); vbox5->setBackgroundMode( PaletteButton ); 147 QVBox *vbox5 = new QVBox( this ); vbox5->setBackgroundMode( PaletteButton );
148 QVBox *vbox4 = new QVBox( vbox5 ); vbox4->setBackgroundMode( PaletteButton );
149
150 QHBox *hbox6 = new QHBox( vbox4 ); hbox6->setBackgroundMode( PaletteButton );
151
152 tabWidget = new QTabWidget( hbox6, "tabWidget" );
153 tabWidget->setTabShape(QTabWidget::Triangular);
154
155 QWidget *pTab;
156 pTab = new QWidget( tabWidget, "pTab" );
157 playlistView = new QListView( pTab, "Videoview" );
158 playlistView->setMinimumSize(236,260);
159 tabWidget->insertTab( pTab,"Playlist");
135 160
136 // Add the playlist area 161 // Add the playlist area
137 QVBox *vbox3 = new QVBox( vbox5 ); vbox3->setBackgroundMode( PaletteButton );
138 d->playListFrame = vbox3;
139 162
140 QLabel *plString = new QLabel( tr(" PlayList"), vbox3 ); 163 QVBox *vbox3 = new QVBox( pTab ); vbox3->setBackgroundMode( PaletteButton );
141 plString->setBackgroundMode( QButton::PaletteButton ); 164 d->playListFrame = vbox3;
142 plString->setFont( QFont( "Helvetica", 8, QFont::Bold ) ); 165 d->playListFrame ->setMinimumSize(235,260);
143 166
144 QHBox *hbox2 = new QHBox( vbox3 ); hbox2->setBackgroundMode( PaletteButton ); 167 QHBox *hbox2 = new QHBox( vbox3 ); hbox2->setBackgroundMode( PaletteButton );
145 d->selectedFiles = new PlayListSelection( hbox2 );
146 QVBox *vbox1 = new QVBox( hbox2 ); vbox1->setBackgroundMode( PaletteButton );
147 168
148#ifndef BUTTONS_ON_TOOLBAR 169 d->selectedFiles = new PlayListSelection( hbox2);
149 d->tbPlay = new ToolButton( vbox1, tr( "Play" ), "mpegplayer/play", mediaPlayerState, SLOT(setPlaying(bool)), TRUE ); 170 QVBox *vbox1 = new QVBox( hbox2 ); vbox1->setBackgroundMode( PaletteButton );
150 QVBox *stretch1 = new QVBox( vbox1 ); stretch1->setBackgroundMode( PaletteButton ); // add stretch
151#endif
152 new ToolButton( vbox1, tr( "Move Up" ), "mpegplayer/up", d->selectedFiles, SLOT(moveSelectedUp()) );
153 new ToolButton( vbox1, tr( "Remove" ), "mpegplayer/cut", d->selectedFiles, SLOT(removeSelected()) );
154 new ToolButton( vbox1, tr( "Move Down" ), "mpegplayer/down", d->selectedFiles, SLOT(moveSelectedDown()) );
155 QVBox *stretch2 = new QVBox( vbox1 ); stretch2->setBackgroundMode( PaletteButton ); // add stretch
156#ifndef BUTTONS_ON_TOOLBAR
157 d->tbShuffle = new ToolButton( vbox1, tr( "Randomize" ), "mpegplayer/shuffle", mediaPlayerState, SLOT(setShuffled(bool)), TRUE );
158#endif
159 171
172 QVBox *stretch1 = new QVBox( vbox1 ); stretch1->setBackgroundMode( PaletteButton ); // add stretch
173 new ToolButton( vbox1, tr( "Move Up" ), "mpegplayer/up", d->selectedFiles, SLOT(moveSelectedUp()) );
174 new ToolButton( vbox1, tr( "Remove" ), "mpegplayer/cut", d->selectedFiles, SLOT(removeSelected()) );
175 new ToolButton( vbox1, tr( "Move Down" ), "mpegplayer/down", d->selectedFiles, SLOT(moveSelectedDown()) );
176 QVBox *stretch2 = new QVBox( vbox1 ); stretch2->setBackgroundMode( PaletteButton ); // add stretch
177
178 QWidget *aTab;
179 aTab = new QWidget( tabWidget, "aTab" );
180 audioView = new QListView( aTab, "Audioview" );
181 audioView->setMinimumSize(233,260);
182 audioView->addColumn( "Title",150);
183 audioView->addColumn("Size", 45);
184 audioView->addColumn("Media",35);
185 audioView->setColumnAlignment(1, Qt::AlignRight);
186 audioView->setColumnAlignment(2, Qt::AlignRight);
187 tabWidget->insertTab(aTab,"Audio");
188// audioView
189 Global::findDocuments(&files, "audio/*");
190 QListIterator<DocLnk> dit( files.children() );
191 QString storage;
192 for ( ; dit.current(); ++dit ) {
193 QListViewItem * newItem;
194 if(dit.current()->file().find("/mnt/cf") != -1 ) storage="CF";
195 else if(dit.current()->file().find("/mnt/hda") != -1 ) storage="CF";
196 else if(dit.current()->file().find("/mnt/card") != -1 ) storage="SD";
197 else storage="RAM";
198 if ( QFile( dit.current()->file()).exists() ) {
199 newItem= /*(void)*/ new QListViewItem( audioView, dit.current()->name(), QString::number( QFile( dit.current()->file()).size() ), storage);
200 newItem->setPixmap(0, Resource::loadPixmap( "mpegplayer/musicfile" ));
201 }
202 }
203// videowidget
204
205 QWidget *vTab;
206 vTab = new QWidget( tabWidget, "vTab" );
207 videoView = new QListView( vTab, "Videoview" );
208 videoView->setMinimumSize(233,260);
209
210 videoView->addColumn("Title",150);
211 videoView->addColumn("Size",45);
212 videoView->addColumn("Media",35);
213 videoView->setColumnAlignment(1, Qt::AlignRight);
214 videoView->setColumnAlignment(2, Qt::AlignRight);
215
216 tabWidget->insertTab( vTab,"Video");
217
218 Global::findDocuments(&vFiles, "video/*");
219 QListIterator<DocLnk> Vdit( vFiles.children() );
220 for ( ; Vdit.current(); ++Vdit ) {
221 if( Vdit.current()->file().find("/mnt/cf") != -1 ) storage="CF";
222 else if( Vdit.current()->file().find("/mnt/hda") != -1 ) storage="CF";
223 else if( Vdit.current()->file().find("/mnt/card") != -1 ) storage="SD";
224 else storage="RAM";
225 QListViewItem * newItem;
226 if ( QFile( Vdit.current()->file()).exists() ) {
227 newItem= /*(void)*/ new QListViewItem( videoView, Vdit.current()->name(), QString::number( QFile( Vdit.current()->file()).size() ), storage);
228 newItem->setPixmap(0, Resource::loadPixmap( "mpegplayer/videofile" ));
229 }
230 }
160 // add the library area 231 // add the library area
161 QVBox *vbox4 = new QVBox( vbox5 ); vbox4->setBackgroundMode( PaletteButton ); 232 QPEApplication::setStylusOperation( this, QPEApplication::RightOnHold );
162 233
163 QLabel *libString = new QLabel( tr(" Media Library"), vbox4 ); 234// connect( audioView, SIGNAL( clicked( QListViewItem *) ), this, SLOT( playIt( QListViewItem *) ) );
164 libString->setBackgroundMode( QButton::PaletteButton ); 235// connect( videoView, SIGNAL( clicked( QListViewItem *) ), this, SLOT( playIt( QListViewItem *) ) );
165 libString->setFont( QFont( "Helvetica", 8, QFont::Bold ) );
166 236
167 QHBox *hbox6 = new QHBox( vbox4 ); hbox6->setBackgroundMode( PaletteButton ); 237 connect( audioView, SIGNAL( clicked( QListViewItem *) ), this, SLOT( addToSelection( QListViewItem *) ) );
168 d->files = new FileSelector( "video/*;audio/*", hbox6, "Find Media Files", FALSE, FALSE ); 238 connect( videoView, SIGNAL( clicked( QListViewItem *) ), this, SLOT( addToSelection( QListViewItem *) ) );
169 d->files->setBackgroundMode( PaletteButton ); 239
170 QVBox *vbox7 = new QVBox( hbox6 ); vbox7->setBackgroundMode( PaletteButton ); 240 connect( audioView, SIGNAL( rightButtonPressed( QListViewItem *, const QPoint&, int ) ),
241 this, SLOT( addToSelection( QListViewItem *, const QPoint&, int )) );
242 connect( videoView, SIGNAL( rightButtonPressed( QListViewItem *, const QPoint&, int ) ),
243 this, SLOT( addToSelection( QListViewItem *, const QPoint&, int )) );
171 244
172#ifdef SIDE_BUTTONS
173 new ToolButton( vbox7, tr( "Add to Playlist" ), "mpegplayer/add_to_playlist", d->selectedFiles, SLOT(addSelected()) );
174 new ToolButton( vbox7, tr( "Remove from Playlist" ), "mpegplayer/remove_from_playlist", d->selectedFiles, SLOT(removeSelected()) );
175 QVBox *stretch3 = new QVBox( vbox1 ); stretch3->setBackgroundMode( PaletteButton ); // add stretch
176#endif
177 245
178 connect( d->files, SIGNAL( fileSelected( const DocLnk & ) ), this, SLOT( addToSelection( const DocLnk & ) ) ); 246 connect( tabWidget, SIGNAL (currentChanged(QWidget*)),this,SLOT(tabChanged(QWidget*)));
247 // connect( d->files, SIGNAL( fileSelected( const DocLnk & ) ), this, SLOT( addToSelection( const DocLnk & ) ) );
248 // connect( d->files, SIGNAL( fileSelected( const DocLnk & ) ), this, SLOT( addToSelection( const DocLnk & ) ) );
179 connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), d->tbPlay, SLOT( setOn( bool ) ) ); 249 connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), d->tbPlay, SLOT( setOn( bool ) ) );
@@ -181,7 +251,12 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
181 connect( mediaPlayerState, SIGNAL( shuffledToggled( bool ) ), d->tbShuffle, SLOT( setOn( bool ) ) ); 251 connect( mediaPlayerState, SIGNAL( shuffledToggled( bool ) ), d->tbShuffle, SLOT( setOn( bool ) ) );
182 connect( mediaPlayerState, SIGNAL( fullscreenToggled( bool ) ), d->tbFull, SLOT( setOn( bool ) ) ); 252
183 connect( mediaPlayerState, SIGNAL( scaledToggled( bool ) ), d->tbScale, SLOT( setOn( bool ) ) ); 253// connect( mediaPlayerState, SIGNAL( fullscreenToggled( bool ) ), fullScreenButton, SLOT( setOn( bool ) ) );
184 connect( mediaPlayerState, SIGNAL( fullscreenToggled( bool ) ), d->tbScale, SLOT( setEnabled( bool ) ) ); 254// connect( mediaPlayerState, SIGNAL( scaledToggled( bool ) ), scaleButton, SLOT( setEnabled( bool ) ) );
255// connect( mediaPlayerState, SIGNAL( fullscreenToggled( bool ) ), fullScreenButton, SLOT( setEnabled( bool ) ) );
256
185 connect( mediaPlayerState, SIGNAL( playlistToggled( bool ) ), this, SLOT( setPlaylist( bool ) ) ); 257 connect( mediaPlayerState, SIGNAL( playlistToggled( bool ) ), this, SLOT( setPlaylist( bool ) ) );
186 258
259 connect( d->selectedFiles, SIGNAL( clicked( QListViewItem *) ), this, SLOT( playIt( QListViewItem *) ) );
260// connect( d->selectedFiles, SIGNAL( fileSelected( const DocLnk & ) ), this, SLOT( addToSelection( const DocLnk & ) ) );
261
187 setCentralWidget( vbox5 ); 262 setCentralWidget( vbox5 );
@@ -200,3 +275,3 @@ PlayListWidget::~PlayListWidget() {
200 if ( d->current ) 275 if ( d->current )
201 delete d->current; 276 delete d->current;
202 delete d; 277 delete d;
@@ -206,2 +281,3 @@ PlayListWidget::~PlayListWidget() {
206void PlayListWidget::initializeStates() { 281void PlayListWidget::initializeStates() {
282
207 d->tbPlay->setOn( mediaPlayerState->playing() ); 283 d->tbPlay->setOn( mediaPlayerState->playing() );
@@ -209,6 +285,6 @@ void PlayListWidget::initializeStates() {
209 d->tbShuffle->setOn( mediaPlayerState->shuffled() ); 285 d->tbShuffle->setOn( mediaPlayerState->shuffled() );
210 d->tbFull->setOn( mediaPlayerState->fullscreen() ); 286// d->tbFull->setOn( mediaPlayerState->fullscreen() );
211 d->tbScale->setOn( mediaPlayerState->scaled() ); 287// d->tbScale->setOn( mediaPlayerState->scaled() );
212 d->tbScale->setEnabled( mediaPlayerState->fullscreen() ); 288// d->tbScale->setEnabled( mediaPlayerState->fullscreen() );
213 setPlaylist( mediaPlayerState->playlist() ); 289// setPlaylist( mediaPlayerState->playlist() );
214} 290}
@@ -222,7 +298,7 @@ void PlayListWidget::readConfig( Config& cfg ) {
222 for ( int i = 0; i < noOfFiles; i++ ) { 298 for ( int i = 0; i < noOfFiles; i++ ) {
223 QString entryName; 299 QString entryName;
224 entryName.sprintf( "File%i", i + 1 ); 300 entryName.sprintf( "File%i", i + 1 );
225 QString linkFile = cfg.readEntry( entryName ); 301 QString linkFile = cfg.readEntry( entryName );
226 DocLnk lnk( linkFile ); 302 DocLnk lnk( linkFile );
227 if ( lnk.isValid() ) 303 if ( lnk.isValid() )
228 d->selectedFiles->addToSelection( lnk ); 304 d->selectedFiles->addToSelection( lnk );
@@ -240,24 +316,24 @@ void PlayListWidget::writeConfig( Config& cfg ) const {
240 do { 316 do {
241 const DocLnk *lnk = d->selectedFiles->current(); 317 const DocLnk *lnk = d->selectedFiles->current();
242 if ( lnk ) { 318 if ( lnk ) {
243 QString entryName; 319 QString entryName;
244 entryName.sprintf( "File%i", noOfFiles + 1 ); 320 entryName.sprintf( "File%i", noOfFiles + 1 );
245 cfg.writeEntry( entryName, lnk->linkFile() ); 321 cfg.writeEntry( entryName, lnk->linkFile() );
246 // if this link does exist, add it so we have the file 322 // if this link does exist, add it so we have the file
247 // next time... 323 // next time...
248 if ( !QFile::exists( lnk->linkFile() ) ) { 324 if ( !QFile::exists( lnk->linkFile() ) ) {
249 // the way writing lnks doesn't really check for out 325 // the way writing lnks doesn't really check for out
250 // of disk space, but check it anyway. 326 // of disk space, but check it anyway.
251 if ( !lnk->writeLink() ) { 327 if ( !lnk->writeLink() ) {
252 QMessageBox::critical( 0, tr("Out of space"), 328 QMessageBox::critical( 0, tr("Out of space"),
253 tr( "There was a problem saving " 329 tr( "There was a problem saving "
254 "the playlist.\n" 330 "the playlist.\n"
255 "Your playlist " 331 "Your playlist "
256 "may be missing some entries\n" 332 "may be missing some entries\n"
257 "the next time you start it." ) 333 "the next time you start it." )
258 ); 334 );
259 } 335 }
260 } 336 }
261 noOfFiles++; 337 noOfFiles++;
262 } 338 }
263 } while ( d->selectedFiles->next() ); 339 } while ( d->selectedFiles->next() );
@@ -269,3 +345,3 @@ void PlayListWidget::writeConfig( Config& cfg ) const {
269void PlayListWidget::addToSelection( const DocLnk& lnk ) { 345void PlayListWidget::addToSelection( const DocLnk& lnk ) {
270 d->setDocumentUsed = FALSE; 346 d->setDocumentUsed = FALSE;
271 if ( mediaPlayerState->playlist() ) 347 if ( mediaPlayerState->playlist() )
@@ -273,3 +349,13 @@ void PlayListWidget::addToSelection( const DocLnk& lnk ) {
273 else 349 else
274 mediaPlayerState->setPlaying( TRUE ); 350 mediaPlayerState->setPlaying( TRUE );
351}
352
353
354void PlayListWidget::addToSelection( QListViewItem *it ,const QPoint & p, int index) {
355 qDebug("add");
356// d->selectedFiles->addToSelection( lnk );
357 // }
358// else
359// mediaPlayerState->setPlaying( TRUE );
360//
275} 361}
@@ -279,3 +365,3 @@ void PlayListWidget::clearList() {
279 while ( first() ) 365 while ( first() )
280 d->selectedFiles->removeSelected(); 366 d->selectedFiles->removeSelected();
281} 367}
@@ -312,12 +398,12 @@ void PlayListWidget::setDocument(const QString& fileref) {
312 if ( fileref.isNull() ) { 398 if ( fileref.isNull() ) {
313 QMessageBox::critical( 0, tr( "Invalid File" ), tr( "There was a problem in getting the file." ) ); 399 QMessageBox::critical( 0, tr( "Invalid File" ), tr( "There was a problem in getting the file." ) );
314 return; 400 return;
315 } 401 }
316 if ( mediaPlayerState->playlist() ) 402 if ( mediaPlayerState->playlist() )
317 addToSelection( DocLnk( fileref ) ); 403 addToSelection( DocLnk( fileref ) );
318 else { 404 else {
319 d->setDocumentUsed = TRUE; 405 d->setDocumentUsed = TRUE;
320 if ( d->current ) 406 if ( d->current )
321 delete d->current; 407 delete d->current;
322 d->current = new DocLnk( fileref ); 408 d->current = new DocLnk( fileref );
323 } 409 }
@@ -343,7 +429,7 @@ const DocLnk *PlayListWidget::current() {
343 if ( mediaPlayerState->playlist() ) 429 if ( mediaPlayerState->playlist() )
344 return d->selectedFiles->current(); 430 return d->selectedFiles->current();
345 else if ( d->setDocumentUsed && d->current ) { 431 else if ( d->setDocumentUsed && d->current ) {
346 return d->current; 432 return d->current;
347 } else 433 } else
348 return d->files->selected(); 434 return d->files->selected();
349} 435}
@@ -353,25 +439,25 @@ bool PlayListWidget::prev() {
353 if ( mediaPlayerState->playlist() ) { 439 if ( mediaPlayerState->playlist() ) {
354 if ( mediaPlayerState->shuffled() ) { 440 if ( mediaPlayerState->shuffled() ) {
355 const DocLnk *cur = current(); 441 const DocLnk *cur = current();
356 int j = 1 + (int)(97.0 * rand() / (RAND_MAX + 1.0)); 442 int j = 1 + (int)(97.0 * rand() / (RAND_MAX + 1.0));
357 for ( int i = 0; i < j; i++ ) { 443 for ( int i = 0; i < j; i++ ) {
358 if ( !d->selectedFiles->next() ) 444 if ( !d->selectedFiles->next() )
359 d->selectedFiles->first(); 445 d->selectedFiles->first();
360 } 446 }
361 if ( cur == current() ) 447 if ( cur == current() )
362 if ( !d->selectedFiles->next() ) 448 if ( !d->selectedFiles->next() )
363 d->selectedFiles->first(); 449 d->selectedFiles->first();
364 return TRUE; 450 return TRUE;
365 } else { 451 } else {
366 if ( !d->selectedFiles->prev() ) { 452 if ( !d->selectedFiles->prev() ) {
367 if ( mediaPlayerState->looping() ) { 453 if ( mediaPlayerState->looping() ) {
368 return d->selectedFiles->last(); 454 return d->selectedFiles->last();
369 } else { 455 } else {
370 return FALSE; 456 return FALSE;
371 } 457 }
372 } 458 }
373 return TRUE; 459 return TRUE;
374 } 460 }
375 } else { 461 } else {
376 return mediaPlayerState->looping(); 462 return mediaPlayerState->looping();
377 } 463 }
@@ -382,16 +468,16 @@ bool PlayListWidget::next() {
382 if ( mediaPlayerState->playlist() ) { 468 if ( mediaPlayerState->playlist() ) {
383 if ( mediaPlayerState->shuffled() ) { 469 if ( mediaPlayerState->shuffled() ) {
384 return prev(); 470 return prev();
385 } else { 471 } else {
386 if ( !d->selectedFiles->next() ) { 472 if ( !d->selectedFiles->next() ) {
387 if ( mediaPlayerState->looping() ) { 473 if ( mediaPlayerState->looping() ) {
388 return d->selectedFiles->first(); 474 return d->selectedFiles->first();
389 } else { 475 } else {
390 return FALSE; 476 return FALSE;
391 } 477 }
392 } 478 }
393 return TRUE; 479 return TRUE;
394 } 480 }
395 } else { 481 } else {
396 return mediaPlayerState->looping(); 482 return mediaPlayerState->looping();
397 } 483 }
@@ -402,5 +488,5 @@ bool PlayListWidget::first() {
402 if ( mediaPlayerState->playlist() ) 488 if ( mediaPlayerState->playlist() )
403 return d->selectedFiles->first(); 489 return d->selectedFiles->first();
404 else 490 else
405 return mediaPlayerState->looping(); 491 return mediaPlayerState->looping();
406} 492}
@@ -410,5 +496,5 @@ bool PlayListWidget::last() {
410 if ( mediaPlayerState->playlist() ) 496 if ( mediaPlayerState->playlist() )
411 return d->selectedFiles->last(); 497 return d->selectedFiles->last();
412 else 498 else
413 return mediaPlayerState->looping(); 499 return mediaPlayerState->looping();
414} 500}
@@ -436,5 +522,5 @@ void PlayListWidget::setPlaylist( bool shown ) {
436 if ( shown ) 522 if ( shown )
437 d->playListFrame->show(); 523 d->playListFrame->show();
438 else 524 else
439 d->playListFrame->hide(); 525 d->playListFrame->hide();
440} 526}
@@ -444,6 +530,120 @@ void PlayListWidget::setView( char view ) {
444 if ( view == 'l' ) 530 if ( view == 'l' )
445 showMaximized(); 531 showMaximized();
446 else 532 else
447 hide(); 533 hide();
534}
535
536void PlayListWidget::addSelected() {
537// QMessageBox::message("Note","Bozo the clown thinks\nthere's something actually here");
538 int tabPage=tabWidget->currentPageIndex();
539 switch (tabPage) {
540 case 0: //playlist
541 break;
542 case 1: { //audio
543 addToSelection( audioView->selectedItem() );
544 }
545 break;
546 case 2: { // video
547 addToSelection( videoView->selectedItem() );
548 }
549 break;
550 };
551}
552
553void PlayListWidget::removeSelected() {
554 d->selectedFiles->removeSelected( );
555}
556
557
558void PlayListWidget::playIt( QListViewItem *it) {
559// d->setDocumentUsed = FALSE;
560 mediaPlayerState->setPlaying(true);
561}
562
563void PlayListWidget::addToSelection( QListViewItem *it) {
564 d->setDocumentUsed = FALSE;
565
566 if(it) {
567 qDebug("add to selection");
568 int tabPage=tabWidget->currentPageIndex();
569 switch (tabPage) {
570 case 1: {
571 QListIterator<DocLnk> dit( files.children() );
572 for ( ; dit.current(); ++dit ) {
573 if( dit.current()->name() == it->text(0)) {
574 d->selectedFiles->addToSelection( **dit );
575 }
576 }
577 }
578 break;
579 case 2: {
580 QListIterator<DocLnk> dit( vFiles.children() );
581 for ( ; dit.current(); ++dit ) {
582 qDebug(dit.current()->name());
583 if( dit.current()->name() == it->text(0)) {
584 d->selectedFiles->addToSelection( **dit );
585 }
586 }
587 }
588 break;
589 case 0:
590 break;
591 };
592 tabWidget->setCurrentPage(0);
593// mediaPlayerState->setPlaying( TRUE );
594 }
595}
596
597void PlayListWidget::tabChanged(QWidget *widg) {
598
599 int tabPage=tabWidget->currentPageIndex();
600 switch (tabPage) {
601 case 0:
602 {
603 d->tbRemoveFromList->setEnabled(TRUE);
604 d->tbAddToList->setEnabled(FALSE);
605 }
606 break;
607 case 1:
608 {
609 d->tbRemoveFromList->setEnabled(FALSE);
610 d->tbAddToList->setEnabled(TRUE);
611 }
612 break;
613 case 2:
614 {
615 d->tbRemoveFromList->setEnabled(FALSE);
616 d->tbAddToList->setEnabled(TRUE);
617 }
618 break;
619 };
448} 620}
449 621
622// void PlayListWidget::cancelMenuTimer() {
623// if( menuTimer->isActive() )
624// menuTimer->stop();
625// }
626
627// void PlayListWidget::showFileMenu() {
628
629// }
630
631// void PlayListWidget::contentsMousePressEvent( QMouseEvent * e )
632// {
633// // QListView::contentsMousePressEvent( e );
634// menuTimer->start( 750, TRUE );
635// }
636
637
638// void PlayListWidget::contentsMouseReleaseEvent( QMouseEvent * e )
639// {
640// // QListView::contentsMouseReleaseEvent( e );
641// menuTimer->stop();
642// }
643// // void PlayListWidget::setFullScreen() {
644// mediaPlayerState->toggleFullscreen( );
645// }
646
647// void PlayListWidget::setScaled() {
648// mediaPlayerState->toggleScaled();
649// }
diff --git a/core/multimedia/opieplayer/playlistwidget.h b/core/multimedia/opieplayer/playlistwidget.h
index 819adb1..5b05f11 100644
--- a/core/multimedia/opieplayer/playlistwidget.h
+++ b/core/multimedia/opieplayer/playlistwidget.h
@@ -1,5 +1,5 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. 2** Copyright (C) 2000 Trolltech AS. All rights reserved.
3** 3**
4** This file is part of the Qtopia Environment. 4** This file is part of Qtopia Environment.
5** 5**
@@ -24,2 +24,4 @@
24#include <qpe/applnk.h> 24#include <qpe/applnk.h>
25#include <qtabwidget.h>
26/* #include <qtimer.h> */
25 27
@@ -28,3 +30,7 @@ class PlayListWidgetPrivate;
28class Config; 30class Config;
29 31class QListViewItem;
32class QListView;
33class QPoint;
34class QAction;
35class QLabel;
30 36
@@ -35,3 +41,8 @@ public:
35 ~PlayListWidget(); 41 ~PlayListWidget();
36 42 QTabWidget * tabWidget;
43 QAction *fullScreenButton, *scaleButton;
44 DocLnkSet files;
45 DocLnkSet vFiles;
46 QListView *audioView, *videoView, *playlistView;
47 QLabel *libString;
37 // retrieve the current playlist entry (media file link) 48 // retrieve the current playlist entry (media file link)
@@ -39,2 +50,3 @@ public:
39 void useSelectedDocument(); 50 void useSelectedDocument();
51/* QTimer * menuTimer; */
40 52
@@ -43,2 +55,4 @@ public slots:
43 void addToSelection( const DocLnk& ); // Add a media file to the playlist 55 void addToSelection( const DocLnk& ); // Add a media file to the playlist
56 void addToSelection( QListViewItem* ); // Add a media file to the playlist
57 void addToSelection( QListViewItem*, const QPoint&,int ); // Add a media file to the playlist
44 void setActiveWindow(); // need to handle this to show the right view 58 void setActiveWindow(); // need to handle this to show the right view
@@ -52,2 +66,3 @@ public slots:
52 void loadList(); // Load a playlist 66 void loadList(); // Load a playlist
67 void playIt( QListViewItem *);
53 bool first(); 68 bool first();
@@ -56,2 +71,10 @@ public slots:
56 bool prev(); 71 bool prev();
72 void addSelected();
73 void removeSelected();
74 void tabChanged(QWidget*);
75/* void setFullScreen(); */
76/* void setScaled(); */
77protected:
78/* void contentsMousePressEvent( QMouseEvent * e ); */
79/* void contentsMouseReleaseEvent( QMouseEvent * e ); */
57 80
@@ -62,2 +85,8 @@ private:
62 PlayListWidgetPrivate *d; // Private implementation data 85 PlayListWidgetPrivate *d; // Private implementation data
86
87protected slots:
88/* void cancelMenuTimer(); */
89/* void showFileMenu(); */
90
91
63}; 92};
diff --git a/core/multimedia/opieplayer/videowidget.cpp b/core/multimedia/opieplayer/videowidget.cpp
index 12ae4fd..1f128a4 100644
--- a/core/multimedia/opieplayer/videowidget.cpp
+++ b/core/multimedia/opieplayer/videowidget.cpp
@@ -1,5 +1,5 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. 2** Copyright (C) 2000 Trolltech AS. All rights reserved.
3** 3**
4** This file is part of the Qtopia Environment. 4** This file is part of Qtopia Environment.
5** 5**
@@ -19,5 +19,4 @@
19**********************************************************************/ 19**********************************************************************/
20
21#include <qpe/resource.h> 20#include <qpe/resource.h>
22#include <qpe/mediaplayerplugininterface.h> 21#include "mediaplayerplugininterface.h"
23#include <qwidget.h> 22#include <qwidget.h>
@@ -69,3 +68,3 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) :
69 QWidget( parent, name, f ), scaledWidth( 0 ), scaledHeight( 0 ) { 68 QWidget( parent, name, f ), scaledWidth( 0 ), scaledHeight( 0 ) {
70 setCaption( tr("MediaPlayer") ); 69 setCaption( tr("OpiePlayer") );
71 setBackgroundPixmap( Resource::loadPixmap( "mpegplayer/metalFinish" ) ); 70 setBackgroundPixmap( Resource::loadPixmap( "mpegplayer/metalFinish" ) );
@@ -83,4 +82,4 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) :
83 82
84 connect( slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) ); 83 connect( slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) );
85 connect( slider, SIGNAL( sliderReleased() ), this, SLOT( sliderReleased() ) ); 84 connect( slider, SIGNAL( sliderReleased() ), this, SLOT( sliderReleased() ) );
86 85
@@ -104,3 +103,3 @@ VideoWidget::~VideoWidget() {
104 for ( int i = 0; i < 3; i++ ) 103 for ( int i = 0; i < 3; i++ )
105 delete pixmaps[i]; 104 delete pixmaps[i];
106 delete currentFrame; 105 delete currentFrame;
@@ -120,3 +119,3 @@ void VideoWidget::sliderReleased() {
120 if ( slider->width() == 0 ) 119 if ( slider->width() == 0 )
121 return; 120 return;
122 long val = long((double)slider->value() * mediaPlayerState->length() / slider->width()); 121 long val = long((double)slider->value() * mediaPlayerState->length() / slider->width());
@@ -138,8 +137,8 @@ void VideoWidget::setView( char view ) {
138 if ( view == 'v' ) { 137 if ( view == 'v' ) {
139 makeVisible(); 138 makeVisible();
140 } else { 139 } else {
141 // Effectively blank the view next time we show it so it looks nicer 140 // Effectively blank the view next time we show it so it looks nicer
142 scaledWidth = 0; 141 scaledWidth = 0;
143 scaledHeight = 0; 142 scaledHeight = 0;
144 hide(); 143 hide();
145 } 144 }
@@ -151,3 +150,3 @@ void VideoWidget::updateSlider( long i, long max ) {
151 if ( max == 0 ) 150 if ( max == 0 )
152 return; 151 return;
153 int width = slider->width(); 152 int width = slider->width();
@@ -155,6 +154,6 @@ void VideoWidget::updateSlider( long i, long max ) {
155 if ( !mediaPlayerState->fullscreen() && !videoSliderBeingMoved ) { 154 if ( !mediaPlayerState->fullscreen() && !videoSliderBeingMoved ) {
156 if ( slider->value() != val ) 155 if ( slider->value() != val )
157 slider->setValue( val ); 156 slider->setValue( val );
158 if ( slider->maxValue() != width ) 157 if ( slider->maxValue() != width )
159 slider->setMaxValue( width ); 158 slider->setMaxValue( width );
160 } 159 }
@@ -165,3 +164,3 @@ void VideoWidget::setToggleButton( int i, bool down ) {
165 if ( down != videoButtons[i].isDown ) 164 if ( down != videoButtons[i].isDown )
166 toggleButton( i ); 165 toggleButton( i );
167} 166}
@@ -187,32 +186,32 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) {
187 for ( int i = 0; i < numButtons; i++ ) { 186 for ( int i = 0; i < numButtons; i++ ) {
188 int x = videoButtons[i].xPos; 187 int x = videoButtons[i].xPos;
189 int y = videoButtons[i].yPos; 188 int y = videoButtons[i].yPos;
190 if ( event->state() == QMouseEvent::LeftButton ) { 189 if ( event->state() == QMouseEvent::LeftButton ) {
191 // The test to see if the mouse click is inside the circular button or not 190 // The test to see if the mouse click is inside the circular button or not
192 // (compared with the radius squared to avoid a square-root of our distance) 191 // (compared with the radius squared to avoid a square-root of our distance)
193 int radius = 16; 192 int radius = 16;
194 QPoint center = QPoint( x + radius, y + radius ); 193 QPoint center = QPoint( x + radius, y + radius );
195 QPoint dXY = center - event->pos(); 194 QPoint dXY = center - event->pos();
196 int dist = dXY.x() * dXY.x() + dXY.y() * dXY.y(); 195 int dist = dXY.x() * dXY.x() + dXY.y() * dXY.y();
197 bool isOnButton = dist <= (radius * radius); 196 bool isOnButton = dist <= (radius * radius);
198 if ( isOnButton != videoButtons[i].isHeld ) { 197 if ( isOnButton != videoButtons[i].isHeld ) {
199 videoButtons[i].isHeld = isOnButton; 198 videoButtons[i].isHeld = isOnButton;
200 toggleButton(i); 199 toggleButton(i);
201 } 200 }
202 } else { 201 } else {
203 if ( videoButtons[i].isHeld ) { 202 if ( videoButtons[i].isHeld ) {
204 videoButtons[i].isHeld = FALSE; 203 videoButtons[i].isHeld = FALSE;
205 if ( !videoButtons[i].isToggle ) 204 if ( !videoButtons[i].isToggle )
206 setToggleButton( i, FALSE ); 205 setToggleButton( i, FALSE );
207 switch (i) { 206 switch (i) {
208 case VideoPlay: mediaPlayerState->setPlaying(videoButtons[i].isDown); return; 207 case VideoPlay: mediaPlayerState->setPlaying(videoButtons[i].isDown); return;
209 case VideoStop: mediaPlayerState->setPlaying(FALSE); return; 208 case VideoStop: mediaPlayerState->setPlaying(FALSE); return;
210 case VideoPause: mediaPlayerState->setPaused(videoButtons[i].isDown); return; 209 case VideoPause: mediaPlayerState->setPaused(videoButtons[i].isDown); return;
211 case VideoNext: mediaPlayerState->setNext(); return; 210 case VideoNext: mediaPlayerState->setNext(); return;
212 case VideoPrevious: mediaPlayerState->setPrev(); return; 211 case VideoPrevious: mediaPlayerState->setPrev(); return;
213 case VideoPlayList: mediaPlayerState->setList(); return; 212 case VideoPlayList: mediaPlayerState->setList(); return;
214 case VideoFullscreen: mediaPlayerState->setFullscreen( TRUE ); makeVisible(); return; 213 case VideoFullscreen: mediaPlayerState->setFullscreen( TRUE ); makeVisible(); return;
215 } 214 }
216 } 215 }
217 } 216 }
218 } 217 }
@@ -228,6 +227,6 @@ void VideoWidget::mouseReleaseEvent( QMouseEvent *event ) {
228 if ( mediaPlayerState->fullscreen() ) { 227 if ( mediaPlayerState->fullscreen() ) {
229 mediaPlayerState->setFullscreen( FALSE ); 228 mediaPlayerState->setFullscreen( FALSE );
230 makeVisible(); 229 makeVisible();
231 } else { 230 } else {
232 mouseMoveEvent( event ); 231 mouseMoveEvent( event );
233 } 232 }
@@ -238,11 +237,11 @@ void VideoWidget::makeVisible() {
238 if ( mediaPlayerState->fullscreen() ) { 237 if ( mediaPlayerState->fullscreen() ) {
239 setBackgroundMode( QWidget::NoBackground ); 238 setBackgroundMode( QWidget::NoBackground );
240 showFullScreen(); 239 showFullScreen();
241 resize( qApp->desktop()->size() ); 240 resize( qApp->desktop()->size() );
242 slider->hide(); 241 slider->hide();
243 } else { 242 } else {
244 setBackgroundPixmap( Resource::loadPixmap( "mpegplayer/metalFinish" ) ); 243 setBackgroundPixmap( Resource::loadPixmap( "mpegplayer/metalFinish" ) );
245 showNormal(); 244 showNormal();
246 showMaximized(); 245 showMaximized();
247 slider->show(); 246 slider->show();
248 } 247 }
@@ -255,25 +254,25 @@ void VideoWidget::paintEvent( QPaintEvent * ) {
255 if ( mediaPlayerState->fullscreen() ) { 254 if ( mediaPlayerState->fullscreen() ) {
256 // Clear the background 255 // Clear the background
257 p.setBrush( QBrush( Qt::black ) ); 256 p.setBrush( QBrush( Qt::black ) );
258 p.drawRect( rect() ); 257 p.drawRect( rect() );
259 258
260 // Draw the current frame 259 // Draw the current frame
261 //p.drawImage( ); // If using directpainter we won't have a copy except whats on the screen 260 //p.drawImage( ); // If using directpainter we won't have a copy except whats on the screen
262 } else { 261 } else {
263 // draw border 262 // draw border
264 qDrawShadePanel( &p, 4, 15, 230, 170, colorGroup(), TRUE, 5, NULL ); 263 qDrawShadePanel( &p, 4, 15, 230, 170, colorGroup(), TRUE, 5, NULL );
265 264
266 // Clear the movie screen first 265 // Clear the movie screen first
267 p.setBrush( QBrush( Qt::black ) ); 266 p.setBrush( QBrush( Qt::black ) );
268 p.drawRect( 9, 20, 220, 160 ); 267 p.drawRect( 9, 20, 220, 160 );
269 268
270 // draw current frame (centrally positioned from scaling to maintain aspect ratio) 269 // draw current frame (centrally positioned from scaling to maintain aspect ratio)
271 p.drawImage( 9 + (220 - scaledWidth) / 2, 20 + (160 - scaledHeight) / 2, *currentFrame, 0, 0, scaledWidth, scaledHeight ); 270 p.drawImage( 9 + (220 - scaledWidth) / 2, 20 + (160 - scaledHeight) / 2, *currentFrame, 0, 0, scaledWidth, scaledHeight );
272 271
273 // draw the buttons 272 // draw the buttons
274 for ( int i = 0; i < numButtons; i++ ) 273 for ( int i = 0; i < numButtons; i++ )
275 paintButton( &p, i ); 274 paintButton( &p, i );
276 275
277 // draw the slider 276 // draw the slider
278 slider->repaint( TRUE ); 277 slider->repaint( TRUE );
279 } 278 }
@@ -302,89 +301,89 @@ bool VideoWidget::playVideo() {
302#ifdef USE_DIRECT_PAINTER 301#ifdef USE_DIRECT_PAINTER
303 QDirectPainter p(this); 302 QDirectPainter p(this);
304 303
305 if ( ( qt_screen->transformOrientation() == 3 ) && 304 if ( ( qt_screen->transformOrientation() == 3 ) &&
306 ( ( dd == 16 ) || ( dd == 32 ) ) && ( p.numRects() == 1 ) ) { 305 ( ( dd == 16 ) || ( dd == 32 ) ) && ( p.numRects() == 1 ) ) {
307 306
308 w = 320; 307 w = 320;
309 h = 240; 308 h = 240;
310 309
311 if ( mediaPlayerState->scaled() ) { 310 if ( mediaPlayerState->scaled() ) {
312 // maintain aspect ratio 311 // maintain aspect ratio
313 if ( w * sh > sw * h ) 312 if ( w * sh > sw * h )
314 w = sw * h / sh; 313 w = sw * h / sh;
315 else 314 else
316 h = sh * w / sw; 315 h = sh * w / sw;
317 } else { 316 } else {
318 w = sw; 317 w = sw;
319 h = sh; 318 h = sh;
320 } 319 }
321 320
322 w--; // we can't allow libmpeg to overwrite. 321 w--; // we can't allow libmpeg to overwrite.
323 QPoint roff = qt_screen->mapToDevice( p.offset(), QSize( qt_screen->width(), qt_screen->height() ) ); 322 QPoint roff = qt_screen->mapToDevice( p.offset(), QSize( qt_screen->width(), qt_screen->height() ) );
324 323
325 int ox = roff.x() - height() + 2 + (height() - w) / 2; 324 int ox = roff.x() - height() + 2 + (height() - w) / 2;
326 int oy = roff.y() + (width() - h) / 2; 325 int oy = roff.y() + (width() - h) / 2;
327 int sx = 0, sy = 0; 326 int sx = 0, sy = 0;
328 327
329 uchar* fp = p.frameBuffer() + p.lineStep() * oy; 328 uchar* fp = p.frameBuffer() + p.lineStep() * oy;
330 fp += dd * ox / 8; 329 fp += dd * ox / 8;
331 uchar **jt = new uchar*[h]; 330 uchar **jt = new uchar*[h];
332 for ( int i = h; i; i-- ) { 331 for ( int i = h; i; i-- ) {
333 jt[h - i] = fp; 332 jt[h - i] = fp;
334 fp += p.lineStep(); 333 fp += p.lineStep();
335 } 334 }
336 335
337 result = mediaPlayerState->curDecoder()->videoReadScaledFrame( jt, sx, sy, sw, sh, w, h, format, 0) == 0; 336 result = mediaPlayerState->curDecoder()->videoReadScaledFrame( jt, sx, sy, sw, sh, w, h, format, 0) == 0;
338 337
339 delete [] jt; 338 delete [] jt;
340 } else { 339 } else {
341#endif 340#endif
342 QPainter p(this); 341 QPainter p(this);
343 342
344 w = 320; 343 w = 320;
345 h = 240; 344 h = 240;
346 345
347 if ( mediaPlayerState->scaled() ) { 346 if ( mediaPlayerState->scaled() ) {
348 // maintain aspect ratio 347 // maintain aspect ratio
349 if ( w * sh > sw * h ) 348 if ( w * sh > sw * h )
350 w = sw * h / sh; 349 w = sw * h / sh;
351 else 350 else
352 h = sh * w / sw; 351 h = sh * w / sw;
353 } else { 352 } else {
354 w = sw; 353 w = sw;
355 h = sh; 354 h = sh;
356 } 355 }
357 356
358 int bytes = ( dd == 16 ) ? 2 : 4; 357 int bytes = ( dd == 16 ) ? 2 : 4;
359 QImage tempFrame( w, h, bytes << 3 ); 358 QImage tempFrame( w, h, bytes << 3 );
360 result = mediaPlayerState->curDecoder()->videoReadScaledFrame( tempFrame.jumpTable(), 359 result = mediaPlayerState->curDecoder()->videoReadScaledFrame( tempFrame.jumpTable(),
361 0, 0, sw, sh, w, h, format, 0) == 0; 360 0, 0, sw, sh, w, h, format, 0) == 0;
362 if ( result && mediaPlayerState->fullscreen() ) { 361 if ( result && mediaPlayerState->fullscreen() ) {
363 362
364 int rw = h, rh = w; 363 int rw = h, rh = w;
365 QImage rotatedFrame( rw, rh, bytes << 3 ); 364 QImage rotatedFrame( rw, rh, bytes << 3 );
366 365
367 ushort* in = (ushort*)tempFrame.bits(); 366 ushort* in = (ushort*)tempFrame.bits();
368 ushort* out = (ushort*)rotatedFrame.bits(); 367 ushort* out = (ushort*)rotatedFrame.bits();
369 int spl = rotatedFrame.bytesPerLine() / bytes; 368 int spl = rotatedFrame.bytesPerLine() / bytes;
370 for (int x=0; x<h; x++) { 369 for (int x=0; x<h; x++) {
371 if ( bytes == 2 ) { 370 if ( bytes == 2 ) {
372 ushort* lout = out++ + (w - 1)*spl; 371 ushort* lout = out++ + (w - 1)*spl;
373 for (int y=0; y<w; y++) { 372 for (int y=0; y<w; y++) {
374 *lout=*in++; 373 *lout=*in++;
375 lout-=spl; 374 lout-=spl;
376 } 375 }
377 } else { 376 } else {
378 ulong* lout = ((ulong *)out)++ + (w - 1)*spl; 377 ulong* lout = ((ulong *)out)++ + (w - 1)*spl;
379 for (int y=0; y<w; y++) { 378 for (int y=0; y<w; y++) {
380 *lout=*((ulong*)in)++; 379 *lout=*((ulong*)in)++;
381 lout-=spl; 380 lout-=spl;
382 } 381 }
383 } 382 }
384 } 383 }
385 384
386 p.drawImage( (240 - rw) / 2, (320 - rh) / 2, rotatedFrame, 0, 0, rw, rh ); 385 p.drawImage( (240 - rw) / 2, (320 - rh) / 2, rotatedFrame, 0, 0, rw, rh );
387 } 386 }
388#ifdef USE_DIRECT_PAINTER 387#ifdef USE_DIRECT_PAINTER
389 } 388 }
390#endif 389#endif
@@ -392,27 +391,27 @@ bool VideoWidget::playVideo() {
392 391
393 w = 220; 392 w = 220;
394 h = 160; 393 h = 160;
395 394
396 // maintain aspect ratio 395 // maintain aspect ratio
397 if ( w * sh > sw * h ) 396 if ( w * sh > sw * h )
398 w = sw * h / sh; 397 w = sw * h / sh;
399 else 398 else
400 h = sh * w / sw; 399 h = sh * w / sw;
401 400
402 result = mediaPlayerState->curDecoder()->videoReadScaledFrame( currentFrame->jumpTable(), 0, 0, sw, sh, w, h, format, 0) == 0; 401 result = mediaPlayerState->curDecoder()->videoReadScaledFrame( currentFrame->jumpTable(), 0, 0, sw, sh, w, h, format, 0) == 0;
403 402
404 QPainter p( this ); 403 QPainter p( this );
405 404
406 // Image changed size, therefore need to blank the possibly unpainted regions first 405 // Image changed size, therefore need to blank the possibly unpainted regions first
407 if ( scaledWidth != w || scaledHeight != h ) { 406 if ( scaledWidth != w || scaledHeight != h ) {
408 p.setBrush( QBrush( Qt::black ) ); 407 p.setBrush( QBrush( Qt::black ) );
409 p.drawRect( 9, 20, 220, 160 ); 408 p.drawRect( 9, 20, 220, 160 );
410 } 409 }
411 410
412 scaledWidth = w; 411 scaledWidth = w;
413 scaledHeight = h; 412 scaledHeight = h;
414 413
415 if ( result ) { 414 if ( result ) {
416 p.drawImage( 9 + (220 - scaledWidth) / 2, 20 + (160 - scaledHeight) / 2, *currentFrame, 0, 0, scaledWidth, scaledHeight ); 415 p.drawImage( 9 + (220 - scaledWidth) / 2, 20 + (160 - scaledHeight) / 2, *currentFrame, 0, 0, scaledWidth, scaledHeight );
417 } 416 }
418 417
diff --git a/core/multimedia/opieplayer/wavplugin/Makefile.in b/core/multimedia/opieplayer/wavplugin/Makefile.in
index bcbe7f2..a46b925 100644
--- a/core/multimedia/opieplayer/wavplugin/Makefile.in
+++ b/core/multimedia/opieplayer/wavplugin/Makefile.in
@@ -102,3 +102,4 @@ REQUIRES=
102wavplugin.o: wavplugin.cpp \ 102wavplugin.o: wavplugin.cpp \
103 wavplugin.h 103 wavplugin.h \
104 ../mediaplayerplugininterface.h
104 105
@@ -106,2 +107,3 @@ wavpluginimpl.o: wavpluginimpl.cpp \
106 wavplugin.h \ 107 wavplugin.h \
108 ../mediaplayerplugininterface.h \
107 wavpluginimpl.h 109 wavpluginimpl.h