37 files changed, 381 insertions, 549 deletions
diff --git a/core/multimedia/opieplayer/Makefile.in b/core/multimedia/opieplayer/Makefile.in index 8d33fb4..1d2ff5e 100644 --- a/core/multimedia/opieplayer/Makefile.in +++ b/core/multimedia/opieplayer/Makefile.in | |||
@@ -138,4 +138,2 @@ 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 \ | ||
141 | mediaplayerstate.h \ | 139 | mediaplayerstate.h \ |
@@ -149,4 +147,3 @@ main.o: main.cpp \ | |||
149 | $(OPIEDIR)/include/qpe/qcom.h \ | 147 | $(OPIEDIR)/include/qpe/qcom.h \ |
150 | $(OPIEDIR)/include/qpe/quuid.h \ | 148 | $(OPIEDIR)/include/qpe/quuid.h |
151 | mediaplayerplugininterface.h | ||
152 | 149 | ||
@@ -154,4 +151,3 @@ loopcontrol.o: loopcontrol.cpp \ | |||
154 | $(OPIEDIR)/include/qpe/qpeapplication.h \ | 151 | $(OPIEDIR)/include/qpe/qpeapplication.h \ |
155 | $(OPIEDIR)/include/qpedecoration_qws.h \ | 152 | $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \ |
156 | $(OPIEDIR)/include/timestring.h \ | ||
157 | loopcontrol.h \ | 153 | loopcontrol.h \ |
@@ -171,4 +167,2 @@ mediaplayerstate.o: mediaplayerstate.cpp \ | |||
171 | $(OPIEDIR)/include/qpe/qpeapplication.h \ | 167 | $(OPIEDIR)/include/qpe/qpeapplication.h \ |
172 | $(OPIEDIR)/include/qpedecoration_qws.h \ | ||
173 | $(OPIEDIR)/include/timestring.h \ | ||
174 | $(OPIEDIR)/include/qpe/qlibrary.h \ | 168 | $(OPIEDIR)/include/qpe/qlibrary.h \ |
@@ -177,3 +171,2 @@ mediaplayerstate.o: mediaplayerstate.cpp \ | |||
177 | $(OPIEDIR)/include/qpe/config.h \ | 171 | $(OPIEDIR)/include/qpe/config.h \ |
178 | mediaplayerplugininterface.h \ | ||
179 | mediaplayerstate.h \ | 172 | mediaplayerstate.h \ |
@@ -185,5 +178,2 @@ videowidget.o: videowidget.cpp \ | |||
185 | $(OPIEDIR)/include/qpe/resource.h \ | 178 | $(OPIEDIR)/include/qpe/resource.h \ |
186 | mediaplayerplugininterface.h \ | ||
187 | $(OPIEDIR)/include/qpe/qcom.h \ | ||
188 | $(OPIEDIR)/include/qpe/quuid.h \ | ||
189 | videowidget.h \ | 179 | videowidget.h \ |
@@ -200,7 +190,2 @@ playlistwidget.o: playlistwidget.cpp \ | |||
200 | $(OPIEDIR)/include/qpe/fileselector.h \ | 190 | $(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 \ | ||
206 | $(OPIEDIR)/include/qpe/applnk.h \ | 191 | $(OPIEDIR)/include/qpe/applnk.h \ |
@@ -215,4 +200,2 @@ mediaplayer.o: mediaplayer.cpp \ | |||
215 | $(OPIEDIR)/include/qpe/qpeapplication.h \ | 200 | $(OPIEDIR)/include/qpe/qpeapplication.h \ |
216 | $(OPIEDIR)/include/qpedecoration_qws.h \ | ||
217 | $(OPIEDIR)/include/timestring.h \ | ||
218 | $(OPIEDIR)/include/qpe/qlibrary.h \ | 201 | $(OPIEDIR)/include/qpe/qlibrary.h \ |
@@ -223,3 +206,2 @@ mediaplayer.o: mediaplayer.cpp \ | |||
223 | mediaplayer.h \ | 206 | mediaplayer.h \ |
224 | mediaplayerplugininterface.h \ | ||
225 | playlistwidget.h \ | 207 | playlistwidget.h \ |
@@ -233,6 +215,5 @@ audiodevice.o: audiodevice.cpp \ | |||
233 | $(OPIEDIR)/include/qpe/qpeapplication.h \ | 215 | $(OPIEDIR)/include/qpe/qpeapplication.h \ |
234 | $(OPIEDIR)/include/qpedecoration_qws.h \ | ||
235 | $(OPIEDIR)/include/timestring.h \ | ||
236 | $(OPIEDIR)/include/qpe/config.h \ | 216 | $(OPIEDIR)/include/qpe/config.h \ |
237 | audiodevice.h | 217 | audiodevice.h \ |
218 | $(OPIEDIR)/include/qpe/qcopenvelope_qws.h | ||
238 | 219 | ||
@@ -262,4 +243,3 @@ moc_mediaplayer.o: moc_mediaplayer.cpp \ | |||
262 | $(OPIEDIR)/include/qpe/qcom.h \ | 243 | $(OPIEDIR)/include/qpe/qcom.h \ |
263 | $(OPIEDIR)/include/qpe/quuid.h \ | 244 | $(OPIEDIR)/include/qpe/quuid.h |
264 | mediaplayerplugininterface.h | ||
265 | 245 | ||
diff --git a/core/multimedia/opieplayer/audiodevice.cpp b/core/multimedia/opieplayer/audiodevice.cpp index 11fd9e8..7b3700a 100644 --- a/core/multimedia/opieplayer/audiodevice.cpp +++ b/core/multimedia/opieplayer/audiodevice.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of the Qtopia Environment. |
5 | ** | 5 | ** |
@@ -19,7 +19,4 @@ | |||
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | // L.J.Potter added better error code Fri 02-15-2002 14:37:47 | ||
21 | |||
22 | 20 | ||
23 | #include <stdlib.h> | 21 | #include <stdlib.h> |
24 | #include <stdio.h> | ||
25 | #include <qpe/qpeapplication.h> | 22 | #include <qpe/qpeapplication.h> |
@@ -111,3 +108,3 @@ void AudioDevice::getVolume( unsigned int& leftVolume, unsigned int& rightVolume | |||
111 | if ( waveOutGetVolume( handle, (LPDWORD)&volume ) ) | 108 | if ( waveOutGetVolume( handle, (LPDWORD)&volume ) ) |
112 | // qDebug( "get volume of audio device failed" ); | 109 | qDebug( "get volume of audio device failed" ); |
113 | waveOutClose( handle ); | 110 | waveOutClose( handle ); |
@@ -118,7 +115,6 @@ void AudioDevice::getVolume( unsigned int& leftVolume, unsigned int& rightVolume | |||
118 | if ( mixerHandle >= 0 ) { | 115 | if ( mixerHandle >= 0 ) { |
119 | if(ioctl( mixerHandle, MIXER_READ(0), &volume )==-1) | 116 | ioctl( mixerHandle, MIXER_READ(0), &volume ); |
120 | perror("ioctl(\"MIXER_READ\")"); | ||
121 | close( mixerHandle ); | 117 | close( mixerHandle ); |
122 | } else | 118 | } else |
123 | perror("open(\"/dev/mixer\")"); | 119 | qDebug( "get volume of audio device failed" ); |
124 | leftVolume = ((volume & 0x00FF) << 16) / 101; | 120 | leftVolume = ((volume & 0x00FF) << 16) / 101; |
@@ -153,3 +149,3 @@ void AudioDevice::setVolume( unsigned int leftVolume, unsigned int rightVolume, | |||
153 | if ( waveOutSetVolume( handle, volume ) ) | 149 | if ( waveOutSetVolume( handle, volume ) ) |
154 | // qDebug( "set volume of audio device failed" ); | 150 | qDebug( "set volume of audio device failed" ); |
155 | waveOutClose( handle ); | 151 | waveOutClose( handle ); |
@@ -164,8 +160,6 @@ void AudioDevice::setVolume( unsigned int leftVolume, unsigned int rightVolume, | |||
164 | if ( ( mixerHandle = open( "/dev/mixer", O_RDWR ) ) >= 0 ) { | 160 | if ( ( mixerHandle = open( "/dev/mixer", O_RDWR ) ) >= 0 ) { |
165 | if(ioctl( mixerHandle, MIXER_WRITE(0), &volume ) ==-1) | 161 | ioctl( mixerHandle, MIXER_WRITE(0), &volume ); |
166 | perror("ioctl(\"MIXER_WRITE\")"); | ||
167 | close( mixerHandle ); | 162 | close( mixerHandle ); |
168 | } else | 163 | } else |
169 | perror("open(\"/dev/mixer\")"); | 164 | qDebug( "set volume of audio device failed" ); |
170 | |||
171 | # else | 165 | # else |
@@ -194,13 +188,41 @@ AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) { | |||
194 | d->bytesPerSample = bps; | 188 | d->bytesPerSample = bps; |
195 | // qDebug("%d",bps); | ||
196 | int format=0; | ||
197 | if( bps == 8) format = AFMT_U8; | ||
198 | else if( bps <= 0) format = AFMT_S16_LE; | ||
199 | else format = AFMT_S16_LE; | ||
200 | 189 | ||
201 | // qDebug("AD- freq %d, channels %d, b/sample %d, bitrate %d",f,chs,bps,format); | ||
202 | connect( qApp, SIGNAL( volumeChanged(bool) ), this, SLOT( volumeChanged(bool) ) ); | 190 | connect( qApp, SIGNAL( volumeChanged(bool) ), this, SLOT( volumeChanged(bool) ) ); |
203 | 191 | ||
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 | ||
204 | 225 | ||
205 | int fragments = 0x10000 * 8 + sound_fragment_shift; | 226 | int fragments = 0x10000 * 8 + sound_fragment_shift; |
227 | int format = AFMT_S16_LE; | ||
206 | int capabilities = 0; | 228 | int capabilities = 0; |
@@ -211,3 +233,3 @@ AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) { | |||
211 | if ( ( d->handle = ::open( "/dev/dsp", O_WRONLY ) ) < 0 ) { | 233 | if ( ( d->handle = ::open( "/dev/dsp", O_WRONLY ) ) < 0 ) { |
212 | perror("open(\"/dev/dsp\") sending to /dev/null instead"); | 234 | qDebug( "error opening audio device /dev/dsp, sending data to /dev/null instead" ); |
213 | d->handle = ::open( "/dev/null", O_WRONLY ); | 235 | d->handle = ::open( "/dev/null", O_WRONLY ); |
@@ -221,16 +243,9 @@ AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) { | |||
221 | 243 | ||
222 | if(ioctl( d->handle, SNDCTL_DSP_GETCAPS, &capabilities )==-1) | 244 | ioctl( d->handle, SNDCTL_DSP_GETCAPS, &capabilities ); |
223 | perror("ioctl(\"SNDCTL_DSP_GETCAPS\")"); | 245 | ioctl( d->handle, SNDCTL_DSP_SETFRAGMENT, &fragments ); |
224 | if(ioctl( d->handle, SNDCTL_DSP_SETFRAGMENT, &fragments )==-1) | 246 | ioctl( d->handle, SNDCTL_DSP_SETFMT, &format ); |
225 | perror("ioctl(\"SNDCTL_DSP_SETFRAGMENT\")"); | 247 | ioctl( d->handle, SNDCTL_DSP_SPEED, &d->frequency ); |
226 | if(ioctl( d->handle, SNDCTL_DSP_SETFMT, & format )==-1) | ||
227 | perror("ioctl(\"SNDCTL_DSP_SETFMT\")"); | ||
228 | qDebug("freq %d", d->frequency); | ||
229 | if(ioctl( d->handle, SNDCTL_DSP_SPEED, &d->frequency )==-1) | ||
230 | perror("ioctl(\"SNDCTL_DSP_SPEED\")"); | ||
231 | qDebug("channels %d",d->channels); | ||
232 | if ( ioctl( d->handle, SNDCTL_DSP_CHANNELS, &d->channels ) == -1 ) { | 248 | if ( ioctl( d->handle, SNDCTL_DSP_CHANNELS, &d->channels ) == -1 ) { |
233 | d->channels = ( d->channels == 1 ) ? 2 : d->channels; | 249 | d->channels = ( d->channels == 1 ) ? 2 : d->channels; |
234 | if(ioctl( d->handle, SNDCTL_DSP_CHANNELS, &d->channels )==-1) | 250 | ioctl( d->handle, SNDCTL_DSP_CHANNELS, &d->channels ); |
235 | perror("ioctl(\"SNDCTL_DSP_CHANNELS\")"); | ||
236 | } | 251 | } |
@@ -248,2 +263,3 @@ AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) { | |||
248 | //if ( capabilities & DSP_CAP_MMAP ) qDebug( "Sound card can mmap" ); | 263 | //if ( capabilities & DSP_CAP_MMAP ) qDebug( "Sound card can mmap" ); |
264 | #endif | ||
249 | } | 265 | } |
diff --git a/core/multimedia/opieplayer/audiodevice.h b/core/multimedia/opieplayer/audiodevice.h index dcd79fe..ec70788 100644 --- a/core/multimedia/opieplayer/audiodevice.h +++ b/core/multimedia/opieplayer/audiodevice.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of the Qtopia Environment. |
5 | ** | 5 | ** |
@@ -19,5 +19,2 @@ | |||
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | // L.J.Potter added changes Fri 02-15-2002 | ||
21 | |||
22 | |||
23 | #ifndef AUDIODEVICE_H | 20 | #ifndef AUDIODEVICE_H |
@@ -25,5 +22,3 @@ | |||
25 | 22 | ||
26 | |||
27 | #include <qobject.h> | 23 | #include <qobject.h> |
28 | #include <sys/soundcard.h> | ||
29 | 24 | ||
@@ -36,3 +31,3 @@ class AudioDevice : public QObject { | |||
36 | public: | 31 | public: |
37 | AudioDevice( unsigned int freq = 44000, unsigned int channels = 2, unsigned int bytesPerSample = AFMT_S16_LE ); | 32 | AudioDevice( unsigned int freq = 44000, unsigned int channels = 2, unsigned int bytesPerSample = 2 ); |
38 | ~AudioDevice(); | 33 | ~AudioDevice(); |
diff --git a/core/multimedia/opieplayer/audiowidget.cpp b/core/multimedia/opieplayer/audiowidget.cpp index 0d88591..1e0757f 100644 --- a/core/multimedia/opieplayer/audiowidget.cpp +++ b/core/multimedia/opieplayer/audiowidget.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of the Qtopia Environment. |
5 | ** | 5 | ** |
@@ -28,3 +28,2 @@ | |||
28 | 28 | ||
29 | |||
30 | extern MediaPlayerState *mediaPlayerState; | 29 | extern MediaPlayerState *mediaPlayerState; |
@@ -63,3 +62,3 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) : | |||
63 | { | 62 | { |
64 | setCaption( tr("OpiePlayer") ); | 63 | setCaption( tr("MediaPlayer") ); |
65 | setBackgroundPixmap( Resource::loadPixmap( "mpegplayer/metalFinish" ) ); | 64 | setBackgroundPixmap( Resource::loadPixmap( "mpegplayer/metalFinish" ) ); |
diff --git a/core/multimedia/opieplayer/audiowidget.h b/core/multimedia/opieplayer/audiowidget.h index 4b82a91..95f5322 100644 --- a/core/multimedia/opieplayer/audiowidget.h +++ b/core/multimedia/opieplayer/audiowidget.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of the Qtopia Environment. |
5 | ** | 5 | ** |
@@ -22,3 +22,2 @@ | |||
22 | 22 | ||
23 | |||
24 | #include <qwidget.h> | 23 | #include <qwidget.h> |
diff --git a/core/multimedia/opieplayer/libflash/libflashplugin.h b/core/multimedia/opieplayer/libflash/libflashplugin.h index a2f1c42..48b512f 100644 --- a/core/multimedia/opieplayer/libflash/libflashplugin.h +++ b/core/multimedia/opieplayer/libflash/libflashplugin.h | |||
@@ -26,4 +26,3 @@ | |||
26 | #include "flash.h" | 26 | #include "flash.h" |
27 | //#include <qpe/mediaplayerplugininterface.h> | 27 | #include <qpe/mediaplayerplugininterface.h> |
28 | #include "../mediaplayerplugininterface.h" | ||
29 | 28 | ||
@@ -51,3 +50,2 @@ public: | |||
51 | int audioSamples( int /*stream*/ ) { return 1000000; } | 50 | int audioSamples( int /*stream*/ ) { return 1000000; } |
52 | int audioBitsPerSample(int) { return 0;} | ||
53 | bool audioSetSample( long sample, int stream ); | 51 | bool audioSetSample( long sample, int stream ); |
diff --git a/core/multimedia/opieplayer/libflash/libflashpluginimpl.h b/core/multimedia/opieplayer/libflash/libflashpluginimpl.h index cb8d959..33d8ad2 100644 --- a/core/multimedia/opieplayer/libflash/libflashpluginimpl.h +++ b/core/multimedia/opieplayer/libflash/libflashpluginimpl.h | |||
@@ -23,4 +23,3 @@ | |||
23 | 23 | ||
24 | //#include <qpe/mediaplayerplugininterface.h> | 24 | #include <qpe/mediaplayerplugininterface.h> |
25 | #include "../mediaplayerplugininterface.h" | ||
26 | 25 | ||
diff --git a/core/multimedia/opieplayer/libflash/swf.h b/core/multimedia/opieplayer/libflash/swf.h index 48986cc..5f5e4f7 100644 --- a/core/multimedia/opieplayer/libflash/swf.h +++ b/core/multimedia/opieplayer/libflash/swf.h | |||
@@ -210,3 +210,3 @@ extern "C" { | |||
210 | //#include "zlib.h" | 210 | //#include "zlib.h" |
211 | #include "/opt/qt-2.3.2-embedded/src/3rdparty/zlib/zlib.h" | 211 | #include "../src/3rdparty/zlib/zlib.h" |
212 | }; | 212 | }; |
diff --git a/core/multimedia/opieplayer/libmad/Makefile.in b/core/multimedia/opieplayer/libmad/Makefile.in index 552043c..e9f74e7 100644 --- a/core/multimedia/opieplayer/libmad/Makefile.in +++ b/core/multimedia/opieplayer/libmad/Makefile.in | |||
@@ -216,3 +216,2 @@ libmadplugin.o: libmadplugin.cpp \ | |||
216 | libmadplugin.h \ | 216 | libmadplugin.h \ |
217 | ../mediaplayerplugininterface.h \ | ||
218 | mad.h | 217 | mad.h |
@@ -221,3 +220,2 @@ libmadpluginimpl.o: libmadpluginimpl.cpp \ | |||
221 | libmadplugin.h \ | 220 | libmadplugin.h \ |
222 | ../mediaplayerplugininterface.h \ | ||
223 | libmadpluginimpl.h | 221 | libmadpluginimpl.h |
diff --git a/core/multimedia/opieplayer/libmad/libmad.pro b/core/multimedia/opieplayer/libmad/libmad.pro index b54ca6b..6c40a15 100644 --- a/core/multimedia/opieplayer/libmad/libmad.pro +++ b/core/multimedia/opieplayer/libmad/libmad.pro | |||
@@ -10,4 +10,2 @@ INCLUDEPATH += $(OPIEDIR)/include .. | |||
10 | DEPENDPATH += ../$(OPIEDIR)/include .. | 10 | DEPENDPATH += ../$(OPIEDIR)/include .. |
11 | TMAKE_CFLAGS += -DFPM_64BIT | ||
12 | TMAKE_CXXFLAGS += -DFPM_64BIT | ||
13 | LIBS += -lqpe -lm | 11 | LIBS += -lqpe -lm |
diff --git a/core/multimedia/opieplayer/libmad/libmadplugin.h b/core/multimedia/opieplayer/libmad/libmadplugin.h index ff84c27..d85e0d4 100644 --- a/core/multimedia/opieplayer/libmad/libmadplugin.h +++ b/core/multimedia/opieplayer/libmad/libmadplugin.h | |||
@@ -22,6 +22,4 @@ | |||
22 | 22 | ||
23 | |||
24 | #include <qstring.h> | 23 | #include <qstring.h> |
25 | //#include <qpe/mediaplayerplugininterface.h> | 24 | #include <qpe/mediaplayerplugininterface.h> |
26 | #include "../mediaplayerplugininterface.h" | ||
27 | 25 | ||
@@ -56,3 +54,2 @@ public: | |||
56 | bool audioSetSample( long sample, int stream ); | 54 | bool audioSetSample( long sample, int stream ); |
57 | int audioBitsPerSample(int) {return 0;} | ||
58 | long audioGetSample( int stream ); | 55 | long audioGetSample( int stream ); |
diff --git a/core/multimedia/opieplayer/libmad/libmadpluginimpl.h b/core/multimedia/opieplayer/libmad/libmadpluginimpl.h index 8ad4956..2c5ed3b 100644 --- a/core/multimedia/opieplayer/libmad/libmadpluginimpl.h +++ b/core/multimedia/opieplayer/libmad/libmadpluginimpl.h | |||
@@ -22,5 +22,3 @@ | |||
22 | 22 | ||
23 | 23 | #include <qpe/mediaplayerplugininterface.h> | |
24 | //#include <qpe/mediaplayerplugininterface.h> | ||
25 | #include "../mediaplayerplugininterface.h" | ||
26 | 24 | ||
@@ -45,2 +43,3 @@ public: | |||
45 | virtual MediaPlayerEncoder *encoder(); | 43 | virtual MediaPlayerEncoder *encoder(); |
44 | |||
46 | private: | 45 | private: |
diff --git a/core/multimedia/opieplayer/libmad/version.c b/core/multimedia/opieplayer/libmad/version.c index 1baba26..413d54b 100644 --- a/core/multimedia/opieplayer/libmad/version.c +++ b/core/multimedia/opieplayer/libmad/version.c | |||
diff --git a/core/multimedia/opieplayer/libmpeg3/Makefile.in b/core/multimedia/opieplayer/libmpeg3/Makefile.in index d255e4f..154f85d 100644 --- a/core/multimedia/opieplayer/libmpeg3/Makefile.in +++ b/core/multimedia/opieplayer/libmpeg3/Makefile.in | |||
@@ -178,4 +178,3 @@ libmpeg3plugin.o: libmpeg3plugin.cpp \ | |||
178 | video/mpeg3video.h \ | 178 | video/mpeg3video.h \ |
179 | mpeg3protos.h \ | 179 | mpeg3protos.h |
180 | ../mediaplayerplugininterface.h | ||
181 | 180 | ||
@@ -195,3 +194,2 @@ libmpeg3pluginimpl.o: libmpeg3pluginimpl.cpp \ | |||
195 | mpeg3protos.h \ | 194 | mpeg3protos.h \ |
196 | ../mediaplayerplugininterface.h \ | ||
197 | libmpeg3pluginimpl.h | 195 | libmpeg3pluginimpl.h |
@@ -418,3 +416,3 @@ audio/layer2.o: audio/layer2.c \ | |||
418 | audio/layer3.o: audio/layer3.c \ | 416 | audio/layer3.o: audio/layer3.c \ |
419 | huffman.h \ | 417 | audio/huffman.h \ |
420 | audio/mpeg3audio.h \ | 418 | audio/mpeg3audio.h \ |
diff --git a/core/multimedia/opieplayer/libmpeg3/libmpeg3plugin.h b/core/multimedia/opieplayer/libmpeg3/libmpeg3plugin.h index 54f259b..e0eb930 100644 --- a/core/multimedia/opieplayer/libmpeg3/libmpeg3plugin.h +++ b/core/multimedia/opieplayer/libmpeg3/libmpeg3plugin.h | |||
@@ -22,3 +22,2 @@ | |||
22 | 22 | ||
23 | |||
24 | #include <qstring.h> | 23 | #include <qstring.h> |
@@ -27,4 +26,3 @@ | |||
27 | #include "mpeg3protos.h" | 26 | #include "mpeg3protos.h" |
28 | //#include <qpe/mediaplayerplugininterface.h> | 27 | #include <qpe/mediaplayerplugininterface.h> |
29 | #include "../mediaplayerplugininterface.h" | ||
30 | 28 | ||
@@ -54,3 +52,2 @@ public: | |||
54 | int audioFrequency( int stream ) { return file ? mpeg3_sample_rate( file, stream ) : 0; } | 52 | int audioFrequency( int stream ) { return file ? mpeg3_sample_rate( file, stream ) : 0; } |
55 | int audioBitsPerSample(int) { return 0;} | ||
56 | int audioSamples( int stream ) { return file ? mpeg3_audio_samples( file, stream ) : 0; } | 53 | 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 89abf97..e9926f4 100644 --- a/core/multimedia/opieplayer/libmpeg3/libmpeg3pluginimpl.h +++ b/core/multimedia/opieplayer/libmpeg3/libmpeg3pluginimpl.h | |||
@@ -22,5 +22,3 @@ | |||
22 | 22 | ||
23 | 23 | #include <qpe/mediaplayerplugininterface.h> | |
24 | //#include <qpe/mediaplayerplugininterface.h> | ||
25 | #include "../mediaplayerplugininterface.h" | ||
26 | 24 | ||
diff --git a/core/multimedia/opieplayer/loopcontrol.cpp b/core/multimedia/opieplayer/loopcontrol.cpp index 1ae0059..dd466ed 100644 --- a/core/multimedia/opieplayer/loopcontrol.cpp +++ b/core/multimedia/opieplayer/loopcontrol.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of the Qtopia Environment. |
5 | ** | 5 | ** |
@@ -19,9 +19,8 @@ | |||
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | // L.J.Potter added changes Fri 02-15-2002 | ||
21 | |||
22 | #include <qpe/qpeapplication.h> | 20 | #include <qpe/qpeapplication.h> |
23 | |||
24 | #ifdef Q_WS_QWS | 21 | #ifdef Q_WS_QWS |
22 | |||
25 | #include <qpe/qcopenvelope_qws.h> | 23 | #include <qpe/qcopenvelope_qws.h> |
26 | #endif | 24 | #endif |
25 | #include <qpe/mediaplayerplugininterface.h> | ||
27 | #include <stdio.h> | 26 | #include <stdio.h> |
@@ -35,3 +34,2 @@ | |||
35 | #include "audiodevice.h" | 34 | #include "audiodevice.h" |
36 | #include "mediaplayerplugininterface.h" | ||
37 | #include "mediaplayerstate.h" | 35 | #include "mediaplayerstate.h" |
@@ -106,4 +104,6 @@ LoopControl::LoopControl( QObject *parent, const char *name ) | |||
106 | pthread_attr_init(&audio_attr); | 104 | pthread_attr_init(&audio_attr); |
107 | #define USE_REALTIME_AUDIO_THREAD | 105 | |
108 | #ifdef USE_REALTIME_AUDIO_THREAD | 106 | if ( getuid() == 0 ) { |
107 | printf("true, guid = %i\n", getuid()); | ||
108 | |||
109 | // Attempt to set it to real-time round robin | 109 | // Attempt to set it to real-time round robin |
@@ -118,3 +118,6 @@ LoopControl::LoopControl( QObject *parent, const char *name ) | |||
118 | } | 118 | } |
119 | #endif | 119 | } |
120 | // printf("false, guid = %i\n", getuid()); | ||
121 | usleep( 100 ); | ||
122 | |||
120 | pthread_create(&audio_tid, &audio_attr, (void * (*)(void *))startAudioThread, this); | 123 | pthread_create(&audio_tid, &audio_attr, (void * (*)(void *))startAudioThread, this); |
@@ -233,3 +236,3 @@ void LoopControl::startAudio() { | |||
233 | long samplesRead = 0; | 236 | long samplesRead = 0; |
234 | bool readOk=mediaPlayerState->curDecoder()->audioReadSamples( (short*)audioBuffer, channels, 1024, samplesRead, stream ); | 237 | mediaPlayerState->curDecoder()->audioReadSamples( (short*)audioBuffer, channels, 1024, samplesRead, stream ); |
235 | long sampleWeShouldBeAt = long( playtime.elapsed() ) * freq / 1000; | 238 | long sampleWeShouldBeAt = long( playtime.elapsed() ) * freq / 1000; |
@@ -239,4 +242,3 @@ void LoopControl::startAudio() { | |||
239 | usleep( (long)((double)sampleWaitTime * 1000000.0 / freq) ); | 242 | usleep( (long)((double)sampleWaitTime * 1000000.0 / freq) ); |
240 | } | 243 | } else if ( sampleWaitTime <= -5000 ) { |
241 | else if ( sampleWaitTime <= -5000 ) { | ||
242 | qDebug("need to catch up by: %li (%i,%li)", -sampleWaitTime, currentSample, sampleWeShouldBeAt ); | 244 | qDebug("need to catch up by: %li (%i,%li)", -sampleWaitTime, currentSample, sampleWeShouldBeAt ); |
@@ -249,3 +251,3 @@ void LoopControl::startAudio() { | |||
249 | 251 | ||
250 | moreAudio = readOk && (audioSampleCounter <= total_audio_samples); | 252 | moreAudio = audioSampleCounter <= total_audio_samples; |
251 | 253 | ||
@@ -379,3 +381,3 @@ bool LoopControl::init( const QString& filename ) { | |||
379 | channels = mediaPlayerState->curDecoder()->audioChannels( astream ); | 381 | channels = mediaPlayerState->curDecoder()->audioChannels( astream ); |
380 | qDebug( "LC- channels = %d", channels ); | 382 | DecodeLoopDebug(( "channels = %d\n", channels )); |
381 | 383 | ||
@@ -384,3 +386,3 @@ bool LoopControl::init( const QString& filename ) { | |||
384 | 386 | ||
385 | // total_audio_samples += 1000; | 387 | total_audio_samples += 1000; |
386 | 388 | ||
@@ -389,3 +391,3 @@ bool LoopControl::init( const QString& filename ) { | |||
389 | freq = mediaPlayerState->curDecoder()->audioFrequency( astream ); | 391 | freq = mediaPlayerState->curDecoder()->audioFrequency( astream ); |
390 | qDebug( "LC- frequency = %d", freq ); | 392 | DecodeLoopDebug(( "frequency = %d\n", freq )); |
391 | 393 | ||
@@ -393,5 +395,5 @@ bool LoopControl::init( const QString& filename ) { | |||
393 | 395 | ||
394 | int bits_per_sample = mediaPlayerState->curDecoder()->audioBitsPerSample( astream); | 396 | static const int bytes_per_sample = 2; //16 bit |
395 | 397 | ||
396 | audioDevice = new AudioDevice( freq, channels, bits_per_sample); | 398 | audioDevice = new AudioDevice( freq, channels, bytes_per_sample ); |
397 | audioBuffer = new char[ audioDevice->bufferSize() ]; | 399 | audioBuffer = new char[ audioDevice->bufferSize() ]; |
diff --git a/core/multimedia/opieplayer/loopcontrol.h b/core/multimedia/opieplayer/loopcontrol.h index fc7d316..3191259 100644 --- a/core/multimedia/opieplayer/loopcontrol.h +++ b/core/multimedia/opieplayer/loopcontrol.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of the Qtopia Environment. |
5 | ** | 5 | ** |
@@ -19,4 +19,2 @@ | |||
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | // L.J.Potter added changes Fri 02-15-2002 | ||
21 | |||
22 | #ifndef MPEGVIEW_H | 20 | #ifndef MPEGVIEW_H |
@@ -24,3 +22,2 @@ | |||
24 | 22 | ||
25 | |||
26 | #include <qwidget.h> | 23 | #include <qwidget.h> |
diff --git a/core/multimedia/opieplayer/loopcontrol_threaded.cpp b/core/multimedia/opieplayer/loopcontrol_threaded.cpp index 2e49bb7..eb89b85 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 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of the Qtopia Environment. |
5 | ** | 5 | ** |
@@ -22,2 +22,3 @@ | |||
22 | 22 | ||
23 | |||
23 | #include <qpe/qpeapplication.h> | 24 | #include <qpe/qpeapplication.h> |
@@ -28,3 +29,3 @@ | |||
28 | #endif | 29 | #endif |
29 | #include "mediaplayerplugininterface.h" | 30 | #include <qpe/mediaplayerplugininterface.h> |
30 | #include <stdio.h> | 31 | #include <stdio.h> |
diff --git a/core/multimedia/opieplayer/loopcontrol_threaded.h b/core/multimedia/opieplayer/loopcontrol_threaded.h index 9a009d1..ced6ac8 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 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of the Qtopia Environment. |
5 | ** | 5 | ** |
@@ -23,2 +23,3 @@ | |||
23 | 23 | ||
24 | |||
24 | #include <qwidget.h> | 25 | #include <qwidget.h> |
diff --git a/core/multimedia/opieplayer/main.cpp b/core/multimedia/opieplayer/main.cpp index 9f7ef73..720a1ca 100644 --- a/core/multimedia/opieplayer/main.cpp +++ b/core/multimedia/opieplayer/main.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of the Qtopia Environment. |
5 | ** | 5 | ** |
@@ -27,3 +27,2 @@ | |||
27 | 27 | ||
28 | |||
29 | MediaPlayerState *mediaPlayerState; | 28 | MediaPlayerState *mediaPlayerState; |
@@ -50,3 +49,3 @@ int main(int argc, char **argv) { | |||
50 | 49 | ||
51 | pl.setCaption( MediaPlayer::tr("Opie Player") ); | 50 | pl.setCaption( MediaPlayer::tr("Media Player") ); |
52 | a.showMainDocumentWidget(&pl); | 51 | a.showMainDocumentWidget(&pl); |
diff --git a/core/multimedia/opieplayer/mediaplayer.cpp b/core/multimedia/opieplayer/mediaplayer.cpp index 3d8f76c..ce42c2c 100644 --- a/core/multimedia/opieplayer/mediaplayer.cpp +++ b/core/multimedia/opieplayer/mediaplayer.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of the Qtopia Environment. |
5 | ** | 5 | ** |
@@ -19,2 +19,3 @@ | |||
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | |||
20 | #include <qpe/qpeapplication.h> | 21 | #include <qpe/qpeapplication.h> |
diff --git a/core/multimedia/opieplayer/mediaplayer.h b/core/multimedia/opieplayer/mediaplayer.h index 379d95c..73f8124 100644 --- a/core/multimedia/opieplayer/mediaplayer.h +++ b/core/multimedia/opieplayer/mediaplayer.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of the Qtopia Environment. |
5 | ** | 5 | ** |
@@ -22,3 +22,2 @@ | |||
22 | 22 | ||
23 | |||
24 | #include <qmainwindow.h> | 23 | #include <qmainwindow.h> |
@@ -26,3 +25,3 @@ | |||
26 | #include <qpe/qlibrary.h> | 25 | #include <qpe/qlibrary.h> |
27 | #include "mediaplayerplugininterface.h" | 26 | #include <qpe/mediaplayerplugininterface.h> |
28 | 27 | ||
diff --git a/core/multimedia/opieplayer/mediaplayerplugininterface.h b/core/multimedia/opieplayer/mediaplayerplugininterface.h index 339b2e4..aeeffde 100644 --- a/core/multimedia/opieplayer/mediaplayerplugininterface.h +++ b/core/multimedia/opieplayer/mediaplayerplugininterface.h | |||
@@ -22,2 +22,3 @@ | |||
22 | 22 | ||
23 | |||
23 | #include <qpe/qcom.h> | 24 | #include <qpe/qcom.h> |
@@ -63,3 +64,8 @@ public: | |||
63 | virtual long audioGetSample( int stream ) = 0; | 64 | 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; | ||
64 | virtual bool audioReadSamples( short *samples, int channels, long samples, long& samplesRead, int stream ) = 0; | 67 | 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; | ||
65 | 71 | ||
@@ -93,5 +99,2 @@ public: | |||
93 | 99 | ||
94 | // File Properies | ||
95 | virtual long getPlayTime() { return -1; } | ||
96 | virtual int audioBitsPerSample( int stream ) = 0; | ||
97 | }; | 100 | }; |
diff --git a/core/multimedia/opieplayer/mediaplayerstate.cpp b/core/multimedia/opieplayer/mediaplayerstate.cpp index 2a6bca3..7e82166 100644 --- a/core/multimedia/opieplayer/mediaplayerstate.cpp +++ b/core/multimedia/opieplayer/mediaplayerstate.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of the Qtopia Environment. |
5 | ** | 5 | ** |
@@ -21,2 +21,3 @@ | |||
21 | #include <qpe/qlibrary.h> | 21 | #include <qpe/qlibrary.h> |
22 | #include <qpe/mediaplayerplugininterface.h> | ||
22 | #include <qpe/config.h> | 23 | #include <qpe/config.h> |
@@ -25,7 +26,4 @@ | |||
25 | #include <qdir.h> | 26 | #include <qdir.h> |
26 | #include "mediaplayerplugininterface.h" | ||
27 | #include "mediaplayerstate.h" | 27 | #include "mediaplayerstate.h" |
28 | 28 | ||
29 | |||
30 | |||
31 | #ifdef QT_NO_COMPONENT | 29 | #ifdef QT_NO_COMPONENT |
@@ -38,4 +36,4 @@ | |||
38 | 36 | ||
39 | //#define MediaPlayerDebug(x) qDebug x | 37 | #define MediaPlayerDebug(x)qDebug x |
40 | #define MediaPlayerDebug(x) | 38 | //#define MediaPlayerDebug(x) |
41 | 39 | ||
@@ -118,6 +116,2 @@ MediaPlayerDecoder *MediaPlayerState::libMpeg3Decoder() { | |||
118 | 116 | ||
119 | // ### hack to get true sample count | ||
120 | // MediaPlayerDecoder *MediaPlayerState::libWavDecoder() { | ||
121 | // return libwavdecoder; | ||
122 | // } | ||
123 | 117 | ||
diff --git a/core/multimedia/opieplayer/mediaplayerstate.h b/core/multimedia/opieplayer/mediaplayerstate.h index 1a23742..e82c263 100644 --- a/core/multimedia/opieplayer/mediaplayerstate.h +++ b/core/multimedia/opieplayer/mediaplayerstate.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of the Qtopia Environment. |
5 | ** | 5 | ** |
@@ -22,3 +22,2 @@ | |||
22 | 22 | ||
23 | |||
24 | #include <qobject.h> | 23 | #include <qobject.h> |
@@ -108,3 +107,2 @@ private: | |||
108 | MediaPlayerDecoder *libmpeg3decoder; | 107 | MediaPlayerDecoder *libmpeg3decoder; |
109 | // MediaPlayerDecoder *libwavdecoder; | ||
110 | 108 | ||
diff --git a/core/multimedia/opieplayer/playlistselection.cpp b/core/multimedia/opieplayer/playlistselection.cpp index f17ab6f..a82b594 100644 --- a/core/multimedia/opieplayer/playlistselection.cpp +++ b/core/multimedia/opieplayer/playlistselection.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of the Qtopia Environment. |
5 | ** | 5 | ** |
@@ -32,3 +32,2 @@ | |||
32 | 32 | ||
33 | |||
34 | class PlayListSelectionItem : public QListViewItem { | 33 | class PlayListSelectionItem : public QListViewItem { |
diff --git a/core/multimedia/opieplayer/playlistselection.h b/core/multimedia/opieplayer/playlistselection.h index 6ce6bdc..22d3c74 100644 --- a/core/multimedia/opieplayer/playlistselection.h +++ b/core/multimedia/opieplayer/playlistselection.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of the Qtopia Environment. |
5 | ** | 5 | ** |
@@ -23,2 +23,3 @@ | |||
23 | 23 | ||
24 | |||
24 | #include <qlist.h> | 25 | #include <qlist.h> |
diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp index 269aed8..0423e7a 100644 --- a/core/multimedia/opieplayer/playlistwidget.cpp +++ b/core/multimedia/opieplayer/playlistwidget.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of the Qtopia Environment. |
5 | ** | 5 | ** |
@@ -19,2 +19,3 @@ | |||
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | |||
20 | #include <qpe/qpemenubar.h> | 21 | #include <qpe/qpemenubar.h> |
@@ -22,4 +23,2 @@ | |||
22 | #include <qpe/fileselector.h> | 23 | #include <qpe/fileselector.h> |
23 | #include <qpe/qpeapplication.h> | ||
24 | |||
25 | #include <qpe/applnk.h> | 24 | #include <qpe/applnk.h> |
@@ -38,6 +37,2 @@ | |||
38 | #include <qtoolbutton.h> | 37 | #include <qtoolbutton.h> |
39 | #include <qtabwidget.h> | ||
40 | #include <qlistview.h> | ||
41 | #include <qpoint.h> | ||
42 | //#include <qtimer.h> | ||
43 | 38 | ||
@@ -49,5 +44,2 @@ | |||
49 | 44 | ||
50 | #define BUTTONS_ON_TOOLBAR | ||
51 | #define SIDE_BUTTONS | ||
52 | #define CAN_SAVE_LOAD_PLAYLISTS | ||
53 | 45 | ||
@@ -55,8 +47,11 @@ extern MediaPlayerState *mediaPlayerState; | |||
55 | 47 | ||
56 | // class myFileSelector { | ||
57 | 48 | ||
58 | // }; | ||
59 | class PlayListWidgetPrivate { | 49 | class PlayListWidgetPrivate { |
60 | public: | 50 | public: |
61 | QToolButton *tbPlay, *tbFull, *tbLoop, *tbScale, *tbShuffle, *tbAddToList, *tbRemoveFromList, *tbMoveUp, *tbMoveDown, *tbRemove; | 51 | QToolButton *tbPlay; |
52 | QToolButton *tbFull; | ||
53 | QToolButton *tbLoop; | ||
54 | QToolButton *tbScale; | ||
55 | QToolButton *tbShuffle; | ||
56 | |||
62 | QFrame *playListFrame; | 57 | QFrame *playListFrame; |
@@ -100,4 +95,2 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) | |||
100 | d->current = NULL; | 95 | d->current = NULL; |
101 | // menuTimer = new QTimer( this ,"menu timer"), | ||
102 | // connect( menuTimer, SIGNAL( timeout() ), SLOT( addSelected() ) ); | ||
103 | 96 | ||
@@ -105,3 +98,3 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) | |||
105 | 98 | ||
106 | setCaption( tr("OpiePlayer") ); | 99 | setCaption( tr("MediaPlayer") ); |
107 | setIcon( Resource::loadPixmap( "MPEGPlayer" ) ); | 100 | setIcon( Resource::loadPixmap( "MPEGPlayer" ) ); |
@@ -120,60 +113,31 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) | |||
120 | bar->setLabel( tr( "Play Operations" ) ); | 113 | bar->setLabel( tr( "Play Operations" ) ); |
121 | d->tbAddToList = new ToolButton( bar, tr( "Add to Playlist" ), "mpegplayer/add_to_playlist", | 114 | #ifdef BUTTONS_ON_TOOLBAR |
122 | 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", | 116 | d->tbShuffle = new ToolButton( bar, tr( "Randomize" ), "mpegplayer/shuffle", mediaPlayerState, SLOT(setShuffled(bool)), TRUE ); |
124 | this , SLOT(removeSelected()) ); | 117 | #endif |
125 | d->tbPlay = new ToolButton( bar, tr( "Play" ), "mpegplayer/play", | 118 | d->tbLoop = new ToolButton( bar, tr( "Loop" ), "mpegplayer/loop", mediaPlayerState, SLOT(setLooping(bool)), TRUE ); |
126 | mediaPlayerState, SLOT(setPlaying(bool)), TRUE ); | 119 | d->tbFull = new ToolButton( bar, tr( "Fullscreen" ), "fullscreen", mediaPlayerState, SLOT(setFullscreen(bool)), TRUE ); |
127 | 120 | d->tbScale = new ToolButton( bar, tr( "Scale" ), "mpegplayer/scale", mediaPlayerState, SLOT(setScaled(bool)), TRUE ); | |
128 | d->tbShuffle = new ToolButton( bar, tr( "Randomize" ), "mpegplayer/shuffle", | ||
129 | mediaPlayerState, SLOT(setShuffled(bool)), TRUE ); | ||
130 | d->tbLoop = new ToolButton( bar, tr( "Loop" ), "mpegplayer/loop", | ||
131 | mediaPlayerState, SLOT(setLooping(bool)), TRUE ); | ||
132 | |||
133 | // d->tbFull = new ToolButton( bar, tr( "Fullscreen" ), "fullscreen", mediaPlayerState, SLOT(setFullscreen(bool)), TRUE ); | ||
134 | // d->tbScale = new ToolButton( bar, tr( "Scale" ), "mpegplayer/scale", mediaPlayerState, SLOT(setScaled(bool)), TRUE ); | ||
135 | 121 | ||
136 | QPopupMenu *pmPlayList = new QPopupMenu( this ); | 122 | QPopupMenu *pmPlayList = new QPopupMenu( this ); |
137 | menu->insertItem( tr( "File" ), pmPlayList ); | 123 | menu->insertItem( tr( "PlayList" ), pmPlayList ); |
124 | new MenuItem( pmPlayList, tr( "Toggle PlayList" ), mediaPlayerState, SLOT( togglePlaylist() ) ); | ||
138 | new MenuItem( pmPlayList, tr( "Clear List" ), this, SLOT( clearList() ) ); | 125 | new MenuItem( pmPlayList, tr( "Clear List" ), this, SLOT( clearList() ) ); |
139 | new MenuItem( pmPlayList, tr( "Add all audio files" ), this, SLOT( addAllMusicToList() ) ); | 126 | new MenuItem( pmPlayList, tr( "Add all music files" ), this, SLOT( addAllMusicToList() ) ); |
140 | new MenuItem( pmPlayList, tr( "Add all video files" ), this, SLOT( addAllVideoToList() ) ); | 127 | new MenuItem( pmPlayList, tr( "Add all video files" ), this, SLOT( addAllVideoToList() ) ); |
141 | new MenuItem( pmPlayList, tr( "Add all files" ), this, SLOT( addAllToList() ) ); | 128 | new MenuItem( pmPlayList, tr( "Add all files" ), this, SLOT( addAllToList() ) ); |
129 | #ifdef CAN_SAVE_LOAD_PLAYLISTS | ||
142 | new MenuItem( pmPlayList, tr( "Save PlayList" ), this, SLOT( saveList() ) ); | 130 | new MenuItem( pmPlayList, tr( "Save PlayList" ), this, SLOT( saveList() ) ); |
143 | new MenuItem( pmPlayList, tr( "Load PlayList" ), this, SLOT( loadList() ) ); | 131 | new MenuItem( pmPlayList, tr( "Load PlayList" ), this, SLOT( loadList() ) ); |
144 | 132 | #endif | |
145 | QPopupMenu *pmView = new QPopupMenu( this ); | ||
146 | menu->insertItem( tr( "View" ), pmView ); | ||
147 | |||
148 | fullScreenButton = new QAction(tr("Full Screen"), Resource::loadPixmap("fullscreen"), QString::null, 0, this, 0); | ||
149 | connect( fullScreenButton, SIGNAL(activated()), mediaPlayerState, SLOT(toggleFullscreen()) ); | ||
150 | fullScreenButton->addTo(pmView); | ||
151 | scaleButton = new QAction(tr("Scale"), Resource::loadPixmap("mpegplayer/scale"), QString::null, 0, this, 0); | ||
152 | connect( scaleButton, SIGNAL(activated()), mediaPlayerState, SLOT(toggleScaled()) ); | ||
153 | scaleButton->addTo(pmView); | ||
154 | 133 | ||
155 | QVBox *vbox5 = new QVBox( this ); vbox5->setBackgroundMode( PaletteButton ); | 134 | QVBox *vbox5 = new QVBox( this ); vbox5->setBackgroundMode( PaletteButton ); |
156 | QVBox *vbox4 = new QVBox( vbox5 ); vbox4->setBackgroundMode( PaletteButton ); | ||
157 | // vbox4->setMargin(4); | ||
158 | // libString = new QLabel( tr(" Media Library"), vbox4 ); | ||
159 | // libString->setBackgroundMode( QButton::PaletteButton ); | ||
160 | // libString->setFont( QFont( "Helvetica", 8, QFont::Bold ) ); | ||
161 | |||
162 | QHBox *hbox6 = new QHBox( vbox4 ); hbox6->setBackgroundMode( PaletteButton ); | ||
163 | |||
164 | tabWidget = new QTabWidget( hbox6, "tabWidget" ); | ||
165 | tabWidget->setTabShape(QTabWidget::Triangular); | ||
166 | |||
167 | |||
168 | QWidget *pTab; | ||
169 | pTab = new QWidget( tabWidget, "pTab" ); | ||
170 | playlistView = new QListView( pTab, "Videoview" ); | ||
171 | playlistView->setMinimumSize(236,260); | ||
172 | tabWidget->insertTab( pTab,"Playlist"); | ||
173 | 135 | ||
174 | // Add the playlist area | 136 | // Add the playlist area |
175 | 137 | QVBox *vbox3 = new QVBox( vbox5 ); vbox3->setBackgroundMode( PaletteButton ); | |
176 | QVBox *vbox3 = new QVBox( pTab ); vbox3->setBackgroundMode( PaletteButton ); | ||
177 | d->playListFrame = vbox3; | 138 | d->playListFrame = vbox3; |
178 | d->playListFrame ->setMinimumSize(235,260); | 139 | |
140 | QLabel *plString = new QLabel( tr(" PlayList"), vbox3 ); | ||
141 | plString->setBackgroundMode( QButton::PaletteButton ); | ||
142 | plString->setFont( QFont( "Helvetica", 8, QFont::Bold ) ); | ||
179 | 143 | ||
@@ -183,3 +147,6 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) | |||
183 | 147 | ||
148 | #ifndef BUTTONS_ON_TOOLBAR | ||
149 | d->tbPlay = new ToolButton( vbox1, tr( "Play" ), "mpegplayer/play", mediaPlayerState, SLOT(setPlaying(bool)), TRUE ); | ||
184 | QVBox *stretch1 = new QVBox( vbox1 ); stretch1->setBackgroundMode( PaletteButton ); // add stretch | 150 | QVBox *stretch1 = new QVBox( vbox1 ); stretch1->setBackgroundMode( PaletteButton ); // add stretch |
151 | #endif | ||
185 | new ToolButton( vbox1, tr( "Move Up" ), "mpegplayer/up", d->selectedFiles, SLOT(moveSelectedUp()) ); | 152 | new ToolButton( vbox1, tr( "Move Up" ), "mpegplayer/up", d->selectedFiles, SLOT(moveSelectedUp()) ); |
@@ -188,86 +155,25 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) | |||
188 | QVBox *stretch2 = new QVBox( vbox1 ); stretch2->setBackgroundMode( PaletteButton ); // add stretch | 155 | QVBox *stretch2 = new QVBox( vbox1 ); stretch2->setBackgroundMode( PaletteButton ); // add stretch |
189 | 156 | #ifndef BUTTONS_ON_TOOLBAR | |
190 | QWidget *aTab; | 157 | d->tbShuffle = new ToolButton( vbox1, tr( "Randomize" ), "mpegplayer/shuffle", mediaPlayerState, SLOT(setShuffled(bool)), TRUE ); |
191 | aTab = new QWidget( tabWidget, "aTab" ); | 158 | #endif |
192 | audioView = new QListView( aTab, "Audioview" ); | ||
193 | audioView->setMinimumSize(233,260); | ||
194 | audioView->addColumn( "Title",150); | ||
195 | audioView->addColumn("Size", 45); | ||
196 | audioView->addColumn("Media",35); | ||
197 | audioView->setColumnAlignment(1, Qt::AlignRight); | ||
198 | audioView->setColumnAlignment(2, Qt::AlignRight); | ||
199 | tabWidget->insertTab(aTab,"Audio"); | ||
200 | // audioView | ||
201 | Global::findDocuments(&files, "audio/*"); | ||
202 | QListIterator<DocLnk> dit( files.children() ); | ||
203 | QString storage; | ||
204 | for ( ; dit.current(); ++dit ) { | ||
205 | QListViewItem * newItem; | ||
206 | if(dit.current()->file().find("/mnt/cf") != -1 ) storage="CF"; | ||
207 | else if(dit.current()->file().find("/mnt/hda") != -1 ) storage="CF"; | ||
208 | else if(dit.current()->file().find("/mnt/card") != -1 ) storage="SD"; | ||
209 | else storage="RAM"; | ||
210 | if ( QFile( dit.current()->file()).exists() ) { | ||
211 | newItem= /*(void)*/ new QListViewItem( audioView, dit.current()->name(), QString::number( QFile( dit.current()->file()).size() ), storage); | ||
212 | newItem->setPixmap(0, Resource::loadPixmap( "mpegplayer/musicfile" )); | ||
213 | } | ||
214 | } | ||
215 | // videowidget | ||
216 | |||
217 | QWidget *vTab; | ||
218 | vTab = new QWidget( tabWidget, "vTab" ); | ||
219 | videoView = new QListView( vTab, "Videoview" ); | ||
220 | videoView->setMinimumSize(233,260); | ||
221 | |||
222 | videoView->addColumn("Title",150); | ||
223 | videoView->addColumn("Size",45); | ||
224 | videoView->addColumn("Media",35); | ||
225 | videoView->setColumnAlignment(1, Qt::AlignRight); | ||
226 | videoView->setColumnAlignment(2, Qt::AlignRight); | ||
227 | |||
228 | tabWidget->insertTab( vTab,"Video"); | ||
229 | |||
230 | Global::findDocuments(&vFiles, "video/*"); | ||
231 | QListIterator<DocLnk> Vdit( vFiles.children() ); | ||
232 | for ( ; Vdit.current(); ++Vdit ) { | ||
233 | if( Vdit.current()->file().find("/mnt/cf") != -1 ) storage="CF"; | ||
234 | else if( Vdit.current()->file().find("/mnt/hda") != -1 ) storage="CF"; | ||
235 | else if( Vdit.current()->file().find("/mnt/card") != -1 ) storage="SD"; | ||
236 | else storage="RAM"; | ||
237 | QListViewItem * newItem; | ||
238 | if ( QFile( Vdit.current()->file()).exists() ) { | ||
239 | newItem= /*(void)*/ new QListViewItem( videoView, Vdit.current()->name(), QString::number( QFile( Vdit.current()->file()).size() ), storage); | ||
240 | newItem->setPixmap(0, Resource::loadPixmap( "mpegplayer/videofile" )); | ||
241 | } | ||
242 | } | ||
243 | |||
244 | |||
245 | // d->tbPlay = new ToolButton( vbox1, tr( "Play" ), "mpegplayer/play", mediaPlayerState, SLOT(setPlaying(bool)), TRUE ); | ||
246 | // d->tbShuffle = new ToolButton( vbox1, tr( "Randomize" ), "mpegplayer/shuffle", mediaPlayerState, SLOT(setShuffled(bool)), TRUE ); | ||
247 | 159 | ||
248 | // add the library area | 160 | // add the library area |
161 | QVBox *vbox4 = new QVBox( vbox5 ); vbox4->setBackgroundMode( PaletteButton ); | ||
249 | 162 | ||
250 | // d->files->setBackgroundMode( PaletteButton ); | 163 | QLabel *libString = new QLabel( tr(" Media Library"), vbox4 ); |
251 | // QVBox *vbox7 = new QVBox( hbox6 ); vbox7->setBackgroundMode( PaletteButton ); | 164 | libString->setBackgroundMode( QButton::PaletteButton ); |
252 | 165 | libString->setFont( QFont( "Helvetica", 8, QFont::Bold ) ); | |
253 | // #ifdef SIDE_BUTTONS | ||
254 | // QVBox *stretch3 = new QVBox( vbox1 ); stretch3->setBackgroundMode( PaletteButton ); // add stretch | ||
255 | // #endif | ||
256 | QPEApplication::setStylusOperation( this, QPEApplication::RightOnHold ); | ||
257 | |||
258 | // connect( audioView, SIGNAL( clicked( QListViewItem *) ), this, SLOT( playIt( QListViewItem *) ) ); | ||
259 | // connect( videoView, SIGNAL( clicked( QListViewItem *) ), this, SLOT( playIt( QListViewItem *) ) ); | ||
260 | 166 | ||
261 | connect( audioView, SIGNAL( clicked( QListViewItem *) ), this, SLOT( addToSelection( QListViewItem *) ) ); | 167 | QHBox *hbox6 = new QHBox( vbox4 ); hbox6->setBackgroundMode( PaletteButton ); |
262 | connect( videoView, SIGNAL( clicked( QListViewItem *) ), this, SLOT( addToSelection( QListViewItem *) ) ); | 168 | d->files = new FileSelector( "video/*;audio/*", hbox6, "Find Media Files", FALSE, FALSE ); |
169 | d->files->setBackgroundMode( PaletteButton ); | ||
170 | QVBox *vbox7 = new QVBox( hbox6 ); vbox7->setBackgroundMode( PaletteButton ); | ||
263 | 171 | ||
264 | connect( audioView, SIGNAL( rightButtonPressed( QListViewItem *, const QPoint&, int ) ), | 172 | #ifdef SIDE_BUTTONS |
265 | this, SLOT( addToSelection( QListViewItem *, const QPoint&, int )) ); | 173 | new ToolButton( vbox7, tr( "Add to Playlist" ), "mpegplayer/add_to_playlist", d->selectedFiles, SLOT(addSelected()) ); |
266 | connect( videoView, SIGNAL( rightButtonPressed( QListViewItem *, const QPoint&, int ) ), | 174 | new ToolButton( vbox7, tr( "Remove from Playlist" ), "mpegplayer/remove_from_playlist", d->selectedFiles, SLOT(removeSelected()) ); |
267 | this, SLOT( addToSelection( QListViewItem *, const QPoint&, int )) ); | 175 | QVBox *stretch3 = new QVBox( vbox1 ); stretch3->setBackgroundMode( PaletteButton ); // add stretch |
176 | #endif | ||
268 | 177 | ||
269 | connect( playlistView, SIGNAL( pressed( QListViewItem *) ), this, SLOT( playIt( QListViewItem *) ) ); | 178 | connect( d->files, SIGNAL( fileSelected( const DocLnk & ) ), this, SLOT( addToSelection( const DocLnk & ) ) ); |
270 | connect( tabWidget, SIGNAL (currentChanged(QWidget*)),this,SLOT(tabChanged(QWidget*))); | ||
271 | // connect( d->files, SIGNAL( fileSelected( const DocLnk & ) ), this, SLOT( addToSelection( const DocLnk & ) ) ); | ||
272 | // connect( d->files, SIGNAL( fileSelected( const DocLnk & ) ), this, SLOT( addToSelection( const DocLnk & ) ) ); | ||
273 | connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), d->tbPlay, SLOT( setOn( bool ) ) ); | 179 | connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), d->tbPlay, SLOT( setOn( bool ) ) ); |
@@ -275,7 +181,5 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) | |||
275 | connect( mediaPlayerState, SIGNAL( shuffledToggled( bool ) ), d->tbShuffle, SLOT( setOn( bool ) ) ); | 181 | connect( mediaPlayerState, SIGNAL( shuffledToggled( bool ) ), d->tbShuffle, SLOT( setOn( bool ) ) ); |
276 | 182 | connect( mediaPlayerState, SIGNAL( fullscreenToggled( bool ) ), d->tbFull, SLOT( setOn( bool ) ) ); | |
277 | // connect( mediaPlayerState, SIGNAL( fullscreenToggled( bool ) ), fullScreenButton, SLOT( setOn( bool ) ) ); | 183 | connect( mediaPlayerState, SIGNAL( scaledToggled( bool ) ), d->tbScale, SLOT( setOn( bool ) ) ); |
278 | // connect( mediaPlayerState, SIGNAL( scaledToggled( bool ) ), scaleButton, SLOT( setEnabled( bool ) ) ); | 184 | connect( mediaPlayerState, SIGNAL( fullscreenToggled( bool ) ), d->tbScale, SLOT( setEnabled( bool ) ) ); |
279 | // connect( mediaPlayerState, SIGNAL( fullscreenToggled( bool ) ), fullScreenButton, SLOT( setEnabled( bool ) ) ); | ||
280 | |||
281 | connect( mediaPlayerState, SIGNAL( playlistToggled( bool ) ), this, SLOT( setPlaylist( bool ) ) ); | 185 | connect( mediaPlayerState, SIGNAL( playlistToggled( bool ) ), this, SLOT( setPlaylist( bool ) ) ); |
@@ -302,3 +206,2 @@ PlayListWidget::~PlayListWidget() { | |||
302 | void PlayListWidget::initializeStates() { | 206 | void PlayListWidget::initializeStates() { |
303 | |||
304 | d->tbPlay->setOn( mediaPlayerState->playing() ); | 207 | d->tbPlay->setOn( mediaPlayerState->playing() ); |
@@ -306,6 +209,6 @@ void PlayListWidget::initializeStates() { | |||
306 | d->tbShuffle->setOn( mediaPlayerState->shuffled() ); | 209 | d->tbShuffle->setOn( mediaPlayerState->shuffled() ); |
307 | // d->tbFull->setOn( mediaPlayerState->fullscreen() ); | 210 | d->tbFull->setOn( mediaPlayerState->fullscreen() ); |
308 | // d->tbScale->setOn( mediaPlayerState->scaled() ); | 211 | d->tbScale->setOn( mediaPlayerState->scaled() ); |
309 | // d->tbScale->setEnabled( mediaPlayerState->fullscreen() ); | 212 | d->tbScale->setEnabled( mediaPlayerState->fullscreen() ); |
310 | // setPlaylist( mediaPlayerState->playlist() ); | 213 | setPlaylist( mediaPlayerState->playlist() ); |
311 | } | 214 | } |
@@ -374,12 +277,2 @@ void PlayListWidget::addToSelection( const DocLnk& lnk ) { | |||
374 | 277 | ||
375 | void PlayListWidget::addToSelection( QListViewItem *it ,const QPoint & p, int index) { | ||
376 | qDebug("add"); | ||
377 | // d->selectedFiles->addToSelection( lnk ); | ||
378 | // } | ||
379 | // else | ||
380 | // mediaPlayerState->setPlaying( TRUE ); | ||
381 | // | ||
382 | } | ||
383 | |||
384 | |||
385 | void PlayListWidget::clearList() { | 278 | void PlayListWidget::clearList() { |
@@ -556,143 +449 @@ void PlayListWidget::setView( char view ) { | |||
556 | |||
557 | void PlayListWidget::addSelected() { | ||
558 | // QMessageBox::message("Note","Bozo the clown thinks\nthere's something actually here"); | ||
559 | int tabPage=tabWidget->currentPageIndex(); | ||
560 | switch (tabPage) { | ||
561 | case 0: //playlist | ||
562 | break; | ||
563 | case 1: { //audio | ||
564 | addToSelection( audioView->selectedItem() ); | ||
565 | } | ||
566 | break; | ||
567 | case 2: { // video | ||
568 | addToSelection( videoView->selectedItem() ); | ||
569 | } | ||
570 | break; | ||
571 | }; | ||
572 | } | ||
573 | |||
574 | void PlayListWidget::removeSelected() { | ||
575 | d->selectedFiles->removeSelected( ); | ||
576 | } | ||
577 | |||
578 | |||
579 | void PlayListWidget::playIt( QListViewItem *it) { | ||
580 | d->setDocumentUsed = FALSE; | ||
581 | |||
582 | if(it) { | ||
583 | qDebug("playit"); | ||
584 | int tabPage=tabWidget->currentPageIndex(); | ||
585 | switch (tabPage) { | ||
586 | case 1: { | ||
587 | DocLnkSet files; | ||
588 | QListIterator<DocLnk> dit( files.children() ); | ||
589 | for ( ; dit.current(); ++dit ) { | ||
590 | if( dit.current()->name() == it->text(0)) { | ||
591 | setDocument( dit.current()->name()); | ||
592 | } | ||
593 | } | ||
594 | } | ||
595 | break; | ||
596 | case 2: { | ||
597 | DocLnkSet vFiles; | ||
598 | QListIterator<DocLnk> dit( vFiles.children() ); | ||
599 | for ( ; dit.current(); ++dit ) { | ||
600 | qDebug(dit.current()->name()); | ||
601 | if( dit.current()->name() == it->text(0)) { | ||
602 | qDebug(it->text(0)); | ||
603 | setDocument( dit.current()->name()); | ||
604 | } | ||
605 | } | ||
606 | } | ||
607 | break; | ||
608 | }; | ||
609 | } | ||
610 | } | ||
611 | |||
612 | void PlayListWidget::addToSelection( QListViewItem *it) { | ||
613 | d->setDocumentUsed = FALSE; | ||
614 | |||
615 | if(it) { | ||
616 | qDebug("add to selection"); | ||
617 | int tabPage=tabWidget->currentPageIndex(); | ||
618 | switch (tabPage) { | ||
619 | case 1: { | ||
620 | QListIterator<DocLnk> dit( files.children() ); | ||
621 | for ( ; dit.current(); ++dit ) { | ||
622 | if( dit.current()->name() == it->text(0)) { | ||
623 | d->selectedFiles->addToSelection( **dit ); | ||
624 | } | ||
625 | } | ||
626 | } | ||
627 | break; | ||
628 | case 2: { | ||
629 | QListIterator<DocLnk> dit( vFiles.children() ); | ||
630 | for ( ; dit.current(); ++dit ) { | ||
631 | qDebug(dit.current()->name()); | ||
632 | if( dit.current()->name() == it->text(0)) { | ||
633 | d->selectedFiles->addToSelection( **dit ); | ||
634 | } | ||
635 | } | ||
636 | } | ||
637 | break; | ||
638 | case 0: | ||
639 | break; | ||
640 | }; | ||
641 | tabWidget->setCurrentPage(0); | ||
642 | // mediaPlayerState->setPlaying( TRUE ); | ||
643 | } | ||
644 | } | ||
645 | |||
646 | void PlayListWidget::tabChanged(QWidget *widg) { | ||
647 | |||
648 | int tabPage=tabWidget->currentPageIndex(); | ||
649 | switch (tabPage) { | ||
650 | case 0: | ||
651 | { | ||
652 | d->tbRemoveFromList->setEnabled(TRUE); | ||
653 | d->tbAddToList->setEnabled(FALSE); | ||
654 | } | ||
655 | break; | ||
656 | case 1: | ||
657 | { | ||
658 | d->tbRemoveFromList->setEnabled(FALSE); | ||
659 | d->tbAddToList->setEnabled(TRUE); | ||
660 | } | ||
661 | break; | ||
662 | case 2: | ||
663 | { | ||
664 | d->tbRemoveFromList->setEnabled(FALSE); | ||
665 | d->tbAddToList->setEnabled(TRUE); | ||
666 | } | ||
667 | break; | ||
668 | }; | ||
669 | } | ||
670 | |||
671 | // void PlayListWidget::cancelMenuTimer() { | ||
672 | // if( menuTimer->isActive() ) | ||
673 | // menuTimer->stop(); | ||
674 | // } | ||
675 | |||
676 | // void PlayListWidget::showFileMenu() { | ||
677 | |||
678 | // } | ||
679 | |||
680 | // void PlayListWidget::contentsMousePressEvent( QMouseEvent * e ) | ||
681 | // { | ||
682 | // // QListView::contentsMousePressEvent( e ); | ||
683 | // menuTimer->start( 750, TRUE ); | ||
684 | // } | ||
685 | |||
686 | |||
687 | // void PlayListWidget::contentsMouseReleaseEvent( QMouseEvent * e ) | ||
688 | // { | ||
689 | // // QListView::contentsMouseReleaseEvent( e ); | ||
690 | // menuTimer->stop(); | ||
691 | // } | ||
692 | // // void PlayListWidget::setFullScreen() { | ||
693 | // mediaPlayerState->toggleFullscreen( ); | ||
694 | // } | ||
695 | |||
696 | // void PlayListWidget::setScaled() { | ||
697 | // mediaPlayerState->toggleScaled(); | ||
698 | // } | ||
diff --git a/core/multimedia/opieplayer/playlistwidget.h b/core/multimedia/opieplayer/playlistwidget.h index 6fe2211..819adb1 100644 --- a/core/multimedia/opieplayer/playlistwidget.h +++ b/core/multimedia/opieplayer/playlistwidget.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of the Qtopia Environment. |
5 | ** | 5 | ** |
@@ -22,7 +22,4 @@ | |||
22 | 22 | ||
23 | |||
24 | #include <qmainwindow.h> | 23 | #include <qmainwindow.h> |
25 | #include <qpe/applnk.h> | 24 | #include <qpe/applnk.h> |
26 | #include <qtabwidget.h> | ||
27 | /* #include <qtimer.h> */ | ||
28 | 25 | ||
@@ -31,7 +28,3 @@ class PlayListWidgetPrivate; | |||
31 | class Config; | 28 | class Config; |
32 | class QListViewItem; | 29 | |
33 | class QListView; | ||
34 | class QPoint; | ||
35 | class QAction; | ||
36 | class QLabel; | ||
37 | 30 | ||
@@ -42,8 +35,3 @@ public: | |||
42 | ~PlayListWidget(); | 35 | ~PlayListWidget(); |
43 | QTabWidget * tabWidget; | 36 | |
44 | QAction *fullScreenButton, *scaleButton; | ||
45 | DocLnkSet files; | ||
46 | DocLnkSet vFiles; | ||
47 | QListView *audioView, *videoView, *playlistView; | ||
48 | QLabel *libString; | ||
49 | // retrieve the current playlist entry (media file link) | 37 | // retrieve the current playlist entry (media file link) |
@@ -51,3 +39,2 @@ public: | |||
51 | void useSelectedDocument(); | 39 | void useSelectedDocument(); |
52 | /* QTimer * menuTimer; */ | ||
53 | 40 | ||
@@ -56,4 +43,2 @@ public slots: | |||
56 | void addToSelection( const DocLnk& ); // Add a media file to the playlist | 43 | void addToSelection( const DocLnk& ); // Add a media file to the playlist |
57 | void addToSelection( QListViewItem* ); // Add a media file to the playlist | ||
58 | void addToSelection( QListViewItem*, const QPoint&,int ); // Add a media file to the playlist | ||
59 | void setActiveWindow(); // need to handle this to show the right view | 44 | void setActiveWindow(); // need to handle this to show the right view |
@@ -67,3 +52,2 @@ public slots: | |||
67 | void loadList(); // Load a playlist | 52 | void loadList(); // Load a playlist |
68 | void playIt( QListViewItem *); | ||
69 | bool first(); | 53 | bool first(); |
@@ -72,10 +56,2 @@ public slots: | |||
72 | bool prev(); | 56 | bool prev(); |
73 | void addSelected(); | ||
74 | void removeSelected(); | ||
75 | void tabChanged(QWidget*); | ||
76 | /* void setFullScreen(); */ | ||
77 | /* void setScaled(); */ | ||
78 | protected: | ||
79 | /* void contentsMousePressEvent( QMouseEvent * e ); */ | ||
80 | /* void contentsMouseReleaseEvent( QMouseEvent * e ); */ | ||
81 | 57 | ||
@@ -86,8 +62,2 @@ private: | |||
86 | PlayListWidgetPrivate *d; // Private implementation data | 62 | PlayListWidgetPrivate *d; // Private implementation data |
87 | |||
88 | protected slots: | ||
89 | /* void cancelMenuTimer(); */ | ||
90 | /* void showFileMenu(); */ | ||
91 | |||
92 | |||
93 | }; | 63 | }; |
diff --git a/core/multimedia/opieplayer/videowidget.cpp b/core/multimedia/opieplayer/videowidget.cpp index 1f128a4..12ae4fd 100644 --- a/core/multimedia/opieplayer/videowidget.cpp +++ b/core/multimedia/opieplayer/videowidget.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of the Qtopia Environment. |
5 | ** | 5 | ** |
@@ -19,4 +19,5 @@ | |||
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | |||
20 | #include <qpe/resource.h> | 21 | #include <qpe/resource.h> |
21 | #include "mediaplayerplugininterface.h" | 22 | #include <qpe/mediaplayerplugininterface.h> |
22 | #include <qwidget.h> | 23 | #include <qwidget.h> |
@@ -68,3 +69,3 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) : | |||
68 | QWidget( parent, name, f ), scaledWidth( 0 ), scaledHeight( 0 ) { | 69 | QWidget( parent, name, f ), scaledWidth( 0 ), scaledHeight( 0 ) { |
69 | setCaption( tr("OpiePlayer") ); | 70 | setCaption( tr("MediaPlayer") ); |
70 | setBackgroundPixmap( Resource::loadPixmap( "mpegplayer/metalFinish" ) ); | 71 | setBackgroundPixmap( Resource::loadPixmap( "mpegplayer/metalFinish" ) ); |
diff --git a/core/multimedia/opieplayer/videowidget.h b/core/multimedia/opieplayer/videowidget.h index 8b49091..cf13743 100644 --- a/core/multimedia/opieplayer/videowidget.h +++ b/core/multimedia/opieplayer/videowidget.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of the Qtopia Environment. |
5 | ** | 5 | ** |
@@ -25,3 +25,2 @@ | |||
25 | 25 | ||
26 | |||
27 | class QPixmap; | 26 | class QPixmap; |
diff --git a/core/multimedia/opieplayer/wavplugin/Makefile.in b/core/multimedia/opieplayer/wavplugin/Makefile.in index a46b925..bcbe7f2 100644 --- a/core/multimedia/opieplayer/wavplugin/Makefile.in +++ b/core/multimedia/opieplayer/wavplugin/Makefile.in | |||
@@ -102,4 +102,3 @@ REQUIRES= | |||
102 | wavplugin.o: wavplugin.cpp \ | 102 | wavplugin.o: wavplugin.cpp \ |
103 | wavplugin.h \ | 103 | wavplugin.h |
104 | ../mediaplayerplugininterface.h | ||
105 | 104 | ||
@@ -107,3 +106,2 @@ wavpluginimpl.o: wavpluginimpl.cpp \ | |||
107 | wavplugin.h \ | 106 | wavplugin.h \ |
108 | ../mediaplayerplugininterface.h \ | ||
109 | wavpluginimpl.h | 107 | wavpluginimpl.h |
diff --git a/core/multimedia/opieplayer/wavplugin/wavplugin.cpp b/core/multimedia/opieplayer/wavplugin/wavplugin.cpp index 7f63b3b..0be667f 100644 --- a/core/multimedia/opieplayer/wavplugin/wavplugin.cpp +++ b/core/multimedia/opieplayer/wavplugin/wavplugin.cpp | |||
@@ -19,4 +19,2 @@ | |||
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | // L.J.Potter added changes Fri 02-15-2002 | ||
21 | |||
22 | #include <stdio.h> | 20 | #include <stdio.h> |
@@ -29,3 +27,2 @@ | |||
29 | 27 | ||
30 | |||
31 | //#define debugMsg(a) qDebug(a) | 28 | //#define debugMsg(a) qDebug(a) |
@@ -51,3 +48,3 @@ struct ChunkData { | |||
51 | 48 | ||
52 | const int sound_buffer_size = 512; // 4096; // you got to be kidding right? | 49 | const int sound_buffer_size = 4096; |
53 | 50 | ||
@@ -65,2 +62,6 @@ public: | |||
65 | int samples; | 62 | int samples; |
63 | int freq; | ||
64 | int chan; | ||
65 | int sampleRate; | ||
66 | int resolution; | ||
66 | 67 | ||
@@ -76,4 +77,4 @@ public: | |||
76 | { | 77 | { |
78 | qDebug("add"); | ||
77 | done = 0; | 79 | done = 0; |
78 | qApp->processEvents(); | ||
79 | 80 | ||
@@ -90,3 +91,3 @@ public: | |||
90 | } | 91 | } |
91 | samples_due += chunkdata.samplesPerSec; | 92 | samples_due += 44100; |
92 | while ( count && (samples_due > chunkdata.samplesPerSec) ) { | 93 | while ( count && (samples_due > chunkdata.samplesPerSec) ) { |
@@ -100,2 +101,3 @@ public: | |||
100 | } | 101 | } |
102 | |||
101 | return TRUE; | 103 | return TRUE; |
@@ -104,2 +106,3 @@ public: | |||
104 | bool initialise() { | 106 | bool initialise() { |
107 | qDebug("initialize"); | ||
105 | if ( input == 0 ) | 108 | if ( input == 0 ) |
@@ -140,3 +143,8 @@ public: | |||
140 | } | 143 | } |
141 | } else { | 144 | } |
145 | |||
146 | |||
147 | |||
148 | |||
149 | else { | ||
142 | // ignored chunk | 150 | // ignored chunk |
@@ -147,3 +155,3 @@ public: | |||
147 | } // while | 155 | } // while |
148 | qDebug("bits %d", chunkdata.wBitsPerSample); | 156 | |
149 | return TRUE; | 157 | return TRUE; |
@@ -174,3 +182,3 @@ public: | |||
174 | } | 182 | } |
175 | if ( chunkdata.wBitsPerSample == 8 ) { | 183 | if ( resolution == 8 ) { |
176 | l = (data[out++] - 128) * 128; | 184 | l = (data[out++] - 128) * 128; |
@@ -180,6 +188,6 @@ public: | |||
180 | } | 188 | } |
181 | if ( chunkdata.channels == 1 ) { | 189 | if ( chan == 1 ) { |
182 | r = l; | 190 | r = l; |
183 | } else { | 191 | } else { |
184 | if ( chunkdata.wBitsPerSample == 8 ) { | 192 | if ( resolution == 8 ) { |
185 | r = (data[out++] - 128) * 128; | 193 | r = (data[out++] - 128) * 128; |
@@ -193,2 +201,150 @@ public: | |||
193 | 201 | ||
202 | ////////////////////////////////////////////////////// | ||
203 | int getWavSettings(int fd) | ||
204 | { //this came from wmrecord | ||
205 | |||
206 | char t1[4]; | ||
207 | unsigned long l1; | ||
208 | int found; | ||
209 | short fmt; | ||
210 | unsigned short ch, brate; | ||
211 | unsigned long srate; | ||
212 | |||
213 | |||
214 | /* First read in the RIFF identifier. If this is missing then the | ||
215 | * file is not a valid WAVE file. | ||
216 | */ | ||
217 | if (read(fd, t1, 4)<4) { | ||
218 | qDebug(" Could not read from sound file.\n"); | ||
219 | return -1; | ||
220 | } | ||
221 | if (strncmp(t1, "RIFF", 4)) { | ||
222 | qDebug(" not a valid WAV file.\n"); | ||
223 | return -1; | ||
224 | } | ||
225 | /* Advance the file pointer to the next relevant field. */ | ||
226 | lseek(fd, 4, SEEK_CUR); | ||
227 | /* Read in the WAVE identifier. */ | ||
228 | if (read(fd, t1, 4)<4) { | ||
229 | qDebug("Could not read from sound file.\n"); | ||
230 | return -1; | ||
231 | } | ||
232 | if (strncmp(t1, "WAVE", 4)) { | ||
233 | qDebug("not a valid WAV file.\n"); | ||
234 | return -1; | ||
235 | } | ||
236 | |||
237 | /* Search through the file for the format chunk. If the end of the | ||
238 | * file is reached without finding the chunk, then the file is not a | ||
239 | * valid WAVE file. | ||
240 | */ | ||
241 | found = 0; | ||
242 | while (!found) { | ||
243 | if (read(fd, t1, 4)<4) { | ||
244 | qDebug("Could not read from sound file.\n"); | ||
245 | return -1; | ||
246 | } | ||
247 | if (strncmp(t1, "fmt ", 4)) { | ||
248 | /* Determine the length of the chunk found and skip to the next | ||
249 | * chunk. The chunk length is always stored in the four bytes | ||
250 | * following the chunk id. | ||
251 | */ | ||
252 | if (read(fd, &l1, 4)<4) { | ||
253 | qDebug("Could not read from sound file.\n"); | ||
254 | return -1; | ||
255 | } | ||
256 | lseek(fd, l1, SEEK_CUR); | ||
257 | } | ||
258 | else { | ||
259 | /* This is the format chunk, which stores the playback settings | ||
260 | * for the recording. | ||
261 | */ | ||
262 | /* Skip the length field, since we don't really need it. */ | ||
263 | lseek(fd, 4, SEEK_CUR); | ||
264 | /* Read in the format tag. If it has a value of 1, then there is | ||
265 | * no compression and we can attempt to play the file | ||
266 | * back. Otherwise, return. | ||
267 | */ | ||
268 | if (read(fd, &fmt, 2)<2) { | ||
269 | qDebug("Could not read from format chunk.\n"); | ||
270 | return -1; | ||
271 | } | ||
272 | if (fmt != 1) { | ||
273 | qDebug("Wave file contains compressed data." | ||
274 | " Unable to continue.\n"); | ||
275 | return -1; | ||
276 | } | ||
277 | /* Get the stereo mode. */ | ||
278 | if (read(fd, &ch, 2)<2) { | ||
279 | qDebug("Could not read from format chunk.\n"); | ||
280 | return -1; | ||
281 | } | ||
282 | else { | ||
283 | chan = ch; | ||
284 | qDebug("File has %d channels", chan); | ||
285 | } | ||
286 | /* Get the sample rate. */ | ||
287 | if (read(fd, &srate, 4)<4) { | ||
288 | qDebug("Could not read from format chunk.\n"); | ||
289 | return -1; | ||
290 | } | ||
291 | else { | ||
292 | sampleRate = srate; | ||
293 | qDebug("File has samplerate of %d", sampleRate); | ||
294 | } | ||
295 | /* Get the bit rate. This is at the end of the format chunk. */ | ||
296 | lseek(fd, 6, SEEK_CUR); | ||
297 | if (read(fd, &brate, 2)<2) { | ||
298 | qDebug("Could not read from format chunk.\n"); | ||
299 | return -1; | ||
300 | } | ||
301 | else { | ||
302 | resolution = brate; | ||
303 | qDebug("File has bitrate of %d", resolution); | ||
304 | } | ||
305 | |||
306 | found++; | ||
307 | } | ||
308 | } | ||
309 | |||
310 | /* Search through the file for the data chunk. If the end of the | ||
311 | * file is reached without finding the chunk, then the file is not a | ||
312 | * valid WAVE file. | ||
313 | */ | ||
314 | found = 0; | ||
315 | while (!found) { | ||
316 | if (read(fd, t1, 4)<4) { | ||
317 | qDebug("Could not read from sound file.\n"); | ||
318 | return -1; | ||
319 | } | ||
320 | if (strncmp(t1, "data", 4)) { | ||
321 | /* Determine the length of the chunk found and skip to the next | ||
322 | * chunk. The chunk length is always stored in the four bytes | ||
323 | * following the chunk id. | ||
324 | */ | ||
325 | if (read(fd, &l1, 4)<4) { | ||
326 | qDebug("Could not read from sound file.\n"); | ||
327 | return -1; | ||
328 | } | ||
329 | lseek(fd, l1, SEEK_CUR); | ||
330 | } | ||
331 | else { | ||
332 | /* This is the data chunk, which stores the recording. */ | ||
333 | /* Get the length field. */ | ||
334 | if (read(fd, &l1, 4)<4) { | ||
335 | qDebug("Could not read from sound file.\n"); | ||
336 | return -1; | ||
337 | } | ||
338 | else { | ||
339 | samples =l1; | ||
340 | qDebug("file has length of %d\nlasting %d seconds",l1, (( l1 / sampleRate) / chan) / 2 ); // ???? | ||
341 | return l1; | ||
342 | } | ||
343 | } | ||
344 | } | ||
345 | |||
346 | return 0; | ||
347 | } | ||
348 | |||
349 | ////////////////////////////////////////////////// | ||
194 | }; | 350 | }; |
@@ -209,3 +365,3 @@ WavPlugin::~WavPlugin() { | |||
209 | bool WavPlugin::isFileSupported( const QString& path ) { | 365 | bool WavPlugin::isFileSupported( const QString& path ) { |
210 | // qDebug( "WavPlugin::isFileSupported" ); | 366 | debugMsg( "WavPlugin::isFileSupported" ); |
211 | 367 | ||
@@ -228,3 +384,3 @@ bool WavPlugin::isFileSupported( const QString& path ) { | |||
228 | bool WavPlugin::open( const QString& path ) { | 384 | bool WavPlugin::open( const QString& path ) { |
229 | // qDebug( "WavPlugin::open" ); | 385 | qDebug( "WavPlugin::open" ); |
230 | 386 | ||
@@ -242,2 +398,3 @@ bool WavPlugin::open( const QString& path ) { | |||
242 | 398 | ||
399 | // d->getWavSettings( d->input.handle()); | ||
243 | d->initialise(); | 400 | d->initialise(); |
@@ -249,3 +406,3 @@ bool WavPlugin::open( const QString& path ) { | |||
249 | bool WavPlugin::close() { | 406 | bool WavPlugin::close() { |
250 | // qDebug( "WavPlugin::close" ); | 407 | qDebug( "WavPlugin::close" ); |
251 | 408 | ||
@@ -259,3 +416,3 @@ bool WavPlugin::close() { | |||
259 | bool WavPlugin::isOpen() { | 416 | bool WavPlugin::isOpen() { |
260 | // qDebug( "WavPlugin::isOpen" ); | 417 | qDebug( "WavPlugin::isOpen" ); |
261 | return ( d->input != 0 ); | 418 | return ( d->input != 0 ); |
@@ -265,3 +422,3 @@ bool WavPlugin::isOpen() { | |||
265 | int WavPlugin::audioStreams() { | 422 | int WavPlugin::audioStreams() { |
266 | // qDebug( "WavPlugin::audioStreams" ); | 423 | qDebug( "WavPlugin::audioStreams" ); |
267 | return 1; | 424 | return 1; |
@@ -271,4 +428,4 @@ int WavPlugin::audioStreams() { | |||
271 | int WavPlugin::audioChannels( int ) { | 428 | int WavPlugin::audioChannels( int ) { |
272 | // qDebug( "WavPlugin::audioChannels" ); | 429 | debugMsg( "WavPlugin::audioChannels" ); |
273 | return d->chunkdata.channels;// 2; // ### Always scale audio to stereo samples | 430 | return d->chan; |
274 | } | 431 | } |
@@ -277,4 +434,4 @@ int WavPlugin::audioChannels( int ) { | |||
277 | int WavPlugin::audioFrequency( int ) { | 434 | int WavPlugin::audioFrequency( int ) { |
278 | // qDebug( "WavPlugin::audioFrequency %d", d->chunkdata.samplesPerSec ); | 435 | qDebug( "WavPlugin::audioFrequency" ); |
279 | return d->chunkdata.samplesPerSec; //44100; // ### Always scale to frequency of 44100 | 436 | return d->freq; |
280 | } | 437 | } |
@@ -283,5 +440,6 @@ int WavPlugin::audioFrequency( int ) { | |||
283 | int WavPlugin::audioSamples( int ) { | 440 | int WavPlugin::audioSamples( int ) { |
284 | // qDebug( "WavPlugin::audioSamples" ); | 441 | qDebug( "WavPlugin::audioSamples" ); |
285 | return d->samples / d->chunkdata.channels/2; // ### Scaled samples will be made stereo, | 442 | return d->samples; |
286 | // Therefore if source is mono we will double the number of samples | 443 | // return d->samples * 2 / d->chunkdata.channels; // ### Scaled samples will be made stereo, |
444 | // // Therefore if source is mono we will double the number of samples | ||
287 | } | 445 | } |
@@ -290,3 +448,3 @@ int WavPlugin::audioSamples( int ) { | |||
290 | bool WavPlugin::audioSetSample( long, int ) { | 448 | bool WavPlugin::audioSetSample( long, int ) { |
291 | // qDebug( "WavPlugin::audioSetSample" ); | 449 | qDebug( "WavPlugin::audioSetSample" ); |
292 | return FALSE; | 450 | return FALSE; |
@@ -296,3 +454,3 @@ bool WavPlugin::audioSetSample( long, int ) { | |||
296 | long WavPlugin::audioGetSample( int ) { | 454 | long WavPlugin::audioGetSample( int ) { |
297 | // qDebug( "WavPlugin::audioGetSample" ); | 455 | qDebug( "WavPlugin::audioGetSample" ); |
298 | return 0; | 456 | return 0; |
@@ -326,3 +484,3 @@ bool WavPlugin::audioReadStereoSamples( short *output, long samples, long& sampl | |||
326 | bool WavPlugin::audioReadSamples( short *output, int channels, long samples, long& samplesMade, int ) { | 484 | bool WavPlugin::audioReadSamples( short *output, int channels, long samples, long& samplesMade, int ) { |
327 | // qDebug( "WavPlugin::audioReadSamples" ); | 485 | qDebug( "WavPlugin::audioReadSamples" ); |
328 | return d->add( output, samples, samplesMade, channels != 1 ); | 486 | return d->add( output, samples, samplesMade, channels != 1 ); |
@@ -331,3 +489,3 @@ bool WavPlugin::audioReadSamples( short *output, int channels, long samples, lon | |||
331 | double WavPlugin::getTime() { | 489 | double WavPlugin::getTime() { |
332 | // qDebug( "WavPlugin::getTime" ); | 490 | qDebug( "WavPlugin::getTime" ); |
333 | return 0.0; | 491 | return 0.0; |
@@ -335,7 +493,2 @@ double WavPlugin::getTime() { | |||
335 | 493 | ||
336 | int WavPlugin::audioBitsPerSample( int ) { | ||
337 | // qDebug( "WavPlugin::audioFormat %d", d->chunkdata.wBitsPerSample ); | ||
338 | return d->chunkdata.wBitsPerSample; // | ||
339 | } | ||
340 | |||
341 | 494 | ||
diff --git a/core/multimedia/opieplayer/wavplugin/wavplugin.h b/core/multimedia/opieplayer/wavplugin/wavplugin.h index 6afd67e..19d1a8e 100644 --- a/core/multimedia/opieplayer/wavplugin/wavplugin.h +++ b/core/multimedia/opieplayer/wavplugin/wavplugin.h | |||
@@ -19,4 +19,2 @@ | |||
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | // L.J.Potter added changes Fri 02-15-2002 | ||
21 | |||
22 | #ifndef WAV_PLUGIN_H | 20 | #ifndef WAV_PLUGIN_H |
@@ -24,6 +22,5 @@ | |||
24 | 22 | ||
25 | |||
26 | #include <qstring.h> | 23 | #include <qstring.h> |
27 | #include <qapplication.h> | 24 | #include <qapplication.h> |
28 | #include "../mediaplayerplugininterface.h" | 25 | #include <qpe/mediaplayerplugininterface.h> |
29 | 26 | ||
@@ -56,3 +53,2 @@ public: | |||
56 | int audioFrequency( int stream ); | 53 | int audioFrequency( int stream ); |
57 | int audioBitsPerSample( int stream ); | ||
58 | int audioSamples( int stream ); | 54 | int audioSamples( int stream ); |
diff --git a/core/multimedia/opieplayer/wavplugin/wavpluginimpl.cpp b/core/multimedia/opieplayer/wavplugin/wavpluginimpl.cpp index 1f7b85b..2923180 100644 --- a/core/multimedia/opieplayer/wavplugin/wavpluginimpl.cpp +++ b/core/multimedia/opieplayer/wavplugin/wavpluginimpl.cpp | |||
@@ -22,3 +22,2 @@ | |||
22 | 22 | ||
23 | |||
24 | WavPluginImpl::WavPluginImpl() | 23 | WavPluginImpl::WavPluginImpl() |
diff --git a/core/multimedia/opieplayer/wavplugin/wavpluginimpl.h b/core/multimedia/opieplayer/wavplugin/wavpluginimpl.h index ee32f54..71f5f20 100644 --- a/core/multimedia/opieplayer/wavplugin/wavpluginimpl.h +++ b/core/multimedia/opieplayer/wavplugin/wavpluginimpl.h | |||
@@ -22,4 +22,3 @@ | |||
22 | 22 | ||
23 | 23 | #include <qpe/mediaplayerplugininterface.h> | |
24 | #include "../mediaplayerplugininterface.h" | ||
25 | 24 | ||