summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-06-22 01:38:20 (UTC)
committer llornkcor <llornkcor>2002-06-22 01:38:20 (UTC)
commit9adc4e5ab0a07eda196fffc8921da2d2d4f273e7 (patch) (unidiff)
tree91500597f01f145b5ec5a6ff80e812c59f95317f
parent28f2e6b92c40125172c9716790dc98cc30abc7fc (diff)
downloadopie-9adc4e5ab0a07eda196fffc8921da2d2d4f273e7.zip
opie-9adc4e5ab0a07eda196fffc8921da2d2d4f273e7.tar.gz
opie-9adc4e5ab0a07eda196fffc8921da2d2d4f273e7.tar.bz2
new action if /dev/dsp can't open, instead of sending to bytes to /dev/null.. lets immediately exit
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/multimedia/opieplayer/audiodevice.cpp15
-rw-r--r--core/multimedia/opieplayer/playlistwidget.cpp10
2 files changed, 18 insertions, 7 deletions
diff --git a/core/multimedia/opieplayer/audiodevice.cpp b/core/multimedia/opieplayer/audiodevice.cpp
index faadd72..8f04d0d 100644
--- a/core/multimedia/opieplayer/audiodevice.cpp
+++ b/core/multimedia/opieplayer/audiodevice.cpp
@@ -1,378 +1,389 @@
1/********************************************************************** 1/**********************************************************************
2 ** Copyright (C) 2000 Trolltech AS. All rights reserved. 2 ** Copyright (C) 2000 Trolltech AS. All rights reserved.
3 ** 3 **
4 ** This file is part of Qtopia Environment. 4 ** This file is part of 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 20// L.J.Potter added better error code Fri 02-15-2002 14:37:47
21 21
22 22
23#include <stdlib.h> 23#include <stdlib.h>
24#include <stdio.h> 24#include <stdio.h>
25#include <qpe/qpeapplication.h> 25#include <qpe/qpeapplication.h>
26#include <qpe/config.h> 26#include <qpe/config.h>
27#include <qmessagebox.h>
28
27#include "audiodevice.h" 29#include "audiodevice.h"
28 30
31
32#include <errno.h>
33
29#if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP) 34#if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP)
30#include "qpe/qcopenvelope_qws.h" 35#include "qpe/qcopenvelope_qws.h"
31#endif 36#endif
32 37
33// #ifdef Q_WS_WIN 38// #ifdef Q_WS_WIN
34// #include <windows.h> 39// #include <windows.h>
35// #include <mmsystem.h> 40// #include <mmsystem.h>
36// #include <mmreg.h> 41// #include <mmreg.h>
37// #endif 42// #endif
38#if defined(Q_WS_X11) || defined(Q_WS_QWS) 43#if defined(Q_WS_X11) || defined(Q_WS_QWS)
39#include <fcntl.h> 44#include <fcntl.h>
40#include <sys/ioctl.h> 45#include <sys/ioctl.h>
41#include <sys/soundcard.h> 46#include <sys/soundcard.h>
42#include <sys/stat.h> 47#include <sys/stat.h>
43#include <sys/time.h> 48#include <sys/time.h>
44#include <sys/types.h> 49#include <sys/types.h>
45#include <unistd.h> 50#include <unistd.h>
46#endif 51#endif
47 52
48// #if defined(Q_OS_WIN32) 53// #if defined(Q_OS_WIN32)
49// static const int expectedBytesPerMilliSecond = 2 * 2 * 44000 / 1000; 54// static const int expectedBytesPerMilliSecond = 2 * 2 * 44000 / 1000;
50// static const int timerResolutionMilliSeconds = 30; 55// static const int timerResolutionMilliSeconds = 30;
51// static const int sound_fragment_bytes = timerResolutionMilliSeconds * expectedBytesPerMilliSecond; 56// static const int sound_fragment_bytes = timerResolutionMilliSeconds * expectedBytesPerMilliSecond;
52// #else 57// #else
53# if defined(QT_QWS_IPAQ) 58# if defined(QT_QWS_IPAQ)
54static const int sound_fragment_shift = 14; 59static const int sound_fragment_shift = 14;
55# else 60# else
56static const int sound_fragment_shift = 16; 61static const int sound_fragment_shift = 16;
57# endif 62# endif
58static const int sound_fragment_bytes = (1<<sound_fragment_shift); 63static const int sound_fragment_bytes = (1<<sound_fragment_shift);
59//#endif 64//#endif
60 65
61 66
62class AudioDevicePrivate { 67class AudioDevicePrivate {
63public: 68public:
64 int handle; 69 int handle;
65 unsigned int frequency; 70 unsigned int frequency;
66 unsigned int channels; 71 unsigned int channels;
67 unsigned int bytesPerSample; 72 unsigned int bytesPerSample;
68 unsigned int bufferSize; 73 unsigned int bufferSize;
69//#ifndef Q_OS_WIN32 74//#ifndef Q_OS_WIN32
70 bool can_GETOSPACE; 75 bool can_GETOSPACE;
71 char* unwrittenBuffer; 76 char* unwrittenBuffer;
72 unsigned int unwritten; 77 unsigned int unwritten;
73//#endif 78//#endif
74 79
75 static int dspFd; 80 static int dspFd;
76 static bool muted; 81 static bool muted;
77 static unsigned int leftVolume; 82 static unsigned int leftVolume;
78 static unsigned int rightVolume; 83 static unsigned int rightVolume;
79}; 84};
80 85
81 86
82#ifdef Q_WS_QWS 87#ifdef Q_WS_QWS
83// This is for keeping the device open in-between playing files when 88// This is for keeping the device open in-between playing files when
84// the device makes clicks and it starts to drive you insane! :) 89// the device makes clicks and it starts to drive you insane! :)
85// Best to have the device not open when not using it though 90// Best to have the device not open when not using it though
86//#define KEEP_DEVICE_OPEN 91//#define KEEP_DEVICE_OPEN
87#endif 92#endif
88 93
89 94
90int AudioDevicePrivate::dspFd = 0; 95int AudioDevicePrivate::dspFd = 0;
91bool AudioDevicePrivate::muted = FALSE; 96bool AudioDevicePrivate::muted = FALSE;
92unsigned int AudioDevicePrivate::leftVolume = 0; 97unsigned int AudioDevicePrivate::leftVolume = 0;
93unsigned int AudioDevicePrivate::rightVolume = 0; 98unsigned int AudioDevicePrivate::rightVolume = 0;
94 99
95 100
96void AudioDevice::getVolume( unsigned int& leftVolume, unsigned int& rightVolume, bool &muted ) { 101void AudioDevice::getVolume( unsigned int& leftVolume, unsigned int& rightVolume, bool &muted ) {
97 muted = AudioDevicePrivate::muted; 102 muted = AudioDevicePrivate::muted;
98 unsigned int volume; 103 unsigned int volume;
99// #ifdef Q_OS_WIN32 104// #ifdef Q_OS_WIN32
100// HWAVEOUT handle; 105// HWAVEOUT handle;
101// WAVEFORMATEX formatData; 106// WAVEFORMATEX formatData;
102// formatData.cbSize = sizeof(WAVEFORMATEX); 107// formatData.cbSize = sizeof(WAVEFORMATEX);
103// formatData.wFormatTag = WAVE_FORMAT_PCM; 108// formatData.wFormatTag = WAVE_FORMAT_PCM;
104// formatData.nAvgBytesPerSec = 4 * 44000; 109// formatData.nAvgBytesPerSec = 4 * 44000;
105// formatData.nBlockAlign = 4; 110// formatData.nBlockAlign = 4;
106// formatData.nChannels = 2; 111// formatData.nChannels = 2;
107// formatData.nSamplesPerSec = 44000; 112// formatData.nSamplesPerSec = 44000;
108// formatData.wBitsPerSample = 16; 113// formatData.wBitsPerSample = 16;
109// waveOutOpen(&handle, WAVE_MAPPER, &formatData, 0L, 0L, CALLBACK_NULL); 114// waveOutOpen(&handle, WAVE_MAPPER, &formatData, 0L, 0L, CALLBACK_NULL);
110// if ( waveOutGetVolume( handle, (LPDWORD)&volume ) ) 115// if ( waveOutGetVolume( handle, (LPDWORD)&volume ) )
111// // qDebug( "get volume of audio device failed" ); 116// // qDebug( "get volume of audio device failed" );
112// waveOutClose( handle ); 117// waveOutClose( handle );
113// leftVolume = volume & 0xFFFF; 118// leftVolume = volume & 0xFFFF;
114// rightVolume = volume >> 16; 119// rightVolume = volume >> 16;
115// #else 120// #else
116 int mixerHandle = open( "/dev/mixer", O_RDWR ); 121 int mixerHandle = open( "/dev/mixer", O_RDWR );
117 if ( mixerHandle >= 0 ) { 122 if ( mixerHandle >= 0 ) {
118 if(ioctl( mixerHandle, MIXER_READ(0), &volume )==-1) 123 if(ioctl( mixerHandle, MIXER_READ(0), &volume )==-1)
119 perror("ioctl(\"MIXER_READ\")"); 124 perror("ioctl(\"MIXER_READ\")");
120 close( mixerHandle ); 125 close( mixerHandle );
121 } else 126 } else
122 perror("open(\"/dev/mixer\")"); 127 perror("open(\"/dev/mixer\")");
123 leftVolume = ((volume & 0x00FF) << 16) / 101; 128 leftVolume = ((volume & 0x00FF) << 16) / 101;
124 rightVolume = ((volume & 0xFF00) << 8) / 101; 129 rightVolume = ((volume & 0xFF00) << 8) / 101;
125//#endif 130//#endif
126} 131}
127 132
128 133
129void AudioDevice::setVolume( unsigned int leftVolume, unsigned int rightVolume, bool muted ) { 134void AudioDevice::setVolume( unsigned int leftVolume, unsigned int rightVolume, bool muted ) {
130 AudioDevicePrivate::muted = muted; 135 AudioDevicePrivate::muted = muted;
131 if ( muted ) { 136 if ( muted ) {
132 AudioDevicePrivate::leftVolume = leftVolume; 137 AudioDevicePrivate::leftVolume = leftVolume;
133 AudioDevicePrivate::rightVolume = rightVolume; 138 AudioDevicePrivate::rightVolume = rightVolume;
134 leftVolume = 0; 139 leftVolume = 0;
135 rightVolume = 0; 140 rightVolume = 0;
136 } else { 141 } else {
137 leftVolume = ( (int) leftVolume < 0 ) ? 0 : (( leftVolume > 0xFFFF ) ? 0xFFFF : leftVolume ); 142 leftVolume = ( (int) leftVolume < 0 ) ? 0 : (( leftVolume > 0xFFFF ) ? 0xFFFF : leftVolume );
138 rightVolume = ( (int)rightVolume < 0 ) ? 0 : (( rightVolume > 0xFFFF ) ? 0xFFFF : rightVolume ); 143 rightVolume = ( (int)rightVolume < 0 ) ? 0 : (( rightVolume > 0xFFFF ) ? 0xFFFF : rightVolume );
139 } 144 }
140// #ifdef Q_OS_WIN32 145// #ifdef Q_OS_WIN32
141// HWAVEOUT handle; 146// HWAVEOUT handle;
142// WAVEFORMATEX formatData; 147// WAVEFORMATEX formatData;
143// formatData.cbSize = sizeof(WAVEFORMATEX); 148// formatData.cbSize = sizeof(WAVEFORMATEX);
144// formatData.wFormatTag = WAVE_FORMAT_PCM; 149// formatData.wFormatTag = WAVE_FORMAT_PCM;
145// formatData.nAvgBytesPerSec = 4 * 44000; 150// formatData.nAvgBytesPerSec = 4 * 44000;
146// formatData.nBlockAlign = 4; 151// formatData.nBlockAlign = 4;
147// formatData.nChannels = 2; 152// formatData.nChannels = 2;
148// formatData.nSamplesPerSec = 44000; 153// formatData.nSamplesPerSec = 44000;
149// formatData.wBitsPerSample = 16; 154// formatData.wBitsPerSample = 16;
150// waveOutOpen(&handle, WAVE_MAPPER, &formatData, 0L, 0L, CALLBACK_NULL); 155// waveOutOpen(&handle, WAVE_MAPPER, &formatData, 0L, 0L, CALLBACK_NULL);
151// unsigned int volume = (rightVolume << 16) | leftVolume; 156// unsigned int volume = (rightVolume << 16) | leftVolume;
152// if ( waveOutSetVolume( handle, volume ) ) 157// if ( waveOutSetVolume( handle, volume ) )
153// // qDebug( "set volume of audio device failed" ); 158// // qDebug( "set volume of audio device failed" );
154// waveOutClose( handle ); 159// waveOutClose( handle );
155// #else 160// #else
156 // Volume can be from 0 to 100 which is 101 distinct values 161 // Volume can be from 0 to 100 which is 101 distinct values
157 unsigned int rV = (rightVolume * 101) >> 16; 162 unsigned int rV = (rightVolume * 101) >> 16;
158 163
159# if 0 164# if 0
160 unsigned int lV = (leftVolume * 101) >> 16; 165 unsigned int lV = (leftVolume * 101) >> 16;
161 unsigned int volume = ((rV << 8) & 0xFF00) | (lV & 0x00FF); 166 unsigned int volume = ((rV << 8) & 0xFF00) | (lV & 0x00FF);
162 int mixerHandle = 0; 167 int mixerHandle = 0;
163 if ( ( mixerHandle = open( "/dev/mixer", O_RDWR ) ) >= 0 ) { 168 if ( ( mixerHandle = open( "/dev/mixer", O_RDWR ) ) >= 0 ) {
164 if(ioctl( mixerHandle, MIXER_WRITE(0), &volume ) ==-1) 169 if(ioctl( mixerHandle, MIXER_WRITE(0), &volume ) ==-1)
165 perror("ioctl(\"MIXER_WRITE\")"); 170 perror("ioctl(\"MIXER_WRITE\")");
166 close( mixerHandle ); 171 close( mixerHandle );
167 } else 172 } else
168 perror("open(\"/dev/mixer\")"); 173 perror("open(\"/dev/mixer\")");
169 174
170# else 175# else
171 // 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
172 // independant right and left channel setting, or setting for different outputs 177 // independant right and left channel setting, or setting for different outputs
173 Config cfg("qpe"); // qtopia is "Sound" 178 Config cfg("qpe"); // qtopia is "Sound"
174 cfg.setGroup("Volume"); // qtopia is "Settings" 179 cfg.setGroup("Volume"); // qtopia is "Settings"
175 cfg.writeEntry("VolumePercent",(int)rV); //qtopia is Volume 180 cfg.writeEntry("VolumePercent",(int)rV); //qtopia is Volume
176# endif 181# endif
177 182
178//#endif 183//#endif
179// qDebug( "setting volume to: 0x%x", volume ); 184// qDebug( "setting volume to: 0x%x", volume );
180#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)
181 // Send notification that the volume has changed 186 // Send notification that the volume has changed
182 QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << muted; 187 QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << muted;
183#endif 188#endif
184} 189}
185 190
186 191
187 192
188 193
189AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) { 194AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) {
190 qDebug("creating new audio device"); 195 qDebug("creating new audio device");
191 QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE; 196 QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE;
192 d = new AudioDevicePrivate; 197 d = new AudioDevicePrivate;
193 d->frequency = f; 198 d->frequency = f;
194 d->channels = chs; 199 d->channels = chs;
195 d->bytesPerSample = bps; 200 d->bytesPerSample = bps;
196 qDebug("%d",bps); 201 qDebug("%d",bps);
197 int format=0; 202 int format=0;
198 if( bps == 8) format = AFMT_U8; 203 if( bps == 8) format = AFMT_U8;
199 else if( bps <= 0) format = AFMT_S16_LE; 204 else if( bps <= 0) format = AFMT_S16_LE;
200 else format = AFMT_S16_LE; 205 else format = AFMT_S16_LE;
201 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);
202 connect( qApp, SIGNAL( volumeChanged(bool) ), this, SLOT( volumeChanged(bool) ) ); 207 connect( qApp, SIGNAL( volumeChanged(bool) ), this, SLOT( volumeChanged(bool) ) );
203 208
204 int fragments = 0x10000 * 8 + sound_fragment_shift; 209 int fragments = 0x10000 * 8 + sound_fragment_shift;
205 int capabilities = 0; 210 int capabilities = 0;
206 211
207 212
208#ifdef KEEP_DEVICE_OPEN 213#ifdef KEEP_DEVICE_OPEN
209 if ( AudioDevicePrivate::dspFd == 0 ) { 214 if ( AudioDevicePrivate::dspFd == 0 ) {
210#endif 215#endif
211 if ( ( d->handle = ::open( "/dev/dsp", O_WRONLY ) ) < 0 ) { 216 if ( ( d->handle = ::open( "/dev/dsp", O_WRONLY ) ) < 0 ) {
212 perror("open(\"/dev/dsp\") sending to /dev/null instead"); 217
213 d->handle = ::open( "/dev/null", O_WRONLY ); 218// perror("open(\"/dev/dsp\") sending to /dev/null instead");
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.");
221 QMessageBox::critical(0, "Vmemo", errorMsg, tr("Abort"));
222 exit(-1); //harsh?
223// d->handle = ::open( "/dev/null", O_WRONLY );
224 // WTF?!?!
214 } 225 }
215#ifdef KEEP_DEVICE_OPEN 226#ifdef KEEP_DEVICE_OPEN
216 AudioDevicePrivate::dspFd = d->handle; 227 AudioDevicePrivate::dspFd = d->handle;
217 } else { 228 } else {
218 d->handle = AudioDevicePrivate::dspFd; 229 d->handle = AudioDevicePrivate::dspFd;
219 } 230 }
220#endif 231#endif
221 232
222 if(ioctl( d->handle, SNDCTL_DSP_GETCAPS, &capabilities )==-1) 233 if(ioctl( d->handle, SNDCTL_DSP_GETCAPS, &capabilities )==-1)
223 perror("ioctl(\"SNDCTL_DSP_GETCAPS\")"); 234 perror("ioctl(\"SNDCTL_DSP_GETCAPS\")");
224 if(ioctl( d->handle, SNDCTL_DSP_SETFRAGMENT, &fragments )==-1) 235 if(ioctl( d->handle, SNDCTL_DSP_SETFRAGMENT, &fragments )==-1)
225 perror("ioctl(\"SNDCTL_DSP_SETFRAGMENT\")"); 236 perror("ioctl(\"SNDCTL_DSP_SETFRAGMENT\")");
226 if(ioctl( d->handle, SNDCTL_DSP_SETFMT, & format )==-1) 237 if(ioctl( d->handle, SNDCTL_DSP_SETFMT, & format )==-1)
227 perror("ioctl(\"SNDCTL_DSP_SETFMT\")"); 238 perror("ioctl(\"SNDCTL_DSP_SETFMT\")");
228 qDebug("freq %d", d->frequency); 239 qDebug("freq %d", d->frequency);
229 if(ioctl( d->handle, SNDCTL_DSP_SPEED, &d->frequency )==-1) 240 if(ioctl( d->handle, SNDCTL_DSP_SPEED, &d->frequency )==-1)
230 perror("ioctl(\"SNDCTL_DSP_SPEED\")"); 241 perror("ioctl(\"SNDCTL_DSP_SPEED\")");
231 qDebug("channels %d",d->channels); 242 qDebug("channels %d",d->channels);
232 if ( ioctl( d->handle, SNDCTL_DSP_CHANNELS, &d->channels ) == -1 ) { 243 if ( ioctl( d->handle, SNDCTL_DSP_CHANNELS, &d->channels ) == -1 ) {
233 d->channels = ( d->channels == 1 ) ? 2 : d->channels; 244 d->channels = ( d->channels == 1 ) ? 2 : d->channels;
234 if(ioctl( d->handle, SNDCTL_DSP_CHANNELS, &d->channels )==-1) 245 if(ioctl( d->handle, SNDCTL_DSP_CHANNELS, &d->channels )==-1)
235 perror("ioctl(\"SNDCTL_DSP_CHANNELS\")"); 246 perror("ioctl(\"SNDCTL_DSP_CHANNELS\")");
236 } 247 }
237 248
238 d->bufferSize = sound_fragment_bytes; 249 d->bufferSize = sound_fragment_bytes;
239 d->unwrittenBuffer = new char[d->bufferSize]; 250 d->unwrittenBuffer = new char[d->bufferSize];
240 d->unwritten = 0; 251 d->unwritten = 0;
241 d->can_GETOSPACE = TRUE; // until we find otherwise 252 d->can_GETOSPACE = TRUE; // until we find otherwise
242 253
243 //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 );
244 //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 );
245 //if ( capabilities & DSP_CAP_BATCH ) qDebug( "Sound card has local buffer" ); 256 //if ( capabilities & DSP_CAP_BATCH ) qDebug( "Sound card has local buffer" );
246 //if ( capabilities & DSP_CAP_REALTIME )qDebug( "Sound card has realtime sync" ); 257 //if ( capabilities & DSP_CAP_REALTIME )qDebug( "Sound card has realtime sync" );
247 //if ( capabilities & DSP_CAP_TRIGGER ) qDebug( "Sound card has precise trigger" ); 258 //if ( capabilities & DSP_CAP_TRIGGER ) qDebug( "Sound card has precise trigger" );
248 //if ( capabilities & DSP_CAP_MMAP ) qDebug( "Sound card can mmap" ); 259 //if ( capabilities & DSP_CAP_MMAP ) qDebug( "Sound card can mmap" );
249 QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << FALSE; 260 QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << FALSE;
250 261
251} 262}
252 263
253 264
254AudioDevice::~AudioDevice() { 265AudioDevice::~AudioDevice() {
255 qDebug("destryo audiodevice"); 266 qDebug("destryo audiodevice");
256 QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE; 267 QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE;
257 268
258// #ifdef Q_OS_WIN32 269// #ifdef Q_OS_WIN32
259// waveOutClose( (HWAVEOUT)d->handle ); 270// waveOutClose( (HWAVEOUT)d->handle );
260// #else 271// #else
261# ifndef KEEP_DEVICE_OPEN 272# ifndef KEEP_DEVICE_OPEN
262 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
263# endif 274# endif
264 delete d->unwrittenBuffer; 275 delete d->unwrittenBuffer;
265 delete d; 276 delete d;
266//#endif 277//#endif
267 QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << FALSE; 278 QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << FALSE;
268 279
269} 280}
270 281
271 282
272void AudioDevice::volumeChanged( bool muted ) 283void AudioDevice::volumeChanged( bool muted )
273{ 284{
274 AudioDevicePrivate::muted = muted; 285 AudioDevicePrivate::muted = muted;
275} 286}
276 287
277 288
278void AudioDevice::write( char *buffer, unsigned int length ) 289void AudioDevice::write( char *buffer, unsigned int length )
279{ 290{
280// #ifdef Q_OS_WIN32 291// #ifdef Q_OS_WIN32
281// // returns immediately and (to be implemented) emits completedIO() when finished writing 292// // returns immediately and (to be implemented) emits completedIO() when finished writing
282// WAVEHDR *lpWaveHdr = (WAVEHDR *)malloc( sizeof(WAVEHDR) ); 293// WAVEHDR *lpWaveHdr = (WAVEHDR *)malloc( sizeof(WAVEHDR) );
283// // 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
284// lpWaveHdr->lpData = buffer; 295// lpWaveHdr->lpData = buffer;
285// lpWaveHdr->dwBufferLength = length; 296// lpWaveHdr->dwBufferLength = length;
286// lpWaveHdr->dwFlags = 0L; 297// lpWaveHdr->dwFlags = 0L;
287// lpWaveHdr->dwLoops = 0L; 298// lpWaveHdr->dwLoops = 0L;
288// waveOutPrepareHeader( (HWAVEOUT)d->handle, lpWaveHdr, sizeof(WAVEHDR) ); 299// waveOutPrepareHeader( (HWAVEOUT)d->handle, lpWaveHdr, sizeof(WAVEHDR) );
289// // waveOutWrite returns immediately. the data is sent in the background. 300// // waveOutWrite returns immediately. the data is sent in the background.
290// if ( waveOutWrite( (HWAVEOUT)d->handle, lpWaveHdr, sizeof(WAVEHDR) ) ) 301// if ( waveOutWrite( (HWAVEOUT)d->handle, lpWaveHdr, sizeof(WAVEHDR) ) )
291// qDebug( "failed to write block to audio device" ); 302// qDebug( "failed to write block to audio device" );
292// // emit completedIO(); 303// // emit completedIO();
293// #else 304// #else
294 int t = ::write( d->handle, buffer, length ); 305 int t = ::write( d->handle, buffer, length );
295 if ( t<0 ) t = 0; 306 if ( t<0 ) t = 0;
296 if ( t != (int)length) { 307 if ( t != (int)length) {
297 qDebug("Ahhh!! memcpys 1"); 308 qDebug("Ahhh!! memcpys 1");
298 memcpy(d->unwrittenBuffer,buffer+t,length-t); 309 memcpy(d->unwrittenBuffer,buffer+t,length-t);
299 d->unwritten = length-t; 310 d->unwritten = length-t;
300 } 311 }
301//#endif 312//#endif
302} 313}
303 314
304 315
305unsigned int AudioDevice::channels() const 316unsigned int AudioDevice::channels() const
306{ 317{
307 return d->channels; 318 return d->channels;
308} 319}
309 320
310 321
311unsigned int AudioDevice::frequency() const 322unsigned int AudioDevice::frequency() const
312{ 323{
313 return d->frequency; 324 return d->frequency;
314} 325}
315 326
316 327
317unsigned int AudioDevice::bytesPerSample() const 328unsigned int AudioDevice::bytesPerSample() const
318{ 329{
319 return d->bytesPerSample; 330 return d->bytesPerSample;
320} 331}
321 332
322 333
323unsigned int AudioDevice::bufferSize() const 334unsigned int AudioDevice::bufferSize() const
324{ 335{
325 return d->bufferSize; 336 return d->bufferSize;
326} 337}
327 338
328unsigned int AudioDevice::canWrite() const 339unsigned int AudioDevice::canWrite() const
329{ 340{
330// #ifdef Q_OS_WIN32 341// #ifdef Q_OS_WIN32
331// return bufferSize(); // Any better? 342// return bufferSize(); // Any better?
332// #else 343// #else
333 audio_buf_info info; 344 audio_buf_info info;
334 if ( d->can_GETOSPACE && ioctl(d->handle,SNDCTL_DSP_GETOSPACE,&info) ) { 345 if ( d->can_GETOSPACE && ioctl(d->handle,SNDCTL_DSP_GETOSPACE,&info) ) {
335 d->can_GETOSPACE = FALSE; 346 d->can_GETOSPACE = FALSE;
336 fcntl( d->handle, F_SETFL, O_NONBLOCK ); 347 fcntl( d->handle, F_SETFL, O_NONBLOCK );
337 } 348 }
338 if ( d->can_GETOSPACE ) { 349 if ( d->can_GETOSPACE ) {
339 int t = info.fragments * sound_fragment_bytes; 350 int t = info.fragments * sound_fragment_bytes;
340 return QMIN(t,(int)bufferSize()); 351 return QMIN(t,(int)bufferSize());
341 } else { 352 } else {
342 if ( d->unwritten ) { 353 if ( d->unwritten ) {
343 int t = ::write( d->handle, d->unwrittenBuffer, d->unwritten ); 354 int t = ::write( d->handle, d->unwrittenBuffer, d->unwritten );
344 if ( t<0 ) t = 0; 355 if ( t<0 ) t = 0;
345 if ( (unsigned)t!=d->unwritten ) { 356 if ( (unsigned)t!=d->unwritten ) {
346 memcpy(d->unwrittenBuffer,d->unwrittenBuffer+t,d->unwritten-t); 357 memcpy(d->unwrittenBuffer,d->unwrittenBuffer+t,d->unwritten-t);
347 d->unwritten -= t; 358 d->unwritten -= t;
348 } else { 359 } else {
349 d->unwritten = 0; 360 d->unwritten = 0;
350 } 361 }
351 } 362 }
352 if ( d->unwritten ) 363 if ( d->unwritten )
353 return 0; 364 return 0;
354 else 365 else
355 return d->bufferSize; 366 return d->bufferSize;
356 } 367 }
357//#endif 368//#endif
358} 369}
359 370
360 371
361int AudioDevice::bytesWritten() { 372int AudioDevice::bytesWritten() {
362// #ifdef Q_OS_WIN32 373// #ifdef Q_OS_WIN32
363// MMTIME pmmt = { TIME_BYTES, 0 }; 374// MMTIME pmmt = { TIME_BYTES, 0 };
364// if ( ( waveOutGetPosition( (HWAVEOUT)d->handle, &pmmt, sizeof(MMTIME) ) != MMSYSERR_NOERROR ) || ( pmmt.wType != TIME_BYTES ) ) { 375// if ( ( waveOutGetPosition( (HWAVEOUT)d->handle, &pmmt, sizeof(MMTIME) ) != MMSYSERR_NOERROR ) || ( pmmt.wType != TIME_BYTES ) ) {
365// qDebug( "failed to get audio device position" ); 376// qDebug( "failed to get audio device position" );
366// return -1; 377// return -1;
367// } 378// }
368// return pmmt.u.cb; 379// return pmmt.u.cb;
369// #else 380// #else
370 int buffered = 0; 381 int buffered = 0;
371 if ( ioctl( d->handle, SNDCTL_DSP_GETODELAY, &buffered ) ) { 382 if ( ioctl( d->handle, SNDCTL_DSP_GETODELAY, &buffered ) ) {
372 qDebug( "failed to get audio device position" ); 383 qDebug( "failed to get audio device position" );
373 return -1; 384 return -1;
374 } 385 }
375 return buffered; 386 return buffered;
376//#endif 387//#endif
377} 388}
378 389
diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp
index ae25fe3..0332237 100644
--- a/core/multimedia/opieplayer/playlistwidget.cpp
+++ b/core/multimedia/opieplayer/playlistwidget.cpp
@@ -164,951 +164,951 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
164 this , SLOT(removeSelected()) ); 164 this , SLOT(removeSelected()) );
165// d->tbPlay = new ToolButton( bar, tr( "Play" ), "opieplayer/play", /*this */mediaPlayerState , SLOT(setPlaying(bool) /* btnPlay() */), TRUE ); 165// d->tbPlay = new ToolButton( bar, tr( "Play" ), "opieplayer/play", /*this */mediaPlayerState , SLOT(setPlaying(bool) /* btnPlay() */), TRUE );
166 d->tbPlay = new ToolButton( bar, tr( "Play" ), "opieplayer/play", 166 d->tbPlay = new ToolButton( bar, tr( "Play" ), "opieplayer/play",
167 this , SLOT( btnPlay(bool) ), TRUE ); 167 this , SLOT( btnPlay(bool) ), TRUE );
168 d->tbShuffle = new ToolButton( bar, tr( "Randomize" ),"opieplayer/shuffle", 168 d->tbShuffle = new ToolButton( bar, tr( "Randomize" ),"opieplayer/shuffle",
169 mediaPlayerState, SLOT(setShuffled(bool)), TRUE ); 169 mediaPlayerState, SLOT(setShuffled(bool)), TRUE );
170 d->tbLoop = new ToolButton( bar, tr( "Loop" ),"opieplayer/loop", 170 d->tbLoop = new ToolButton( bar, tr( "Loop" ),"opieplayer/loop",
171 mediaPlayerState, SLOT(setLooping(bool)), TRUE ); 171 mediaPlayerState, SLOT(setLooping(bool)), TRUE );
172 tbDeletePlaylist->hide(); 172 tbDeletePlaylist->hide();
173 173
174 QPopupMenu *pmPlayList = new QPopupMenu( this ); 174 QPopupMenu *pmPlayList = new QPopupMenu( this );
175 menu->insertItem( tr( "File" ), pmPlayList ); 175 menu->insertItem( tr( "File" ), pmPlayList );
176 new MenuItem( pmPlayList, tr( "Clear List" ), this, SLOT( clearList() ) ); 176 new MenuItem( pmPlayList, tr( "Clear List" ), this, SLOT( clearList() ) );
177 new MenuItem( pmPlayList, tr( "Add all audio files" ), this, SLOT( addAllMusicToList() ) ); 177 new MenuItem( pmPlayList, tr( "Add all audio files" ), this, SLOT( addAllMusicToList() ) );
178 new MenuItem( pmPlayList, tr( "Add all video files" ), this, SLOT( addAllVideoToList() ) ); 178 new MenuItem( pmPlayList, tr( "Add all video files" ), this, SLOT( addAllVideoToList() ) );
179 new MenuItem( pmPlayList, tr( "Add all files" ), this, SLOT( addAllToList() ) ); 179 new MenuItem( pmPlayList, tr( "Add all files" ), this, SLOT( addAllToList() ) );
180 pmPlayList->insertSeparator(-1); 180 pmPlayList->insertSeparator(-1);
181 new MenuItem( pmPlayList, tr( "Save PlayList" ), this, SLOT( saveList() ) ); 181 new MenuItem( pmPlayList, tr( "Save PlayList" ), this, SLOT( saveList() ) );
182 new MenuItem( pmPlayList, tr( "Export playlist to m3u" ), this, SLOT(writem3u() ) ); 182 new MenuItem( pmPlayList, tr( "Export playlist to m3u" ), this, SLOT(writem3u() ) );
183 pmPlayList->insertSeparator(-1); 183 pmPlayList->insertSeparator(-1);
184 new MenuItem( pmPlayList, tr( "Open File or URL" ), this,SLOT( openFile() ) ); 184 new MenuItem( pmPlayList, tr( "Open File or URL" ), this,SLOT( openFile() ) );
185 pmPlayList->insertSeparator(-1); 185 pmPlayList->insertSeparator(-1);
186 new MenuItem( pmPlayList, tr( "Rescan for Audio Files" ), this,SLOT( scanForAudio() ) ); 186 new MenuItem( pmPlayList, tr( "Rescan for Audio Files" ), this,SLOT( scanForAudio() ) );
187 new MenuItem( pmPlayList, tr( "Rescan for Video Files" ), this,SLOT( scanForVideo() ) ); 187 new MenuItem( pmPlayList, tr( "Rescan for Video Files" ), this,SLOT( scanForVideo() ) );
188 188
189 QPopupMenu *pmView = new QPopupMenu( this ); 189 QPopupMenu *pmView = new QPopupMenu( this );
190 menu->insertItem( tr( "View" ), pmView ); 190 menu->insertItem( tr( "View" ), pmView );
191 191
192 fullScreenButton = new QAction(tr("Full Screen"), Resource::loadPixmap("fullscreen"), QString::null, 0, this, 0); 192 fullScreenButton = new QAction(tr("Full Screen"), Resource::loadPixmap("fullscreen"), QString::null, 0, this, 0);
193 fullScreenButton->addTo(pmView); 193 fullScreenButton->addTo(pmView);
194 scaleButton = new QAction(tr("Scale"), Resource::loadPixmap("opieplayer/scale"), QString::null, 0, this, 0); 194 scaleButton = new QAction(tr("Scale"), Resource::loadPixmap("opieplayer/scale"), QString::null, 0, this, 0);
195 scaleButton->addTo(pmView); 195 scaleButton->addTo(pmView);
196 196
197 QVBox *vbox5 = new QVBox( this ); vbox5->setBackgroundMode( PaletteButton ); 197 QVBox *vbox5 = new QVBox( this ); vbox5->setBackgroundMode( PaletteButton );
198 QVBox *vbox4 = new QVBox( vbox5 ); vbox4->setBackgroundMode( PaletteButton ); 198 QVBox *vbox4 = new QVBox( vbox5 ); vbox4->setBackgroundMode( PaletteButton );
199 199
200 QHBox *hbox6 = new QHBox( vbox4 ); hbox6->setBackgroundMode( PaletteButton ); 200 QHBox *hbox6 = new QHBox( vbox4 ); hbox6->setBackgroundMode( PaletteButton );
201 201
202 tabWidget = new QTabWidget( hbox6, "tabWidget" ); 202 tabWidget = new QTabWidget( hbox6, "tabWidget" );
203 tabWidget->setTabShape(QTabWidget::Triangular); 203 tabWidget->setTabShape(QTabWidget::Triangular);
204 204
205 QWidget *pTab; 205 QWidget *pTab;
206 pTab = new QWidget( tabWidget, "pTab" ); 206 pTab = new QWidget( tabWidget, "pTab" );
207// playlistView = new QListView( pTab, "playlistview" ); 207// playlistView = new QListView( pTab, "playlistview" );
208// playlistView->setMinimumSize(236,260); 208// playlistView->setMinimumSize(236,260);
209 tabWidget->insertTab( pTab,"Playlist"); 209 tabWidget->insertTab( pTab,"Playlist");
210 210
211 211
212 // Add the playlist area 212 // Add the playlist area
213 213
214 QVBox *vbox3 = new QVBox( pTab ); vbox3->setBackgroundMode( PaletteButton ); 214 QVBox *vbox3 = new QVBox( pTab ); vbox3->setBackgroundMode( PaletteButton );
215 d->playListFrame = vbox3; 215 d->playListFrame = vbox3;
216 d->playListFrame ->setMinimumSize(235,260); 216 d->playListFrame ->setMinimumSize(235,260);
217 217
218 QHBox *hbox2 = new QHBox( vbox3 ); hbox2->setBackgroundMode( PaletteButton ); 218 QHBox *hbox2 = new QHBox( vbox3 ); hbox2->setBackgroundMode( PaletteButton );
219 219
220 d->selectedFiles = new PlayListSelection( hbox2); 220 d->selectedFiles = new PlayListSelection( hbox2);
221 QVBox *vbox1 = new QVBox( hbox2 ); vbox1->setBackgroundMode( PaletteButton ); 221 QVBox *vbox1 = new QVBox( hbox2 ); vbox1->setBackgroundMode( PaletteButton );
222 222
223 QPEApplication::setStylusOperation( d->selectedFiles->viewport(),QPEApplication::RightOnHold); 223 QPEApplication::setStylusOperation( d->selectedFiles->viewport(),QPEApplication::RightOnHold);
224 224
225 225
226 226
227 QVBox *stretch1 = new QVBox( vbox1 ); stretch1->setBackgroundMode( PaletteButton ); // add stretch 227 QVBox *stretch1 = new QVBox( vbox1 ); stretch1->setBackgroundMode( PaletteButton ); // add stretch
228 new ToolButton( vbox1, tr( "Move Up" ), "opieplayer/up", d->selectedFiles, SLOT(moveSelectedUp()) ); 228 new ToolButton( vbox1, tr( "Move Up" ), "opieplayer/up", d->selectedFiles, SLOT(moveSelectedUp()) );
229 new ToolButton( vbox1, tr( "Remove" ), "opieplayer/cut", d->selectedFiles, SLOT(removeSelected()) ); 229 new ToolButton( vbox1, tr( "Remove" ), "opieplayer/cut", d->selectedFiles, SLOT(removeSelected()) );
230 new ToolButton( vbox1, tr( "Move Down" ), "opieplayer/down", d->selectedFiles, SLOT(moveSelectedDown()) ); 230 new ToolButton( vbox1, tr( "Move Down" ), "opieplayer/down", d->selectedFiles, SLOT(moveSelectedDown()) );
231 QVBox *stretch2 = new QVBox( vbox1 ); stretch2->setBackgroundMode( PaletteButton ); // add stretch 231 QVBox *stretch2 = new QVBox( vbox1 ); stretch2->setBackgroundMode( PaletteButton ); // add stretch
232 232
233 QWidget *aTab; 233 QWidget *aTab;
234 aTab = new QWidget( tabWidget, "aTab" ); 234 aTab = new QWidget( tabWidget, "aTab" );
235 audioView = new QListView( aTab, "Audioview" ); 235 audioView = new QListView( aTab, "Audioview" );
236 audioView->setMinimumSize(233,260); 236 audioView->setMinimumSize(233,260);
237 audioView->addColumn( tr("Title"),140); 237 audioView->addColumn( tr("Title"),140);
238 audioView->addColumn(tr("Size"), -1); 238 audioView->addColumn(tr("Size"), -1);
239 audioView->addColumn(tr("Media"),-1); 239 audioView->addColumn(tr("Media"),-1);
240 audioView->setColumnAlignment(1, Qt::AlignRight); 240 audioView->setColumnAlignment(1, Qt::AlignRight);
241 audioView->setColumnAlignment(2, Qt::AlignRight); 241 audioView->setColumnAlignment(2, Qt::AlignRight);
242 audioView->setAllColumnsShowFocus(TRUE); 242 audioView->setAllColumnsShowFocus(TRUE);
243 243
244 audioView->setMultiSelection( TRUE ); 244 audioView->setMultiSelection( TRUE );
245 audioView->setSelectionMode( QListView::Extended); 245 audioView->setSelectionMode( QListView::Extended);
246 246
247 tabWidget->insertTab(aTab,tr("Audio")); 247 tabWidget->insertTab(aTab,tr("Audio"));
248 248
249 QPEApplication::setStylusOperation( audioView->viewport(),QPEApplication::RightOnHold); 249 QPEApplication::setStylusOperation( audioView->viewport(),QPEApplication::RightOnHold);
250 250
251// audioView 251// audioView
252// populateAudioView(); 252// populateAudioView();
253// videowidget 253// videowidget
254 254
255 QWidget *vTab; 255 QWidget *vTab;
256 vTab = new QWidget( tabWidget, "vTab" ); 256 vTab = new QWidget( tabWidget, "vTab" );
257 videoView = new QListView( vTab, "Videoview" ); 257 videoView = new QListView( vTab, "Videoview" );
258 videoView->setMinimumSize(233,260); 258 videoView->setMinimumSize(233,260);
259 259
260 videoView->addColumn(tr("Title"),140); 260 videoView->addColumn(tr("Title"),140);
261 videoView->addColumn(tr("Size"),-1); 261 videoView->addColumn(tr("Size"),-1);
262 videoView->addColumn(tr("Media"),-1); 262 videoView->addColumn(tr("Media"),-1);
263 videoView->setColumnAlignment(1, Qt::AlignRight); 263 videoView->setColumnAlignment(1, Qt::AlignRight);
264 videoView->setColumnAlignment(2, Qt::AlignRight); 264 videoView->setColumnAlignment(2, Qt::AlignRight);
265 videoView->setAllColumnsShowFocus(TRUE); 265 videoView->setAllColumnsShowFocus(TRUE);
266 videoView->setMultiSelection( TRUE ); 266 videoView->setMultiSelection( TRUE );
267 videoView->setSelectionMode( QListView::Extended); 267 videoView->setSelectionMode( QListView::Extended);
268 268
269 QPEApplication::setStylusOperation( videoView->viewport(),QPEApplication::RightOnHold); 269 QPEApplication::setStylusOperation( videoView->viewport(),QPEApplication::RightOnHold);
270 270
271 tabWidget->insertTab( vTab,tr("Video")); 271 tabWidget->insertTab( vTab,tr("Video"));
272// populateVideoView(); 272// populateVideoView();
273 273
274//playlists list 274//playlists list
275 QWidget *LTab; 275 QWidget *LTab;
276 LTab = new QWidget( tabWidget, "LTab" ); 276 LTab = new QWidget( tabWidget, "LTab" );
277 playLists = new FileSelector( "playlist/plain", LTab, "fileselector" , FALSE, FALSE); //buggy 277 playLists = new FileSelector( "playlist/plain", LTab, "fileselector" , FALSE, FALSE); //buggy
278 playLists->setMinimumSize(233,260); 278 playLists->setMinimumSize(233,260);
279 tabWidget->insertTab(LTab,tr("Lists")); 279 tabWidget->insertTab(LTab,tr("Lists"));
280 280
281// connect( playLists, SIGNAL( newSelected( const DocLnk &) ), this, SLOT( newFile( const DocLnk & ) ) ); 281// connect( playLists, SIGNAL( newSelected( const DocLnk &) ), this, SLOT( newFile( const DocLnk & ) ) );
282 282
283// add the library area 283// add the library area
284 284
285// connect( audioView, SIGNAL( rightButtonClicked( QListViewItem *, const QPoint &, int)), 285// connect( audioView, SIGNAL( rightButtonClicked( QListViewItem *, const QPoint &, int)),
286// this, SLOT( fauxPlay( QListViewItem *) ) ); 286// this, SLOT( fauxPlay( QListViewItem *) ) );
287// connect( videoView, SIGNAL( rightButtonClicked( QListViewItem *, const QPoint &, int)), 287// connect( videoView, SIGNAL( rightButtonClicked( QListViewItem *, const QPoint &, int)),
288// this, SLOT( fauxPlay( QListViewItem *)) ); 288// this, SLOT( fauxPlay( QListViewItem *)) );
289 289
290// connect( audioView, SIGNAL( clicked( QListViewItem *) ), this, SLOT( fauxPlay( QListViewItem *) ) ); 290// connect( audioView, SIGNAL( clicked( QListViewItem *) ), this, SLOT( fauxPlay( QListViewItem *) ) );
291// connect( videoView, SIGNAL( clicked( QListViewItem *) ), this, SLOT( fauxPlay( QListViewItem *) ) ); 291// connect( videoView, SIGNAL( clicked( QListViewItem *) ), this, SLOT( fauxPlay( QListViewItem *) ) );
292 292
293 connect(tbDeletePlaylist,(SIGNAL(released())),SLOT( deletePlaylist())); 293 connect(tbDeletePlaylist,(SIGNAL(released())),SLOT( deletePlaylist()));
294 connect( fullScreenButton, SIGNAL(activated()), mediaPlayerState, SLOT(toggleFullscreen()) ); 294 connect( fullScreenButton, SIGNAL(activated()), mediaPlayerState, SLOT(toggleFullscreen()) );
295 connect( scaleButton, SIGNAL(activated()), mediaPlayerState, SLOT(toggleScaled()) ); 295 connect( scaleButton, SIGNAL(activated()), mediaPlayerState, SLOT(toggleScaled()) );
296 connect( d->selectedFiles, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)), 296 connect( d->selectedFiles, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
297 this,SLOT( playlistViewPressed(int, QListViewItem *, const QPoint&, int)) ); 297 this,SLOT( playlistViewPressed(int, QListViewItem *, const QPoint&, int)) );
298 298
299 connect( audioView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)), 299 connect( audioView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
300 this,SLOT( viewPressed(int, QListViewItem *, const QPoint&, int)) ); 300 this,SLOT( viewPressed(int, QListViewItem *, const QPoint&, int)) );
301 301
302 connect( audioView, SIGNAL( returnPressed( QListViewItem *)), 302 connect( audioView, SIGNAL( returnPressed( QListViewItem *)),
303 this,SLOT( playIt( QListViewItem *)) ); 303 this,SLOT( playIt( QListViewItem *)) );
304 connect( audioView, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( addToSelection( QListViewItem *) ) ); 304 connect( audioView, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( addToSelection( QListViewItem *) ) );
305 305
306 connect( videoView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)), 306 connect( videoView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
307 this,SLOT( viewPressed(int, QListViewItem *, const QPoint&, int)) ); 307 this,SLOT( viewPressed(int, QListViewItem *, const QPoint&, int)) );
308 connect( videoView, SIGNAL( returnPressed( QListViewItem *)), 308 connect( videoView, SIGNAL( returnPressed( QListViewItem *)),
309 this,SLOT( playIt( QListViewItem *)) ); 309 this,SLOT( playIt( QListViewItem *)) );
310 connect( videoView, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( addToSelection( QListViewItem *) ) ); 310 connect( videoView, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( addToSelection( QListViewItem *) ) );
311 311
312 connect( playLists, SIGNAL( fileSelected( const DocLnk &) ), this, SLOT( loadList( const DocLnk & ) ) ); 312 connect( playLists, SIGNAL( fileSelected( const DocLnk &) ), this, SLOT( loadList( const DocLnk & ) ) );
313 313
314 314
315 connect( tabWidget, SIGNAL (currentChanged(QWidget*)),this,SLOT(tabChanged(QWidget*))); 315 connect( tabWidget, SIGNAL (currentChanged(QWidget*)),this,SLOT(tabChanged(QWidget*)));
316 316
317 connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), d->tbPlay, SLOT( setOn( bool ) ) ); 317 connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), d->tbPlay, SLOT( setOn( bool ) ) );
318 connect( mediaPlayerState, SIGNAL( loopingToggled( bool ) ), d->tbLoop, SLOT( setOn( bool ) ) ); 318 connect( mediaPlayerState, SIGNAL( loopingToggled( bool ) ), d->tbLoop, SLOT( setOn( bool ) ) );
319 connect( mediaPlayerState, SIGNAL( shuffledToggled( bool ) ), d->tbShuffle, SLOT( setOn( bool ) ) ); 319 connect( mediaPlayerState, SIGNAL( shuffledToggled( bool ) ), d->tbShuffle, SLOT( setOn( bool ) ) );
320 connect( mediaPlayerState, SIGNAL( playlistToggled( bool ) ), this, SLOT( setPlaylist( bool ) ) ); 320 connect( mediaPlayerState, SIGNAL( playlistToggled( bool ) ), this, SLOT( setPlaylist( bool ) ) );
321 321
322 connect( d->selectedFiles, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( playIt( QListViewItem *) ) ); 322 connect( d->selectedFiles, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( playIt( QListViewItem *) ) );
323// connect( d->selectedFiles, SIGNAL( fileSelected( const DocLnk & ) ), this, SLOT( addToSelection( const DocLnk & ) ) ); 323// connect( d->selectedFiles, SIGNAL( fileSelected( const DocLnk & ) ), this, SLOT( addToSelection( const DocLnk & ) ) );
324 324
325 setCentralWidget( vbox5 ); 325 setCentralWidget( vbox5 );
326 326
327 Config cfg( "OpiePlayer" ); 327 Config cfg( "OpiePlayer" );
328 readConfig( cfg ); 328 readConfig( cfg );
329 QString currentPlaylist = cfg.readEntry("CurrentPlaylist",""); 329 QString currentPlaylist = cfg.readEntry("CurrentPlaylist","");
330// qDebug("currentList is "+currentPlaylist); 330// qDebug("currentList is "+currentPlaylist);
331 loadList(DocLnk( currentPlaylist)); 331 loadList(DocLnk( currentPlaylist));
332 setCaption(tr("OpiePlayer: ")+ currentPlaylist ); 332 setCaption(tr("OpiePlayer: ")+ currentPlaylist );
333 333
334 initializeStates(); 334 initializeStates();
335} 335}
336 336
337 337
338PlayListWidget::~PlayListWidget() { 338PlayListWidget::~PlayListWidget() {
339 Config cfg( "OpiePlayer" ); 339 Config cfg( "OpiePlayer" );
340 writeConfig( cfg ); 340 writeConfig( cfg );
341 341
342 342
343 if ( d->current ) 343 if ( d->current )
344 delete d->current; 344 delete d->current;
345 delete d; 345 delete d;
346} 346}
347 347
348 348
349void PlayListWidget::initializeStates() { 349void PlayListWidget::initializeStates() {
350 350
351 d->tbPlay->setOn( mediaPlayerState->playing() ); 351 d->tbPlay->setOn( mediaPlayerState->playing() );
352 d->tbLoop->setOn( mediaPlayerState->looping() ); 352 d->tbLoop->setOn( mediaPlayerState->looping() );
353 d->tbShuffle->setOn( mediaPlayerState->shuffled() ); 353 d->tbShuffle->setOn( mediaPlayerState->shuffled() );
354// d->tbFull->setOn( mediaPlayerState->fullscreen() ); 354// d->tbFull->setOn( mediaPlayerState->fullscreen() );
355// d->tbScale->setOn( mediaPlayerState->scaled() ); 355// d->tbScale->setOn( mediaPlayerState->scaled() );
356// d->tbScale->setEnabled( mediaPlayerState->fullscreen() ); 356// d->tbScale->setEnabled( mediaPlayerState->fullscreen() );
357// setPlaylist( mediaPlayerState->playlist() ); 357// setPlaylist( mediaPlayerState->playlist() );
358 setPlaylist( true); 358 setPlaylist( true);
359// d->selectedFiles->first(); 359// d->selectedFiles->first();
360 360
361} 361}
362 362
363 363
364void PlayListWidget::readConfig( Config& cfg ) { 364void PlayListWidget::readConfig( Config& cfg ) {
365 cfg.setGroup("PlayList"); 365 cfg.setGroup("PlayList");
366 QString currentString = cfg.readEntry("current", "" ); 366 QString currentString = cfg.readEntry("current", "" );
367 int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 ); 367 int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 );
368 for ( int i = 0; i < noOfFiles; i++ ) { 368 for ( int i = 0; i < noOfFiles; i++ ) {
369 QString entryName; 369 QString entryName;
370 entryName.sprintf( "File%i", i + 1 ); 370 entryName.sprintf( "File%i", i + 1 );
371 QString linkFile = cfg.readEntry( entryName ); 371 QString linkFile = cfg.readEntry( entryName );
372 DocLnk lnk( linkFile ); 372 DocLnk lnk( linkFile );
373 if ( lnk.isValid() ) { 373 if ( lnk.isValid() ) {
374 d->selectedFiles->addToSelection( lnk ); 374 d->selectedFiles->addToSelection( lnk );
375 } 375 }
376 } 376 }
377 d->selectedFiles->setSelectedItem( currentString); 377 d->selectedFiles->setSelectedItem( currentString);
378// d->selectedFiles->setSelectedItem( (const QString &)currentString); 378// d->selectedFiles->setSelectedItem( (const QString &)currentString);
379} 379}
380 380
381 381
382void PlayListWidget::writeConfig( Config& cfg ) const { 382void PlayListWidget::writeConfig( Config& cfg ) const {
383 383
384 d->selectedFiles->writeCurrent( cfg); 384 d->selectedFiles->writeCurrent( cfg);
385 cfg.setGroup("PlayList"); 385 cfg.setGroup("PlayList");
386 int noOfFiles = 0; 386 int noOfFiles = 0;
387 d->selectedFiles->first(); 387 d->selectedFiles->first();
388 do { 388 do {
389 const DocLnk *lnk = d->selectedFiles->current(); 389 const DocLnk *lnk = d->selectedFiles->current();
390 if ( lnk ) { 390 if ( lnk ) {
391 QString entryName; 391 QString entryName;
392 entryName.sprintf( "File%i", noOfFiles + 1 ); 392 entryName.sprintf( "File%i", noOfFiles + 1 );
393// qDebug(entryName); 393// qDebug(entryName);
394 cfg.writeEntry( entryName, lnk->linkFile() ); 394 cfg.writeEntry( entryName, lnk->linkFile() );
395 // if this link does exist, add it so we have the file 395 // if this link does exist, add it so we have the file
396 // next time... 396 // next time...
397 if ( !QFile::exists( lnk->linkFile() ) ) { 397 if ( !QFile::exists( lnk->linkFile() ) ) {
398 // the way writing lnks doesn't really check for out 398 // the way writing lnks doesn't really check for out
399 // of disk space, but check it anyway. 399 // of disk space, but check it anyway.
400 if ( !lnk->writeLink() ) { 400 if ( !lnk->writeLink() ) {
401 QMessageBox::critical( 0, tr("Out of space"), 401 QMessageBox::critical( 0, tr("Out of space"),
402 tr( "There was a problem saving " 402 tr( "There was a problem saving "
403 "the playlist.\n" 403 "the playlist.\n"
404 "Your playlist " 404 "Your playlist "
405 "may be missing some entries\n" 405 "may be missing some entries\n"
406 "the next time you start it." ) 406 "the next time you start it." )
407 ); 407 );
408 } 408 }
409 } 409 }
410 noOfFiles++; 410 noOfFiles++;
411 } 411 }
412 } 412 }
413 while ( d->selectedFiles->next() ); 413 while ( d->selectedFiles->next() );
414 cfg.writeEntry("NumberOfFiles", noOfFiles ); 414 cfg.writeEntry("NumberOfFiles", noOfFiles );
415} 415}
416 416
417 417
418void PlayListWidget::addToSelection( const DocLnk& lnk ) { 418void PlayListWidget::addToSelection( const DocLnk& lnk ) {
419// qDebug("add"); 419// qDebug("add");
420 if( lnk.file().find(" ",0,TRUE) != -1 || lnk.file().find("%20",0,TRUE) != -1) { 420// if( lnk.file().find(" ",0,TRUE) != -1 || lnk.file().find("%20",0,TRUE) != -1) {
421 QMessageBox::message("Note","You are trying to play\na malformed url."); 421// QMessageBox::message("Note","You are trying to play\na malformed url.");
422 422
423 } else { 423// } else {
424 424
425 d->setDocumentUsed = FALSE; 425 d->setDocumentUsed = FALSE;
426 if ( mediaPlayerState->playlist() ) { 426 if ( mediaPlayerState->playlist() ) {
427 if(QFileInfo(lnk.file()).exists() || lnk.file().left(4) == "http" ) 427 if(QFileInfo(lnk.file()).exists() || lnk.file().left(4) == "http" )
428 d->selectedFiles->addToSelection( lnk ); 428 d->selectedFiles->addToSelection( lnk );
429 } 429 }
430 else 430 else
431 mediaPlayerState->setPlaying( TRUE ); 431 mediaPlayerState->setPlaying( TRUE );
432 } 432// }
433} 433}
434 434
435 435
436void PlayListWidget::clearList() { 436void PlayListWidget::clearList() {
437 while ( first() ) 437 while ( first() )
438 d->selectedFiles->removeSelected(); 438 d->selectedFiles->removeSelected();
439} 439}
440 440
441 441
442void PlayListWidget::addAllToList() { 442void PlayListWidget::addAllToList() {
443 DocLnkSet filesAll; 443 DocLnkSet filesAll;
444 Global::findDocuments(&filesAll, "video/*;audio/*"); 444 Global::findDocuments(&filesAll, "video/*;audio/*");
445 QListIterator<DocLnk> Adit( filesAll.children() ); 445 QListIterator<DocLnk> Adit( filesAll.children() );
446 for ( ; Adit.current(); ++Adit ) 446 for ( ; Adit.current(); ++Adit )
447 if(QFileInfo(Adit.current()->file()).exists()) 447 if(QFileInfo(Adit.current()->file()).exists())
448 d->selectedFiles->addToSelection( **Adit ); 448 d->selectedFiles->addToSelection( **Adit );
449} 449}
450 450
451 451
452void PlayListWidget::addAllMusicToList() { 452void PlayListWidget::addAllMusicToList() {
453 QListIterator<DocLnk> dit( files.children() ); 453 QListIterator<DocLnk> dit( files.children() );
454 for ( ; dit.current(); ++dit ) 454 for ( ; dit.current(); ++dit )
455 if(QFileInfo(dit.current()->file()).exists()) 455 if(QFileInfo(dit.current()->file()).exists())
456 d->selectedFiles->addToSelection( **dit ); 456 d->selectedFiles->addToSelection( **dit );
457} 457}
458 458
459 459
460void PlayListWidget::addAllVideoToList() { 460void PlayListWidget::addAllVideoToList() {
461 QListIterator<DocLnk> dit( vFiles.children() ); 461 QListIterator<DocLnk> dit( vFiles.children() );
462 for ( ; dit.current(); ++dit ) 462 for ( ; dit.current(); ++dit )
463 if(QFileInfo( dit.current()->file()).exists()) 463 if(QFileInfo( dit.current()->file()).exists())
464 d->selectedFiles->addToSelection( **dit ); 464 d->selectedFiles->addToSelection( **dit );
465} 465}
466 466
467 467
468void PlayListWidget::setDocument(const QString& fileref) { 468void PlayListWidget::setDocument(const QString& fileref) {
469 qDebug(fileref); 469 qDebug(fileref);
470 fromSetDocument = TRUE; 470 fromSetDocument = TRUE;
471 if ( fileref.isNull() ) { 471 if ( fileref.isNull() ) {
472 QMessageBox::critical( 0, tr( "Invalid File" ), tr( "There was a problem in getting the file." ) ); 472 QMessageBox::critical( 0, tr( "Invalid File" ), tr( "There was a problem in getting the file." ) );
473 return; 473 return;
474 } 474 }
475// qDebug("setDocument "+fileref); 475// qDebug("setDocument "+fileref);
476 if(fileref.find("m3u",0,TRUE) != -1) { //is m3u 476 if(fileref.find("m3u",0,TRUE) != -1) { //is m3u
477 readm3u( fileref); 477 readm3u( fileref);
478 } 478 }
479 else if(fileref.find("pls",0,TRUE) != -1) { //is pls 479 else if(fileref.find("pls",0,TRUE) != -1) { //is pls
480 readPls( fileref); 480 readPls( fileref);
481 } 481 }
482 else if(fileref.find("playlist",0,TRUE) != -1) {//is playlist 482 else if(fileref.find("playlist",0,TRUE) != -1) {//is playlist
483 clearList(); 483 clearList();
484 loadList(DocLnk(fileref)); 484 loadList(DocLnk(fileref));
485 d->selectedFiles->first(); 485 d->selectedFiles->first();
486 } else { 486 } else {
487 clearList(); 487 clearList();
488 addToSelection( DocLnk( fileref ) ); 488 addToSelection( DocLnk( fileref ) );
489 d->setDocumentUsed = TRUE; 489 d->setDocumentUsed = TRUE;
490 mediaPlayerState->setPlaying( FALSE ); 490 mediaPlayerState->setPlaying( FALSE );
491 qApp->processEvents(); 491 qApp->processEvents();
492 mediaPlayerState->setPlaying( TRUE ); 492 mediaPlayerState->setPlaying( TRUE );
493 qApp->processEvents(); 493 qApp->processEvents();
494 setCaption(tr("OpiePlayer")); 494 setCaption(tr("OpiePlayer"));
495 } 495 }
496} 496}
497 497
498 498
499void PlayListWidget::setActiveWindow() { 499void PlayListWidget::setActiveWindow() {
500 // When we get raised we need to ensure that it switches views 500 // When we get raised we need to ensure that it switches views
501 char origView = mediaPlayerState->view(); 501 char origView = mediaPlayerState->view();
502 mediaPlayerState->setView( 'l' ); // invalidate 502 mediaPlayerState->setView( 'l' ); // invalidate
503 mediaPlayerState->setView( origView ); // now switch back 503 mediaPlayerState->setView( origView ); // now switch back
504} 504}
505 505
506 506
507void PlayListWidget::useSelectedDocument() { 507void PlayListWidget::useSelectedDocument() {
508 d->setDocumentUsed = FALSE; 508 d->setDocumentUsed = FALSE;
509} 509}
510 510
511 511
512const DocLnk *PlayListWidget::current() { // this is fugly 512const DocLnk *PlayListWidget::current() { // this is fugly
513 513
514// if( fromSetDocument) { 514// if( fromSetDocument) {
515// qDebug("from setDoc"); 515// qDebug("from setDoc");
516// DocLnkSet files; 516// DocLnkSet files;
517// Global::findDocuments(&files, "video/*;audio/*"); 517// Global::findDocuments(&files, "video/*;audio/*");
518// QListIterator<DocLnk> dit( files.children() ); 518// QListIterator<DocLnk> dit( files.children() );
519// for ( ; dit.current(); ++dit ) { 519// for ( ; dit.current(); ++dit ) {
520// if(dit.current()->linkFile() == setDocFileRef) { 520// if(dit.current()->linkFile() == setDocFileRef) {
521// qDebug(setDocFileRef); 521// qDebug(setDocFileRef);
522// return dit; 522// return dit;
523// } 523// }
524// } 524// }
525// } else 525// } else
526 526
527 527
528 switch (tabWidget->currentPageIndex()) { 528 switch (tabWidget->currentPageIndex()) {
529 case 0: //playlist 529 case 0: //playlist
530 { 530 {
531 qDebug("playlist"); 531 qDebug("playlist");
532 if ( mediaPlayerState->playlist() ) { 532 if ( mediaPlayerState->playlist() ) {
533 return d->selectedFiles->current(); 533 return d->selectedFiles->current();
534 } 534 }
535 else if ( d->setDocumentUsed && d->current ) { 535 else if ( d->setDocumentUsed && d->current ) {
536 return d->current; 536 return d->current;
537 } else { 537 } else {
538 return d->files->selected(); 538 return d->files->selected();
539 } 539 }
540 } 540 }
541 break; 541 break;
542 case 1://audio 542 case 1://audio
543 { 543 {
544 qDebug("audioView"); 544 qDebug("audioView");
545 QListIterator<DocLnk> dit( files.children() ); 545 QListIterator<DocLnk> dit( files.children() );
546 for ( ; dit.current(); ++dit ) { 546 for ( ; dit.current(); ++dit ) {
547 if( dit.current()->name() == audioView->currentItem()->text(0) && !insanityBool) { 547 if( dit.current()->name() == audioView->currentItem()->text(0) && !insanityBool) {
548 qDebug("here"); 548 qDebug("here");
549 insanityBool=TRUE; 549 insanityBool=TRUE;
550 return dit; 550 return dit;
551 } 551 }
552 } 552 }
553 } 553 }
554 break; 554 break;
555 case 2: // video 555 case 2: // video
556 { 556 {
557 qDebug("videoView"); 557 qDebug("videoView");
558 QListIterator<DocLnk> Vdit( vFiles.children() ); 558 QListIterator<DocLnk> Vdit( vFiles.children() );
559 for ( ; Vdit.current(); ++Vdit ) { 559 for ( ; Vdit.current(); ++Vdit ) {
560 if( Vdit.current()->name() == videoView->currentItem()->text(0) && !insanityBool) { 560 if( Vdit.current()->name() == videoView->currentItem()->text(0) && !insanityBool) {
561 insanityBool=TRUE; 561 insanityBool=TRUE;
562 return Vdit; 562 return Vdit;
563 } 563 }
564 } 564 }
565 } 565 }
566 break; 566 break;
567 }; 567 };
568 return 0; 568 return 0;
569} 569}
570 570
571bool PlayListWidget::prev() { 571bool PlayListWidget::prev() {
572 if ( mediaPlayerState->playlist() ) { 572 if ( mediaPlayerState->playlist() ) {
573 if ( mediaPlayerState->shuffled() ) { 573 if ( mediaPlayerState->shuffled() ) {
574 const DocLnk *cur = current(); 574 const DocLnk *cur = current();
575 int j = 1 + (int)(97.0 * rand() / (RAND_MAX + 1.0)); 575 int j = 1 + (int)(97.0 * rand() / (RAND_MAX + 1.0));
576 for ( int i = 0; i < j; i++ ) { 576 for ( int i = 0; i < j; i++ ) {
577 if ( !d->selectedFiles->next() ) 577 if ( !d->selectedFiles->next() )
578 d->selectedFiles->first(); 578 d->selectedFiles->first();
579 } 579 }
580 if ( cur == current() ) 580 if ( cur == current() )
581 if ( !d->selectedFiles->next() ) 581 if ( !d->selectedFiles->next() )
582 d->selectedFiles->first(); 582 d->selectedFiles->first();
583 return TRUE; 583 return TRUE;
584 } else { 584 } else {
585 if ( !d->selectedFiles->prev() ) { 585 if ( !d->selectedFiles->prev() ) {
586 if ( mediaPlayerState->looping() ) { 586 if ( mediaPlayerState->looping() ) {
587 return d->selectedFiles->last(); 587 return d->selectedFiles->last();
588 } else { 588 } else {
589 return FALSE; 589 return FALSE;
590 } 590 }
591 } 591 }
592 return TRUE; 592 return TRUE;
593 } 593 }
594 } else { 594 } else {
595 return mediaPlayerState->looping(); 595 return mediaPlayerState->looping();
596 } 596 }
597} 597}
598 598
599 599
600bool PlayListWidget::next() { 600bool PlayListWidget::next() {
601 if ( mediaPlayerState->playlist() ) { 601 if ( mediaPlayerState->playlist() ) {
602 if ( mediaPlayerState->shuffled() ) { 602 if ( mediaPlayerState->shuffled() ) {
603 return prev(); 603 return prev();
604 } else { 604 } else {
605 if ( !d->selectedFiles->next() ) { 605 if ( !d->selectedFiles->next() ) {
606 if ( mediaPlayerState->looping() ) { 606 if ( mediaPlayerState->looping() ) {
607 return d->selectedFiles->first(); 607 return d->selectedFiles->first();
608 } else { 608 } else {
609 return FALSE; 609 return FALSE;
610 } 610 }
611 } 611 }
612 return TRUE; 612 return TRUE;
613 } 613 }
614 } else { 614 } else {
615 return mediaPlayerState->looping(); 615 return mediaPlayerState->looping();
616 } 616 }
617} 617}
618 618
619 619
620bool PlayListWidget::first() { 620bool PlayListWidget::first() {
621 if ( mediaPlayerState->playlist() ) 621 if ( mediaPlayerState->playlist() )
622 return d->selectedFiles->first(); 622 return d->selectedFiles->first();
623 else 623 else
624 return mediaPlayerState->looping(); 624 return mediaPlayerState->looping();
625} 625}
626 626
627 627
628bool PlayListWidget::last() { 628bool PlayListWidget::last() {
629 if ( mediaPlayerState->playlist() ) 629 if ( mediaPlayerState->playlist() )
630 return d->selectedFiles->last(); 630 return d->selectedFiles->last();
631 else 631 else
632 return mediaPlayerState->looping(); 632 return mediaPlayerState->looping();
633} 633}
634 634
635 635
636void PlayListWidget::saveList() { 636void PlayListWidget::saveList() {
637 637
638 QString filename; 638 QString filename;
639 InputDialog *fileDlg; 639 InputDialog *fileDlg;
640 fileDlg = new InputDialog(this,tr("Save Playlist"),TRUE, 0); 640 fileDlg = new InputDialog(this,tr("Save Playlist"),TRUE, 0);
641 fileDlg->exec(); 641 fileDlg->exec();
642 if( fileDlg->result() == 1 ) { 642 if( fileDlg->result() == 1 ) {
643 if ( d->current ) 643 if ( d->current )
644 delete d->current; 644 delete d->current;
645 filename = fileDlg->LineEdit1->text();//+".playlist"; 645 filename = fileDlg->LineEdit1->text();//+".playlist";
646// qDebug("saving playlist "+filename+".playlist"); 646// qDebug("saving playlist "+filename+".playlist");
647 Config cfg( filename +".playlist"); 647 Config cfg( filename +".playlist");
648 writeConfig( cfg ); 648 writeConfig( cfg );
649 649
650 DocLnk lnk; 650 DocLnk lnk;
651// lnk.setComment( ""); 651// lnk.setComment( "");
652 lnk.setFile(QDir::homeDirPath()+"/Settings/"+filename+".playlist.conf"); //sets File property 652 lnk.setFile(QDir::homeDirPath()+"/Settings/"+filename+".playlist.conf"); //sets File property
653 lnk.setType("playlist/plain");// hey is this a REGISTERED mime type?!?!? ;D 653 lnk.setType("playlist/plain");// hey is this a REGISTERED mime type?!?!? ;D
654 lnk.setIcon("opieplayer/playlist2"); 654 lnk.setIcon("opieplayer/playlist2");
655 lnk.setName( filename); //sets file name 655 lnk.setName( filename); //sets file name
656// qDebug(filename); 656// qDebug(filename);
657 if(!lnk.writeLink()) 657 if(!lnk.writeLink())
658 qDebug("Writing doclink did not work"); 658 qDebug("Writing doclink did not work");
659 } 659 }
660 Config config( "OpiePlayer" ); 660 Config config( "OpiePlayer" );
661 config.writeEntry("CurrentPlaylist",filename); 661 config.writeEntry("CurrentPlaylist",filename);
662 setCaption(tr("OpiePlayer: ")+filename); 662 setCaption(tr("OpiePlayer: ")+filename);
663 d->selectedFiles->first(); 663 d->selectedFiles->first();
664 if(fileDlg) 664 if(fileDlg)
665 delete fileDlg; 665 delete fileDlg;
666} 666}
667 667
668void PlayListWidget::loadList( const DocLnk & lnk) { 668void PlayListWidget::loadList( const DocLnk & lnk) {
669 QString name= lnk.name(); 669 QString name= lnk.name();
670// qDebug("currentList is "+name); 670// qDebug("currentList is "+name);
671 if( name.length()>1) { 671 if( name.length()>1) {
672 setCaption("OpiePlayer: "+name); 672 setCaption("OpiePlayer: "+name);
673// qDebug("load list "+ name+".playlist"); 673// qDebug("load list "+ name+".playlist");
674 clearList(); 674 clearList();
675 Config cfg( name+".playlist"); 675 Config cfg( name+".playlist");
676 readConfig(cfg); 676 readConfig(cfg);
677 677
678 tabWidget->setCurrentPage(0); 678 tabWidget->setCurrentPage(0);
679 679
680 Config config( "OpiePlayer" ); 680 Config config( "OpiePlayer" );
681 config.writeEntry("CurrentPlaylist", name); 681 config.writeEntry("CurrentPlaylist", name);
682// d->selectedFiles->first(); 682// d->selectedFiles->first();
683 } 683 }
684 684
685} 685}
686 686
687void PlayListWidget::setPlaylist( bool shown ) { 687void PlayListWidget::setPlaylist( bool shown ) {
688 if ( shown ) 688 if ( shown )
689 d->playListFrame->show(); 689 d->playListFrame->show();
690 else 690 else
691 d->playListFrame->hide(); 691 d->playListFrame->hide();
692} 692}
693 693
694void PlayListWidget::setView( char view ) { 694void PlayListWidget::setView( char view ) {
695 if ( view == 'l' ) 695 if ( view == 'l' )
696 showMaximized(); 696 showMaximized();
697 else 697 else
698 hide(); 698 hide();
699} 699}
700 700
701void PlayListWidget::addSelected() { 701void PlayListWidget::addSelected() {
702 702
703 Config cfg( "OpiePlayer" ); 703 Config cfg( "OpiePlayer" );
704 cfg.setGroup("PlayList"); 704 cfg.setGroup("PlayList");
705 QString currentPlaylist = cfg.readEntry("CurrentPlaylist",""); 705 QString currentPlaylist = cfg.readEntry("CurrentPlaylist","");
706 int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 ); 706 int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 );
707 707
708 switch (tabWidget->currentPageIndex()) { 708 switch (tabWidget->currentPageIndex()) {
709 case 0: //playlist 709 case 0: //playlist
710 break; 710 break;
711 case 1: { //audio 711 case 1: { //audio
712// QString entryName; 712// QString entryName;
713// entryName.sprintf( "File%i", i + 1 ); 713// entryName.sprintf( "File%i", i + 1 );
714// QString linkFile = cfg.readEntry( entryName ); 714// QString linkFile = cfg.readEntry( entryName );
715 QListViewItemIterator it( audioView ); 715 QListViewItemIterator it( audioView );
716 // iterate through all items of the listview 716 // iterate through all items of the listview
717 for ( ; it.current(); ++it ) { 717 for ( ; it.current(); ++it ) {
718 if ( it.current()->isSelected() ) { 718 if ( it.current()->isSelected() ) {
719 QListIterator<DocLnk> dit( files.children() ); 719 QListIterator<DocLnk> dit( files.children() );
720 for ( ; dit.current(); ++dit ) { 720 for ( ; dit.current(); ++dit ) {
721 if( dit.current()->name() == it.current()->text(0) ) { 721 if( dit.current()->name() == it.current()->text(0) ) {
722 d->selectedFiles->addToSelection( **dit ); 722 d->selectedFiles->addToSelection( **dit );
723 } 723 }
724 } 724 }
725 audioView->setSelected( it.current(),FALSE); 725 audioView->setSelected( it.current(),FALSE);
726 } 726 }
727 } 727 }
728 tabWidget->setCurrentPage(0); 728 tabWidget->setCurrentPage(0);
729 } 729 }
730 break; 730 break;
731 case 2: { // video 731 case 2: { // video
732 QListViewItemIterator it( videoView ); 732 QListViewItemIterator it( videoView );
733 // iterate through all items of the listview 733 // iterate through all items of the listview
734 for ( ; it.current(); ++it ) { 734 for ( ; it.current(); ++it ) {
735 if ( it.current()->isSelected() ) { 735 if ( it.current()->isSelected() ) {
736 QListIterator<DocLnk> dit( vFiles.children() ); 736 QListIterator<DocLnk> dit( vFiles.children() );
737 for ( ; dit.current(); ++dit ) { 737 for ( ; dit.current(); ++dit ) {
738 if( dit.current()->name() == it.current()->text(0) ) { 738 if( dit.current()->name() == it.current()->text(0) ) {
739 d->selectedFiles->addToSelection( **dit ); 739 d->selectedFiles->addToSelection( **dit );
740 } 740 }
741 } 741 }
742 742
743 videoView->setSelected( it.current(),FALSE); 743 videoView->setSelected( it.current(),FALSE);
744 } 744 }
745 } 745 }
746// for ( int i = 0; i < noOfFiles; i++ ) { 746// for ( int i = 0; i < noOfFiles; i++ ) {
747// QString entryName; 747// QString entryName;
748// entryName.sprintf( "File%i", i + 1 ); 748// entryName.sprintf( "File%i", i + 1 );
749// QString linkFile = cfg.readEntry( entryName ); 749// QString linkFile = cfg.readEntry( entryName );
750// if( DocLnk( linkFile).name() == videoView->selectedItem()->text(0) ) { 750// if( DocLnk( linkFile).name() == videoView->selectedItem()->text(0) ) {
751// int result= QMessageBox::warning(this,tr("OpiePlayer"), 751// int result= QMessageBox::warning(this,tr("OpiePlayer"),
752// tr("This is all ready in your playlist.\nContinue?"), 752// tr("This is all ready in your playlist.\nContinue?"),
753// tr("Yes"),tr("No"),0,0,1); 753// tr("Yes"),tr("No"),0,0,1);
754// if (result !=0) 754// if (result !=0)
755// return; 755// return;
756// } 756// }
757// } 757// }
758// addToSelection( videoView->selectedItem() ); 758// addToSelection( videoView->selectedItem() );
759 tabWidget->setCurrentPage(0); 759 tabWidget->setCurrentPage(0);
760 } 760 }
761 break; 761 break;
762 }; 762 };
763} 763}
764 764
765void PlayListWidget::removeSelected() { 765void PlayListWidget::removeSelected() {
766 d->selectedFiles->removeSelected( ); 766 d->selectedFiles->removeSelected( );
767} 767}
768 768
769void PlayListWidget::playIt( QListViewItem *it) { 769void PlayListWidget::playIt( QListViewItem *it) {
770// d->setDocumentUsed = FALSE; 770// d->setDocumentUsed = FALSE;
771// mediaPlayerState->curPosition =0; 771// mediaPlayerState->curPosition =0;
772 qDebug("playIt"); 772 qDebug("playIt");
773 mediaPlayerState->setPlaying(FALSE); 773 mediaPlayerState->setPlaying(FALSE);
774 mediaPlayerState->setPlaying(TRUE); 774 mediaPlayerState->setPlaying(TRUE);
775 d->selectedFiles->unSelect(); 775 d->selectedFiles->unSelect();
776} 776}
777 777
778void PlayListWidget::addToSelection( QListViewItem *it) { 778void PlayListWidget::addToSelection( QListViewItem *it) {
779 d->setDocumentUsed = FALSE; 779 d->setDocumentUsed = FALSE;
780 780
781 if(it) { 781 if(it) {
782 switch (tabWidget->currentPageIndex()) { 782 switch (tabWidget->currentPageIndex()) {
783 case 1: { 783 case 1: {
784 QListIterator<DocLnk> dit( files.children() ); 784 QListIterator<DocLnk> dit( files.children() );
785 for ( ; dit.current(); ++dit ) { 785 for ( ; dit.current(); ++dit ) {
786 if( dit.current()->name() == it->text(0)) { 786 if( dit.current()->name() == it->text(0)) {
787 d->selectedFiles->addToSelection( **dit ); 787 d->selectedFiles->addToSelection( **dit );
788 } 788 }
789 } 789 }
790 } 790 }
791 break; 791 break;
792 case 2: { 792 case 2: {
793 QListIterator<DocLnk> dit( vFiles.children() ); 793 QListIterator<DocLnk> dit( vFiles.children() );
794 for ( ; dit.current(); ++dit ) { 794 for ( ; dit.current(); ++dit ) {
795 if( dit.current()->name() == it->text(0)) { 795 if( dit.current()->name() == it->text(0)) {
796 d->selectedFiles->addToSelection( **dit ); 796 d->selectedFiles->addToSelection( **dit );
797 } 797 }
798 } 798 }
799 } 799 }
800 break; 800 break;
801 case 0: 801 case 0:
802 break; 802 break;
803 }; 803 };
804 tabWidget->setCurrentPage(0); 804 tabWidget->setCurrentPage(0);
805 } 805 }
806} 806}
807 807
808void PlayListWidget::tabChanged(QWidget *widg) { 808void PlayListWidget::tabChanged(QWidget *widg) {
809 809
810 switch ( tabWidget->currentPageIndex()) { 810 switch ( tabWidget->currentPageIndex()) {
811 case 0: 811 case 0:
812 { 812 {
813 if( !tbDeletePlaylist->isHidden()) 813 if( !tbDeletePlaylist->isHidden())
814 tbDeletePlaylist->hide(); 814 tbDeletePlaylist->hide();
815 d->tbRemoveFromList->setEnabled(TRUE); 815 d->tbRemoveFromList->setEnabled(TRUE);
816 d->tbAddToList->setEnabled(FALSE); 816 d->tbAddToList->setEnabled(FALSE);
817 } 817 }
818 break; 818 break;
819 case 1: 819 case 1:
820 { 820 {
821 audioView->clear(); 821 audioView->clear();
822 populateAudioView(); 822 populateAudioView();
823 823
824 if( !tbDeletePlaylist->isHidden()) 824 if( !tbDeletePlaylist->isHidden())
825 tbDeletePlaylist->hide(); 825 tbDeletePlaylist->hide();
826 d->tbRemoveFromList->setEnabled(FALSE); 826 d->tbRemoveFromList->setEnabled(FALSE);
827 d->tbAddToList->setEnabled(TRUE); 827 d->tbAddToList->setEnabled(TRUE);
828 } 828 }
829 break; 829 break;
830 case 2: 830 case 2:
831 { 831 {
832 videoView->clear(); 832 videoView->clear();
833 populateVideoView(); 833 populateVideoView();
834 if( !tbDeletePlaylist->isHidden()) 834 if( !tbDeletePlaylist->isHidden())
835 tbDeletePlaylist->hide(); 835 tbDeletePlaylist->hide();
836 d->tbRemoveFromList->setEnabled(FALSE); 836 d->tbRemoveFromList->setEnabled(FALSE);
837 d->tbAddToList->setEnabled(TRUE); 837 d->tbAddToList->setEnabled(TRUE);
838 } 838 }
839 break; 839 break;
840 case 3: 840 case 3:
841 { 841 {
842 if( tbDeletePlaylist->isHidden()) 842 if( tbDeletePlaylist->isHidden())
843 tbDeletePlaylist->show(); 843 tbDeletePlaylist->show();
844 playLists->reread(); 844 playLists->reread();
845 } 845 }
846 break; 846 break;
847 }; 847 };
848} 848}
849 849
850void PlayListWidget::btnPlay(bool b) { 850void PlayListWidget::btnPlay(bool b) {
851 851
852// mediaPlayerState->setPlaying(b); 852// mediaPlayerState->setPlaying(b);
853 switch ( tabWidget->currentPageIndex()) { 853 switch ( tabWidget->currentPageIndex()) {
854 case 0: 854 case 0:
855 { 855 {
856// if( d->selectedFiles->current()->file().find(" ",0,TRUE) != -1 856// if( d->selectedFiles->current()->file().find(" ",0,TRUE) != -1
857// if( d->selectedFiles->current()->file().find("%20",0,TRUE) != -1) { 857// if( d->selectedFiles->current()->file().find("%20",0,TRUE) != -1) {
858 QMessageBox::message("Note","You are trying to play\na malformed url."); 858// QMessageBox::message("Note","You are trying to play\na malformed url.");
859// } else { 859// } else {
860 mediaPlayerState->setPlaying(b); 860 mediaPlayerState->setPlaying(b);
861// } 861// }
862 } 862 }
863 break; 863 break;
864 case 1: 864 case 1:
865 { 865 {
866 addToSelection( audioView->currentItem() ); 866 addToSelection( audioView->currentItem() );
867 mediaPlayerState->setPlaying(b); 867 mediaPlayerState->setPlaying(b);
868 d->selectedFiles->removeSelected( ); 868 d->selectedFiles->removeSelected( );
869 tabWidget->setCurrentPage(1); 869 tabWidget->setCurrentPage(1);
870 d->selectedFiles->unSelect(); 870 d->selectedFiles->unSelect();
871 insanityBool=FALSE; 871 insanityBool=FALSE;
872 }// audioView->clearSelection(); 872 }// audioView->clearSelection();
873 break; 873 break;
874 case 2: 874 case 2:
875 { 875 {
876 addToSelection( videoView->currentItem() ); 876 addToSelection( videoView->currentItem() );
877 mediaPlayerState->setPlaying(b); 877 mediaPlayerState->setPlaying(b);
878 qApp->processEvents(); 878 qApp->processEvents();
879 d->selectedFiles->removeSelected( ); 879 d->selectedFiles->removeSelected( );
880 tabWidget->setCurrentPage(2); 880 tabWidget->setCurrentPage(2);
881 d->selectedFiles->unSelect(); 881 d->selectedFiles->unSelect();
882 insanityBool=FALSE; 882 insanityBool=FALSE;
883 }// videoView->clearSelection(); 883 }// videoView->clearSelection();
884 break; 884 break;
885 }; 885 };
886 886
887} 887}
888 888
889void PlayListWidget::deletePlaylist() { 889void PlayListWidget::deletePlaylist() {
890 switch( QMessageBox::information( this, (tr("Remove Playlist?")), 890 switch( QMessageBox::information( this, (tr("Remove Playlist?")),
891 (tr("You really want to delete\nthis playlist?")), 891 (tr("You really want to delete\nthis playlist?")),
892 (tr("Yes")), (tr("No")), 0 )){ 892 (tr("Yes")), (tr("No")), 0 )){
893 case 0: // Yes clicked, 893 case 0: // Yes clicked,
894 QFile().remove(playLists->selected()->file()); 894 QFile().remove(playLists->selected()->file());
895 QFile().remove(playLists->selected()->linkFile()); 895 QFile().remove(playLists->selected()->linkFile());
896 playLists->reread(); 896 playLists->reread();
897 break; 897 break;
898 case 1: // Cancel 898 case 1: // Cancel
899 break; 899 break;
900 }; 900 };
901} 901}
902 902
903void PlayListWidget::viewPressed( int mouse, QListViewItem *item, const QPoint& point, int i) 903void PlayListWidget::viewPressed( int mouse, QListViewItem *item, const QPoint& point, int i)
904{ 904{
905 switch (mouse) { 905 switch (mouse) {
906 case 1: 906 case 1:
907 break; 907 break;
908 case 2:{ 908 case 2:{
909 909
910 QPopupMenu m; 910 QPopupMenu m;
911 m.insertItem( tr( "Play" ), this, SLOT( playSelected() )); 911 m.insertItem( tr( "Play" ), this, SLOT( playSelected() ));
912 m.insertItem( tr( "Add to Playlist" ), this, SLOT( addSelected() )); 912 m.insertItem( tr( "Add to Playlist" ), this, SLOT( addSelected() ));
913 m.insertSeparator(); 913 m.insertSeparator();
914 if( QFile(QPEApplication::qpeDir()+"lib/libopie.so").exists() ) 914 if( QFile(QPEApplication::qpeDir()+"lib/libopie.so").exists() )
915 m.insertItem( tr( "Properties" ), this, SLOT( listDelete() )); 915 m.insertItem( tr( "Properties" ), this, SLOT( listDelete() ));
916 916
917 m.exec( QCursor::pos() ); 917 m.exec( QCursor::pos() );
918 } 918 }
919 break; 919 break;
920 }; 920 };
921} 921}
922 922
923void PlayListWidget::playSelected() 923void PlayListWidget::playSelected()
924{ 924{
925 btnPlay( TRUE); 925 btnPlay( TRUE);
926// d->selectedFiles->unSelect(); 926// d->selectedFiles->unSelect();
927} 927}
928 928
929void PlayListWidget::playlistViewPressed( int mouse, QListViewItem *item, const QPoint& point, int i) 929void PlayListWidget::playlistViewPressed( int mouse, QListViewItem *item, const QPoint& point, int i)
930{ 930{
931 switch (mouse) { 931 switch (mouse) {
932 case 1: 932 case 1:
933 933
934 break; 934 break;
935 case 2:{ 935 case 2:{
936 QPopupMenu m; 936 QPopupMenu m;
937 m.insertItem( tr( "Play Selected" ), this, SLOT( playSelected() )); 937 m.insertItem( tr( "Play Selected" ), this, SLOT( playSelected() ));
938 m.insertItem( tr( "Remove" ), this, SLOT( removeSelected() )); 938 m.insertItem( tr( "Remove" ), this, SLOT( removeSelected() ));
939// m.insertSeparator(); 939// m.insertSeparator();
940// m.insertItem( tr( "Properties" ), this, SLOT( listDelete() )); 940// m.insertItem( tr( "Properties" ), this, SLOT( listDelete() ));
941 m.exec( QCursor::pos() ); 941 m.exec( QCursor::pos() );
942 } 942 }
943 break; 943 break;
944 }; 944 };
945 945
946} 946}
947 947
948void PlayListWidget::listDelete() { 948void PlayListWidget::listDelete() {
949 Config cfg( "OpiePlayer" ); 949 Config cfg( "OpiePlayer" );
950 cfg.setGroup("PlayList"); 950 cfg.setGroup("PlayList");
951 QString currentPlaylist = cfg.readEntry("CurrentPlaylist",""); 951 QString currentPlaylist = cfg.readEntry("CurrentPlaylist","");
952 QString file; 952 QString file;
953 int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 ); 953 int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 );
954 switch ( tabWidget->currentPageIndex()) { 954 switch ( tabWidget->currentPageIndex()) {
955 case 0: 955 case 0:
956 break; 956 break;
957 case 1: 957 case 1:
958 { 958 {
959 file = audioView->selectedItem()->text(0); 959 file = audioView->selectedItem()->text(0);
960// Global::findDocuments(&files, "audio/*"); 960// Global::findDocuments(&files, "audio/*");
961// AppLnkSet appFiles; 961// AppLnkSet appFiles;
962 QListIterator<DocLnk> dit( files.children() ); 962 QListIterator<DocLnk> dit( files.children() );
963 for ( ; dit.current(); ++dit ) { 963 for ( ; dit.current(); ++dit ) {
964 if( dit.current()->name() == file) { 964 if( dit.current()->name() == file) {
965// qDebug(file); 965// qDebug(file);
966 LnkProperties prop( dit.current() ); 966 LnkProperties prop( dit.current() );
967// connect(&prop, SIGNAL(select(const AppLnk *)), this, SLOT(externalSelected(const AppLnk *))); 967// connect(&prop, SIGNAL(select(const AppLnk *)), this, SLOT(externalSelected(const AppLnk *)));
968 prop.showMaximized(); 968 prop.showMaximized();
969 prop.exec(); 969 prop.exec();
970 } 970 }
971 } 971 }
972 populateAudioView(); 972 populateAudioView();
973 } 973 }
974 break; 974 break;
975 case 2: 975 case 2:
976 { 976 {
977// file = videoView->selectedItem()->text(0); 977// file = videoView->selectedItem()->text(0);
978// for ( int i = 0; i < noOfFiles; i++ ) { 978// for ( int i = 0; i < noOfFiles; i++ ) {
979// QString entryName; 979// QString entryName;
980// entryName.sprintf( "File%i", i + 1 ); 980// entryName.sprintf( "File%i", i + 1 );
981// QString linkFile = cfg.readEntry( entryName ); 981// QString linkFile = cfg.readEntry( entryName );
982// AppLnk lnk( AppLnk(linkFile)); 982// AppLnk lnk( AppLnk(linkFile));
983// if( lnk.name() == file ) { 983// if( lnk.name() == file ) {
984// LnkProperties prop( &lnk); 984// LnkProperties prop( &lnk);
985// // connect(&prop, SIGNAL(select(const AppLnk *)), this, SLOT(externalSelected(const AppLnk *))); 985// // connect(&prop, SIGNAL(select(const AppLnk *)), this, SLOT(externalSelected(const AppLnk *)));
986// prop.showMaximized(); 986// prop.showMaximized();
987// prop.exec(); 987// prop.exec();
988// } 988// }
989// } 989// }
990 } 990 }
991 break; 991 break;
992 }; 992 };
993} 993}
994 994
995void PlayListWidget::scanForAudio() { 995void PlayListWidget::scanForAudio() {
996 qDebug("scan for audio"); 996 qDebug("scan for audio");
997 files.detachChildren(); 997 files.detachChildren();
998 QListIterator<DocLnk> sdit( files.children() ); 998 QListIterator<DocLnk> sdit( files.children() );
999 for ( ; sdit.current(); ++sdit ) { 999 for ( ; sdit.current(); ++sdit ) {
1000 delete sdit.current(); 1000 delete sdit.current();
1001 } 1001 }
1002 Global::findDocuments(&files, "audio/*"); 1002 Global::findDocuments(&files, "audio/*");
1003 audioScan = TRUE; 1003 audioScan = TRUE;
1004} 1004}
1005void PlayListWidget::scanForVideo() { 1005void PlayListWidget::scanForVideo() {
1006 qDebug("scan for video"); 1006 qDebug("scan for video");
1007 vFiles.detachChildren(); 1007 vFiles.detachChildren();
1008 QListIterator<DocLnk> sdit( vFiles.children() ); 1008 QListIterator<DocLnk> sdit( vFiles.children() );
1009 for ( ; sdit.current(); ++sdit ) { 1009 for ( ; sdit.current(); ++sdit ) {
1010 delete sdit.current(); 1010 delete sdit.current();
1011 } 1011 }
1012 Global::findDocuments(&vFiles, "video/*"); 1012 Global::findDocuments(&vFiles, "video/*");
1013 videoScan = TRUE; 1013 videoScan = TRUE;
1014} 1014}
1015 1015
1016void PlayListWidget::populateAudioView() { 1016void PlayListWidget::populateAudioView() {
1017 1017
1018 audioView->clear(); 1018 audioView->clear();
1019 StorageInfo storageInfo; 1019 StorageInfo storageInfo;
1020 const QList<FileSystem> &fs = storageInfo.fileSystems(); 1020 const QList<FileSystem> &fs = storageInfo.fileSystems();
1021 if(!audioScan) scanForAudio(); 1021 if(!audioScan) scanForAudio();
1022 1022
1023 QListIterator<DocLnk> dit( files.children() ); 1023 QListIterator<DocLnk> dit( files.children() );
1024 QListIterator<FileSystem> it ( fs ); 1024 QListIterator<FileSystem> it ( fs );
1025 1025
1026 QString storage; 1026 QString storage;
1027 for ( ; dit.current(); ++dit ) { 1027 for ( ; dit.current(); ++dit ) {
1028 for( ; it.current(); ++it ){ 1028 for( ; it.current(); ++it ){
1029 const QString name = (*it)->name(); 1029 const QString name = (*it)->name();
1030 const QString path = (*it)->path(); 1030 const QString path = (*it)->path();
1031 if(dit.current()->file().find(path) != -1 ) storage=name; 1031 if(dit.current()->file().find(path) != -1 ) storage=name;
1032 } 1032 }
1033 1033
1034 QListViewItem * newItem; 1034 QListViewItem * newItem;
1035 if ( QFile( dit.current()->file()).exists() ) { 1035 if ( QFile( dit.current()->file()).exists() ) {
1036// qDebug(dit.current()->name()); 1036// qDebug(dit.current()->name());
1037 newItem= /*(void)*/ new QListViewItem( audioView, dit.current()->name(), 1037 newItem= /*(void)*/ new QListViewItem( audioView, dit.current()->name(),
1038 QString::number( QFile( dit.current()->file()).size() ), storage); 1038 QString::number( QFile( dit.current()->file()).size() ), storage);
1039 newItem->setPixmap(0, Resource::loadPixmap( "opieplayer/musicfile" )); 1039 newItem->setPixmap(0, Resource::loadPixmap( "opieplayer/musicfile" ));
1040 } 1040 }
1041 } 1041 }
1042 1042
1043} 1043}
1044 1044
1045void PlayListWidget::populateVideoView() { 1045void PlayListWidget::populateVideoView() {
1046 videoView->clear(); 1046 videoView->clear();
1047 StorageInfo storageInfo; 1047 StorageInfo storageInfo;
1048 const QList<FileSystem> &fs = storageInfo.fileSystems(); 1048 const QList<FileSystem> &fs = storageInfo.fileSystems();
1049 1049
1050 if(!videoScan ) scanForVideo(); 1050 if(!videoScan ) scanForVideo();
1051 1051
1052 QListIterator<DocLnk> Vdit( vFiles.children() ); 1052 QListIterator<DocLnk> Vdit( vFiles.children() );
1053 QListIterator<FileSystem> it ( fs ); 1053 QListIterator<FileSystem> it ( fs );
1054 videoView->clear(); 1054 videoView->clear();
1055 QString storage; 1055 QString storage;
1056 for ( ; Vdit.current(); ++Vdit ) { 1056 for ( ; Vdit.current(); ++Vdit ) {
1057 for( ; it.current(); ++it ){ 1057 for( ; it.current(); ++it ){
1058 const QString name = (*it)->name(); 1058 const QString name = (*it)->name();
1059 const QString path = (*it)->path(); 1059 const QString path = (*it)->path();
1060 if( Vdit.current()->file().find(path) != -1 ) storage=name; 1060 if( Vdit.current()->file().find(path) != -1 ) storage=name;
1061 } 1061 }
1062 1062
1063 QListViewItem * newItem; 1063 QListViewItem * newItem;
1064 if ( QFile( Vdit.current()->file()).exists() ) { 1064 if ( QFile( Vdit.current()->file()).exists() ) {
1065 newItem= /*(void)*/ new QListViewItem( videoView, Vdit.current()->name(), 1065 newItem= /*(void)*/ new QListViewItem( videoView, Vdit.current()->name(),
1066 QString::number( QFile( Vdit.current()->file()).size() ), storage); 1066 QString::number( QFile( Vdit.current()->file()).size() ), storage);
1067 newItem->setPixmap(0, Resource::loadPixmap( "opieplayer/videofile" )); 1067 newItem->setPixmap(0, Resource::loadPixmap( "opieplayer/videofile" ));
1068 } 1068 }
1069 } 1069 }
1070} 1070}
1071 1071
1072void PlayListWidget::openFile() { 1072void PlayListWidget::openFile() {
1073 QString filename, name; 1073 QString filename, name;
1074 InputDialog *fileDlg; 1074 InputDialog *fileDlg;
1075 fileDlg = new InputDialog(this,tr("Open file or URL"),TRUE, 0); 1075 fileDlg = new InputDialog(this,tr("Open file or URL"),TRUE, 0);
1076 fileDlg->exec(); 1076 fileDlg->exec();
1077 if( fileDlg->result() == 1 ) { 1077 if( fileDlg->result() == 1 ) {
1078 filename = fileDlg->LineEdit1->text(); 1078 filename = fileDlg->LineEdit1->text();
1079// http://205.188.234.129:8030 1079// http://205.188.234.129:8030
1080// http://66.28.68.70:8000 1080// http://66.28.68.70:8000
1081// filename.replace(QRegExp("%20")," "); 1081// filename.replace(QRegExp("%20")," ");
1082 if(filename.find(" ",0,TRUE) != -1 || filename.find("%20",0,TRUE) != -1) { 1082 if(filename.find(" ",0,TRUE) != -1 || filename.find("%20",0,TRUE) != -1) {
1083 QMessageBox::message("Note","Spaces in urls are not allowed."); 1083 QMessageBox::message("Note","Spaces in urls are not allowed.");
1084 return; 1084 return;
1085 } else { 1085 } else {
1086 qDebug("Selected filename is "+filename); 1086 qDebug("Selected filename is "+filename);
1087 if(filename.right(3) == "m3u") 1087 if(filename.right(3) == "m3u")
1088 readm3u( filename); 1088 readm3u( filename);
1089 else if(filename.right(3) == "pls") 1089 else if(filename.right(3) == "pls")
1090 readPls( filename); 1090 readPls( filename);
1091 else { 1091 else {
1092 DocLnk lnk; 1092 DocLnk lnk;
1093 1093
1094 lnk.setName(filename); //sets file name 1094 lnk.setName(filename); //sets file name
1095 if(filename.right(1) != "/" && filename.right(3) != "mp3" && filename.right(3) != "MP3") 1095 if(filename.right(1) != "/" && filename.right(3) != "mp3" && filename.right(3) != "MP3")
1096 filename += "/"; 1096 filename += "/";
1097 lnk.setFile(filename); //sets File property 1097 lnk.setFile(filename); //sets File property
1098 1098
1099 lnk.setType("audio/x-mpegurl"); 1099 lnk.setType("audio/x-mpegurl");
1100 lnk.setExec("opieplayer"); 1100 lnk.setExec("opieplayer");
1101 lnk.setIcon("opieplayer/MPEGPlayer"); 1101 lnk.setIcon("opieplayer/MPEGPlayer");
1102 1102
1103 if(!lnk.writeLink()) 1103 if(!lnk.writeLink())
1104 qDebug("Writing doclink did not work"); 1104 qDebug("Writing doclink did not work");
1105 d->selectedFiles->addToSelection( lnk); 1105 d->selectedFiles->addToSelection( lnk);
1106// if(fileDlg2) 1106// if(fileDlg2)
1107// delete fileDlg2; 1107// delete fileDlg2;
1108 } 1108 }
1109 } 1109 }
1110 } 1110 }
1111 if(fileDlg) 1111 if(fileDlg)
1112 delete fileDlg; 1112 delete fileDlg;
1113} 1113}
1114 1114