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 | |||
@@ -127,123 +127,104 @@ REQUIRES= | |||
127 | 127 | ||
128 | ####### Sub-libraries | 128 | ####### Sub-libraries |
129 | 129 | ||
130 | 130 | ||
131 | ###### Combined headers | 131 | ###### Combined headers |
132 | 132 | ||
133 | 133 | ||
134 | 134 | ||
135 | ####### Compile | 135 | ####### Compile |
136 | 136 | ||
137 | main.o: main.cpp \ | 137 | 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 \ |
142 | playlistwidget.h \ | 140 | playlistwidget.h \ |
143 | $(OPIEDIR)/include/qpe/applnk.h \ | 141 | $(OPIEDIR)/include/qpe/applnk.h \ |
144 | audiowidget.h \ | 142 | audiowidget.h \ |
145 | videowidget.h \ | 143 | videowidget.h \ |
146 | loopcontrol.h \ | 144 | loopcontrol.h \ |
147 | mediaplayer.h \ | 145 | mediaplayer.h \ |
148 | $(OPIEDIR)/include/qpe/qlibrary.h \ | 146 | $(OPIEDIR)/include/qpe/qlibrary.h \ |
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 | ||
153 | loopcontrol.o: loopcontrol.cpp \ | 150 | 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 \ |
158 | videowidget.h \ | 154 | videowidget.h \ |
159 | audiodevice.h \ | 155 | audiodevice.h \ |
160 | mediaplayerplugininterface.h \ | 156 | mediaplayerplugininterface.h \ |
161 | $(OPIEDIR)/include/qpe/qcom.h \ | 157 | $(OPIEDIR)/include/qpe/qcom.h \ |
162 | $(OPIEDIR)/include/qpe/quuid.h \ | 158 | $(OPIEDIR)/include/qpe/quuid.h \ |
163 | mediaplayerstate.h | 159 | mediaplayerstate.h |
164 | 160 | ||
165 | playlistselection.o: playlistselection.cpp \ | 161 | playlistselection.o: playlistselection.cpp \ |
166 | $(OPIEDIR)/include/qpe/applnk.h \ | 162 | $(OPIEDIR)/include/qpe/applnk.h \ |
167 | $(OPIEDIR)/include/qpe/resource.h \ | 163 | $(OPIEDIR)/include/qpe/resource.h \ |
168 | playlistselection.h | 164 | playlistselection.h |
169 | 165 | ||
170 | mediaplayerstate.o: mediaplayerstate.cpp \ | 166 | 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 \ |
175 | $(OPIEDIR)/include/qpe/qcom.h \ | 169 | $(OPIEDIR)/include/qpe/qcom.h \ |
176 | $(OPIEDIR)/include/qpe/quuid.h \ | 170 | $(OPIEDIR)/include/qpe/quuid.h \ |
177 | $(OPIEDIR)/include/qpe/config.h \ | 171 | $(OPIEDIR)/include/qpe/config.h \ |
178 | mediaplayerplugininterface.h \ | ||
179 | mediaplayerstate.h \ | 172 | mediaplayerstate.h \ |
180 | libmad/libmadpluginimpl.h \ | 173 | libmad/libmadpluginimpl.h \ |
181 | libmpeg3/libmpeg3pluginimpl.h \ | 174 | libmpeg3/libmpeg3pluginimpl.h \ |
182 | wavplugin/wavpluginimpl.h | 175 | wavplugin/wavpluginimpl.h |
183 | 176 | ||
184 | videowidget.o: videowidget.cpp \ | 177 | 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 \ |
190 | mediaplayerstate.h | 180 | mediaplayerstate.h |
191 | 181 | ||
192 | audiowidget.o: audiowidget.cpp \ | 182 | audiowidget.o: audiowidget.cpp \ |
193 | $(OPIEDIR)/include/qpe/resource.h \ | 183 | $(OPIEDIR)/include/qpe/resource.h \ |
194 | audiowidget.h \ | 184 | audiowidget.h \ |
195 | mediaplayerstate.h | 185 | mediaplayerstate.h |
196 | 186 | ||
197 | playlistwidget.o: playlistwidget.cpp \ | 187 | playlistwidget.o: playlistwidget.cpp \ |
198 | $(OPIEDIR)/include/qpe/qpemenubar.h \ | 188 | $(OPIEDIR)/include/qpe/qpemenubar.h \ |
199 | $(OPIEDIR)/include/qpe/qpetoolbar.h \ | 189 | $(OPIEDIR)/include/qpe/qpetoolbar.h \ |
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 \ |
207 | $(OPIEDIR)/include/qpe/config.h \ | 192 | $(OPIEDIR)/include/qpe/config.h \ |
208 | $(OPIEDIR)/include/qpe/global.h \ | 193 | $(OPIEDIR)/include/qpe/global.h \ |
209 | $(OPIEDIR)/include/qpe/resource.h \ | 194 | $(OPIEDIR)/include/qpe/resource.h \ |
210 | playlistselection.h \ | 195 | playlistselection.h \ |
211 | playlistwidget.h \ | 196 | playlistwidget.h \ |
212 | mediaplayerstate.h | 197 | mediaplayerstate.h |
213 | 198 | ||
214 | mediaplayer.o: mediaplayer.cpp \ | 199 | 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 \ |
219 | $(OPIEDIR)/include/qpe/qcom.h \ | 202 | $(OPIEDIR)/include/qpe/qcom.h \ |
220 | $(OPIEDIR)/include/qpe/quuid.h \ | 203 | $(OPIEDIR)/include/qpe/quuid.h \ |
221 | $(OPIEDIR)/include/qpe/resource.h \ | 204 | $(OPIEDIR)/include/qpe/resource.h \ |
222 | $(OPIEDIR)/include/qpe/config.h \ | 205 | $(OPIEDIR)/include/qpe/config.h \ |
223 | mediaplayer.h \ | 206 | mediaplayer.h \ |
224 | mediaplayerplugininterface.h \ | ||
225 | playlistwidget.h \ | 207 | playlistwidget.h \ |
226 | $(OPIEDIR)/include/qpe/applnk.h \ | 208 | $(OPIEDIR)/include/qpe/applnk.h \ |
227 | audiowidget.h \ | 209 | audiowidget.h \ |
228 | loopcontrol.h \ | 210 | loopcontrol.h \ |
229 | audiodevice.h \ | 211 | audiodevice.h \ |
230 | mediaplayerstate.h | 212 | mediaplayerstate.h |
231 | 213 | ||
232 | audiodevice.o: audiodevice.cpp \ | 214 | 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 | ||
239 | moc_loopcontrol.o: moc_loopcontrol.cpp \ | 220 | moc_loopcontrol.o: moc_loopcontrol.cpp \ |
240 | loopcontrol.h | 221 | loopcontrol.h |
241 | 222 | ||
242 | moc_playlistselection.o: moc_playlistselection.cpp \ | 223 | moc_playlistselection.o: moc_playlistselection.cpp \ |
243 | playlistselection.h \ | 224 | playlistselection.h \ |
244 | $(OPIEDIR)/include/qpe/applnk.h | 225 | $(OPIEDIR)/include/qpe/applnk.h |
245 | 226 | ||
246 | moc_mediaplayerstate.o: moc_mediaplayerstate.cpp \ | 227 | moc_mediaplayerstate.o: moc_mediaplayerstate.cpp \ |
247 | mediaplayerstate.h | 228 | mediaplayerstate.h |
248 | 229 | ||
249 | moc_videowidget.o: moc_videowidget.cpp \ | 230 | moc_videowidget.o: moc_videowidget.cpp \ |
@@ -251,26 +232,25 @@ moc_videowidget.o: moc_videowidget.cpp \ | |||
251 | 232 | ||
252 | moc_audiowidget.o: moc_audiowidget.cpp \ | 233 | moc_audiowidget.o: moc_audiowidget.cpp \ |
253 | audiowidget.h | 234 | audiowidget.h |
254 | 235 | ||
255 | moc_playlistwidget.o: moc_playlistwidget.cpp \ | 236 | moc_playlistwidget.o: moc_playlistwidget.cpp \ |
256 | playlistwidget.h \ | 237 | playlistwidget.h \ |
257 | $(OPIEDIR)/include/qpe/applnk.h | 238 | $(OPIEDIR)/include/qpe/applnk.h |
258 | 239 | ||
259 | moc_mediaplayer.o: moc_mediaplayer.cpp \ | 240 | moc_mediaplayer.o: moc_mediaplayer.cpp \ |
260 | mediaplayer.h \ | 241 | mediaplayer.h \ |
261 | $(OPIEDIR)/include/qpe/qlibrary.h \ | 242 | $(OPIEDIR)/include/qpe/qlibrary.h \ |
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 | ||
266 | moc_audiodevice.o: moc_audiodevice.cpp \ | 246 | moc_audiodevice.o: moc_audiodevice.cpp \ |
267 | audiodevice.h | 247 | audiodevice.h |
268 | 248 | ||
269 | moc_loopcontrol.cpp: loopcontrol.h | 249 | moc_loopcontrol.cpp: loopcontrol.h |
270 | $(MOC) loopcontrol.h -o moc_loopcontrol.cpp | 250 | $(MOC) loopcontrol.h -o moc_loopcontrol.cpp |
271 | 251 | ||
272 | moc_playlistselection.cpp: playlistselection.h | 252 | moc_playlistselection.cpp: playlistselection.h |
273 | $(MOC) playlistselection.h -o moc_playlistselection.cpp | 253 | $(MOC) playlistselection.h -o moc_playlistselection.cpp |
274 | 254 | ||
275 | moc_mediaplayerstate.cpp: mediaplayerstate.h | 255 | moc_mediaplayerstate.cpp: mediaplayerstate.h |
276 | $(MOC) mediaplayerstate.h -o moc_mediaplayerstate.cpp | 256 | $(MOC) mediaplayerstate.h -o moc_mediaplayerstate.cpp |
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,36 +1,33 @@ | |||
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 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
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> |
26 | #include <qpe/config.h> | 23 | #include <qpe/config.h> |
27 | #include "audiodevice.h" | 24 | #include "audiodevice.h" |
28 | 25 | ||
29 | #if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP) | 26 | #if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP) |
30 | #include "qpe/qcopenvelope_qws.h" | 27 | #include "qpe/qcopenvelope_qws.h" |
31 | #endif | 28 | #endif |
32 | 29 | ||
33 | #ifdef Q_WS_WIN | 30 | #ifdef Q_WS_WIN |
34 | #include <windows.h> | 31 | #include <windows.h> |
35 | #include <mmsystem.h> | 32 | #include <mmsystem.h> |
36 | #include <mmreg.h> | 33 | #include <mmreg.h> |
@@ -100,36 +97,35 @@ void AudioDevice::getVolume( unsigned int& leftVolume, unsigned int& rightVolume | |||
100 | #ifdef Q_OS_WIN32 | 97 | #ifdef Q_OS_WIN32 |
101 | HWAVEOUT handle; | 98 | HWAVEOUT handle; |
102 | WAVEFORMATEX formatData; | 99 | WAVEFORMATEX formatData; |
103 | formatData.cbSize = sizeof(WAVEFORMATEX); | 100 | formatData.cbSize = sizeof(WAVEFORMATEX); |
104 | formatData.wFormatTag = WAVE_FORMAT_PCM; | 101 | formatData.wFormatTag = WAVE_FORMAT_PCM; |
105 | formatData.nAvgBytesPerSec = 4 * 44000; | 102 | formatData.nAvgBytesPerSec = 4 * 44000; |
106 | formatData.nBlockAlign = 4; | 103 | formatData.nBlockAlign = 4; |
107 | formatData.nChannels = 2; | 104 | formatData.nChannels = 2; |
108 | formatData.nSamplesPerSec = 44000; | 105 | formatData.nSamplesPerSec = 44000; |
109 | formatData.wBitsPerSample = 16; | 106 | formatData.wBitsPerSample = 16; |
110 | waveOutOpen(&handle, WAVE_MAPPER, &formatData, 0L, 0L, CALLBACK_NULL); | 107 | waveOutOpen(&handle, WAVE_MAPPER, &formatData, 0L, 0L, CALLBACK_NULL); |
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 ); |
114 | leftVolume = volume & 0xFFFF; | 111 | leftVolume = volume & 0xFFFF; |
115 | rightVolume = volume >> 16; | 112 | rightVolume = volume >> 16; |
116 | #else | 113 | #else |
117 | int mixerHandle = open( "/dev/mixer", O_RDWR ); | 114 | int mixerHandle = open( "/dev/mixer", O_RDWR ); |
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; |
125 | rightVolume = ((volume & 0xFF00) << 8) / 101; | 121 | rightVolume = ((volume & 0xFF00) << 8) / 101; |
126 | #endif | 122 | #endif |
127 | } | 123 | } |
128 | 124 | ||
129 | 125 | ||
130 | void AudioDevice::setVolume( unsigned int leftVolume, unsigned int rightVolume, bool muted ) { | 126 | void AudioDevice::setVolume( unsigned int leftVolume, unsigned int rightVolume, bool muted ) { |
131 | AudioDevicePrivate::muted = muted; | 127 | AudioDevicePrivate::muted = muted; |
132 | if ( muted ) { | 128 | if ( muted ) { |
133 | AudioDevicePrivate::leftVolume = leftVolume; | 129 | AudioDevicePrivate::leftVolume = leftVolume; |
134 | AudioDevicePrivate::rightVolume = rightVolume; | 130 | AudioDevicePrivate::rightVolume = rightVolume; |
135 | leftVolume = 0; | 131 | leftVolume = 0; |
@@ -142,119 +138,139 @@ void AudioDevice::setVolume( unsigned int leftVolume, unsigned int rightVolume, | |||
142 | HWAVEOUT handle; | 138 | HWAVEOUT handle; |
143 | WAVEFORMATEX formatData; | 139 | WAVEFORMATEX formatData; |
144 | formatData.cbSize = sizeof(WAVEFORMATEX); | 140 | formatData.cbSize = sizeof(WAVEFORMATEX); |
145 | formatData.wFormatTag = WAVE_FORMAT_PCM; | 141 | formatData.wFormatTag = WAVE_FORMAT_PCM; |
146 | formatData.nAvgBytesPerSec = 4 * 44000; | 142 | formatData.nAvgBytesPerSec = 4 * 44000; |
147 | formatData.nBlockAlign = 4; | 143 | formatData.nBlockAlign = 4; |
148 | formatData.nChannels = 2; | 144 | formatData.nChannels = 2; |
149 | formatData.nSamplesPerSec = 44000; | 145 | formatData.nSamplesPerSec = 44000; |
150 | formatData.wBitsPerSample = 16; | 146 | formatData.wBitsPerSample = 16; |
151 | waveOutOpen(&handle, WAVE_MAPPER, &formatData, 0L, 0L, CALLBACK_NULL); | 147 | waveOutOpen(&handle, WAVE_MAPPER, &formatData, 0L, 0L, CALLBACK_NULL); |
152 | unsigned int volume = (rightVolume << 16) | leftVolume; | 148 | unsigned int volume = (rightVolume << 16) | leftVolume; |
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 ); |
156 | #else | 152 | #else |
157 | // Volume can be from 0 to 100 which is 101 distinct values | 153 | // Volume can be from 0 to 100 which is 101 distinct values |
158 | unsigned int rV = (rightVolume * 101) >> 16; | 154 | unsigned int rV = (rightVolume * 101) >> 16; |
159 | 155 | ||
160 | # if 0 | 156 | # if 0 |
161 | unsigned int lV = (leftVolume * 101) >> 16; | 157 | unsigned int lV = (leftVolume * 101) >> 16; |
162 | unsigned int volume = ((rV << 8) & 0xFF00) | (lV & 0x00FF); | 158 | unsigned int volume = ((rV << 8) & 0xFF00) | (lV & 0x00FF); |
163 | int mixerHandle = 0; | 159 | int mixerHandle = 0; |
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 |
172 | // This is the way this has to be done now I guess, doesn't allow for | 166 | // This is the way this has to be done now I guess, doesn't allow for |
173 | // independant right and left channel setting, or setting for different outputs | 167 | // independant right and left channel setting, or setting for different outputs |
174 | Config cfg("Sound"); | 168 | Config cfg("Sound"); |
175 | cfg.setGroup("System"); | 169 | cfg.setGroup("System"); |
176 | cfg.writeEntry("Volume",(int)rV); | 170 | cfg.writeEntry("Volume",(int)rV); |
177 | # endif | 171 | # endif |
178 | 172 | ||
179 | #endif | 173 | #endif |
180 | // qDebug( "setting volume to: 0x%x", volume ); | 174 | // qDebug( "setting volume to: 0x%x", volume ); |
181 | #if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP) | 175 | #if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP) |
182 | // Send notification that the volume has changed | 176 | // Send notification that the volume has changed |
183 | QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << muted; | 177 | QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << muted; |
184 | #endif | 178 | #endif |
185 | } | 179 | } |
186 | 180 | ||
187 | 181 | ||
188 | 182 | ||
189 | 183 | ||
190 | AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) { | 184 | AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) { |
191 | d = new AudioDevicePrivate; | 185 | d = new AudioDevicePrivate; |
192 | d->frequency = f; | 186 | d->frequency = f; |
193 | d->channels = chs; | 187 | d->channels = chs; |
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; |
207 | 229 | ||
208 | #ifdef KEEP_DEVICE_OPEN | 230 | #ifdef KEEP_DEVICE_OPEN |
209 | if ( AudioDevicePrivate::dspFd == 0 ) { | 231 | if ( AudioDevicePrivate::dspFd == 0 ) { |
210 | #endif | 232 | #endif |
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 ); |
214 | } | 236 | } |
215 | #ifdef KEEP_DEVICE_OPEN | 237 | #ifdef KEEP_DEVICE_OPEN |
216 | AudioDevicePrivate::dspFd = d->handle; | 238 | AudioDevicePrivate::dspFd = d->handle; |
217 | } else { | 239 | } else { |
218 | d->handle = AudioDevicePrivate::dspFd; | 240 | d->handle = AudioDevicePrivate::dspFd; |
219 | } | 241 | } |
220 | #endif | 242 | #endif |
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 | } |
237 | 252 | ||
238 | d->bufferSize = sound_fragment_bytes; | 253 | d->bufferSize = sound_fragment_bytes; |
239 | d->unwrittenBuffer = new char[d->bufferSize]; | 254 | d->unwrittenBuffer = new char[d->bufferSize]; |
240 | d->unwritten = 0; | 255 | d->unwritten = 0; |
241 | d->can_GETOSPACE = TRUE; // until we find otherwise | 256 | d->can_GETOSPACE = TRUE; // until we find otherwise |
242 | 257 | ||
243 | //if ( chs != d->channels ) qDebug( "Wanted %d, got %d channels", chs, d->channels ); | 258 | //if ( chs != d->channels ) qDebug( "Wanted %d, got %d channels", chs, d->channels ); |
244 | //if ( f != d->frequency ) qDebug( "wanted %dHz, got %dHz", f, d->frequency ); | 259 | //if ( f != d->frequency ) qDebug( "wanted %dHz, got %dHz", f, d->frequency ); |
245 | //if ( capabilities & DSP_CAP_BATCH ) qDebug( "Sound card has local buffer" ); | 260 | //if ( capabilities & DSP_CAP_BATCH ) qDebug( "Sound card has local buffer" ); |
246 | //if ( capabilities & DSP_CAP_REALTIME )qDebug( "Sound card has realtime sync" ); | 261 | //if ( capabilities & DSP_CAP_REALTIME )qDebug( "Sound card has realtime sync" ); |
247 | //if ( capabilities & DSP_CAP_TRIGGER ) qDebug( "Sound card has precise trigger" ); | 262 | //if ( capabilities & DSP_CAP_TRIGGER ) qDebug( "Sound card has precise trigger" ); |
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 | } |
250 | 266 | ||
251 | 267 | ||
252 | AudioDevice::~AudioDevice() { | 268 | AudioDevice::~AudioDevice() { |
253 | #ifdef Q_OS_WIN32 | 269 | #ifdef Q_OS_WIN32 |
254 | waveOutClose( (HWAVEOUT)d->handle ); | 270 | waveOutClose( (HWAVEOUT)d->handle ); |
255 | #else | 271 | #else |
256 | # ifndef KEEP_DEVICE_OPEN | 272 | # ifndef KEEP_DEVICE_OPEN |
257 | close( d->handle ); // Now it should be safe to shut the handle | 273 | close( d->handle ); // Now it should be safe to shut the handle |
258 | # endif | 274 | # endif |
259 | delete d->unwrittenBuffer; | 275 | delete d->unwrittenBuffer; |
260 | delete d; | 276 | delete d; |
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,49 +1,44 @@ | |||
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 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | // L.J.Potter added changes Fri 02-15-2002 | ||
21 | |||
22 | |||
23 | #ifndef AUDIODEVICE_H | 20 | #ifndef AUDIODEVICE_H |
24 | #define AUDIODEVICE_H | 21 | #define AUDIODEVICE_H |
25 | 22 | ||
26 | |||
27 | #include <qobject.h> | 23 | #include <qobject.h> |
28 | #include <sys/soundcard.h> | ||
29 | 24 | ||
30 | 25 | ||
31 | class AudioDevicePrivate; | 26 | class AudioDevicePrivate; |
32 | 27 | ||
33 | 28 | ||
34 | class AudioDevice : public QObject { | 29 | class AudioDevice : public QObject { |
35 | Q_OBJECT | 30 | Q_OBJECT |
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(); |
39 | 34 | ||
40 | unsigned int canWrite() const; | 35 | unsigned int canWrite() const; |
41 | void write( char *buffer, unsigned int length ); | 36 | void write( char *buffer, unsigned int length ); |
42 | int bytesWritten(); | 37 | int bytesWritten(); |
43 | 38 | ||
44 | unsigned int channels() const; | 39 | unsigned int channels() const; |
45 | unsigned int frequency() const; | 40 | unsigned int frequency() const; |
46 | unsigned int bytesPerSample() const; | 41 | unsigned int bytesPerSample() const; |
47 | unsigned int bufferSize() const; | 42 | unsigned int bufferSize() const; |
48 | 43 | ||
49 | // Each volume level is from 0 to 0xFFFF | 44 | // Each volume level is from 0 to 0xFFFF |
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,41 +1,40 @@ | |||
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 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #include <qwidget.h> | 20 | #include <qwidget.h> |
21 | #include <qpixmap.h> | 21 | #include <qpixmap.h> |
22 | #include <qbutton.h> | 22 | #include <qbutton.h> |
23 | #include <qpainter.h> | 23 | #include <qpainter.h> |
24 | #include <qframe.h> | 24 | #include <qframe.h> |
25 | #include <qpe/resource.h> | 25 | #include <qpe/resource.h> |
26 | #include "audiowidget.h" | 26 | #include "audiowidget.h" |
27 | #include "mediaplayerstate.h" | 27 | #include "mediaplayerstate.h" |
28 | 28 | ||
29 | |||
30 | extern MediaPlayerState *mediaPlayerState; | 29 | extern MediaPlayerState *mediaPlayerState; |
31 | 30 | ||
32 | 31 | ||
33 | static const int xo = -2; // movable x offset | 32 | static const int xo = -2; // movable x offset |
34 | static const int yo = 22; // movable y offset | 33 | static const int yo = 22; // movable y offset |
35 | 34 | ||
36 | 35 | ||
37 | struct MediaButton { | 36 | struct MediaButton { |
38 | int xPos, yPos; | 37 | int xPos, yPos; |
39 | int color; | 38 | int color; |
40 | bool isToggle, isBig, isHeld, isDown; | 39 | bool isToggle, isBig, isHeld, isDown; |
41 | }; | 40 | }; |
@@ -52,25 +51,25 @@ MediaButton audioButtons[] = { | |||
52 | { 3*30+xo, 6*30-5+yo, 3, FALSE, FALSE, FALSE, FALSE }, // volume down | 51 | { 3*30+xo, 6*30-5+yo, 3, FALSE, FALSE, FALSE, FALSE }, // volume down |
53 | { 5*30+xo, 1*30+yo, 0, TRUE, FALSE, FALSE, FALSE }, // repeat/loop | 52 | { 5*30+xo, 1*30+yo, 0, TRUE, FALSE, FALSE, FALSE }, // repeat/loop |
54 | { 1*30+xo, 1*30+yo, 0, FALSE, FALSE, FALSE, FALSE } // playlist | 53 | { 1*30+xo, 1*30+yo, 0, FALSE, FALSE, FALSE, FALSE } // playlist |
55 | }; | 54 | }; |
56 | 55 | ||
57 | 56 | ||
58 | static const int numButtons = (sizeof(audioButtons)/sizeof(MediaButton)); | 57 | static const int numButtons = (sizeof(audioButtons)/sizeof(MediaButton)); |
59 | 58 | ||
60 | 59 | ||
61 | AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) : | 60 | AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) : |
62 | QWidget( parent, name, f ) | 61 | QWidget( parent, name, f ) |
63 | { | 62 | { |
64 | setCaption( tr("OpiePlayer") ); | 63 | setCaption( tr("MediaPlayer") ); |
65 | setBackgroundPixmap( Resource::loadPixmap( "mpegplayer/metalFinish" ) ); | 64 | setBackgroundPixmap( Resource::loadPixmap( "mpegplayer/metalFinish" ) ); |
66 | pixmaps[0] = new QPixmap( Resource::loadPixmap( "mpegplayer/mediaButtonsAll" ) ); | 65 | pixmaps[0] = new QPixmap( Resource::loadPixmap( "mpegplayer/mediaButtonsAll" ) ); |
67 | pixmaps[1] = new QPixmap( Resource::loadPixmap( "mpegplayer/mediaButtonsBig" ) ); | 66 | pixmaps[1] = new QPixmap( Resource::loadPixmap( "mpegplayer/mediaButtonsBig" ) ); |
68 | pixmaps[2] = new QPixmap( Resource::loadPixmap( "mpegplayer/mediaControls" ) ); | 67 | pixmaps[2] = new QPixmap( Resource::loadPixmap( "mpegplayer/mediaControls" ) ); |
69 | pixmaps[3] = new QPixmap( Resource::loadPixmap( "mpegplayer/animatedButton" ) ); | 68 | pixmaps[3] = new QPixmap( Resource::loadPixmap( "mpegplayer/animatedButton" ) ); |
70 | 69 | ||
71 | songInfo = new Ticker( this ); | 70 | songInfo = new Ticker( this ); |
72 | songInfo->setFocusPolicy( QWidget::NoFocus ); | 71 | songInfo->setFocusPolicy( QWidget::NoFocus ); |
73 | songInfo->setGeometry( QRect( 7, 3, 220, 20 ) ); | 72 | songInfo->setGeometry( QRect( 7, 3, 220, 20 ) ); |
74 | 73 | ||
75 | slider = new QSlider( Qt::Horizontal, this ); | 74 | slider = new QSlider( Qt::Horizontal, this ); |
76 | slider->setFixedWidth( 220 ); | 75 | slider->setFixedWidth( 220 ); |
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,35 +1,34 @@ | |||
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 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #ifndef AUDIO_WIDGET_H | 20 | #ifndef AUDIO_WIDGET_H |
21 | #define AUDIO_WIDGET_H | 21 | #define AUDIO_WIDGET_H |
22 | 22 | ||
23 | |||
24 | #include <qwidget.h> | 23 | #include <qwidget.h> |
25 | #include <qpainter.h> | 24 | #include <qpainter.h> |
26 | #include <qdrawutil.h> | 25 | #include <qdrawutil.h> |
27 | #include <qpixmap.h> | 26 | #include <qpixmap.h> |
28 | #include <qstring.h> | 27 | #include <qstring.h> |
29 | #include <qslider.h> | 28 | #include <qslider.h> |
30 | #include <qframe.h> | 29 | #include <qframe.h> |
31 | 30 | ||
32 | 31 | ||
33 | class QPixmap; | 32 | class QPixmap; |
34 | 33 | ||
35 | 34 | ||
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 | |||
@@ -15,50 +15,48 @@ | |||
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #ifndef LIBFLASH_PLUGIN_H | 20 | #ifndef LIBFLASH_PLUGIN_H |
21 | #define LIBFLASH_PLUGIN_H | 21 | #define LIBFLASH_PLUGIN_H |
22 | 22 | ||
23 | 23 | ||
24 | #include <qstring.h> | 24 | #include <qstring.h> |
25 | #include <qapplication.h> | 25 | #include <qapplication.h> |
26 | #include "flash.h" | 26 | #include "flash.h" |
27 | //#include <qpe/mediaplayerplugininterface.h> | 27 | #include <qpe/mediaplayerplugininterface.h> |
28 | #include "../mediaplayerplugininterface.h" | ||
29 | 28 | ||
30 | 29 | ||
31 | class LibFlashPlugin : public MediaPlayerDecoder { | 30 | class LibFlashPlugin : public MediaPlayerDecoder { |
32 | 31 | ||
33 | public: | 32 | public: |
34 | LibFlashPlugin(); | 33 | LibFlashPlugin(); |
35 | ~LibFlashPlugin() { close(); } | 34 | ~LibFlashPlugin() { close(); } |
36 | 35 | ||
37 | const char *pluginName() { return "LibFlashPlugin: " PLUGIN_NAME " " FLASH_VERSION_STRING; } | 36 | const char *pluginName() { return "LibFlashPlugin: " PLUGIN_NAME " " FLASH_VERSION_STRING; } |
38 | const char *pluginComment() { return "This is the libflash library: " PLUGIN_NAME " " FLASH_VERSION_STRING; } | 37 | const char *pluginComment() { return "This is the libflash library: " PLUGIN_NAME " " FLASH_VERSION_STRING; } |
39 | double pluginVersion() { return 1.0; } | 38 | double pluginVersion() { return 1.0; } |
40 | 39 | ||
41 | bool isFileSupported( const QString& fileName ) { return fileName.right(4) == ".swf"; } | 40 | bool isFileSupported( const QString& fileName ) { return fileName.right(4) == ".swf"; } |
42 | bool open( const QString& fileName ); | 41 | bool open( const QString& fileName ); |
43 | bool close() { FlashClose( file ); file = NULL; return TRUE; } | 42 | bool close() { FlashClose( file ); file = NULL; return TRUE; } |
44 | bool isOpen() { return file != NULL; } | 43 | bool isOpen() { return file != NULL; } |
45 | const QString &fileInfo() { return strInfo = qApp->translate( "MediaPlayer", "No Information Available", "media plugin text" ); } | 44 | const QString &fileInfo() { return strInfo = qApp->translate( "MediaPlayer", "No Information Available", "media plugin text" ); } |
46 | 45 | ||
47 | // If decoder doesn't support audio then return 0 here | 46 | // If decoder doesn't support audio then return 0 here |
48 | int audioStreams() { return 1; } | 47 | int audioStreams() { return 1; } |
49 | int audioChannels( int /*stream*/ ) { return 2; } | 48 | int audioChannels( int /*stream*/ ) { return 2; } |
50 | int audioFrequency( int /*stream*/ ) { return 44100; } | 49 | int audioFrequency( int /*stream*/ ) { return 44100; } |
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 ); |
54 | long audioGetSample( int stream ); | 52 | long audioGetSample( int stream ); |
55 | //bool audioReadMonoSamples( short *output, long samples, long& samplesRead, int stream ); | 53 | //bool audioReadMonoSamples( short *output, long samples, long& samplesRead, int stream ); |
56 | //bool audioReadStereoSamples( short *output, long samples, long& samplesRead, int stream ); | 54 | //bool audioReadStereoSamples( short *output, long samples, long& samplesRead, int stream ); |
57 | bool audioReadSamples( short *output, int channels, long samples, long& samplesRead, int stream ); | 55 | bool audioReadSamples( short *output, int channels, long samples, long& samplesRead, int stream ); |
58 | //bool audioReadSamples( short *output, int channel, long samples, int stream ); | 56 | //bool audioReadSamples( short *output, int channel, long samples, int stream ); |
59 | //bool audioReReadSamples( short *output, int channel, long samples, int stream ); | 57 | //bool audioReReadSamples( short *output, int channel, long samples, int stream ); |
60 | 58 | ||
61 | // If decoder doesn't support video then return 0 here | 59 | // If decoder doesn't support video then return 0 here |
62 | int videoStreams(); | 60 | int videoStreams(); |
63 | int videoWidth( int stream ); | 61 | int videoWidth( int stream ); |
64 | int videoHeight( int stream ); | 62 | int videoHeight( 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 | |||
@@ -12,26 +12,25 @@ | |||
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #ifndef LIBFLASH_PLUGIN_IMPL_H | 20 | #ifndef LIBFLASH_PLUGIN_IMPL_H |
21 | #define LIBFLASH_PLUGIN_IMPL_H | 21 | #define LIBFLASH_PLUGIN_IMPL_H |
22 | 22 | ||
23 | 23 | ||
24 | //#include <qpe/mediaplayerplugininterface.h> | 24 | #include <qpe/mediaplayerplugininterface.h> |
25 | #include "../mediaplayerplugininterface.h" | ||
26 | 25 | ||
27 | 26 | ||
28 | class LibFlashPlugin; | 27 | class LibFlashPlugin; |
29 | 28 | ||
30 | 29 | ||
31 | class LibFlashPluginImpl : public MediaPlayerPluginInterface | 30 | class LibFlashPluginImpl : public MediaPlayerPluginInterface |
32 | { | 31 | { |
33 | public: | 32 | public: |
34 | LibFlashPluginImpl(); | 33 | LibFlashPluginImpl(); |
35 | virtual ~LibFlashPluginImpl(); | 34 | virtual ~LibFlashPluginImpl(); |
36 | 35 | ||
37 | #ifndef QT_NO_COMPONENT | 36 | #ifndef QT_NO_COMPONENT |
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 | |||
@@ -199,25 +199,25 @@ enum | |||
199 | extern int shape_size,shape_nb,shaperecord_size,shaperecord_nb,style_size,style_nb; | 199 | extern int shape_size,shape_nb,shaperecord_size,shaperecord_nb,style_size,style_nb; |
200 | 200 | ||
201 | typedef void (*ScanLineFunc)(void *id, long y, long start, long end); | 201 | typedef void (*ScanLineFunc)(void *id, long y, long start, long end); |
202 | 202 | ||
203 | class Bitmap; | 203 | class Bitmap; |
204 | struct FlashMovie; | 204 | struct FlashMovie; |
205 | 205 | ||
206 | extern "C" { | 206 | extern "C" { |
207 | #include "jpeglib.h" | 207 | #include "jpeglib.h" |
208 | }; | 208 | }; |
209 | extern "C" { | 209 | 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 | }; |
213 | 213 | ||
214 | #include "graphic.h" | 214 | #include "graphic.h" |
215 | #include "character.h" | 215 | #include "character.h" |
216 | #include "bitmap.h" | 216 | #include "bitmap.h" |
217 | #include "shape.h" | 217 | #include "shape.h" |
218 | #include "displaylist.h" | 218 | #include "displaylist.h" |
219 | #include "sound.h" | 219 | #include "sound.h" |
220 | #include "button.h" | 220 | #include "button.h" |
221 | #include "font.h" | 221 | #include "font.h" |
222 | #include "text.h" | 222 | #include "text.h" |
223 | #include "adpcm.h" | 223 | #include "adpcm.h" |
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 | |||
@@ -205,21 +205,19 @@ layer3.o: layer3.c \ | |||
205 | timer.h \ | 205 | timer.h \ |
206 | huffman.h \ | 206 | huffman.h \ |
207 | layer3.h \ | 207 | layer3.h \ |
208 | rq_table.dat \ | 208 | rq_table.dat \ |
209 | imdct_s.dat | 209 | imdct_s.dat |
210 | 210 | ||
211 | huffman.o: huffman.c \ | 211 | huffman.o: huffman.c \ |
212 | libmad_global.h \ | 212 | libmad_global.h \ |
213 | huffman.h | 213 | huffman.h |
214 | 214 | ||
215 | libmadplugin.o: libmadplugin.cpp \ | 215 | libmadplugin.o: libmadplugin.cpp \ |
216 | libmadplugin.h \ | 216 | libmadplugin.h \ |
217 | ../mediaplayerplugininterface.h \ | ||
218 | mad.h | 217 | mad.h |
219 | 218 | ||
220 | libmadpluginimpl.o: libmadpluginimpl.cpp \ | 219 | libmadpluginimpl.o: libmadpluginimpl.cpp \ |
221 | libmadplugin.h \ | 220 | libmadplugin.h \ |
222 | ../mediaplayerplugininterface.h \ | ||
223 | libmadpluginimpl.h | 221 | libmadpluginimpl.h |
224 | 222 | ||
225 | 223 | ||
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 | |||
@@ -1,14 +1,12 @@ | |||
1 | TEMPLATE = lib | 1 | TEMPLATE = lib |
2 | CONFIG += qt warn_on release | 2 | CONFIG += qt warn_on release |
3 | HEADERS = libmad_version.h fixed.h bit.h timer.h stream.h frame.h synth.h decoder.h \ | 3 | HEADERS = 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 \ | 5 | SOURCES = 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 | 7 | TARGET = madplugin |
8 | DESTDIR = ../../plugins/codecs | 8 | DESTDIR = ../../plugins/codecs |
9 | INCLUDEPATH += $(OPIEDIR)/include .. | 9 | 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 |
14 | VERSION = 1.0.0 | 12 | VERSION = 1.0.0 |
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 | |||
@@ -11,28 +11,26 @@ | |||
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #ifndef LIBMAD_PLUGIN_H | 20 | #ifndef LIBMAD_PLUGIN_H |
21 | #define LIBMAD_PLUGIN_H | 21 | #define LIBMAD_PLUGIN_H |
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 | ||
28 | 26 | ||
29 | // #define OLD_MEDIAPLAYER_API | 27 | // #define OLD_MEDIAPLAYER_API |
30 | 28 | ||
31 | 29 | ||
32 | class LibMadPluginData; | 30 | class LibMadPluginData; |
33 | 31 | ||
34 | 32 | ||
35 | class LibMadPlugin : public MediaPlayerDecoder { | 33 | class LibMadPlugin : public MediaPlayerDecoder { |
36 | 34 | ||
37 | public: | 35 | public: |
38 | LibMadPlugin(); | 36 | LibMadPlugin(); |
@@ -45,25 +43,24 @@ public: | |||
45 | bool isFileSupported( const QString& ); | 43 | bool isFileSupported( const QString& ); |
46 | bool open( const QString& ); | 44 | bool open( const QString& ); |
47 | bool close(); | 45 | bool close(); |
48 | bool isOpen(); | 46 | bool isOpen(); |
49 | const QString &fileInfo() { return info; } | 47 | const QString &fileInfo() { return info; } |
50 | 48 | ||
51 | // If decoder doesn't support audio then return 0 here | 49 | // If decoder doesn't support audio then return 0 here |
52 | int audioStreams(); | 50 | int audioStreams(); |
53 | int audioChannels( int stream ); | 51 | int audioChannels( int stream ); |
54 | int audioFrequency( int stream ); | 52 | int audioFrequency( int stream ); |
55 | int audioSamples( int stream ); | 53 | int audioSamples( int stream ); |
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 ); |
59 | #ifdef OLD_MEDIAPLAYER_API | 56 | #ifdef OLD_MEDIAPLAYER_API |
60 | bool audioReadMonoSamples( short *output, long samples, long& samplesRead, int stream ); | 57 | bool audioReadMonoSamples( short *output, long samples, long& samplesRead, int stream ); |
61 | bool audioReadStereoSamples( short *output, long samples, long& samplesRead, int stream ); | 58 | bool audioReadStereoSamples( short *output, long samples, long& samplesRead, int stream ); |
62 | bool audioReadSamples( short *output, int channel, long samples, int stream ); | 59 | bool audioReadSamples( short *output, int channel, long samples, int stream ); |
63 | bool audioReReadSamples( short *output, int channel, long samples, int stream ); | 60 | bool audioReReadSamples( short *output, int channel, long samples, int stream ); |
64 | #else | 61 | #else |
65 | bool audioReadSamples( short *output, int channels, long samples, long& samplesRead, int stream ); | 62 | bool audioReadSamples( short *output, int channels, long samples, long& samplesRead, int stream ); |
66 | #endif | 63 | #endif |
67 | 64 | ||
68 | 65 | ||
69 | bool read(); | 66 | bool read(); |
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 | |||
@@ -11,43 +11,42 @@ | |||
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #ifndef LIBMAD_PLUGIN_IMPL_H | 20 | #ifndef LIBMAD_PLUGIN_IMPL_H |
21 | #define LIBMAD_PLUGIN_IMPL_H | 21 | #define LIBMAD_PLUGIN_IMPL_H |
22 | 22 | ||
23 | 23 | #include <qpe/mediaplayerplugininterface.h> | |
24 | //#include <qpe/mediaplayerplugininterface.h> | ||
25 | #include "../mediaplayerplugininterface.h" | ||
26 | 24 | ||
27 | 25 | ||
28 | class LibMadPlugin; | 26 | class LibMadPlugin; |
29 | 27 | ||
30 | 28 | ||
31 | class LibMadPluginImpl : public MediaPlayerPluginInterface | 29 | class LibMadPluginImpl : public MediaPlayerPluginInterface |
32 | { | 30 | { |
33 | public: | 31 | public: |
34 | LibMadPluginImpl(); | 32 | LibMadPluginImpl(); |
35 | virtual ~LibMadPluginImpl(); | 33 | virtual ~LibMadPluginImpl(); |
36 | 34 | ||
37 | #ifndef QT_NO_COMPONENT | 35 | #ifndef QT_NO_COMPONENT |
38 | 36 | ||
39 | QRESULT queryInterface( const QUuid&, QUnknownInterface** ); | 37 | QRESULT queryInterface( const QUuid&, QUnknownInterface** ); |
40 | Q_REFCOUNT | 38 | Q_REFCOUNT |
41 | 39 | ||
42 | #endif | 40 | #endif |
43 | 41 | ||
44 | virtual MediaPlayerDecoder *decoder(); | 42 | virtual MediaPlayerDecoder *decoder(); |
45 | virtual MediaPlayerEncoder *encoder(); | 43 | virtual MediaPlayerEncoder *encoder(); |
44 | |||
46 | private: | 45 | private: |
47 | LibMadPlugin *libmadplugin; | 46 | LibMadPlugin *libmadplugin; |
48 | ulong ref; | 47 | ulong ref; |
49 | }; | 48 | }; |
50 | 49 | ||
51 | 50 | ||
52 | #endif | 51 | #endif |
53 | 52 | ||
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 | |||
@@ -167,42 +167,40 @@ libmpeg3plugin.o: libmpeg3plugin.cpp \ | |||
167 | libmpeg3plugin.h \ | 167 | libmpeg3plugin.h \ |
168 | libmpeg3.h \ | 168 | libmpeg3.h \ |
169 | mpeg3private.h \ | 169 | mpeg3private.h \ |
170 | mpeg3atrack.h \ | 170 | mpeg3atrack.h \ |
171 | mpeg3demux.h \ | 171 | mpeg3demux.h \ |
172 | mpeg3title.h \ | 172 | mpeg3title.h \ |
173 | mpeg3io.h \ | 173 | mpeg3io.h \ |
174 | mpeg3css.h \ | 174 | mpeg3css.h \ |
175 | mpeg3private.inc \ | 175 | mpeg3private.inc \ |
176 | audio/mpeg3audio.h \ | 176 | audio/mpeg3audio.h \ |
177 | mpeg3vtrack.h \ | 177 | mpeg3vtrack.h \ |
178 | video/mpeg3video.h \ | 178 | video/mpeg3video.h \ |
179 | mpeg3protos.h \ | 179 | mpeg3protos.h |
180 | ../mediaplayerplugininterface.h | ||
181 | 180 | ||
182 | libmpeg3pluginimpl.o: libmpeg3pluginimpl.cpp \ | 181 | libmpeg3pluginimpl.o: libmpeg3pluginimpl.cpp \ |
183 | libmpeg3plugin.h \ | 182 | libmpeg3plugin.h \ |
184 | libmpeg3.h \ | 183 | libmpeg3.h \ |
185 | mpeg3private.h \ | 184 | mpeg3private.h \ |
186 | mpeg3atrack.h \ | 185 | mpeg3atrack.h \ |
187 | mpeg3demux.h \ | 186 | mpeg3demux.h \ |
188 | mpeg3title.h \ | 187 | mpeg3title.h \ |
189 | mpeg3io.h \ | 188 | mpeg3io.h \ |
190 | mpeg3css.h \ | 189 | mpeg3css.h \ |
191 | mpeg3private.inc \ | 190 | mpeg3private.inc \ |
192 | audio/mpeg3audio.h \ | 191 | audio/mpeg3audio.h \ |
193 | mpeg3vtrack.h \ | 192 | mpeg3vtrack.h \ |
194 | video/mpeg3video.h \ | 193 | video/mpeg3video.h \ |
195 | mpeg3protos.h \ | 194 | mpeg3protos.h \ |
196 | ../mediaplayerplugininterface.h \ | ||
197 | libmpeg3pluginimpl.h | 195 | libmpeg3pluginimpl.h |
198 | 196 | ||
199 | bitstream.o: bitstream.c \ | 197 | bitstream.o: bitstream.c \ |
200 | mpeg3private.h \ | 198 | mpeg3private.h \ |
201 | mpeg3atrack.h \ | 199 | mpeg3atrack.h \ |
202 | mpeg3demux.h \ | 200 | mpeg3demux.h \ |
203 | mpeg3title.h \ | 201 | mpeg3title.h \ |
204 | mpeg3io.h \ | 202 | mpeg3io.h \ |
205 | mpeg3css.h \ | 203 | mpeg3css.h \ |
206 | mpeg3private.inc \ | 204 | mpeg3private.inc \ |
207 | audio/mpeg3audio.h \ | 205 | audio/mpeg3audio.h \ |
208 | mpeg3vtrack.h \ | 206 | mpeg3vtrack.h \ |
@@ -407,25 +405,25 @@ audio/layer2.o: audio/layer2.c \ | |||
407 | mpeg3css.h \ | 405 | mpeg3css.h \ |
408 | mpeg3private.inc \ | 406 | mpeg3private.inc \ |
409 | audio/../libmpeg3.h \ | 407 | audio/../libmpeg3.h \ |
410 | mpeg3private.h \ | 408 | mpeg3private.h \ |
411 | mpeg3atrack.h \ | 409 | mpeg3atrack.h \ |
412 | audio/mpeg3audio.h \ | 410 | audio/mpeg3audio.h \ |
413 | mpeg3vtrack.h \ | 411 | mpeg3vtrack.h \ |
414 | video/mpeg3video.h \ | 412 | video/mpeg3video.h \ |
415 | audio/../mpeg3protos.h \ | 413 | audio/../mpeg3protos.h \ |
416 | audio/tables.h | 414 | audio/tables.h |
417 | 415 | ||
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 \ |
421 | audio/ac3.h \ | 419 | audio/ac3.h \ |
422 | audio/mpeg3real.h \ | 420 | audio/mpeg3real.h \ |
423 | audio/../bitstream.h \ | 421 | audio/../bitstream.h \ |
424 | mpeg3demux.h \ | 422 | mpeg3demux.h \ |
425 | mpeg3title.h \ | 423 | mpeg3title.h \ |
426 | mpeg3io.h \ | 424 | mpeg3io.h \ |
427 | mpeg3css.h \ | 425 | mpeg3css.h \ |
428 | mpeg3private.inc \ | 426 | mpeg3private.inc \ |
429 | audio/../libmpeg3.h \ | 427 | audio/../libmpeg3.h \ |
430 | mpeg3private.h \ | 428 | mpeg3private.h \ |
431 | mpeg3atrack.h \ | 429 | mpeg3atrack.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 | |||
@@ -11,31 +11,29 @@ | |||
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #ifndef LIBMPEG3_PLUGIN_H | 20 | #ifndef LIBMPEG3_PLUGIN_H |
21 | #define LIBMPEG3_PLUGIN_H | 21 | #define LIBMPEG3_PLUGIN_H |
22 | 22 | ||
23 | |||
24 | #include <qstring.h> | 23 | #include <qstring.h> |
25 | #include <qapplication.h> | 24 | #include <qapplication.h> |
26 | #include "libmpeg3.h" | 25 | #include "libmpeg3.h" |
27 | #include "mpeg3protos.h" | 26 | #include "mpeg3protos.h" |
28 | //#include <qpe/mediaplayerplugininterface.h> | 27 | #include <qpe/mediaplayerplugininterface.h> |
29 | #include "../mediaplayerplugininterface.h" | ||
30 | 28 | ||
31 | 29 | ||
32 | // #define OLD_MEDIAPLAYER_API | 30 | // #define OLD_MEDIAPLAYER_API |
33 | 31 | ||
34 | 32 | ||
35 | class LibMpeg3Plugin : public MediaPlayerDecoder { | 33 | class LibMpeg3Plugin : public MediaPlayerDecoder { |
36 | 34 | ||
37 | public: | 35 | public: |
38 | LibMpeg3Plugin() { file = NULL; } | 36 | LibMpeg3Plugin() { file = NULL; } |
39 | ~LibMpeg3Plugin() { close(); } | 37 | ~LibMpeg3Plugin() { close(); } |
40 | 38 | ||
41 | const char *pluginName() { return "LibMpeg3Plugin"; } | 39 | const char *pluginName() { return "LibMpeg3Plugin"; } |
@@ -43,25 +41,24 @@ public: | |||
43 | double pluginVersion() { return 1.0; } | 41 | double pluginVersion() { return 1.0; } |
44 | 42 | ||
45 | bool isFileSupported( const QString& fileName ) { return mpeg3_check_sig( (char *)fileName.latin1() ) == 1; } | 43 | bool isFileSupported( const QString& fileName ) { return mpeg3_check_sig( (char *)fileName.latin1() ) == 1; } |
46 | bool open( const QString& fileName ) { file = mpeg3_open( (char *)fileName.latin1() ); return file != NULL; } | 44 | bool open( const QString& fileName ) { file = mpeg3_open( (char *)fileName.latin1() ); return file != NULL; } |
47 | bool close() { if ( file ) { int r = mpeg3_close( file ); file = NULL; return r == 1; } return FALSE; } | 45 | bool close() { if ( file ) { int r = mpeg3_close( file ); file = NULL; return r == 1; } return FALSE; } |
48 | bool isOpen() { return file != NULL; } | 46 | bool isOpen() { return file != NULL; } |
49 | const QString &fileInfo() { return strInfo = ""; } | 47 | const QString &fileInfo() { return strInfo = ""; } |
50 | 48 | ||
51 | // If decoder doesn't support audio then return 0 here | 49 | // If decoder doesn't support audio then return 0 here |
52 | int audioStreams() { return file ? mpeg3_total_astreams( file ) : 0; } | 50 | int audioStreams() { return file ? mpeg3_total_astreams( file ) : 0; } |
53 | int audioChannels( int stream ) { return file ? mpeg3_audio_channels( file, stream ) : 0; } | 51 | int audioChannels( int stream ) { return file ? mpeg3_audio_channels( file, stream ) : 0; } |
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; } |
57 | bool audioSetSample( long sample, int stream ) { return file ? mpeg3_set_sample( file, sample, stream) == 1 : FALSE; } | 54 | bool audioSetSample( long sample, int stream ) { return file ? mpeg3_set_sample( file, sample, stream) == 1 : FALSE; } |
58 | long audioGetSample( int stream ) { return file ? mpeg3_get_sample( file, stream ) : 0; } | 55 | long audioGetSample( int stream ) { return file ? mpeg3_get_sample( file, stream ) : 0; } |
59 | #ifdef OLD_MEDIAPLAYER_API | 56 | #ifdef OLD_MEDIAPLAYER_API |
60 | bool audioReadMonoSamples( short *output, long samples, long& samplesRead, int stream ); | 57 | bool audioReadMonoSamples( short *output, long samples, long& samplesRead, int stream ); |
61 | bool audioReadStereoSamples( short *output, long samples, long& samplesRead, int stream ); | 58 | bool audioReadStereoSamples( short *output, long samples, long& samplesRead, int stream ); |
62 | bool audioReadSamples( short *output, int channel, long samples, int stream ); | 59 | bool audioReadSamples( short *output, int channel, long samples, int stream ); |
63 | bool audioReReadSamples( short *output, int channel, long samples, int stream ); | 60 | bool audioReReadSamples( short *output, int channel, long samples, int stream ); |
64 | #else | 61 | #else |
65 | bool audioReadSamples( short *output, int channels, long samples, long& samplesRead, int stream ); | 62 | bool audioReadSamples( short *output, int channels, long samples, long& samplesRead, int stream ); |
66 | #endif | 63 | #endif |
67 | 64 | ||
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 | |||
@@ -11,27 +11,25 @@ | |||
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #ifndef LIBMPEG3_PLUGIN_IMPL_H | 20 | #ifndef LIBMPEG3_PLUGIN_IMPL_H |
21 | #define LIBMPEG3_PLUGIN_IMPL_H | 21 | #define LIBMPEG3_PLUGIN_IMPL_H |
22 | 22 | ||
23 | 23 | #include <qpe/mediaplayerplugininterface.h> | |
24 | //#include <qpe/mediaplayerplugininterface.h> | ||
25 | #include "../mediaplayerplugininterface.h" | ||
26 | 24 | ||
27 | 25 | ||
28 | class LibMpeg3Plugin; | 26 | class LibMpeg3Plugin; |
29 | 27 | ||
30 | 28 | ||
31 | class LibMpeg3PluginImpl : public MediaPlayerPluginInterface | 29 | class LibMpeg3PluginImpl : public MediaPlayerPluginInterface |
32 | { | 30 | { |
33 | public: | 31 | public: |
34 | LibMpeg3PluginImpl(); | 32 | LibMpeg3PluginImpl(); |
35 | virtual ~LibMpeg3PluginImpl(); | 33 | virtual ~LibMpeg3PluginImpl(); |
36 | 34 | ||
37 | #ifndef QT_NO_COMPONENT | 35 | #ifndef QT_NO_COMPONENT |
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,48 +1,46 @@ | |||
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 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
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> |
28 | #include <stdlib.h> | 27 | #include <stdlib.h> |
29 | #include <string.h> | 28 | #include <string.h> |
30 | #include <pthread.h> | 29 | #include <pthread.h> |
31 | #include <errno.h> | 30 | #include <errno.h> |
32 | #include <unistd.h> | 31 | #include <unistd.h> |
33 | #include "loopcontrol.h" | 32 | #include "loopcontrol.h" |
34 | #include "videowidget.h" | 33 | #include "videowidget.h" |
35 | #include "audiodevice.h" | 34 | #include "audiodevice.h" |
36 | #include "mediaplayerplugininterface.h" | ||
37 | #include "mediaplayerstate.h" | 35 | #include "mediaplayerstate.h" |
38 | 36 | ||
39 | 37 | ||
40 | extern VideoWidget *videoUI; // now only needed to tell it to play a frame | 38 | extern VideoWidget *videoUI; // now only needed to tell it to play a frame |
41 | extern MediaPlayerState *mediaPlayerState; | 39 | extern MediaPlayerState *mediaPlayerState; |
42 | 40 | ||
43 | 41 | ||
44 | //#define DecodeLoopDebug(x) qDebug x | 42 | //#define DecodeLoopDebug(x) qDebug x |
45 | #define DecodeLoopDebug(x) | 43 | #define DecodeLoopDebug(x) |
46 | 44 | ||
47 | 45 | ||
48 | static char *audioBuffer = NULL; | 46 | static char *audioBuffer = NULL; |
@@ -95,37 +93,42 @@ void *startAudioThread( void *ptr ) { | |||
95 | 93 | ||
96 | Mutex *audioMutex; | 94 | Mutex *audioMutex; |
97 | 95 | ||
98 | 96 | ||
99 | LoopControl::LoopControl( QObject *parent, const char *name ) | 97 | LoopControl::LoopControl( QObject *parent, const char *name ) |
100 | : QObject( parent, name ) { | 98 | : QObject( parent, name ) { |
101 | isMuted = FALSE; | 99 | isMuted = FALSE; |
102 | connect( qApp, SIGNAL( volumeChanged(bool) ), this, SLOT( setMute(bool) ) ); | 100 | connect( qApp, SIGNAL( volumeChanged(bool) ), this, SLOT( setMute(bool) ) ); |
103 | 101 | ||
104 | audioMutex = new Mutex; | 102 | audioMutex = new Mutex; |
105 | 103 | ||
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 |
110 | if ( pthread_attr_setschedpolicy( &audio_attr, SCHED_RR ) == 0 ) { | 110 | if ( pthread_attr_setschedpolicy( &audio_attr, SCHED_RR ) == 0 ) { |
111 | sched_param params; | 111 | sched_param params; |
112 | params.sched_priority = 50; | 112 | params.sched_priority = 50; |
113 | pthread_attr_setschedparam(&audio_attr,¶ms); | 113 | pthread_attr_setschedparam(&audio_attr,¶ms); |
114 | } else { | 114 | } else { |
115 | qDebug( "Error setting up a realtime thread, reverting to using a normal thread." ); | 115 | qDebug( "Error setting up a realtime thread, reverting to using a normal thread." ); |
116 | pthread_attr_destroy(&audio_attr); | 116 | pthread_attr_destroy(&audio_attr); |
117 | pthread_attr_init(&audio_attr); | 117 | pthread_attr_init(&audio_attr); |
118 | } | 118 | } |
119 | #endif | 119 | } |
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); |
121 | } | 124 | } |
122 | 125 | ||
123 | 126 | ||
124 | LoopControl::~LoopControl() { | 127 | LoopControl::~LoopControl() { |
125 | stop(); | 128 | stop(); |
126 | } | 129 | } |
127 | 130 | ||
128 | 131 | ||
129 | static long prev_frame = 0; | 132 | static long prev_frame = 0; |
130 | static int currentSample = 0; | 133 | static int currentSample = 0; |
131 | 134 | ||
@@ -222,41 +225,40 @@ void LoopControl::startAudio() { | |||
222 | audioMutex->lock(); | 225 | audioMutex->lock(); |
223 | 226 | ||
224 | if ( moreAudio ) { | 227 | if ( moreAudio ) { |
225 | 228 | ||
226 | if ( !isMuted && mediaPlayerState->curDecoder() ) { | 229 | if ( !isMuted && mediaPlayerState->curDecoder() ) { |
227 | 230 | ||
228 | currentSample = audioSampleCounter + 1; | 231 | currentSample = audioSampleCounter + 1; |
229 | 232 | ||
230 | if ( currentSample != audioSampleCounter + 1 ) | 233 | if ( currentSample != audioSampleCounter + 1 ) |
231 | qDebug("out of sync with decoder %i %i", currentSample, audioSampleCounter); | 234 | qDebug("out of sync with decoder %i %i", currentSample, audioSampleCounter); |
232 | 235 | ||
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; |
236 | long sampleWaitTime = currentSample - sampleWeShouldBeAt; | 239 | long sampleWaitTime = currentSample - sampleWeShouldBeAt; |
237 | 240 | ||
238 | if ( ( sampleWaitTime > 2000 ) && ( sampleWaitTime < 20000 ) ) { | 241 | if ( ( sampleWaitTime > 2000 ) && ( sampleWaitTime < 20000 ) ) { |
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 ); |
243 | //mediaPlayerState->curDecoder()->audioSetSample( sampleWeShouldBeAt, stream ); | 245 | //mediaPlayerState->curDecoder()->audioSetSample( sampleWeShouldBeAt, stream ); |
244 | currentSample = sampleWeShouldBeAt; | 246 | currentSample = sampleWeShouldBeAt; |
245 | } | 247 | } |
246 | 248 | ||
247 | audioDevice->write( audioBuffer, samplesRead * 2 * channels ); | 249 | audioDevice->write( audioBuffer, samplesRead * 2 * channels ); |
248 | audioSampleCounter = currentSample + samplesRead - 1; | 250 | audioSampleCounter = currentSample + samplesRead - 1; |
249 | 251 | ||
250 | moreAudio = readOk && (audioSampleCounter <= total_audio_samples); | 252 | moreAudio = audioSampleCounter <= total_audio_samples; |
251 | 253 | ||
252 | } else { | 254 | } else { |
253 | 255 | ||
254 | moreAudio = FALSE; | 256 | moreAudio = FALSE; |
255 | 257 | ||
256 | } | 258 | } |
257 | 259 | ||
258 | } | 260 | } |
259 | 261 | ||
260 | audioMutex->unlock(); | 262 | audioMutex->unlock(); |
261 | } | 263 | } |
262 | 264 | ||
@@ -368,41 +370,41 @@ bool LoopControl::init( const QString& filename ) { | |||
368 | if ( !mediaPlayerState->curDecoder()|| !mediaPlayerState->curDecoder()->open( filename ) ) { | 370 | if ( !mediaPlayerState->curDecoder()|| !mediaPlayerState->curDecoder()->open( filename ) ) { |
369 | audioMutex->unlock(); | 371 | audioMutex->unlock(); |
370 | return FALSE; | 372 | return FALSE; |
371 | } | 373 | } |
372 | 374 | ||
373 | hasAudioChannel = mediaPlayerState->curDecoder()->audioStreams() > 0; | 375 | hasAudioChannel = mediaPlayerState->curDecoder()->audioStreams() > 0; |
374 | hasVideoChannel = mediaPlayerState->curDecoder()->videoStreams() > 0; | 376 | hasVideoChannel = mediaPlayerState->curDecoder()->videoStreams() > 0; |
375 | 377 | ||
376 | if ( hasAudioChannel ) { | 378 | if ( hasAudioChannel ) { |
377 | int astream = 0; | 379 | int astream = 0; |
378 | 380 | ||
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 | ||
382 | if ( !total_audio_samples ) | 384 | if ( !total_audio_samples ) |
383 | total_audio_samples = mediaPlayerState->curDecoder()->audioSamples( astream ); | 385 | total_audio_samples = mediaPlayerState->curDecoder()->audioSamples( astream ); |
384 | 386 | ||
385 | // total_audio_samples += 1000; | 387 | total_audio_samples += 1000; |
386 | 388 | ||
387 | mediaPlayerState->setLength( total_audio_samples ); | 389 | mediaPlayerState->setLength( total_audio_samples ); |
388 | 390 | ||
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 | ||
392 | audioSampleCounter = 0; | 394 | audioSampleCounter = 0; |
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() ]; |
398 | channels = audioDevice->channels(); | 400 | channels = audioDevice->channels(); |
399 | 401 | ||
400 | //### must check which frequency is actually used. | 402 | //### must check which frequency is actually used. |
401 | static const int size = 1; | 403 | static const int size = 1; |
402 | short int buf[size]; | 404 | short int buf[size]; |
403 | long samplesRead = 0; | 405 | long samplesRead = 0; |
404 | mediaPlayerState->curDecoder()->audioReadSamples( buf, channels, size, samplesRead, stream ); | 406 | mediaPlayerState->curDecoder()->audioReadSamples( buf, channels, size, samplesRead, stream ); |
405 | } | 407 | } |
406 | 408 | ||
407 | if ( hasVideoChannel ) { | 409 | if ( hasVideoChannel ) { |
408 | total_video_frames = mediaPlayerState->curDecoder()->videoFrames( stream ); | 410 | total_video_frames = mediaPlayerState->curDecoder()->videoFrames( stream ); |
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,37 +1,34 @@ | |||
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 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | // L.J.Potter added changes Fri 02-15-2002 | ||
21 | |||
22 | #ifndef MPEGVIEW_H | 20 | #ifndef MPEGVIEW_H |
23 | #define MPEGVIEW_H | 21 | #define MPEGVIEW_H |
24 | 22 | ||
25 | |||
26 | #include <qwidget.h> | 23 | #include <qwidget.h> |
27 | #include <qdatetime.h> | 24 | #include <qdatetime.h> |
28 | 25 | ||
29 | 26 | ||
30 | class LoopControl : public QObject { | 27 | class LoopControl : public QObject { |
31 | Q_OBJECT | 28 | Q_OBJECT |
32 | public: | 29 | public: |
33 | LoopControl( QObject *parent, const char *name ); | 30 | LoopControl( QObject *parent, const char *name ); |
34 | ~LoopControl(); | 31 | ~LoopControl(); |
35 | 32 | ||
36 | bool init( const QString& filename ); | 33 | bool init( const QString& filename ); |
37 | 34 | ||
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,41 +1,42 @@ | |||
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 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #define _REENTRANT | 21 | #define _REENTRANT |
22 | 22 | ||
23 | |||
23 | #include <qpe/qpeapplication.h> | 24 | #include <qpe/qpeapplication.h> |
24 | #include <qimage.h> | 25 | #include <qimage.h> |
25 | #include <qpainter.h> | 26 | #include <qpainter.h> |
26 | #ifdef Q_WS_QWS | 27 | #ifdef Q_WS_QWS |
27 | #include <qpe/qcopenvelope_qws.h> | 28 | #include <qpe/qcopenvelope_qws.h> |
28 | #endif | 29 | #endif |
29 | #include "mediaplayerplugininterface.h" | 30 | #include <qpe/mediaplayerplugininterface.h> |
30 | #include <stdio.h> | 31 | #include <stdio.h> |
31 | #include <stdlib.h> | 32 | #include <stdlib.h> |
32 | #include <string.h> | 33 | #include <string.h> |
33 | #include <time.h> | 34 | #include <time.h> |
34 | #include <unistd.h> | 35 | #include <unistd.h> |
35 | #include <pthread.h> | 36 | #include <pthread.h> |
36 | #include "loopcontrol.h" | 37 | #include "loopcontrol.h" |
37 | #include "audiodevice.h" | 38 | #include "audiodevice.h" |
38 | #include "videowidget.h" | 39 | #include "videowidget.h" |
39 | #include "audiowidget.h" | 40 | #include "audiowidget.h" |
40 | #include "mediaplayerstate.h" | 41 | #include "mediaplayerstate.h" |
41 | 42 | ||
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,35 +1,36 @@ | |||
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 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #ifndef MPEGVIEW_H | 20 | #ifndef MPEGVIEW_H |
21 | #define MPEGVIEW_H | 21 | #define MPEGVIEW_H |
22 | 22 | ||
23 | 23 | ||
24 | |||
24 | #include <qwidget.h> | 25 | #include <qwidget.h> |
25 | #include <qdatetime.h> | 26 | #include <qdatetime.h> |
26 | 27 | ||
27 | 28 | ||
28 | class LoopControl : public QObject { | 29 | class LoopControl : public QObject { |
29 | Q_OBJECT | 30 | Q_OBJECT |
30 | public: | 31 | public: |
31 | LoopControl( QObject *parent, const char *name ); | 32 | LoopControl( QObject *parent, const char *name ); |
32 | ~LoopControl(); | 33 | ~LoopControl(); |
33 | 34 | ||
34 | bool init( const QString& filename ); | 35 | bool init( const QString& filename ); |
35 | 36 | ||
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,57 +1,56 @@ | |||
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 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #include <qpe/qpeapplication.h> | 20 | #include <qpe/qpeapplication.h> |
21 | #include "mediaplayerstate.h" | 21 | #include "mediaplayerstate.h" |
22 | #include "playlistwidget.h" | 22 | #include "playlistwidget.h" |
23 | #include "audiowidget.h" | 23 | #include "audiowidget.h" |
24 | #include "videowidget.h" | 24 | #include "videowidget.h" |
25 | #include "loopcontrol.h" | 25 | #include "loopcontrol.h" |
26 | #include "mediaplayer.h" | 26 | #include "mediaplayer.h" |
27 | 27 | ||
28 | |||
29 | MediaPlayerState *mediaPlayerState; | 28 | MediaPlayerState *mediaPlayerState; |
30 | PlayListWidget *playList; | 29 | PlayListWidget *playList; |
31 | AudioWidget *audioUI; | 30 | AudioWidget *audioUI; |
32 | VideoWidget *videoUI; | 31 | VideoWidget *videoUI; |
33 | LoopControl *loopControl; | 32 | LoopControl *loopControl; |
34 | 33 | ||
35 | 34 | ||
36 | int main(int argc, char **argv) { | 35 | int main(int argc, char **argv) { |
37 | QPEApplication a(argc,argv); | 36 | QPEApplication a(argc,argv); |
38 | 37 | ||
39 | MediaPlayerState st( 0, "mediaPlayerState" ); | 38 | MediaPlayerState st( 0, "mediaPlayerState" ); |
40 | mediaPlayerState = &st; | 39 | mediaPlayerState = &st; |
41 | PlayListWidget pl( 0, "playList" ); | 40 | PlayListWidget pl( 0, "playList" ); |
42 | playList = &pl; | 41 | playList = &pl; |
43 | AudioWidget aw( 0, "audioUI" ); | 42 | AudioWidget aw( 0, "audioUI" ); |
44 | audioUI = &aw; | 43 | audioUI = &aw; |
45 | VideoWidget vw( 0, "videoUI" ); | 44 | VideoWidget vw( 0, "videoUI" ); |
46 | videoUI = &vw; | 45 | videoUI = &vw; |
47 | LoopControl lc( 0, "loopControl" ); | 46 | LoopControl lc( 0, "loopControl" ); |
48 | loopControl = &lc; | 47 | loopControl = &lc; |
49 | MediaPlayer mp( 0, "mediaPlayer" ); | 48 | MediaPlayer mp( 0, "mediaPlayer" ); |
50 | 49 | ||
51 | pl.setCaption( MediaPlayer::tr("Opie Player") ); | 50 | pl.setCaption( MediaPlayer::tr("Media Player") ); |
52 | a.showMainDocumentWidget(&pl); | 51 | a.showMainDocumentWidget(&pl); |
53 | 52 | ||
54 | return a.exec(); | 53 | return a.exec(); |
55 | } | 54 | } |
56 | 55 | ||
57 | 56 | ||
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,31 +1,32 @@ | |||
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 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | |||
20 | #include <qpe/qpeapplication.h> | 21 | #include <qpe/qpeapplication.h> |
21 | #include <qpe/qlibrary.h> | 22 | #include <qpe/qlibrary.h> |
22 | #include <qpe/resource.h> | 23 | #include <qpe/resource.h> |
23 | #include <qpe/config.h> | 24 | #include <qpe/config.h> |
24 | 25 | ||
25 | #include <qmainwindow.h> | 26 | #include <qmainwindow.h> |
26 | #include <qmessagebox.h> | 27 | #include <qmessagebox.h> |
27 | #include <qwidgetstack.h> | 28 | #include <qwidgetstack.h> |
28 | #include <qfile.h> | 29 | #include <qfile.h> |
29 | 30 | ||
30 | #include "mediaplayer.h" | 31 | #include "mediaplayer.h" |
31 | #include "playlistwidget.h" | 32 | #include "playlistwidget.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,39 +1,38 @@ | |||
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 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #ifndef MEDIA_PLAYER_H | 20 | #ifndef MEDIA_PLAYER_H |
21 | #define MEDIA_PLAYER_H | 21 | #define MEDIA_PLAYER_H |
22 | 22 | ||
23 | |||
24 | #include <qmainwindow.h> | 23 | #include <qmainwindow.h> |
25 | #include <qframe.h> | 24 | #include <qframe.h> |
26 | #include <qpe/qlibrary.h> | 25 | #include <qpe/qlibrary.h> |
27 | #include "mediaplayerplugininterface.h" | 26 | #include <qpe/mediaplayerplugininterface.h> |
28 | 27 | ||
29 | 28 | ||
30 | class DocLnk; | 29 | class DocLnk; |
31 | 30 | ||
32 | 31 | ||
33 | class MediaPlayer : public QObject { | 32 | class MediaPlayer : public QObject { |
34 | Q_OBJECT | 33 | Q_OBJECT |
35 | public: | 34 | public: |
36 | MediaPlayer( QObject *parent, const char *name ); | 35 | MediaPlayer( QObject *parent, const char *name ); |
37 | ~MediaPlayer(); | 36 | ~MediaPlayer(); |
38 | 37 | ||
39 | private slots: | 38 | private slots: |
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 | |||
@@ -11,24 +11,25 @@ | |||
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #ifndef MEDIA_PLAYER_PLUGIN_INTERFACE_H | 20 | #ifndef MEDIA_PLAYER_PLUGIN_INTERFACE_H |
21 | #define MEDIA_PLAYER_PLUGIN_INTERFACE_H | 21 | #define MEDIA_PLAYER_PLUGIN_INTERFACE_H |
22 | 22 | ||
23 | |||
23 | #include <qpe/qcom.h> | 24 | #include <qpe/qcom.h> |
24 | 25 | ||
25 | #ifndef QT_NO_COMPONENT | 26 | #ifndef QT_NO_COMPONENT |
26 | // {c0093632-b44c-4cf7-a279-d82fe8a8890c} | 27 | // {c0093632-b44c-4cf7-a279-d82fe8a8890c} |
27 | # ifndef IID_MediaPlayerPlugin | 28 | # ifndef IID_MediaPlayerPlugin |
28 | # define IID_MediaPlayerPlugin QUuid( 0xc0093632, 0xb44c, 0x4cf7, 0xa2, 0x79, 0xd8, 0x2f, 0xe8, 0xa8, 0x89, 0x0c ) | 29 | # define IID_MediaPlayerPlugin QUuid( 0xc0093632, 0xb44c, 0x4cf7, 0xa2, 0x79, 0xd8, 0x2f, 0xe8, 0xa8, 0x89, 0x0c ) |
29 | # endif | 30 | # endif |
30 | #endif | 31 | #endif |
31 | 32 | ||
32 | 33 | ||
33 | enum ColorFormat { | 34 | enum ColorFormat { |
34 | RGB565, | 35 | RGB565, |
@@ -52,25 +53,30 @@ public: | |||
52 | virtual bool open( const QString& file ) = 0; | 53 | virtual bool open( const QString& file ) = 0; |
53 | virtual bool close() = 0; | 54 | virtual bool close() = 0; |
54 | virtual bool isOpen() = 0; | 55 | virtual bool isOpen() = 0; |
55 | virtual const QString &fileInfo() = 0; | 56 | virtual const QString &fileInfo() = 0; |
56 | 57 | ||
57 | // If decoder doesn't support audio then return 0 here | 58 | // If decoder doesn't support audio then return 0 here |
58 | virtual int audioStreams() = 0; | 59 | virtual int audioStreams() = 0; |
59 | virtual int audioChannels( int stream ) = 0; | 60 | virtual int audioChannels( int stream ) = 0; |
60 | virtual int audioFrequency( int stream ) = 0; | 61 | virtual int audioFrequency( int stream ) = 0; |
61 | virtual int audioSamples( int stream ) = 0; | 62 | virtual int audioSamples( int stream ) = 0; |
62 | virtual bool audioSetSample( long sample, int stream ) = 0; | 63 | virtual bool audioSetSample( long sample, int stream ) = 0; |
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 | ||
66 | // If decoder doesn't support video then return 0 here | 72 | // If decoder doesn't support video then return 0 here |
67 | virtual int videoStreams() = 0; | 73 | virtual int videoStreams() = 0; |
68 | virtual int videoWidth( int stream ) = 0; | 74 | virtual int videoWidth( int stream ) = 0; |
69 | virtual int videoHeight( int stream ) = 0; | 75 | virtual int videoHeight( int stream ) = 0; |
70 | virtual double videoFrameRate( int stream ) = 0; // frames per second (this may change to frames/1000secs) | 76 | virtual double videoFrameRate( int stream ) = 0; // frames per second (this may change to frames/1000secs) |
71 | virtual int videoFrames( int stream ) = 0; | 77 | virtual int videoFrames( int stream ) = 0; |
72 | virtual bool videoSetFrame( long sample, int stream ) = 0; | 78 | virtual bool videoSetFrame( long sample, int stream ) = 0; |
73 | virtual long videoGetFrame( int stream ) = 0; | 79 | virtual long videoGetFrame( int stream ) = 0; |
74 | virtual bool videoReadFrame( unsigned char **output_rows, int in_x, int in_y, int in_w, int in_h, ColorFormat color_model, int stream ) = 0; | 80 | virtual bool videoReadFrame( unsigned char **output_rows, int in_x, int in_y, int in_w, int in_h, ColorFormat color_model, int stream ) = 0; |
75 | virtual bool videoReadScaledFrame( unsigned char **output_rows, int in_x, int in_y, int in_w, int in_h, int out_w, int out_h, ColorFormat color_model, int stream ) = 0; | 81 | virtual bool videoReadScaledFrame( unsigned char **output_rows, int in_x, int in_y, int in_w, int in_h, int out_w, int out_h, ColorFormat color_model, int stream ) = 0; |
76 | virtual bool videoReadYUVFrame( char *y_output, char *u_output, char *v_output, int in_x, int in_y, int in_w, int in_h, int stream ) = 0; | 82 | virtual bool videoReadYUVFrame( char *y_output, char *u_output, char *v_output, int in_x, int in_y, int in_w, int in_h, int stream ) = 0; |
@@ -82,27 +88,24 @@ public: | |||
82 | virtual bool setSMP( int cpus ) = 0; | 88 | virtual bool setSMP( int cpus ) = 0; |
83 | virtual bool setMMX( bool useMMX ) = 0; | 89 | virtual bool setMMX( bool useMMX ) = 0; |
84 | 90 | ||
85 | // Capabilities | 91 | // Capabilities |
86 | virtual bool supportsAudio() = 0; | 92 | virtual bool supportsAudio() = 0; |
87 | virtual bool supportsVideo() = 0; | 93 | virtual bool supportsVideo() = 0; |
88 | virtual bool supportsYUV() = 0; | 94 | virtual bool supportsYUV() = 0; |
89 | virtual bool supportsMMX() = 0; | 95 | virtual bool supportsMMX() = 0; |
90 | virtual bool supportsSMP() = 0; | 96 | virtual bool supportsSMP() = 0; |
91 | virtual bool supportsStereo() = 0; | 97 | virtual bool supportsStereo() = 0; |
92 | virtual bool supportsScaling() = 0; | 98 | virtual bool supportsScaling() = 0; |
93 | 99 | ||
94 | // File Properies | ||
95 | virtual long getPlayTime() { return -1; } | ||
96 | virtual int audioBitsPerSample( int stream ) = 0; | ||
97 | }; | 100 | }; |
98 | 101 | ||
99 | 102 | ||
100 | class MediaPlayerEncoder; | 103 | class MediaPlayerEncoder; |
101 | 104 | ||
102 | 105 | ||
103 | struct MediaPlayerPluginInterface : public QUnknownInterface | 106 | struct MediaPlayerPluginInterface : public QUnknownInterface |
104 | { | 107 | { |
105 | virtual MediaPlayerDecoder *decoder() = 0; | 108 | virtual MediaPlayerDecoder *decoder() = 0; |
106 | virtual MediaPlayerEncoder *encoder() = 0; | 109 | virtual MediaPlayerEncoder *encoder() = 0; |
107 | }; | 110 | }; |
108 | 111 | ||
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,52 +1,50 @@ | |||
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 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #include <qpe/qpeapplication.h> | 20 | #include <qpe/qpeapplication.h> |
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> |
23 | #include <qvaluelist.h> | 24 | #include <qvaluelist.h> |
24 | #include <qobject.h> | 25 | #include <qobject.h> |
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 |
32 | // Plugins which are compiled in when no plugin architecture available | 30 | // Plugins which are compiled in when no plugin architecture available |
33 | #include "libmad/libmadpluginimpl.h" | 31 | #include "libmad/libmadpluginimpl.h" |
34 | #include "libmpeg3/libmpeg3pluginimpl.h" | 32 | #include "libmpeg3/libmpeg3pluginimpl.h" |
35 | #include "wavplugin/wavpluginimpl.h" | 33 | #include "wavplugin/wavpluginimpl.h" |
36 | #endif | 34 | #endif |
37 | 35 | ||
38 | 36 | ||
39 | //#define MediaPlayerDebug(x) qDebug x | 37 | #define MediaPlayerDebug(x)qDebug x |
40 | #define MediaPlayerDebug(x) | 38 | //#define MediaPlayerDebug(x) |
41 | 39 | ||
42 | 40 | ||
43 | MediaPlayerState::MediaPlayerState( QObject *parent, const char *name ) | 41 | MediaPlayerState::MediaPlayerState( QObject *parent, const char *name ) |
44 | : QObject( parent, name ), decoder( NULL ), libmpeg3decoder( NULL ) { | 42 | : QObject( parent, name ), decoder( NULL ), libmpeg3decoder( NULL ) { |
45 | Config cfg( "MediaPlayer" ); | 43 | Config cfg( "MediaPlayer" ); |
46 | readConfig( cfg ); | 44 | readConfig( cfg ); |
47 | loadPlugins(); | 45 | loadPlugins(); |
48 | } | 46 | } |
49 | 47 | ||
50 | 48 | ||
51 | MediaPlayerState::~MediaPlayerState() { | 49 | MediaPlayerState::~MediaPlayerState() { |
52 | Config cfg( "MediaPlayer" ); | 50 | Config cfg( "MediaPlayer" ); |
@@ -107,28 +105,24 @@ MediaPlayerDecoder *MediaPlayerState::newDecoder( const QString& file ) { | |||
107 | 105 | ||
108 | 106 | ||
109 | MediaPlayerDecoder *MediaPlayerState::curDecoder() { | 107 | MediaPlayerDecoder *MediaPlayerState::curDecoder() { |
110 | return decoder; | 108 | return decoder; |
111 | } | 109 | } |
112 | 110 | ||
113 | 111 | ||
114 | // ### hack to get true sample count | 112 | // ### hack to get true sample count |
115 | MediaPlayerDecoder *MediaPlayerState::libMpeg3Decoder() { | 113 | MediaPlayerDecoder *MediaPlayerState::libMpeg3Decoder() { |
116 | return libmpeg3decoder; | 114 | return libmpeg3decoder; |
117 | } | 115 | } |
118 | 116 | ||
119 | // ### hack to get true sample count | ||
120 | // MediaPlayerDecoder *MediaPlayerState::libWavDecoder() { | ||
121 | // return libwavdecoder; | ||
122 | // } | ||
123 | 117 | ||
124 | void MediaPlayerState::loadPlugins() { | 118 | void MediaPlayerState::loadPlugins() { |
125 | 119 | ||
126 | #ifndef QT_NO_COMPONENT | 120 | #ifndef QT_NO_COMPONENT |
127 | QValueList<MediaPlayerPlugin>::Iterator mit; | 121 | QValueList<MediaPlayerPlugin>::Iterator mit; |
128 | for ( mit = pluginList.begin(); mit != pluginList.end(); ++mit ) { | 122 | for ( mit = pluginList.begin(); mit != pluginList.end(); ++mit ) { |
129 | (*mit).iface->release(); | 123 | (*mit).iface->release(); |
130 | (*mit).library->unload(); | 124 | (*mit).library->unload(); |
131 | delete (*mit).library; | 125 | delete (*mit).library; |
132 | } | 126 | } |
133 | pluginList.clear(); | 127 | pluginList.clear(); |
134 | 128 | ||
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,35 +1,34 @@ | |||
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 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #ifndef MEDIA_PLAYER_STATE_H | 20 | #ifndef MEDIA_PLAYER_STATE_H |
21 | #define MEDIA_PLAYER_STATE_H | 21 | #define MEDIA_PLAYER_STATE_H |
22 | 22 | ||
23 | |||
24 | #include <qobject.h> | 23 | #include <qobject.h> |
25 | 24 | ||
26 | 25 | ||
27 | class MediaPlayerDecoder; | 26 | class MediaPlayerDecoder; |
28 | class Config; | 27 | class Config; |
29 | 28 | ||
30 | 29 | ||
31 | class MediaPlayerState : public QObject { | 30 | class MediaPlayerState : public QObject { |
32 | Q_OBJECT | 31 | Q_OBJECT |
33 | public: | 32 | public: |
34 | MediaPlayerState( QObject *parent, const char *name ); | 33 | MediaPlayerState( QObject *parent, const char *name ); |
35 | ~MediaPlayerState(); | 34 | ~MediaPlayerState(); |
@@ -97,22 +96,21 @@ private: | |||
97 | bool isScaled; | 96 | bool isScaled; |
98 | bool isLooping; | 97 | bool isLooping; |
99 | bool isShuffled; | 98 | bool isShuffled; |
100 | bool usePlaylist; | 99 | bool usePlaylist; |
101 | bool isPaused; | 100 | bool isPaused; |
102 | bool isPlaying; | 101 | bool isPlaying; |
103 | long curPosition; | 102 | long curPosition; |
104 | long curLength; | 103 | long curLength; |
105 | char curView; | 104 | char curView; |
106 | 105 | ||
107 | MediaPlayerDecoder *decoder; | 106 | MediaPlayerDecoder *decoder; |
108 | MediaPlayerDecoder *libmpeg3decoder; | 107 | MediaPlayerDecoder *libmpeg3decoder; |
109 | // MediaPlayerDecoder *libwavdecoder; | ||
110 | 108 | ||
111 | void loadPlugins(); | 109 | void loadPlugins(); |
112 | void readConfig( Config& cfg ); | 110 | void readConfig( Config& cfg ); |
113 | void writeConfig( Config& cfg ) const; | 111 | void writeConfig( Config& cfg ) const; |
114 | }; | 112 | }; |
115 | 113 | ||
116 | 114 | ||
117 | #endif // MEDIA_PLAYER_STATE_H | 115 | #endif // MEDIA_PLAYER_STATE_H |
118 | 116 | ||
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,16 +1,16 @@ | |||
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 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
@@ -21,25 +21,24 @@ | |||
21 | #include <qpe/resource.h> | 21 | #include <qpe/resource.h> |
22 | #include <qpainter.h> | 22 | #include <qpainter.h> |
23 | #include <qimage.h> | 23 | #include <qimage.h> |
24 | #include <qheader.h> | 24 | #include <qheader.h> |
25 | #include <qlistview.h> | 25 | #include <qlistview.h> |
26 | #include <qlist.h> | 26 | #include <qlist.h> |
27 | #include <qpixmap.h> | 27 | #include <qpixmap.h> |
28 | 28 | ||
29 | #include "playlistselection.h" | 29 | #include "playlistselection.h" |
30 | 30 | ||
31 | #include <stdlib.h> | 31 | #include <stdlib.h> |
32 | 32 | ||
33 | |||
34 | class PlayListSelectionItem : public QListViewItem { | 33 | class PlayListSelectionItem : public QListViewItem { |
35 | public: | 34 | public: |
36 | PlayListSelectionItem( QListView *parent, const DocLnk *f ) : QListViewItem( parent ), fl( f ) { | 35 | PlayListSelectionItem( QListView *parent, const DocLnk *f ) : QListViewItem( parent ), fl( f ) { |
37 | setText( 0, f->name() ); | 36 | setText( 0, f->name() ); |
38 | setPixmap( 0, f->pixmap() ); | 37 | setPixmap( 0, f->pixmap() ); |
39 | } | 38 | } |
40 | 39 | ||
41 | ~PlayListSelectionItem() { | 40 | ~PlayListSelectionItem() { |
42 | }; | 41 | }; |
43 | 42 | ||
44 | const DocLnk *file() const { return fl; } | 43 | const DocLnk *file() const { return fl; } |
45 | 44 | ||
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,35 +1,36 @@ | |||
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 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #ifndef PLAY_LIST_SELECTION_H | 20 | #ifndef PLAY_LIST_SELECTION_H |
21 | #define PLAY_LIST_SELECTION_H | 21 | #define PLAY_LIST_SELECTION_H |
22 | 22 | ||
23 | 23 | ||
24 | |||
24 | #include <qlist.h> | 25 | #include <qlist.h> |
25 | #include <qlistview.h> | 26 | #include <qlistview.h> |
26 | #include <qpe/applnk.h> | 27 | #include <qpe/applnk.h> |
27 | 28 | ||
28 | 29 | ||
29 | class PlayListSelection : public QListView { | 30 | class PlayListSelection : public QListView { |
30 | Q_OBJECT | 31 | Q_OBJECT |
31 | public: | 32 | public: |
32 | PlayListSelection( QWidget *parent, const char *name=0 ); | 33 | PlayListSelection( QWidget *parent, const char *name=0 ); |
33 | ~PlayListSelection(); | 34 | ~PlayListSelection(); |
34 | 35 | ||
35 | const DocLnk *current(); // retrieve the current playlist entry (media file link) | 36 | const DocLnk *current(); // retrieve the current playlist entry (media file link) |
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,73 +1,68 @@ | |||
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 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | |||
20 | #include <qpe/qpemenubar.h> | 21 | #include <qpe/qpemenubar.h> |
21 | #include <qpe/qpetoolbar.h> | 22 | #include <qpe/qpetoolbar.h> |
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> |
26 | #include <qpe/config.h> | 25 | #include <qpe/config.h> |
27 | #include <qpe/global.h> | 26 | #include <qpe/global.h> |
28 | #include <qpe/resource.h> | 27 | #include <qpe/resource.h> |
29 | #include <qaction.h> | 28 | #include <qaction.h> |
30 | #include <qimage.h> | 29 | #include <qimage.h> |
31 | #include <qfile.h> | 30 | #include <qfile.h> |
32 | #include <qlayout.h> | 31 | #include <qlayout.h> |
33 | #include <qlabel.h> | 32 | #include <qlabel.h> |
34 | #include <qlist.h> | 33 | #include <qlist.h> |
35 | #include <qlistbox.h> | 34 | #include <qlistbox.h> |
36 | #include <qmainwindow.h> | 35 | #include <qmainwindow.h> |
37 | #include <qmessagebox.h> | 36 | #include <qmessagebox.h> |
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 | ||
44 | #include "playlistselection.h" | 39 | #include "playlistselection.h" |
45 | #include "playlistwidget.h" | 40 | #include "playlistwidget.h" |
46 | #include "mediaplayerstate.h" | 41 | #include "mediaplayerstate.h" |
47 | 42 | ||
48 | #include <stdlib.h> | 43 | #include <stdlib.h> |
49 | 44 | ||
50 | #define BUTTONS_ON_TOOLBAR | ||
51 | #define SIDE_BUTTONS | ||
52 | #define CAN_SAVE_LOAD_PLAYLISTS | ||
53 | 45 | ||
54 | extern MediaPlayerState *mediaPlayerState; | 46 | 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; |
63 | FileSelector *files; | 58 | FileSelector *files; |
64 | PlayListSelection *selectedFiles; | 59 | PlayListSelection *selectedFiles; |
65 | bool setDocumentUsed; | 60 | bool setDocumentUsed; |
66 | DocLnk *current; | 61 | DocLnk *current; |
67 | }; | 62 | }; |
68 | 63 | ||
69 | 64 | ||
70 | class ToolButton : public QToolButton { | 65 | class ToolButton : public QToolButton { |
71 | public: | 66 | public: |
72 | ToolButton( QWidget *parent, const char *name, const QString& icon, QObject *handler, const QString& slot, bool t = FALSE ) | 67 | ToolButton( QWidget *parent, const char *name, const QString& icon, QObject *handler, const QString& slot, bool t = FALSE ) |
73 | : QToolButton( parent, name ) { | 68 | : QToolButton( parent, name ) { |
@@ -89,234 +84,142 @@ public: | |||
89 | connect( this, SIGNAL( activated() ), handler, slot ); | 84 | connect( this, SIGNAL( activated() ), handler, slot ); |
90 | addTo( parent ); | 85 | addTo( parent ); |
91 | } | 86 | } |
92 | }; | 87 | }; |
93 | 88 | ||
94 | 89 | ||
95 | PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) | 90 | PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) |
96 | : QMainWindow( parent, name, fl ) { | 91 | : QMainWindow( parent, name, fl ) { |
97 | 92 | ||
98 | d = new PlayListWidgetPrivate; | 93 | d = new PlayListWidgetPrivate; |
99 | d->setDocumentUsed = FALSE; | 94 | d->setDocumentUsed = FALSE; |
100 | d->current = NULL; | 95 | d->current = NULL; |
101 | // menuTimer = new QTimer( this ,"menu timer"), | ||
102 | // connect( menuTimer, SIGNAL( timeout() ), SLOT( addSelected() ) ); | ||
103 | 96 | ||
104 | setBackgroundMode( PaletteButton ); | 97 | setBackgroundMode( PaletteButton ); |
105 | 98 | ||
106 | setCaption( tr("OpiePlayer") ); | 99 | setCaption( tr("MediaPlayer") ); |
107 | setIcon( Resource::loadPixmap( "MPEGPlayer" ) ); | 100 | setIcon( Resource::loadPixmap( "MPEGPlayer" ) ); |
108 | 101 | ||
109 | setToolBarsMovable( FALSE ); | 102 | setToolBarsMovable( FALSE ); |
110 | 103 | ||
111 | // Create Toolbar | 104 | // Create Toolbar |
112 | QPEToolBar *toolbar = new QPEToolBar( this ); | 105 | QPEToolBar *toolbar = new QPEToolBar( this ); |
113 | toolbar->setHorizontalStretchable( TRUE ); | 106 | toolbar->setHorizontalStretchable( TRUE ); |
114 | 107 | ||
115 | // Create Menubar | 108 | // Create Menubar |
116 | QPEMenuBar *menu = new QPEMenuBar( toolbar ); | 109 | QPEMenuBar *menu = new QPEMenuBar( toolbar ); |
117 | menu->setMargin( 0 ); | 110 | menu->setMargin( 0 ); |
118 | 111 | ||
119 | QPEToolBar *bar = new QPEToolBar( this ); | 112 | QPEToolBar *bar = new QPEToolBar( this ); |
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 | ||
180 | QHBox *hbox2 = new QHBox( vbox3 ); hbox2->setBackgroundMode( PaletteButton ); | 144 | QHBox *hbox2 = new QHBox( vbox3 ); hbox2->setBackgroundMode( PaletteButton ); |
181 | d->selectedFiles = new PlayListSelection( hbox2); | 145 | d->selectedFiles = new PlayListSelection( hbox2); |
182 | QVBox *vbox1 = new QVBox( hbox2 ); vbox1->setBackgroundMode( PaletteButton ); | 146 | QVBox *vbox1 = new QVBox( hbox2 ); vbox1->setBackgroundMode( PaletteButton ); |
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()) ); |
186 | new ToolButton( vbox1, tr( "Remove" ), "mpegplayer/cut", d->selectedFiles, SLOT(removeSelected()) ); | 153 | new ToolButton( vbox1, tr( "Remove" ), "mpegplayer/cut", d->selectedFiles, SLOT(removeSelected()) ); |
187 | new ToolButton( vbox1, tr( "Move Down" ), "mpegplayer/down", d->selectedFiles, SLOT(moveSelectedDown()) ); | 154 | new ToolButton( vbox1, tr( "Move Down" ), "mpegplayer/down", d->selectedFiles, SLOT(moveSelectedDown()) ); |
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 ) ) ); |
274 | connect( mediaPlayerState, SIGNAL( loopingToggled( bool ) ), d->tbLoop, SLOT( setOn( bool ) ) ); | 180 | connect( mediaPlayerState, SIGNAL( loopingToggled( bool ) ), d->tbLoop, SLOT( setOn( bool ) ) ); |
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 ) ) ); |
282 | 186 | ||
283 | setCentralWidget( vbox5 ); | 187 | setCentralWidget( vbox5 ); |
284 | 188 | ||
285 | Config cfg( "MediaPlayer" ); | 189 | Config cfg( "MediaPlayer" ); |
286 | readConfig( cfg ); | 190 | readConfig( cfg ); |
287 | 191 | ||
288 | initializeStates(); | 192 | initializeStates(); |
289 | } | 193 | } |
290 | 194 | ||
291 | 195 | ||
292 | PlayListWidget::~PlayListWidget() { | 196 | PlayListWidget::~PlayListWidget() { |
293 | Config cfg( "MediaPlayer" ); | 197 | Config cfg( "MediaPlayer" ); |
294 | writeConfig( cfg ); | 198 | writeConfig( cfg ); |
295 | 199 | ||
296 | if ( d->current ) | 200 | if ( d->current ) |
297 | delete d->current; | 201 | delete d->current; |
298 | delete d; | 202 | delete d; |
299 | } | 203 | } |
300 | 204 | ||
301 | 205 | ||
302 | void PlayListWidget::initializeStates() { | 206 | void PlayListWidget::initializeStates() { |
303 | |||
304 | d->tbPlay->setOn( mediaPlayerState->playing() ); | 207 | d->tbPlay->setOn( mediaPlayerState->playing() ); |
305 | d->tbLoop->setOn( mediaPlayerState->looping() ); | 208 | d->tbLoop->setOn( mediaPlayerState->looping() ); |
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 | } |
312 | 215 | ||
313 | 216 | ||
314 | void PlayListWidget::readConfig( Config& cfg ) { | 217 | void PlayListWidget::readConfig( Config& cfg ) { |
315 | cfg.setGroup("PlayList"); | 218 | cfg.setGroup("PlayList"); |
316 | 219 | ||
317 | int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 ); | 220 | int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 ); |
318 | 221 | ||
319 | for ( int i = 0; i < noOfFiles; i++ ) { | 222 | for ( int i = 0; i < noOfFiles; i++ ) { |
320 | QString entryName; | 223 | QString entryName; |
321 | entryName.sprintf( "File%i", i + 1 ); | 224 | entryName.sprintf( "File%i", i + 1 ); |
322 | QString linkFile = cfg.readEntry( entryName ); | 225 | QString linkFile = cfg.readEntry( entryName ); |
@@ -363,34 +266,24 @@ void PlayListWidget::writeConfig( Config& cfg ) const { | |||
363 | } | 266 | } |
364 | 267 | ||
365 | 268 | ||
366 | void PlayListWidget::addToSelection( const DocLnk& lnk ) { | 269 | void PlayListWidget::addToSelection( const DocLnk& lnk ) { |
367 | d->setDocumentUsed = FALSE; | 270 | d->setDocumentUsed = FALSE; |
368 | if ( mediaPlayerState->playlist() ) | 271 | if ( mediaPlayerState->playlist() ) |
369 | d->selectedFiles->addToSelection( lnk ); | 272 | d->selectedFiles->addToSelection( lnk ); |
370 | else | 273 | else |
371 | mediaPlayerState->setPlaying( TRUE ); | 274 | mediaPlayerState->setPlaying( TRUE ); |
372 | } | 275 | } |
373 | 276 | ||
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() { |
386 | while ( first() ) | 279 | while ( first() ) |
387 | d->selectedFiles->removeSelected(); | 280 | d->selectedFiles->removeSelected(); |
388 | } | 281 | } |
389 | 282 | ||
390 | 283 | ||
391 | void PlayListWidget::addAllToList() { | 284 | void PlayListWidget::addAllToList() { |
392 | DocLnkSet files; | 285 | DocLnkSet files; |
393 | Global::findDocuments(&files, "video/*;audio/*"); | 286 | Global::findDocuments(&files, "video/*;audio/*"); |
394 | QListIterator<DocLnk> dit( files.children() ); | 287 | QListIterator<DocLnk> dit( files.children() ); |
395 | for ( ; dit.current(); ++dit ) | 288 | for ( ; dit.current(); ++dit ) |
396 | d->selectedFiles->addToSelection( **dit ); | 289 | d->selectedFiles->addToSelection( **dit ); |
@@ -545,154 +438,12 @@ void PlayListWidget::setPlaylist( bool shown ) { | |||
545 | else | 438 | else |
546 | d->playListFrame->hide(); | 439 | d->playListFrame->hide(); |
547 | } | 440 | } |
548 | 441 | ||
549 | 442 | ||
550 | void PlayListWidget::setView( char view ) { | 443 | void PlayListWidget::setView( char view ) { |
551 | if ( view == 'l' ) | 444 | if ( view == 'l' ) |
552 | showMaximized(); | 445 | showMaximized(); |
553 | else | 446 | else |
554 | hide(); | 447 | hide(); |
555 | } | 448 | } |
556 | 449 | ||
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,97 +1,67 @@ | |||
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 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #ifndef PLAY_LIST_WIDGET_H | 20 | #ifndef PLAY_LIST_WIDGET_H |
21 | #define PLAY_LIST_WIDGET_H | 21 | #define PLAY_LIST_WIDGET_H |
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 | ||
29 | 26 | ||
30 | class PlayListWidgetPrivate; | 27 | 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 | ||
38 | class PlayListWidget : public QMainWindow { | 31 | class PlayListWidget : public QMainWindow { |
39 | Q_OBJECT | 32 | Q_OBJECT |
40 | public: | 33 | public: |
41 | PlayListWidget( QWidget* parent=0, const char* name=0, WFlags fl=0 ); | 34 | PlayListWidget( QWidget* parent=0, const char* name=0, WFlags fl=0 ); |
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) |
50 | const DocLnk *current(); | 38 | const DocLnk *current(); |
51 | void useSelectedDocument(); | 39 | void useSelectedDocument(); |
52 | /* QTimer * menuTimer; */ | ||
53 | 40 | ||
54 | public slots: | 41 | public slots: |
55 | void setDocument( const QString& fileref ); | 42 | void setDocument( const QString& fileref ); |
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 |
60 | void setPlaylist( bool ); // Show/Hide the playlist | 45 | void setPlaylist( bool ); // Show/Hide the playlist |
61 | void setView( char ); | 46 | void setView( char ); |
62 | void clearList(); | 47 | void clearList(); |
63 | void addAllToList(); | 48 | void addAllToList(); |
64 | void addAllMusicToList(); | 49 | void addAllMusicToList(); |
65 | void addAllVideoToList(); | 50 | void addAllVideoToList(); |
66 | void saveList(); // Save the playlist | 51 | void saveList(); // Save the playlist |
67 | void loadList(); // Load a playlist | 52 | void loadList(); // Load a playlist |
68 | void playIt( QListViewItem *); | ||
69 | bool first(); | 53 | bool first(); |
70 | bool last(); | 54 | bool last(); |
71 | bool next(); | 55 | bool next(); |
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 | ||
82 | private: | 58 | private: |
83 | void initializeStates(); | 59 | void initializeStates(); |
84 | void readConfig( Config& cfg ); | 60 | void readConfig( Config& cfg ); |
85 | void writeConfig( Config& cfg ) const; | 61 | void writeConfig( Config& cfg ) const; |
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 | }; |
94 | 64 | ||
95 | 65 | ||
96 | #endif // PLAY_LIST_WIDGET_H | 66 | #endif // PLAY_LIST_WIDGET_H |
97 | 67 | ||
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,33 +1,34 @@ | |||
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 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
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> |
23 | #include <qpainter.h> | 24 | #include <qpainter.h> |
24 | #include <qpixmap.h> | 25 | #include <qpixmap.h> |
25 | #include <qslider.h> | 26 | #include <qslider.h> |
26 | #include <qdrawutil.h> | 27 | #include <qdrawutil.h> |
27 | #include "videowidget.h" | 28 | #include "videowidget.h" |
28 | #include "mediaplayerstate.h" | 29 | #include "mediaplayerstate.h" |
29 | 30 | ||
30 | 31 | ||
31 | #ifdef Q_WS_QWS | 32 | #ifdef Q_WS_QWS |
32 | # define USE_DIRECT_PAINTER | 33 | # define USE_DIRECT_PAINTER |
33 | # include <qdirectpainter_qws.h> | 34 | # include <qdirectpainter_qws.h> |
@@ -57,25 +58,25 @@ MediaButton videoButtons[] = { | |||
57 | { 5+3*32+xo, 200+yo, TRUE, FALSE, FALSE, 2 }, // pause | 58 | { 5+3*32+xo, 200+yo, TRUE, FALSE, FALSE, 2 }, // pause |
58 | { 5+4*32+xo, 200+yo, FALSE, FALSE, FALSE, 3 }, // next | 59 | { 5+4*32+xo, 200+yo, FALSE, FALSE, FALSE, 3 }, // next |
59 | { 5+5*32+xo, 200+yo, FALSE, FALSE, FALSE, 8 }, // playlist | 60 | { 5+5*32+xo, 200+yo, FALSE, FALSE, FALSE, 8 }, // playlist |
60 | { 5+6*32+xo, 200+yo, TRUE, FALSE, FALSE, 9 } // fullscreen | 61 | { 5+6*32+xo, 200+yo, TRUE, FALSE, FALSE, 9 } // fullscreen |
61 | }; | 62 | }; |
62 | 63 | ||
63 | 64 | ||
64 | static const int numButtons = (sizeof(videoButtons)/sizeof(MediaButton)); | 65 | static const int numButtons = (sizeof(videoButtons)/sizeof(MediaButton)); |
65 | 66 | ||
66 | 67 | ||
67 | VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) : | 68 | 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" ) ); |
71 | pixmaps[0] = new QPixmap( Resource::loadPixmap( "mpegplayer/mediaButton0a" ) ); | 72 | pixmaps[0] = new QPixmap( Resource::loadPixmap( "mpegplayer/mediaButton0a" ) ); |
72 | pixmaps[1] = new QPixmap( Resource::loadPixmap( "mpegplayer/mediaButton0b" ) ); | 73 | pixmaps[1] = new QPixmap( Resource::loadPixmap( "mpegplayer/mediaButton0b" ) ); |
73 | pixmaps[2] = new QPixmap( Resource::loadPixmap( "mpegplayer/mediaControls0" ) ); | 74 | pixmaps[2] = new QPixmap( Resource::loadPixmap( "mpegplayer/mediaControls0" ) ); |
74 | currentFrame = new QImage( 220 + 2, 160, (QPixmap::defaultDepth() == 16) ? 16 : 32 ); | 75 | currentFrame = new QImage( 220 + 2, 160, (QPixmap::defaultDepth() == 16) ? 16 : 32 ); |
75 | 76 | ||
76 | slider = new QSlider( Qt::Horizontal, this ); | 77 | slider = new QSlider( Qt::Horizontal, this ); |
77 | slider->setMinValue( 0 ); | 78 | slider->setMinValue( 0 ); |
78 | slider->setMaxValue( 1 ); | 79 | slider->setMaxValue( 1 ); |
79 | slider->setBackgroundPixmap( Resource::loadPixmap( "mpegplayer/metalFinish" ) ); | 80 | slider->setBackgroundPixmap( Resource::loadPixmap( "mpegplayer/metalFinish" ) ); |
80 | slider->setFocusPolicy( QWidget::NoFocus ); | 81 | slider->setFocusPolicy( QWidget::NoFocus ); |
81 | slider->setGeometry( QRect( 7, 250, 220, 20 ) ); | 82 | slider->setGeometry( QRect( 7, 250, 220, 20 ) ); |
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,38 +1,37 @@ | |||
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 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #ifndef VIDEO_WIDGET_H | 20 | #ifndef VIDEO_WIDGET_H |
21 | #define VIDEO_WIDGET_H | 21 | #define VIDEO_WIDGET_H |
22 | 22 | ||
23 | 23 | ||
24 | #include <qwidget.h> | 24 | #include <qwidget.h> |
25 | 25 | ||
26 | |||
27 | class QPixmap; | 26 | class QPixmap; |
28 | class QSlider; | 27 | class QSlider; |
29 | 28 | ||
30 | 29 | ||
31 | enum VideoButtons { | 30 | enum VideoButtons { |
32 | VideoPrevious, | 31 | VideoPrevious, |
33 | VideoStop, | 32 | VideoStop, |
34 | VideoPlay, | 33 | VideoPlay, |
35 | VideoPause, | 34 | VideoPause, |
36 | VideoNext, | 35 | VideoNext, |
37 | VideoPlayList, | 36 | VideoPlayList, |
38 | VideoFullscreen | 37 | VideoFullscreen |
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 | |||
@@ -91,21 +91,19 @@ listaddonentmodules: | |||
91 | REQUIRES= | 91 | REQUIRES= |
92 | 92 | ||
93 | ####### Sub-libraries | 93 | ####### Sub-libraries |
94 | 94 | ||
95 | 95 | ||
96 | ###### Combined headers | 96 | ###### Combined headers |
97 | 97 | ||
98 | 98 | ||
99 | 99 | ||
100 | ####### Compile | 100 | ####### Compile |
101 | 101 | ||
102 | wavplugin.o: wavplugin.cpp \ | 102 | wavplugin.o: wavplugin.cpp \ |
103 | wavplugin.h \ | 103 | wavplugin.h |
104 | ../mediaplayerplugininterface.h | ||
105 | 104 | ||
106 | wavpluginimpl.o: wavpluginimpl.cpp \ | 105 | wavpluginimpl.o: wavpluginimpl.cpp \ |
107 | wavplugin.h \ | 106 | wavplugin.h \ |
108 | ../mediaplayerplugininterface.h \ | ||
109 | wavpluginimpl.h | 107 | wavpluginimpl.h |
110 | 108 | ||
111 | 109 | ||
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 | |||
@@ -8,109 +8,112 @@ | |||
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | // L.J.Potter added changes Fri 02-15-2002 | ||
21 | |||
22 | #include <stdio.h> | 20 | #include <stdio.h> |
23 | #include <stdarg.h> | 21 | #include <stdarg.h> |
24 | #include <stdlib.h> | 22 | #include <stdlib.h> |
25 | #include <errno.h> | 23 | #include <errno.h> |
26 | #include <unistd.h> | 24 | #include <unistd.h> |
27 | #include <qfile.h> | 25 | #include <qfile.h> |
28 | #include "wavplugin.h" | 26 | #include "wavplugin.h" |
29 | 27 | ||
30 | |||
31 | //#define debugMsg(a) qDebug(a) | 28 | //#define debugMsg(a) qDebug(a) |
32 | #define debugMsg(a) | 29 | #define debugMsg(a) |
33 | 30 | ||
34 | 31 | ||
35 | struct RiffChunk { | 32 | struct RiffChunk { |
36 | char id[4]; | 33 | char id[4]; |
37 | Q_UINT32 size; | 34 | Q_UINT32 size; |
38 | char data[4]; | 35 | char data[4]; |
39 | }; | 36 | }; |
40 | 37 | ||
41 | 38 | ||
42 | struct ChunkData { | 39 | struct ChunkData { |
43 | Q_INT16 formatTag; | 40 | Q_INT16 formatTag; |
44 | Q_INT16 channels; | 41 | Q_INT16 channels; |
45 | Q_INT32 samplesPerSec; | 42 | Q_INT32 samplesPerSec; |
46 | Q_INT32 avgBytesPerSec; | 43 | Q_INT32 avgBytesPerSec; |
47 | Q_INT16 blockAlign; | 44 | Q_INT16 blockAlign; |
48 | Q_INT16 wBitsPerSample; | 45 | Q_INT16 wBitsPerSample; |
49 | }; | 46 | }; |
50 | 47 | ||
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 | ||
54 | 51 | ||
55 | class WavPluginData { | 52 | class WavPluginData { |
56 | public: | 53 | public: |
57 | QFile *input; | 54 | QFile *input; |
58 | 55 | ||
59 | int wavedata_remaining; | 56 | int wavedata_remaining; |
60 | ChunkData chunkdata; | 57 | ChunkData chunkdata; |
61 | RiffChunk chunk; | 58 | RiffChunk chunk; |
62 | uchar data[sound_buffer_size+32]; // +32 to handle badly aligned input data | 59 | uchar data[sound_buffer_size+32]; // +32 to handle badly aligned input data |
63 | int out,max; | 60 | int out,max; |
64 | int samples_due; | 61 | int samples_due; |
65 | int samples; | 62 | int samples; |
63 | int freq; | ||
64 | int chan; | ||
65 | int sampleRate; | ||
66 | int resolution; | ||
66 | 67 | ||
67 | WavPluginData() { | 68 | WavPluginData() { |
68 | max = out = sound_buffer_size; | 69 | max = out = sound_buffer_size; |
69 | wavedata_remaining = 0; | 70 | wavedata_remaining = 0; |
70 | samples_due = 0; | 71 | samples_due = 0; |
71 | samples = -1; | 72 | samples = -1; |
72 | } | 73 | } |
73 | 74 | ||
74 | // expands out samples to the frequency of 44kHz | 75 | // expands out samples to the frequency of 44kHz |
75 | bool add( short *output, long count, long& done, bool stereo ) | 76 | bool add( short *output, long count, long& done, bool stereo ) |
76 | { | 77 | { |
78 | qDebug("add"); | ||
77 | done = 0; | 79 | done = 0; |
78 | qApp->processEvents(); | ||
79 | 80 | ||
80 | if ( input == 0 ) { | 81 | if ( input == 0 ) { |
81 | qDebug("no input"); | 82 | qDebug("no input"); |
82 | return FALSE; | 83 | return FALSE; |
83 | } | 84 | } |
84 | 85 | ||
85 | while ( count ) { | 86 | while ( count ) { |
86 | int l,r; | 87 | int l,r; |
87 | if ( getSample(l, r) == FALSE ) { | 88 | if ( getSample(l, r) == FALSE ) { |
88 | qDebug("didn't get sample"); | 89 | qDebug("didn't get sample"); |
89 | return FALSE; | 90 | return FALSE; |
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) ) { |
93 | *output++ = l; | 94 | *output++ = l; |
94 | if ( stereo ) | 95 | if ( stereo ) |
95 | *output++ = r; | 96 | *output++ = r; |
96 | samples_due -= chunkdata.samplesPerSec; | 97 | samples_due -= chunkdata.samplesPerSec; |
97 | count--; | 98 | count--; |
98 | done++; | 99 | done++; |
99 | } | 100 | } |
100 | } | 101 | } |
102 | |||
101 | return TRUE; | 103 | return TRUE; |
102 | } | 104 | } |
103 | 105 | ||
104 | bool initialise() { | 106 | bool initialise() { |
107 | qDebug("initialize"); | ||
105 | if ( input == 0 ) | 108 | if ( input == 0 ) |
106 | return FALSE; | 109 | return FALSE; |
107 | 110 | ||
108 | wavedata_remaining = -1; | 111 | wavedata_remaining = -1; |
109 | 112 | ||
110 | while ( wavedata_remaining == -1 ) { | 113 | while ( wavedata_remaining == -1 ) { |
111 | // Keep reading chunks... | 114 | // Keep reading chunks... |
112 | const int n = sizeof(chunk) - sizeof(chunk.data); | 115 | const int n = sizeof(chunk) - sizeof(chunk.data); |
113 | int t = input->readBlock( (char*)&chunk, n ); | 116 | int t = input->readBlock( (char*)&chunk, n ); |
114 | if ( t != n ) { | 117 | if ( t != n ) { |
115 | if ( t == -1 ) | 118 | if ( t == -1 ) |
116 | return FALSE; | 119 | return FALSE; |
@@ -129,32 +132,37 @@ public: | |||
129 | return FALSE; | 132 | return FALSE; |
130 | } | 133 | } |
131 | } | 134 | } |
132 | } else if ( qstrncmp(chunk.id,"fmt ",4) == 0 ) { | 135 | } else if ( qstrncmp(chunk.id,"fmt ",4) == 0 ) { |
133 | if ( input->readBlock((char*)&chunkdata,sizeof(chunkdata)) != sizeof(chunkdata) ) { | 136 | if ( input->readBlock((char*)&chunkdata,sizeof(chunkdata)) != sizeof(chunkdata) ) { |
134 | return FALSE; | 137 | return FALSE; |
135 | } | 138 | } |
136 | #define WAVE_FORMAT_PCM 1 | 139 | #define WAVE_FORMAT_PCM 1 |
137 | if ( chunkdata.formatTag != WAVE_FORMAT_PCM ) { | 140 | if ( chunkdata.formatTag != WAVE_FORMAT_PCM ) { |
138 | qDebug("WAV file: UNSUPPORTED FORMAT %d",chunkdata.formatTag); | 141 | qDebug("WAV file: UNSUPPORTED FORMAT %d",chunkdata.formatTag); |
139 | return FALSE; | 142 | return FALSE; |
140 | } | 143 | } |
141 | } else { | 144 | } |
145 | |||
146 | |||
147 | |||
148 | |||
149 | else { | ||
142 | // ignored chunk | 150 | // ignored chunk |
143 | if ( chunk.size > 1000000000 || !input->at(input->at()+chunk.size) ) { | 151 | if ( chunk.size > 1000000000 || !input->at(input->at()+chunk.size) ) { |
144 | return FALSE; | 152 | return FALSE; |
145 | } | 153 | } |
146 | } | 154 | } |
147 | } // while | 155 | } // while |
148 | qDebug("bits %d", chunkdata.wBitsPerSample); | 156 | |
149 | return TRUE; | 157 | return TRUE; |
150 | } | 158 | } |
151 | 159 | ||
152 | 160 | ||
153 | // gets a sample from the file | 161 | // gets a sample from the file |
154 | bool getSample(int& l, int& r) | 162 | bool getSample(int& l, int& r) |
155 | { | 163 | { |
156 | l = r = 0; | 164 | l = r = 0; |
157 | 165 | ||
158 | if ( input == 0 ) | 166 | if ( input == 0 ) |
159 | return FALSE; | 167 | return FALSE; |
160 | 168 | ||
@@ -163,147 +171,297 @@ public: | |||
163 | 171 | ||
164 | if ( out >= max ) { | 172 | if ( out >= max ) { |
165 | max = input->readBlock( (char*)data, (uint)QMIN(sound_buffer_size,wavedata_remaining) ); | 173 | max = input->readBlock( (char*)data, (uint)QMIN(sound_buffer_size,wavedata_remaining) ); |
166 | 174 | ||
167 | wavedata_remaining -= max; | 175 | wavedata_remaining -= max; |
168 | 176 | ||
169 | out = 0; | 177 | out = 0; |
170 | if ( max <= 0 ) { | 178 | if ( max <= 0 ) { |
171 | max = 0; | 179 | max = 0; |
172 | return TRUE; | 180 | return TRUE; |
173 | } | 181 | } |
174 | } | 182 | } |
175 | if ( chunkdata.wBitsPerSample == 8 ) { | 183 | if ( resolution == 8 ) { |
176 | l = (data[out++] - 128) * 128; | 184 | l = (data[out++] - 128) * 128; |
177 | } else { | 185 | } else { |
178 | l = ((short*)data)[out/2]; | 186 | l = ((short*)data)[out/2]; |
179 | out += 2; | 187 | out += 2; |
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; |
186 | } else { | 194 | } else { |
187 | r = ((short*)data)[out/2]; | 195 | r = ((short*)data)[out/2]; |
188 | out += 2; | 196 | out += 2; |
189 | } | 197 | } |
190 | } | 198 | } |
191 | return TRUE; | 199 | return TRUE; |
192 | } // getSample | 200 | } // getSample |
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 | }; |
195 | 351 | ||
196 | 352 | ||
197 | WavPlugin::WavPlugin() { | 353 | WavPlugin::WavPlugin() { |
198 | d = new WavPluginData; | 354 | d = new WavPluginData; |
199 | d->input = 0; | 355 | d->input = 0; |
200 | } | 356 | } |
201 | 357 | ||
202 | 358 | ||
203 | WavPlugin::~WavPlugin() { | 359 | WavPlugin::~WavPlugin() { |
204 | close(); | 360 | close(); |
205 | delete d; | 361 | delete d; |
206 | } | 362 | } |
207 | 363 | ||
208 | 364 | ||
209 | bool WavPlugin::isFileSupported( const QString& path ) { | 365 | bool WavPlugin::isFileSupported( const QString& path ) { |
210 | // qDebug( "WavPlugin::isFileSupported" ); | 366 | debugMsg( "WavPlugin::isFileSupported" ); |
211 | 367 | ||
212 | char *ext = strrchr( path.latin1(), '.' ); | 368 | char *ext = strrchr( path.latin1(), '.' ); |
213 | 369 | ||
214 | // Test file extension | 370 | // Test file extension |
215 | if ( ext ) { | 371 | if ( ext ) { |
216 | if ( strncasecmp(ext, ".raw", 4) == 0 ) | 372 | if ( strncasecmp(ext, ".raw", 4) == 0 ) |
217 | return TRUE; | 373 | return TRUE; |
218 | if ( strncasecmp(ext, ".wav", 4) == 0 ) | 374 | if ( strncasecmp(ext, ".wav", 4) == 0 ) |
219 | return TRUE; | 375 | return TRUE; |
220 | if ( strncasecmp(ext, ".wave", 4) == 0 ) | 376 | if ( strncasecmp(ext, ".wave", 4) == 0 ) |
221 | return TRUE; | 377 | return TRUE; |
222 | } | 378 | } |
223 | 379 | ||
224 | return FALSE; | 380 | return FALSE; |
225 | } | 381 | } |
226 | 382 | ||
227 | 383 | ||
228 | bool WavPlugin::open( const QString& path ) { | 384 | bool WavPlugin::open( const QString& path ) { |
229 | // qDebug( "WavPlugin::open" ); | 385 | qDebug( "WavPlugin::open" ); |
230 | 386 | ||
231 | d->max = d->out = sound_buffer_size; | 387 | d->max = d->out = sound_buffer_size; |
232 | d->wavedata_remaining = 0; | 388 | d->wavedata_remaining = 0; |
233 | d->samples_due = 0; | 389 | d->samples_due = 0; |
234 | 390 | ||
235 | d->input = new QFile( path ); | 391 | d->input = new QFile( path ); |
236 | if ( d->input->open(IO_ReadOnly) == FALSE ) { | 392 | if ( d->input->open(IO_ReadOnly) == FALSE ) { |
237 | qDebug("couldn't open file"); | 393 | qDebug("couldn't open file"); |
238 | delete d->input; | 394 | delete d->input; |
239 | d->input = 0; | 395 | d->input = 0; |
240 | return FALSE; | 396 | return FALSE; |
241 | } | 397 | } |
242 | 398 | ||
399 | // d->getWavSettings( d->input.handle()); | ||
243 | d->initialise(); | 400 | d->initialise(); |
244 | 401 | ||
245 | return TRUE; | 402 | return TRUE; |
246 | } | 403 | } |
247 | 404 | ||
248 | 405 | ||
249 | bool WavPlugin::close() { | 406 | bool WavPlugin::close() { |
250 | // qDebug( "WavPlugin::close" ); | 407 | qDebug( "WavPlugin::close" ); |
251 | 408 | ||
252 | d->input->close(); | 409 | d->input->close(); |
253 | delete d->input; | 410 | delete d->input; |
254 | d->input = 0; | 411 | d->input = 0; |
255 | return TRUE; | 412 | return TRUE; |
256 | } | 413 | } |
257 | 414 | ||
258 | 415 | ||
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 ); |
262 | } | 419 | } |
263 | 420 | ||
264 | 421 | ||
265 | int WavPlugin::audioStreams() { | 422 | int WavPlugin::audioStreams() { |
266 | // qDebug( "WavPlugin::audioStreams" ); | 423 | qDebug( "WavPlugin::audioStreams" ); |
267 | return 1; | 424 | return 1; |
268 | } | 425 | } |
269 | 426 | ||
270 | 427 | ||
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 | } |
275 | 432 | ||
276 | 433 | ||
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 | } |
281 | 438 | ||
282 | 439 | ||
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 | } |
288 | 446 | ||
289 | 447 | ||
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; |
293 | } | 451 | } |
294 | 452 | ||
295 | 453 | ||
296 | long WavPlugin::audioGetSample( int ) { | 454 | long WavPlugin::audioGetSample( int ) { |
297 | // qDebug( "WavPlugin::audioGetSample" ); | 455 | qDebug( "WavPlugin::audioGetSample" ); |
298 | return 0; | 456 | return 0; |
299 | } | 457 | } |
300 | 458 | ||
301 | /* | 459 | /* |
302 | bool WavPlugin::audioReadSamples( short *, int, long, int ) { | 460 | bool WavPlugin::audioReadSamples( short *, int, long, int ) { |
303 | debugMsg( "WavPlugin::audioReadSamples" ); | 461 | debugMsg( "WavPlugin::audioReadSamples" ); |
304 | return FALSE; | 462 | return FALSE; |
305 | } | 463 | } |
306 | 464 | ||
307 | 465 | ||
308 | bool WavPlugin::audioReReadSamples( short *, int, long, int ) { | 466 | bool WavPlugin::audioReReadSamples( short *, int, long, int ) { |
309 | debugMsg( "WavPlugin::audioReReadSamples" ); | 467 | debugMsg( "WavPlugin::audioReReadSamples" ); |
@@ -315,27 +473,22 @@ bool WavPlugin::audioReadMonoSamples( short *output, long samples, long& samples | |||
315 | debugMsg( "WavPlugin::audioReadMonoSamples" ); | 473 | debugMsg( "WavPlugin::audioReadMonoSamples" ); |
316 | return !d->add( output, samples, samplesMade, FALSE ); | 474 | return !d->add( output, samples, samplesMade, FALSE ); |
317 | } | 475 | } |
318 | 476 | ||
319 | 477 | ||
320 | bool WavPlugin::audioReadStereoSamples( short *output, long samples, long& samplesMade, int ) { | 478 | bool WavPlugin::audioReadStereoSamples( short *output, long samples, long& samplesMade, int ) { |
321 | debugMsg( "WavPlugin::audioReadStereoSamples" ); | 479 | debugMsg( "WavPlugin::audioReadStereoSamples" ); |
322 | return !d->add( output, samples, samplesMade, TRUE ); | 480 | return !d->add( output, samples, samplesMade, TRUE ); |
323 | } | 481 | } |
324 | */ | 482 | */ |
325 | 483 | ||
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 ); |
329 | } | 487 | } |
330 | 488 | ||
331 | double WavPlugin::getTime() { | 489 | double WavPlugin::getTime() { |
332 | // qDebug( "WavPlugin::getTime" ); | 490 | qDebug( "WavPlugin::getTime" ); |
333 | return 0.0; | 491 | return 0.0; |
334 | } | 492 | } |
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 | |||
@@ -8,33 +8,30 @@ | |||
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | // L.J.Potter added changes Fri 02-15-2002 | ||
21 | |||
22 | #ifndef WAV_PLUGIN_H | 20 | #ifndef WAV_PLUGIN_H |
23 | #define WAV_PLUGIN_H | 21 | #define WAV_PLUGIN_H |
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 | ||
30 | 27 | ||
31 | // #define OLD_MEDIAPLAYER_API | 28 | // #define OLD_MEDIAPLAYER_API |
32 | 29 | ||
33 | 30 | ||
34 | class WavPluginData; | 31 | class WavPluginData; |
35 | 32 | ||
36 | 33 | ||
37 | class WavPlugin : public MediaPlayerDecoder { | 34 | class WavPlugin : public MediaPlayerDecoder { |
38 | 35 | ||
39 | public: | 36 | public: |
40 | WavPlugin(); | 37 | WavPlugin(); |
@@ -45,25 +42,24 @@ public: | |||
45 | double pluginVersion() { return 1.0; } | 42 | double pluginVersion() { return 1.0; } |
46 | 43 | ||
47 | bool isFileSupported( const QString& ); | 44 | bool isFileSupported( const QString& ); |
48 | bool open( const QString& ); | 45 | bool open( const QString& ); |
49 | bool close(); | 46 | bool close(); |
50 | bool isOpen(); | 47 | bool isOpen(); |
51 | const QString &fileInfo() { return strInfo = ""; } | 48 | const QString &fileInfo() { return strInfo = ""; } |
52 | 49 | ||
53 | // If decoder doesn't support audio then return 0 here | 50 | // If decoder doesn't support audio then return 0 here |
54 | int audioStreams(); | 51 | int audioStreams(); |
55 | int audioChannels( int stream ); | 52 | int audioChannels( int stream ); |
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 ); |
59 | bool audioSetSample( long sample, int stream ); | 55 | bool audioSetSample( long sample, int stream ); |
60 | long audioGetSample( int stream ); | 56 | long audioGetSample( int stream ); |
61 | #ifdef OLD_MEDIAPLAYER_API | 57 | #ifdef OLD_MEDIAPLAYER_API |
62 | bool audioReadMonoSamples( short *output, long samples, long& samplesRead, int stream ); | 58 | bool audioReadMonoSamples( short *output, long samples, long& samplesRead, int stream ); |
63 | bool audioReadStereoSamples( short *output, long samples, long& samplesRead, int stream ); | 59 | bool audioReadStereoSamples( short *output, long samples, long& samplesRead, int stream ); |
64 | bool audioReadSamples( short *output, int channel, long samples, int stream ); | 60 | bool audioReadSamples( short *output, int channel, long samples, int stream ); |
65 | bool audioReReadSamples( short *output, int channel, long samples, int stream ); | 61 | bool audioReReadSamples( short *output, int channel, long samples, int stream ); |
66 | #else | 62 | #else |
67 | bool audioReadSamples( short *output, int channels, long samples, long& samplesRead, int stream ); | 63 | bool audioReadSamples( short *output, int channels, long samples, long& samplesRead, int stream ); |
68 | #endif | 64 | #endif |
69 | 65 | ||
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 | |||
@@ -11,25 +11,24 @@ | |||
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #include "wavplugin.h" | 20 | #include "wavplugin.h" |
21 | #include "wavpluginimpl.h" | 21 | #include "wavpluginimpl.h" |
22 | 22 | ||
23 | |||
24 | WavPluginImpl::WavPluginImpl() | 23 | WavPluginImpl::WavPluginImpl() |
25 | : libmadplugin(0), ref(0) | 24 | : libmadplugin(0), ref(0) |
26 | { | 25 | { |
27 | } | 26 | } |
28 | 27 | ||
29 | 28 | ||
30 | WavPluginImpl::~WavPluginImpl() | 29 | WavPluginImpl::~WavPluginImpl() |
31 | { | 30 | { |
32 | if ( libmadplugin ) | 31 | if ( libmadplugin ) |
33 | delete libmadplugin; | 32 | delete libmadplugin; |
34 | } | 33 | } |
35 | 34 | ||
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 | |||
@@ -11,26 +11,25 @@ | |||
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #ifndef WAV_PLUGIN_IMPL_H | 20 | #ifndef WAV_PLUGIN_IMPL_H |
21 | #define WAV_PLUGIN_IMPL_H | 21 | #define WAV_PLUGIN_IMPL_H |
22 | 22 | ||
23 | 23 | #include <qpe/mediaplayerplugininterface.h> | |
24 | #include "../mediaplayerplugininterface.h" | ||
25 | 24 | ||
26 | 25 | ||
27 | class WavPlugin; | 26 | class WavPlugin; |
28 | 27 | ||
29 | 28 | ||
30 | class WavPluginImpl : public MediaPlayerPluginInterface | 29 | class WavPluginImpl : public MediaPlayerPluginInterface |
31 | { | 30 | { |
32 | public: | 31 | public: |
33 | WavPluginImpl(); | 32 | WavPluginImpl(); |
34 | virtual ~WavPluginImpl(); | 33 | virtual ~WavPluginImpl(); |
35 | 34 | ||
36 | #ifndef QT_NO_COMPONENT | 35 | #ifndef QT_NO_COMPONENT |