-rw-r--r-- | core/multimedia/opieplayer/audiodevice.cpp | 8 | ||||
-rw-r--r-- | core/multimedia/opieplayer/playlistwidget.cpp | 9 |
2 files changed, 11 insertions, 6 deletions
diff --git a/core/multimedia/opieplayer/audiodevice.cpp b/core/multimedia/opieplayer/audiodevice.cpp index 8f04d0d..59e06a6 100644 --- a/core/multimedia/opieplayer/audiodevice.cpp +++ b/core/multimedia/opieplayer/audiodevice.cpp | |||
@@ -172,49 +172,49 @@ void AudioDevice::setVolume( unsigned int leftVolume, unsigned int rightVolume, | |||
172 | } else | 172 | } else |
173 | perror("open(\"/dev/mixer\")"); | 173 | perror("open(\"/dev/mixer\")"); |
174 | 174 | ||
175 | # else | 175 | # else |
176 | // This is the way this has to be done now I guess, doesn't allow for | 176 | // This is the way this has to be done now I guess, doesn't allow for |
177 | // independant right and left channel setting, or setting for different outputs | 177 | // independant right and left channel setting, or setting for different outputs |
178 | Config cfg("qpe"); // qtopia is "Sound" | 178 | Config cfg("qpe"); // qtopia is "Sound" |
179 | cfg.setGroup("Volume"); // qtopia is "Settings" | 179 | cfg.setGroup("Volume"); // qtopia is "Settings" |
180 | cfg.writeEntry("VolumePercent",(int)rV); //qtopia is Volume | 180 | cfg.writeEntry("VolumePercent",(int)rV); //qtopia is Volume |
181 | # endif | 181 | # endif |
182 | 182 | ||
183 | //#endif | 183 | //#endif |
184 | // qDebug( "setting volume to: 0x%x", volume ); | 184 | // qDebug( "setting volume to: 0x%x", volume ); |
185 | #if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP) | 185 | #if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP) |
186 | // Send notification that the volume has changed | 186 | // Send notification that the volume has changed |
187 | QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << muted; | 187 | QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << muted; |
188 | #endif | 188 | #endif |
189 | } | 189 | } |
190 | 190 | ||
191 | 191 | ||
192 | 192 | ||
193 | 193 | ||
194 | AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) { | 194 | AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) { |
195 | qDebug("creating new audio device"); | 195 | qDebug("creating new audio device"); |
196 | QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE; | 196 | // QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE; |
197 | d = new AudioDevicePrivate; | 197 | d = new AudioDevicePrivate; |
198 | d->frequency = f; | 198 | d->frequency = f; |
199 | d->channels = chs; | 199 | d->channels = chs; |
200 | d->bytesPerSample = bps; | 200 | d->bytesPerSample = bps; |
201 | qDebug("%d",bps); | 201 | qDebug("%d",bps); |
202 | int format=0; | 202 | int format=0; |
203 | if( bps == 8) format = AFMT_U8; | 203 | if( bps == 8) format = AFMT_U8; |
204 | else if( bps <= 0) format = AFMT_S16_LE; | 204 | else if( bps <= 0) format = AFMT_S16_LE; |
205 | else format = AFMT_S16_LE; | 205 | else format = AFMT_S16_LE; |
206 | qDebug("AD- freq %d, channels %d, b/sample %d, bitrate %d",f,chs,bps,format); | 206 | qDebug("AD- freq %d, channels %d, b/sample %d, bitrate %d",f,chs,bps,format); |
207 | connect( qApp, SIGNAL( volumeChanged(bool) ), this, SLOT( volumeChanged(bool) ) ); | 207 | connect( qApp, SIGNAL( volumeChanged(bool) ), this, SLOT( volumeChanged(bool) ) ); |
208 | 208 | ||
209 | int fragments = 0x10000 * 8 + sound_fragment_shift; | 209 | int fragments = 0x10000 * 8 + sound_fragment_shift; |
210 | int capabilities = 0; | 210 | int capabilities = 0; |
211 | 211 | ||
212 | 212 | ||
213 | #ifdef KEEP_DEVICE_OPEN | 213 | #ifdef KEEP_DEVICE_OPEN |
214 | if ( AudioDevicePrivate::dspFd == 0 ) { | 214 | if ( AudioDevicePrivate::dspFd == 0 ) { |
215 | #endif | 215 | #endif |
216 | if ( ( d->handle = ::open( "/dev/dsp", O_WRONLY ) ) < 0 ) { | 216 | if ( ( d->handle = ::open( "/dev/dsp", O_WRONLY ) ) < 0 ) { |
217 | 217 | ||
218 | // perror("open(\"/dev/dsp\") sending to /dev/null instead"); | 218 | // perror("open(\"/dev/dsp\") sending to /dev/null instead"); |
219 | perror("open(\"/dev/dsp\")"); | 219 | perror("open(\"/dev/dsp\")"); |
220 | QString errorMsg=tr("Somethin's wrong with\nyour sound device.\nopen(\"/dev/dsp\")\n")+(QString)strerror(errno)+tr("\n\nClosing player now."); | 220 | QString errorMsg=tr("Somethin's wrong with\nyour sound device.\nopen(\"/dev/dsp\")\n")+(QString)strerror(errno)+tr("\n\nClosing player now."); |
@@ -236,67 +236,67 @@ AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) { | |||
236 | perror("ioctl(\"SNDCTL_DSP_SETFRAGMENT\")"); | 236 | perror("ioctl(\"SNDCTL_DSP_SETFRAGMENT\")"); |
237 | if(ioctl( d->handle, SNDCTL_DSP_SETFMT, & format )==-1) | 237 | if(ioctl( d->handle, SNDCTL_DSP_SETFMT, & format )==-1) |
238 | perror("ioctl(\"SNDCTL_DSP_SETFMT\")"); | 238 | perror("ioctl(\"SNDCTL_DSP_SETFMT\")"); |
239 | qDebug("freq %d", d->frequency); | 239 | qDebug("freq %d", d->frequency); |
240 | if(ioctl( d->handle, SNDCTL_DSP_SPEED, &d->frequency )==-1) | 240 | if(ioctl( d->handle, SNDCTL_DSP_SPEED, &d->frequency )==-1) |
241 | perror("ioctl(\"SNDCTL_DSP_SPEED\")"); | 241 | perror("ioctl(\"SNDCTL_DSP_SPEED\")"); |
242 | qDebug("channels %d",d->channels); | 242 | qDebug("channels %d",d->channels); |
243 | if ( ioctl( d->handle, SNDCTL_DSP_CHANNELS, &d->channels ) == -1 ) { | 243 | if ( ioctl( d->handle, SNDCTL_DSP_CHANNELS, &d->channels ) == -1 ) { |
244 | d->channels = ( d->channels == 1 ) ? 2 : d->channels; | 244 | d->channels = ( d->channels == 1 ) ? 2 : d->channels; |
245 | if(ioctl( d->handle, SNDCTL_DSP_CHANNELS, &d->channels )==-1) | 245 | if(ioctl( d->handle, SNDCTL_DSP_CHANNELS, &d->channels )==-1) |
246 | perror("ioctl(\"SNDCTL_DSP_CHANNELS\")"); | 246 | perror("ioctl(\"SNDCTL_DSP_CHANNELS\")"); |
247 | } | 247 | } |
248 | 248 | ||
249 | d->bufferSize = sound_fragment_bytes; | 249 | d->bufferSize = sound_fragment_bytes; |
250 | d->unwrittenBuffer = new char[d->bufferSize]; | 250 | d->unwrittenBuffer = new char[d->bufferSize]; |
251 | d->unwritten = 0; | 251 | d->unwritten = 0; |
252 | d->can_GETOSPACE = TRUE; // until we find otherwise | 252 | d->can_GETOSPACE = TRUE; // until we find otherwise |
253 | 253 | ||
254 | //if ( chs != d->channels ) qDebug( "Wanted %d, got %d channels", chs, d->channels ); | 254 | //if ( chs != d->channels ) qDebug( "Wanted %d, got %d channels", chs, d->channels ); |
255 | //if ( f != d->frequency ) qDebug( "wanted %dHz, got %dHz", f, d->frequency ); | 255 | //if ( f != d->frequency ) qDebug( "wanted %dHz, got %dHz", f, d->frequency ); |
256 | //if ( capabilities & DSP_CAP_BATCH ) qDebug( "Sound card has local buffer" ); | 256 | //if ( capabilities & DSP_CAP_BATCH ) qDebug( "Sound card has local buffer" ); |
257 | //if ( capabilities & DSP_CAP_REALTIME )qDebug( "Sound card has realtime sync" ); | 257 | //if ( capabilities & DSP_CAP_REALTIME )qDebug( "Sound card has realtime sync" ); |
258 | //if ( capabilities & DSP_CAP_TRIGGER ) qDebug( "Sound card has precise trigger" ); | 258 | //if ( capabilities & DSP_CAP_TRIGGER ) qDebug( "Sound card has precise trigger" ); |
259 | //if ( capabilities & DSP_CAP_MMAP ) qDebug( "Sound card can mmap" ); | 259 | //if ( capabilities & DSP_CAP_MMAP ) qDebug( "Sound card can mmap" ); |
260 | QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << FALSE; | 260 | // QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << FALSE; |
261 | 261 | ||
262 | } | 262 | } |
263 | 263 | ||
264 | 264 | ||
265 | AudioDevice::~AudioDevice() { | 265 | AudioDevice::~AudioDevice() { |
266 | qDebug("destryo audiodevice"); | 266 | qDebug("destryo audiodevice"); |
267 | QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE; | 267 | // QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE; |
268 | 268 | ||
269 | // #ifdef Q_OS_WIN32 | 269 | // #ifdef Q_OS_WIN32 |
270 | // waveOutClose( (HWAVEOUT)d->handle ); | 270 | // waveOutClose( (HWAVEOUT)d->handle ); |
271 | // #else | 271 | // #else |
272 | # ifndef KEEP_DEVICE_OPEN | 272 | # ifndef KEEP_DEVICE_OPEN |
273 | 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 |
274 | # endif | 274 | # endif |
275 | delete d->unwrittenBuffer; | 275 | delete d->unwrittenBuffer; |
276 | delete d; | 276 | delete d; |
277 | //#endif | 277 | //#endif |
278 | QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << FALSE; | 278 | // QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << FALSE; |
279 | 279 | ||
280 | } | 280 | } |
281 | 281 | ||
282 | 282 | ||
283 | void AudioDevice::volumeChanged( bool muted ) | 283 | void AudioDevice::volumeChanged( bool muted ) |
284 | { | 284 | { |
285 | AudioDevicePrivate::muted = muted; | 285 | AudioDevicePrivate::muted = muted; |
286 | } | 286 | } |
287 | 287 | ||
288 | 288 | ||
289 | void AudioDevice::write( char *buffer, unsigned int length ) | 289 | void AudioDevice::write( char *buffer, unsigned int length ) |
290 | { | 290 | { |
291 | // #ifdef Q_OS_WIN32 | 291 | // #ifdef Q_OS_WIN32 |
292 | // // returns immediately and (to be implemented) emits completedIO() when finished writing | 292 | // // returns immediately and (to be implemented) emits completedIO() when finished writing |
293 | // WAVEHDR *lpWaveHdr = (WAVEHDR *)malloc( sizeof(WAVEHDR) ); | 293 | // WAVEHDR *lpWaveHdr = (WAVEHDR *)malloc( sizeof(WAVEHDR) ); |
294 | // // maybe the buffer should be copied so that this fool proof, but its a performance hit | 294 | // // maybe the buffer should be copied so that this fool proof, but its a performance hit |
295 | // lpWaveHdr->lpData = buffer; | 295 | // lpWaveHdr->lpData = buffer; |
296 | // lpWaveHdr->dwBufferLength = length; | 296 | // lpWaveHdr->dwBufferLength = length; |
297 | // lpWaveHdr->dwFlags = 0L; | 297 | // lpWaveHdr->dwFlags = 0L; |
298 | // lpWaveHdr->dwLoops = 0L; | 298 | // lpWaveHdr->dwLoops = 0L; |
299 | // waveOutPrepareHeader( (HWAVEOUT)d->handle, lpWaveHdr, sizeof(WAVEHDR) ); | 299 | // waveOutPrepareHeader( (HWAVEOUT)d->handle, lpWaveHdr, sizeof(WAVEHDR) ); |
300 | // // waveOutWrite returns immediately. the data is sent in the background. | 300 | // // waveOutWrite returns immediately. the data is sent in the background. |
301 | // if ( waveOutWrite( (HWAVEOUT)d->handle, lpWaveHdr, sizeof(WAVEHDR) ) ) | 301 | // if ( waveOutWrite( (HWAVEOUT)d->handle, lpWaveHdr, sizeof(WAVEHDR) ) ) |
302 | // qDebug( "failed to write block to audio device" ); | 302 | // qDebug( "failed to write block to audio device" ); |
diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp index 0332237..4926287 100644 --- a/core/multimedia/opieplayer/playlistwidget.cpp +++ b/core/multimedia/opieplayer/playlistwidget.cpp | |||
@@ -1317,36 +1317,41 @@ void PlayListWidget::readPls(const QString &filename) { | |||
1317 | qDebug("adding "+s+" to playlist"); | 1317 | qDebug("adding "+s+" to playlist"); |
1318 | // numberofentries=2 | 1318 | // numberofentries=2 |
1319 | // File1=http | 1319 | // File1=http |
1320 | // Title | 1320 | // Title |
1321 | // Length | 1321 | // Length |
1322 | // Version | 1322 | // Version |
1323 | // File2=http | 1323 | // File2=http |
1324 | 1324 | ||
1325 | s=s.replace( QRegExp("\\"),"/"); | 1325 | s=s.replace( QRegExp("\\"),"/"); |
1326 | DocLnk lnk( s ); | 1326 | DocLnk lnk( s ); |
1327 | QFileInfo f(s); | 1327 | QFileInfo f(s); |
1328 | QString name = f.baseName(); | 1328 | QString name = f.baseName(); |
1329 | if(name.left(4)=="http") | 1329 | if(name.left(4)=="http") |
1330 | name = s.right( s.length() - 7); | 1330 | name = s.right( s.length() - 7); |
1331 | else | 1331 | else |
1332 | name=s; | 1332 | name=s; |
1333 | name = name.right(name.length()-name.findRev("\\",-1,TRUE)-1); | 1333 | name = name.right(name.length()-name.findRev("\\",-1,TRUE)-1); |
1334 | // QFileInfo f(s); | 1334 | // QFileInfo f(s); |
1335 | // QString name = f.baseName(); | 1335 | // QString name = f.baseName(); |
1336 | // name = name.left(name.length()-4); | 1336 | // name = name.left(name.length()-4); |
1337 | // name = name.right(name.findRev("/",0,TRUE)); | 1337 | // name = name.right(name.findRev("/",0,TRUE)); |
1338 | lnk.setName( name); | 1338 | lnk.setName( name); |
1339 | if(s.at(s.length()-4) == '.') | 1339 | if(s.at(s.length()-4) == '.') |
1340 | lnk.setFile( s); | 1340 | lnk.setFile( s); |
1341 | else | 1341 | else { |
1342 | lnk.setFile( s+"/"); | 1342 | if( name.right(1).find('/') == -1) |
1343 | s+="/"; | ||
1344 | // if(s.right(1) != '/') | ||
1345 | lnk.setFile( s); | ||
1346 | |||
1347 | } | ||
1343 | lnk.setType("audio/x-mpegurl"); | 1348 | lnk.setType("audio/x-mpegurl"); |
1344 | 1349 | ||
1345 | qDebug("DocLnk add "+name); | 1350 | qDebug("DocLnk add "+name); |
1346 | d->selectedFiles->addToSelection( lnk); | 1351 | d->selectedFiles->addToSelection( lnk); |
1347 | } | 1352 | } |
1348 | } | 1353 | } |
1349 | i++; | 1354 | i++; |
1350 | } | 1355 | } |
1351 | } | 1356 | } |
1352 | 1357 | ||