Diffstat (limited to 'core/multimedia/opieplayer/audiodevice.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | core/multimedia/opieplayer/audiodevice.cpp | 162 |
1 files changed, 81 insertions, 81 deletions
diff --git a/core/multimedia/opieplayer/audiodevice.cpp b/core/multimedia/opieplayer/audiodevice.cpp index 3262e38..4c5f12d 100644 --- a/core/multimedia/opieplayer/audiodevice.cpp +++ b/core/multimedia/opieplayer/audiodevice.cpp | |||
@@ -21,66 +21,65 @@ | |||
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 "audiodevice.h" | 27 | #include "audiodevice.h" |
28 | 28 | ||
29 | #if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP) | 29 | #if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP) |
30 | #include "qpe/qcopenvelope_qws.h" | 30 | #include "qpe/qcopenvelope_qws.h" |
31 | #endif | 31 | #endif |
32 | 32 | ||
33 | #ifdef Q_WS_WIN | 33 | // #ifdef Q_WS_WIN |
34 | #include <windows.h> | 34 | // #include <windows.h> |
35 | #include <mmsystem.h> | 35 | // #include <mmsystem.h> |
36 | #include <mmreg.h> | 36 | // #include <mmreg.h> |
37 | #endif | 37 | // #endif |
38 | |||
39 | #if defined(Q_WS_X11) || defined(Q_WS_QWS) | 38 | #if defined(Q_WS_X11) || defined(Q_WS_QWS) |
40 | #include <fcntl.h> | 39 | #include <fcntl.h> |
41 | #include <sys/ioctl.h> | 40 | #include <sys/ioctl.h> |
42 | #include <sys/soundcard.h> | 41 | #include <sys/soundcard.h> |
43 | #include <sys/stat.h> | 42 | #include <sys/stat.h> |
44 | #include <sys/time.h> | 43 | #include <sys/time.h> |
45 | #include <sys/types.h> | 44 | #include <sys/types.h> |
46 | #include <unistd.h> | 45 | #include <unistd.h> |
47 | #endif | 46 | #endif |
48 | 47 | ||
49 | #if defined(Q_OS_WIN32) | 48 | // #if defined(Q_OS_WIN32) |
50 | static const int expectedBytesPerMilliSecond = 2 * 2 * 44000 / 1000; | 49 | // static const int expectedBytesPerMilliSecond = 2 * 2 * 44000 / 1000; |
51 | static const int timerResolutionMilliSeconds = 30; | 50 | // static const int timerResolutionMilliSeconds = 30; |
52 | static const int sound_fragment_bytes = timerResolutionMilliSeconds * expectedBytesPerMilliSecond; | 51 | // static const int sound_fragment_bytes = timerResolutionMilliSeconds * expectedBytesPerMilliSecond; |
53 | #else | 52 | // #else |
54 | # if defined(QT_QWS_IPAQ) | 53 | # if defined(QT_QWS_IPAQ) |
55 | static const int sound_fragment_shift = 14; | 54 | static const int sound_fragment_shift = 14; |
56 | # else | 55 | # else |
57 | static const int sound_fragment_shift = 16; | 56 | static const int sound_fragment_shift = 16; |
58 | # endif | 57 | # endif |
59 | static const int sound_fragment_bytes = (1<<sound_fragment_shift); | 58 | static const int sound_fragment_bytes = (1<<sound_fragment_shift); |
60 | #endif | 59 | //#endif |
61 | 60 | ||
62 | 61 | ||
63 | class AudioDevicePrivate { | 62 | class AudioDevicePrivate { |
64 | public: | 63 | public: |
65 | int handle; | 64 | int handle; |
66 | unsigned int frequency; | 65 | unsigned int frequency; |
67 | unsigned int channels; | 66 | unsigned int channels; |
68 | unsigned int bytesPerSample; | 67 | unsigned int bytesPerSample; |
69 | unsigned int bufferSize; | 68 | unsigned int bufferSize; |
70 | #ifndef Q_OS_WIN32 | 69 | //#ifndef Q_OS_WIN32 |
71 | bool can_GETOSPACE; | 70 | bool can_GETOSPACE; |
72 | char* unwrittenBuffer; | 71 | char* unwrittenBuffer; |
73 | unsigned int unwritten; | 72 | unsigned int unwritten; |
74 | #endif | 73 | //#endif |
75 | 74 | ||
76 | static int dspFd; | 75 | static int dspFd; |
77 | static bool muted; | 76 | static bool muted; |
78 | static unsigned int leftVolume; | 77 | static unsigned int leftVolume; |
79 | static unsigned int rightVolume; | 78 | static unsigned int rightVolume; |
80 | }; | 79 | }; |
81 | 80 | ||
82 | 81 | ||
83 | #ifdef Q_WS_QWS | 82 | #ifdef Q_WS_QWS |
84 | // This is for keeping the device open in-between playing files when | 83 | // This is for keeping the device open in-between playing files when |
85 | // the device makes clicks and it starts to drive you insane! :) | 84 | // the device makes clicks and it starts to drive you insane! :) |
86 | // Best to have the device not open when not using it though | 85 | // Best to have the device not open when not using it though |
@@ -88,104 +87,104 @@ public: | |||
88 | #endif | 87 | #endif |
89 | 88 | ||
90 | 89 | ||
91 | int AudioDevicePrivate::dspFd = 0; | 90 | int AudioDevicePrivate::dspFd = 0; |
92 | bool AudioDevicePrivate::muted = FALSE; | 91 | bool AudioDevicePrivate::muted = FALSE; |
93 | unsigned int AudioDevicePrivate::leftVolume = 0; | 92 | unsigned int AudioDevicePrivate::leftVolume = 0; |
94 | unsigned int AudioDevicePrivate::rightVolume = 0; | 93 | unsigned int AudioDevicePrivate::rightVolume = 0; |
95 | 94 | ||
96 | 95 | ||
97 | void AudioDevice::getVolume( unsigned int& leftVolume, unsigned int& rightVolume, bool &muted ) { | 96 | void AudioDevice::getVolume( unsigned int& leftVolume, unsigned int& rightVolume, bool &muted ) { |
98 | muted = AudioDevicePrivate::muted; | 97 | muted = AudioDevicePrivate::muted; |
99 | unsigned int volume; | 98 | unsigned int volume; |
100 | #ifdef Q_OS_WIN32 | 99 | // #ifdef Q_OS_WIN32 |
101 | HWAVEOUT handle; | 100 | // HWAVEOUT handle; |
102 | WAVEFORMATEX formatData; | 101 | // WAVEFORMATEX formatData; |
103 | formatData.cbSize = sizeof(WAVEFORMATEX); | 102 | // formatData.cbSize = sizeof(WAVEFORMATEX); |
104 | formatData.wFormatTag = WAVE_FORMAT_PCM; | 103 | // formatData.wFormatTag = WAVE_FORMAT_PCM; |
105 | formatData.nAvgBytesPerSec = 4 * 44000; | 104 | // formatData.nAvgBytesPerSec = 4 * 44000; |
106 | formatData.nBlockAlign = 4; | 105 | // formatData.nBlockAlign = 4; |
107 | formatData.nChannels = 2; | 106 | // formatData.nChannels = 2; |
108 | formatData.nSamplesPerSec = 44000; | 107 | // formatData.nSamplesPerSec = 44000; |
109 | formatData.wBitsPerSample = 16; | 108 | // formatData.wBitsPerSample = 16; |
110 | waveOutOpen(&handle, WAVE_MAPPER, &formatData, 0L, 0L, CALLBACK_NULL); | 109 | // waveOutOpen(&handle, WAVE_MAPPER, &formatData, 0L, 0L, CALLBACK_NULL); |
111 | if ( waveOutGetVolume( handle, (LPDWORD)&volume ) ) | 110 | // if ( waveOutGetVolume( handle, (LPDWORD)&volume ) ) |
112 | // qDebug( "get volume of audio device failed" ); | 111 | // // qDebug( "get volume of audio device failed" ); |
113 | waveOutClose( handle ); | 112 | // waveOutClose( handle ); |
114 | leftVolume = volume & 0xFFFF; | 113 | // leftVolume = volume & 0xFFFF; |
115 | rightVolume = volume >> 16; | 114 | // rightVolume = volume >> 16; |
116 | #else | 115 | // #else |
117 | int mixerHandle = open( "/dev/mixer", O_RDWR ); | 116 | int mixerHandle = open( "/dev/mixer", O_RDWR ); |
118 | if ( mixerHandle >= 0 ) { | 117 | if ( mixerHandle >= 0 ) { |
119 | if(ioctl( mixerHandle, MIXER_READ(0), &volume )==-1) | 118 | if(ioctl( mixerHandle, MIXER_READ(0), &volume )==-1) |
120 | perror("ioctl(\"MIXER_READ\")"); | 119 | perror("ioctl(\"MIXER_READ\")"); |
121 | close( mixerHandle ); | 120 | close( mixerHandle ); |
122 | } else | 121 | } else |
123 | perror("open(\"/dev/mixer\")"); | 122 | perror("open(\"/dev/mixer\")"); |
124 | leftVolume = ((volume & 0x00FF) << 16) / 101; | 123 | leftVolume = ((volume & 0x00FF) << 16) / 101; |
125 | rightVolume = ((volume & 0xFF00) << 8) / 101; | 124 | rightVolume = ((volume & 0xFF00) << 8) / 101; |
126 | #endif | 125 | //#endif |
127 | } | 126 | } |
128 | 127 | ||
129 | 128 | ||
130 | void AudioDevice::setVolume( unsigned int leftVolume, unsigned int rightVolume, bool muted ) { | 129 | void AudioDevice::setVolume( unsigned int leftVolume, unsigned int rightVolume, bool muted ) { |
131 | AudioDevicePrivate::muted = muted; | 130 | AudioDevicePrivate::muted = muted; |
132 | if ( muted ) { | 131 | if ( muted ) { |
133 | AudioDevicePrivate::leftVolume = leftVolume; | 132 | AudioDevicePrivate::leftVolume = leftVolume; |
134 | AudioDevicePrivate::rightVolume = rightVolume; | 133 | AudioDevicePrivate::rightVolume = rightVolume; |
135 | leftVolume = 0; | 134 | leftVolume = 0; |
136 | rightVolume = 0; | 135 | rightVolume = 0; |
137 | } else { | 136 | } else { |
138 | leftVolume = ( (int) leftVolume < 0 ) ? 0 : (( leftVolume > 0xFFFF ) ? 0xFFFF : leftVolume ); | 137 | leftVolume = ( (int) leftVolume < 0 ) ? 0 : (( leftVolume > 0xFFFF ) ? 0xFFFF : leftVolume ); |
139 | rightVolume = ( (int)rightVolume < 0 ) ? 0 : (( rightVolume > 0xFFFF ) ? 0xFFFF : rightVolume ); | 138 | rightVolume = ( (int)rightVolume < 0 ) ? 0 : (( rightVolume > 0xFFFF ) ? 0xFFFF : rightVolume ); |
140 | } | 139 | } |
141 | #ifdef Q_OS_WIN32 | 140 | // #ifdef Q_OS_WIN32 |
142 | HWAVEOUT handle; | 141 | // HWAVEOUT handle; |
143 | WAVEFORMATEX formatData; | 142 | // WAVEFORMATEX formatData; |
144 | formatData.cbSize = sizeof(WAVEFORMATEX); | 143 | // formatData.cbSize = sizeof(WAVEFORMATEX); |
145 | formatData.wFormatTag = WAVE_FORMAT_PCM; | 144 | // formatData.wFormatTag = WAVE_FORMAT_PCM; |
146 | formatData.nAvgBytesPerSec = 4 * 44000; | 145 | // formatData.nAvgBytesPerSec = 4 * 44000; |
147 | formatData.nBlockAlign = 4; | 146 | // formatData.nBlockAlign = 4; |
148 | formatData.nChannels = 2; | 147 | // formatData.nChannels = 2; |
149 | formatData.nSamplesPerSec = 44000; | 148 | // formatData.nSamplesPerSec = 44000; |
150 | formatData.wBitsPerSample = 16; | 149 | // formatData.wBitsPerSample = 16; |
151 | waveOutOpen(&handle, WAVE_MAPPER, &formatData, 0L, 0L, CALLBACK_NULL); | 150 | // waveOutOpen(&handle, WAVE_MAPPER, &formatData, 0L, 0L, CALLBACK_NULL); |
152 | unsigned int volume = (rightVolume << 16) | leftVolume; | 151 | // unsigned int volume = (rightVolume << 16) | leftVolume; |
153 | if ( waveOutSetVolume( handle, volume ) ) | 152 | // if ( waveOutSetVolume( handle, volume ) ) |
154 | // qDebug( "set volume of audio device failed" ); | 153 | // // qDebug( "set volume of audio device failed" ); |
155 | waveOutClose( handle ); | 154 | // waveOutClose( handle ); |
156 | #else | 155 | // #else |
157 | // Volume can be from 0 to 100 which is 101 distinct values | 156 | // Volume can be from 0 to 100 which is 101 distinct values |
158 | unsigned int rV = (rightVolume * 101) >> 16; | 157 | unsigned int rV = (rightVolume * 101) >> 16; |
159 | 158 | ||
160 | # if 0 | 159 | # if 0 |
161 | unsigned int lV = (leftVolume * 101) >> 16; | 160 | unsigned int lV = (leftVolume * 101) >> 16; |
162 | unsigned int volume = ((rV << 8) & 0xFF00) | (lV & 0x00FF); | 161 | unsigned int volume = ((rV << 8) & 0xFF00) | (lV & 0x00FF); |
163 | int mixerHandle = 0; | 162 | int mixerHandle = 0; |
164 | if ( ( mixerHandle = open( "/dev/mixer", O_RDWR ) ) >= 0 ) { | 163 | if ( ( mixerHandle = open( "/dev/mixer", O_RDWR ) ) >= 0 ) { |
165 | if(ioctl( mixerHandle, MIXER_WRITE(0), &volume ) ==-1) | 164 | if(ioctl( mixerHandle, MIXER_WRITE(0), &volume ) ==-1) |
166 | perror("ioctl(\"MIXER_WRITE\")"); | 165 | perror("ioctl(\"MIXER_WRITE\")"); |
167 | close( mixerHandle ); | 166 | close( mixerHandle ); |
168 | } else | 167 | } else |
169 | perror("open(\"/dev/mixer\")"); | 168 | perror("open(\"/dev/mixer\")"); |
170 | 169 | ||
171 | # else | 170 | # else |
172 | // This is the way this has to be done now I guess, doesn't allow for | 171 | // This is the way this has to be done now I guess, doesn't allow for |
173 | // independant right and left channel setting, or setting for different outputs | 172 | // independant right and left channel setting, or setting for different outputs |
174 | Config cfg("Sound"); | 173 | Config cfg("Sound"); |
175 | cfg.setGroup("System"); | 174 | cfg.setGroup("System"); |
176 | cfg.writeEntry("Volume",(int)rV); | 175 | cfg.writeEntry("Volume",(int)rV); |
177 | # endif | 176 | # endif |
178 | 177 | ||
179 | #endif | 178 | //#endif |
180 | // qDebug( "setting volume to: 0x%x", volume ); | 179 | // qDebug( "setting volume to: 0x%x", volume ); |
181 | #if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP) | 180 | #if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP) |
182 | // Send notification that the volume has changed | 181 | // Send notification that the volume has changed |
183 | QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << muted; | 182 | QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << muted; |
184 | #endif | 183 | #endif |
185 | } | 184 | } |
186 | 185 | ||
187 | 186 | ||
188 | 187 | ||
189 | 188 | ||
190 | AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) { | 189 | AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) { |
191 | qDebug("creating new audio device"); | 190 | qDebug("creating new audio device"); |
@@ -247,67 +246,68 @@ AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) { | |||
247 | //if ( capabilities & DSP_CAP_REALTIME )qDebug( "Sound card has realtime sync" ); | 246 | //if ( capabilities & DSP_CAP_REALTIME )qDebug( "Sound card has realtime sync" ); |
248 | //if ( capabilities & DSP_CAP_TRIGGER ) qDebug( "Sound card has precise trigger" ); | 247 | //if ( capabilities & DSP_CAP_TRIGGER ) qDebug( "Sound card has precise trigger" ); |
249 | //if ( capabilities & DSP_CAP_MMAP ) qDebug( "Sound card can mmap" ); | 248 | //if ( capabilities & DSP_CAP_MMAP ) qDebug( "Sound card can mmap" ); |
250 | QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << FALSE; | 249 | QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << FALSE; |
251 | 250 | ||
252 | } | 251 | } |
253 | 252 | ||
254 | 253 | ||
255 | AudioDevice::~AudioDevice() { | 254 | AudioDevice::~AudioDevice() { |
256 | qDebug("destryo audiodevice"); | 255 | qDebug("destryo audiodevice"); |
257 | QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE; | 256 | QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE; |
258 | 257 | ||
259 | #ifdef Q_OS_WIN32 | 258 | // #ifdef Q_OS_WIN32 |
260 | waveOutClose( (HWAVEOUT)d->handle ); | 259 | // waveOutClose( (HWAVEOUT)d->handle ); |
261 | #else | 260 | // #else |
262 | # ifndef KEEP_DEVICE_OPEN | 261 | # ifndef KEEP_DEVICE_OPEN |
263 | close( d->handle ); // Now it should be safe to shut the handle | 262 | close( d->handle ); // Now it should be safe to shut the handle |
264 | # endif | 263 | # endif |
265 | delete d->unwrittenBuffer; | 264 | delete d->unwrittenBuffer; |
266 | delete d; | 265 | delete d; |
267 | #endif | 266 | //#endif |
267 | QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << FALSE; | ||
268 | 268 | ||
269 | } | 269 | } |
270 | 270 | ||
271 | 271 | ||
272 | void AudioDevice::volumeChanged( bool muted ) | 272 | void AudioDevice::volumeChanged( bool muted ) |
273 | { | 273 | { |
274 | AudioDevicePrivate::muted = muted; | 274 | AudioDevicePrivate::muted = muted; |
275 | } | 275 | } |
276 | 276 | ||
277 | 277 | ||
278 | void AudioDevice::write( char *buffer, unsigned int length ) | 278 | void AudioDevice::write( char *buffer, unsigned int length ) |
279 | { | 279 | { |
280 | #ifdef Q_OS_WIN32 | 280 | // #ifdef Q_OS_WIN32 |
281 | // returns immediately and (to be implemented) emits completedIO() when finished writing | 281 | // // returns immediately and (to be implemented) emits completedIO() when finished writing |
282 | WAVEHDR *lpWaveHdr = (WAVEHDR *)malloc( sizeof(WAVEHDR) ); | 282 | // WAVEHDR *lpWaveHdr = (WAVEHDR *)malloc( sizeof(WAVEHDR) ); |
283 | // maybe the buffer should be copied so that this fool proof, but its a performance hit | 283 | // // maybe the buffer should be copied so that this fool proof, but its a performance hit |
284 | lpWaveHdr->lpData = buffer; | 284 | // lpWaveHdr->lpData = buffer; |
285 | lpWaveHdr->dwBufferLength = length; | 285 | // lpWaveHdr->dwBufferLength = length; |
286 | lpWaveHdr->dwFlags = 0L; | 286 | // lpWaveHdr->dwFlags = 0L; |
287 | lpWaveHdr->dwLoops = 0L; | 287 | // lpWaveHdr->dwLoops = 0L; |
288 | waveOutPrepareHeader( (HWAVEOUT)d->handle, lpWaveHdr, sizeof(WAVEHDR) ); | 288 | // waveOutPrepareHeader( (HWAVEOUT)d->handle, lpWaveHdr, sizeof(WAVEHDR) ); |
289 | // waveOutWrite returns immediately. the data is sent in the background. | 289 | // // waveOutWrite returns immediately. the data is sent in the background. |
290 | if ( waveOutWrite( (HWAVEOUT)d->handle, lpWaveHdr, sizeof(WAVEHDR) ) ) | 290 | // if ( waveOutWrite( (HWAVEOUT)d->handle, lpWaveHdr, sizeof(WAVEHDR) ) ) |
291 | qDebug( "failed to write block to audio device" ); | 291 | // qDebug( "failed to write block to audio device" ); |
292 | // emit completedIO(); | 292 | // // emit completedIO(); |
293 | #else | 293 | // #else |
294 | int t = ::write( d->handle, buffer, length ); | 294 | int t = ::write( d->handle, buffer, length ); |
295 | if ( t<0 ) t = 0; | 295 | if ( t<0 ) t = 0; |
296 | if ( t != (int)length) { | 296 | if ( t != (int)length) { |
297 | qDebug("Ahhh!! memcpys 1"); | 297 | qDebug("Ahhh!! memcpys 1"); |
298 | memcpy(d->unwrittenBuffer,buffer+t,length-t); | 298 | memcpy(d->unwrittenBuffer,buffer+t,length-t); |
299 | d->unwritten = length-t; | 299 | d->unwritten = length-t; |
300 | } | 300 | } |
301 | #endif | 301 | //#endif |
302 | } | 302 | } |
303 | 303 | ||
304 | 304 | ||
305 | unsigned int AudioDevice::channels() const | 305 | unsigned int AudioDevice::channels() const |
306 | { | 306 | { |
307 | return d->channels; | 307 | return d->channels; |
308 | } | 308 | } |
309 | 309 | ||
310 | 310 | ||
311 | unsigned int AudioDevice::frequency() const | 311 | unsigned int AudioDevice::frequency() const |
312 | { | 312 | { |
313 | return d->frequency; | 313 | return d->frequency; |
@@ -318,61 +318,61 @@ unsigned int AudioDevice::bytesPerSample() const | |||
318 | { | 318 | { |
319 | return d->bytesPerSample; | 319 | return d->bytesPerSample; |
320 | } | 320 | } |
321 | 321 | ||
322 | 322 | ||
323 | unsigned int AudioDevice::bufferSize() const | 323 | unsigned int AudioDevice::bufferSize() const |
324 | { | 324 | { |
325 | return d->bufferSize; | 325 | return d->bufferSize; |
326 | } | 326 | } |
327 | 327 | ||
328 | unsigned int AudioDevice::canWrite() const | 328 | unsigned int AudioDevice::canWrite() const |
329 | { | 329 | { |
330 | #ifdef Q_OS_WIN32 | 330 | // #ifdef Q_OS_WIN32 |
331 | return bufferSize(); // Any better? | 331 | // return bufferSize(); // Any better? |
332 | #else | 332 | // #else |
333 | audio_buf_info info; | 333 | audio_buf_info info; |
334 | if ( d->can_GETOSPACE && ioctl(d->handle,SNDCTL_DSP_GETOSPACE,&info) ) { | 334 | if ( d->can_GETOSPACE && ioctl(d->handle,SNDCTL_DSP_GETOSPACE,&info) ) { |
335 | d->can_GETOSPACE = FALSE; | 335 | d->can_GETOSPACE = FALSE; |
336 | fcntl( d->handle, F_SETFL, O_NONBLOCK ); | 336 | fcntl( d->handle, F_SETFL, O_NONBLOCK ); |
337 | } | 337 | } |
338 | if ( d->can_GETOSPACE ) { | 338 | if ( d->can_GETOSPACE ) { |
339 | int t = info.fragments * sound_fragment_bytes; | 339 | int t = info.fragments * sound_fragment_bytes; |
340 | return QMIN(t,(int)bufferSize()); | 340 | return QMIN(t,(int)bufferSize()); |
341 | } else { | 341 | } else { |
342 | if ( d->unwritten ) { | 342 | if ( d->unwritten ) { |
343 | int t = ::write( d->handle, d->unwrittenBuffer, d->unwritten ); | 343 | int t = ::write( d->handle, d->unwrittenBuffer, d->unwritten ); |
344 | if ( t<0 ) t = 0; | 344 | if ( t<0 ) t = 0; |
345 | if ( (unsigned)t!=d->unwritten ) { | 345 | if ( (unsigned)t!=d->unwritten ) { |
346 | memcpy(d->unwrittenBuffer,d->unwrittenBuffer+t,d->unwritten-t); | 346 | memcpy(d->unwrittenBuffer,d->unwrittenBuffer+t,d->unwritten-t); |
347 | d->unwritten -= t; | 347 | d->unwritten -= t; |
348 | } else { | 348 | } else { |
349 | d->unwritten = 0; | 349 | d->unwritten = 0; |
350 | } | 350 | } |
351 | } | 351 | } |
352 | if ( d->unwritten ) | 352 | if ( d->unwritten ) |
353 | return 0; | 353 | return 0; |
354 | else | 354 | else |
355 | return d->bufferSize; | 355 | return d->bufferSize; |
356 | } | 356 | } |
357 | #endif | 357 | //#endif |
358 | } | 358 | } |
359 | 359 | ||
360 | 360 | ||
361 | int AudioDevice::bytesWritten() { | 361 | int AudioDevice::bytesWritten() { |
362 | #ifdef Q_OS_WIN32 | 362 | // #ifdef Q_OS_WIN32 |
363 | MMTIME pmmt = { TIME_BYTES, 0 }; | 363 | // MMTIME pmmt = { TIME_BYTES, 0 }; |
364 | if ( ( waveOutGetPosition( (HWAVEOUT)d->handle, &pmmt, sizeof(MMTIME) ) != MMSYSERR_NOERROR ) || ( pmmt.wType != TIME_BYTES ) ) { | 364 | // if ( ( waveOutGetPosition( (HWAVEOUT)d->handle, &pmmt, sizeof(MMTIME) ) != MMSYSERR_NOERROR ) || ( pmmt.wType != TIME_BYTES ) ) { |
365 | qDebug( "failed to get audio device position" ); | 365 | // qDebug( "failed to get audio device position" ); |
366 | return -1; | 366 | // return -1; |
367 | } | 367 | // } |
368 | return pmmt.u.cb; | 368 | // return pmmt.u.cb; |
369 | #else | 369 | // #else |
370 | int buffered = 0; | 370 | int buffered = 0; |
371 | if ( ioctl( d->handle, SNDCTL_DSP_GETODELAY, &buffered ) ) { | 371 | if ( ioctl( d->handle, SNDCTL_DSP_GETODELAY, &buffered ) ) { |
372 | qDebug( "failed to get audio device position" ); | 372 | qDebug( "failed to get audio device position" ); |
373 | return -1; | 373 | return -1; |
374 | } | 374 | } |
375 | return buffered; | 375 | return buffered; |
376 | #endif | 376 | //#endif |
377 | } | 377 | } |
378 | 378 | ||