fixes for goofy crap going on

1 files changed, 146 insertions, 146 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
@@ -1,22 +1,22 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
-**
-** This file is part of Qtopia Environment.
-**
-** This file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
-**
-** Contact info@trolltech.com if any conditions of this licensing are
-** not clear to you.
-**
-**********************************************************************/
+ ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+ **
+ ** This file is part of Qtopia Environment.
+ **
+ ** This file may be distributed and/or modified under the terms of the
+ ** GNU General Public License version 2 as published by the Free Software
+ ** Foundation and appearing in the file LICENSE.GPL included in the
+ ** packaging of this file.
+ **
+ ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+ ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ **
+ ** See http://www.trolltech.com/gpl/ for GPL licensing information.
+ **
+ ** Contact info@trolltech.com if any conditions of this licensing are
+ ** not clear to you.
+ **
+ **********************************************************************/
 // L.J.Potter added better error code Fri 02-15-2002 14:37:47
 
 
@@ -30,12 +30,11 @@
 #include "qpe/qcopenvelope_qws.h"
 #endif
 
-#ifdef Q_WS_WIN
-#include <windows.h>
-#include <mmsystem.h>
-#include <mmreg.h>
-#endif
-
+// #ifdef Q_WS_WIN
+// #include <windows.h>
+// #include <mmsystem.h>
+// #include <mmreg.h>
+// #endif
 #if defined(Q_WS_X11) || defined(Q_WS_QWS)
 #include <fcntl.h>
 #include <sys/ioctl.h>
@@ -46,18 +45,18 @@
 #include <unistd.h>
 #endif
 
-#if defined(Q_OS_WIN32)
-static const int expectedBytesPerMilliSecond = 2 * 2 * 44000 / 1000;
-static const int timerResolutionMilliSeconds = 30;
-static const int sound_fragment_bytes = timerResolutionMilliSeconds * expectedBytesPerMilliSecond;
-#else
+// #if defined(Q_OS_WIN32)
+// static const int expectedBytesPerMilliSecond = 2 * 2 * 44000 / 1000;
+// static const int timerResolutionMilliSeconds = 30;
+// static const int sound_fragment_bytes = timerResolutionMilliSeconds * expectedBytesPerMilliSecond;
+// #else
 # if defined(QT_QWS_IPAQ)
 static const int sound_fragment_shift = 14;
 # else
 static const int sound_fragment_shift = 16;
 # endif
 static const int sound_fragment_bytes = (1<<sound_fragment_shift);
-#endif
+//#endif
 
 
 class AudioDevicePrivate {
@@ -67,11 +66,11 @@ public:
     unsigned int channels;
     unsigned int bytesPerSample;
     unsigned int bufferSize;
-#ifndef Q_OS_WIN32
+//#ifndef Q_OS_WIN32
     bool can_GETOSPACE;
     char* unwrittenBuffer;
     unsigned int unwritten;
-#endif
+//#endif
 
     static int dspFd;
     static bool muted;
@@ -97,64 +96,64 @@ unsigned int AudioDevicePrivate::rightVolume = 0;
 void AudioDevice::getVolume( unsigned int& leftVolume, unsigned int& rightVolume, bool &muted ) {
     muted = AudioDevicePrivate::muted;
     unsigned int volume;
-#ifdef Q_OS_WIN32
-    HWAVEOUT handle;
-    WAVEFORMATEX formatData;
-    formatData.cbSize = sizeof(WAVEFORMATEX);
-    formatData.wFormatTag = WAVE_FORMAT_PCM;
-    formatData.nAvgBytesPerSec = 4 * 44000;
-    formatData.nBlockAlign = 4;
-    formatData.nChannels = 2;
-    formatData.nSamplesPerSec = 44000;
-    formatData.wBitsPerSample = 16;
-    waveOutOpen(&handle, WAVE_MAPPER, &formatData, 0L, 0L, CALLBACK_NULL);
-    if ( waveOutGetVolume( handle, (LPDWORD)&volume ) )
-//  qDebug( "get volume of audio device failed" );
-    waveOutClose( handle );
-    leftVolume = volume & 0xFFFF;
-    rightVolume = volume >> 16;
-#else
+// #ifdef Q_OS_WIN32
+//     HWAVEOUT handle;
+//     WAVEFORMATEX formatData;
+//     formatData.cbSize = sizeof(WAVEFORMATEX);
+//     formatData.wFormatTag = WAVE_FORMAT_PCM;
+//     formatData.nAvgBytesPerSec = 4 * 44000;
+//     formatData.nBlockAlign = 4;
+//     formatData.nChannels = 2;
+//     formatData.nSamplesPerSec = 44000;
+//     formatData.wBitsPerSample = 16;
+//     waveOutOpen(&handle, WAVE_MAPPER, &formatData, 0L, 0L, CALLBACK_NULL);
+//     if ( waveOutGetVolume( handle, (LPDWORD)&volume ) )
+// //  qDebug( "get volume of audio device failed" );
+//        waveOutClose( handle );
+//     leftVolume = volume & 0xFFFF;
+//     rightVolume = volume >> 16;
+// #else
     int mixerHandle = open( "/dev/mixer", O_RDWR );
     if ( mixerHandle >= 0 ) {
         if(ioctl( mixerHandle, MIXER_READ(0), &volume )==-1)
-        perror("ioctl(\"MIXER_READ\")");
+            perror("ioctl(\"MIXER_READ\")");
         close( mixerHandle );
     } else
         perror("open(\"/dev/mixer\")");
     leftVolume  = ((volume & 0x00FF) << 16) / 101;
     rightVolume = ((volume & 0xFF00) <<  8) / 101;
-#endif
+//#endif
 }
 
 
 void AudioDevice::setVolume( unsigned int leftVolume, unsigned int rightVolume, bool muted ) {
     AudioDevicePrivate::muted = muted;
     if ( muted ) {
-  AudioDevicePrivate::leftVolume = leftVolume;
-  AudioDevicePrivate::rightVolume = rightVolume;
-  leftVolume = 0;
-  rightVolume = 0;
+        AudioDevicePrivate::leftVolume = leftVolume;
+        AudioDevicePrivate::rightVolume = rightVolume;
+        leftVolume = 0;
+        rightVolume = 0;
     } else {
         leftVolume  = ( (int) leftVolume < 0 ) ? 0 : ((  leftVolume > 0xFFFF ) ? 0xFFFF :  leftVolume );
-  rightVolume = ( (int)rightVolume < 0 ) ? 0 : (( rightVolume > 0xFFFF ) ? 0xFFFF : rightVolume );
+        rightVolume = ( (int)rightVolume < 0 ) ? 0 : (( rightVolume > 0xFFFF ) ? 0xFFFF : rightVolume );
     }
-#ifdef Q_OS_WIN32
-    HWAVEOUT handle;
-    WAVEFORMATEX formatData;
-    formatData.cbSize = sizeof(WAVEFORMATEX);
-    formatData.wFormatTag = WAVE_FORMAT_PCM;
-    formatData.nAvgBytesPerSec = 4 * 44000;
-    formatData.nBlockAlign = 4;
-    formatData.nChannels = 2;
-    formatData.nSamplesPerSec = 44000;
-    formatData.wBitsPerSample = 16;
-    waveOutOpen(&handle, WAVE_MAPPER, &formatData, 0L, 0L, CALLBACK_NULL);
-    unsigned int volume = (rightVolume << 16) | leftVolume;
-    if ( waveOutSetVolume( handle, volume ) )
-//  qDebug( "set volume of audio device failed" );
-    waveOutClose( handle );
-#else
-    // Volume can be from 0 to 100 which is 101 distinct values
+// #ifdef Q_OS_WIN32
+//     HWAVEOUT handle;
+//     WAVEFORMATEX formatData;
+//     formatData.cbSize = sizeof(WAVEFORMATEX);
+//     formatData.wFormatTag = WAVE_FORMAT_PCM;
+//     formatData.nAvgBytesPerSec = 4 * 44000;
+//     formatData.nBlockAlign = 4;
+//     formatData.nChannels = 2;
+//     formatData.nSamplesPerSec = 44000;
+//     formatData.wBitsPerSample = 16;
+//     waveOutOpen(&handle, WAVE_MAPPER, &formatData, 0L, 0L, CALLBACK_NULL);
+//     unsigned int volume = (rightVolume << 16) | leftVolume;
+//     if ( waveOutSetVolume( handle, volume ) )
+// //  qDebug( "set volume of audio device failed" );
+//        waveOutClose( handle );
+// #else
+      // Volume can be from 0 to 100 which is 101 distinct values
     unsigned int rV = (rightVolume * 101) >> 16;
 
 # if 0
@@ -169,17 +168,17 @@ void AudioDevice::setVolume( unsigned int leftVolume, unsigned int rightVolume,
         perror("open(\"/dev/mixer\")");
 
 # else
-    // This is the way this has to be done now I guess, doesn't allow for
-    // independant right and left channel setting, or setting for different outputs
+      // This is the way this has to be done now I guess, doesn't allow for
+      // independant right and left channel setting, or setting for different outputs
     Config cfg("Sound");
     cfg.setGroup("System");
     cfg.writeEntry("Volume",(int)rV);
 # endif
 
-#endif
+//#endif
 //    qDebug( "setting volume to: 0x%x", volume ); 
 #if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP)
-    // Send notification that the volume has changed
+      // Send notification that the volume has changed
     QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << muted; 
 #endif
 }
@@ -188,9 +187,9 @@ void AudioDevice::setVolume( unsigned int leftVolume, unsigned int rightVolume,
 
 
 AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) {
-  qDebug("creating new audio device");
+    qDebug("creating new audio device");
     QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE; 
-  d = new AudioDevicePrivate;
+    d = new AudioDevicePrivate;
     d->frequency = f;
     d->channels = chs;
     d->bytesPerSample = bps;
@@ -209,12 +208,12 @@ AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) {
 #ifdef KEEP_DEVICE_OPEN
     if ( AudioDevicePrivate::dspFd == 0 ) {
 #endif
-    if ( ( d->handle = ::open( "/dev/dsp", O_WRONLY ) ) < 0 ) {
-        perror("open(\"/dev/dsp\") sending to /dev/null instead");
-        d->handle = ::open( "/dev/null", O_WRONLY );
-    }
+        if ( ( d->handle = ::open( "/dev/dsp", O_WRONLY ) ) < 0 ) {
+            perror("open(\"/dev/dsp\") sending to /dev/null instead");
+            d->handle = ::open( "/dev/null", O_WRONLY );
+        }
 #ifdef KEEP_DEVICE_OPEN 
-  AudioDevicePrivate::dspFd = d->handle;
+        AudioDevicePrivate::dspFd = d->handle;
     } else {
         d->handle = AudioDevicePrivate::dspFd;
     }
@@ -241,12 +240,12 @@ AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) {
     d->unwritten = 0;
     d->can_GETOSPACE = TRUE; // until we find otherwise
  
-    //if ( chs != d->channels )       qDebug( "Wanted %d, got %d channels", chs, d->channels );
-    //if ( f != d->frequency )        qDebug( "wanted %dHz, got %dHz", f, d->frequency );
-    //if ( capabilities & DSP_CAP_BATCH )   qDebug( "Sound card has local buffer" );
-    //if ( capabilities & DSP_CAP_REALTIME )qDebug( "Sound card has realtime sync" );
-    //if ( capabilities & DSP_CAP_TRIGGER ) qDebug( "Sound card has precise trigger" );
-    //if ( capabilities & DSP_CAP_MMAP )    qDebug( "Sound card can mmap" );
+      //if ( chs != d->channels )       qDebug( "Wanted %d, got %d channels", chs, d->channels );
+      //if ( f != d->frequency )        qDebug( "wanted %dHz, got %dHz", f, d->frequency );
+      //if ( capabilities & DSP_CAP_BATCH )   qDebug( "Sound card has local buffer" );
+      //if ( capabilities & DSP_CAP_REALTIME )qDebug( "Sound card has realtime sync" );
+      //if ( capabilities & DSP_CAP_TRIGGER ) qDebug( "Sound card has precise trigger" );
+      //if ( capabilities & DSP_CAP_MMAP )    qDebug( "Sound card can mmap" );
     QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << FALSE; 
     
 }
@@ -254,17 +253,18 @@ AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) {
 
 AudioDevice::~AudioDevice() {
     qDebug("destryo audiodevice");
-    QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE; 
+    QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE;
     
-#ifdef Q_OS_WIN32
-    waveOutClose( (HWAVEOUT)d->handle );
-#else
+// #ifdef Q_OS_WIN32
+//     waveOutClose( (HWAVEOUT)d->handle );
+// #else
 # ifndef KEEP_DEVICE_OPEN 
     close( d->handle );     // Now it should be safe to shut the handle
 # endif
     delete d->unwrittenBuffer;
     delete d;
-#endif
+//#endif
+    QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << FALSE;
     
 }
 
@@ -277,28 +277,28 @@ void AudioDevice::volumeChanged( bool muted )
 
 void AudioDevice::write( char *buffer, unsigned int length )
 {
-#ifdef Q_OS_WIN32
-    // returns immediately and (to be implemented) emits completedIO() when finished writing
-    WAVEHDR *lpWaveHdr = (WAVEHDR *)malloc( sizeof(WAVEHDR) );
-    // maybe the buffer should be copied so that this fool proof, but its a performance hit
-    lpWaveHdr->lpData = buffer;
-    lpWaveHdr->dwBufferLength = length;
-    lpWaveHdr->dwFlags = 0L;
-    lpWaveHdr->dwLoops = 0L;
-    waveOutPrepareHeader( (HWAVEOUT)d->handle, lpWaveHdr, sizeof(WAVEHDR) );
-    // waveOutWrite returns immediately. the data is sent in the background. 
-    if ( waveOutWrite( (HWAVEOUT)d->handle, lpWaveHdr, sizeof(WAVEHDR) ) )
-  qDebug( "failed to write block to audio device" );
-    // emit completedIO();
-#else
+// #ifdef Q_OS_WIN32
+//     // returns immediately and (to be implemented) emits completedIO() when finished writing
+//     WAVEHDR *lpWaveHdr = (WAVEHDR *)malloc( sizeof(WAVEHDR) );
+//     // maybe the buffer should be copied so that this fool proof, but its a performance hit
+//     lpWaveHdr->lpData = buffer;
+//     lpWaveHdr->dwBufferLength = length;
+//     lpWaveHdr->dwFlags = 0L;
+//     lpWaveHdr->dwLoops = 0L;
+//     waveOutPrepareHeader( (HWAVEOUT)d->handle, lpWaveHdr, sizeof(WAVEHDR) );
+//     // waveOutWrite returns immediately. the data is sent in the background. 
+//     if ( waveOutWrite( (HWAVEOUT)d->handle, lpWaveHdr, sizeof(WAVEHDR) ) )
+//   qDebug( "failed to write block to audio device" );
+//     // emit completedIO();
+// #else
     int t = ::write( d->handle, buffer, length );
     if ( t<0 ) t = 0;
     if ( t != (int)length) {
-  qDebug("Ahhh!! memcpys 1");
-  memcpy(d->unwrittenBuffer,buffer+t,length-t);
-  d->unwritten = length-t;
+        qDebug("Ahhh!! memcpys 1");
+        memcpy(d->unwrittenBuffer,buffer+t,length-t);
+        d->unwritten = length-t;
     }
-#endif
+//#endif
 }
 
 
@@ -327,52 +327,52 @@ unsigned int AudioDevice::bufferSize() const
 
 unsigned int AudioDevice::canWrite() const
 {
-#ifdef Q_OS_WIN32
-    return bufferSize(); // Any better?
-#else
+// #ifdef Q_OS_WIN32
+//     return bufferSize(); // Any better?
+// #else
     audio_buf_info info;
     if ( d->can_GETOSPACE && ioctl(d->handle,SNDCTL_DSP_GETOSPACE,&info) ) {
-  d->can_GETOSPACE = FALSE;
-  fcntl( d->handle, F_SETFL, O_NONBLOCK );
+        d->can_GETOSPACE = FALSE;
+        fcntl( d->handle, F_SETFL, O_NONBLOCK );
     }
     if ( d->can_GETOSPACE ) {
-  int t = info.fragments * sound_fragment_bytes;
-  return QMIN(t,(int)bufferSize());
+        int t = info.fragments * sound_fragment_bytes;
+        return QMIN(t,(int)bufferSize());
     } else {
-  if ( d->unwritten ) {
-      int t = ::write( d->handle, d->unwrittenBuffer, d->unwritten );
-      if ( t<0 ) t = 0;
-      if ( (unsigned)t!=d->unwritten ) {
-    memcpy(d->unwrittenBuffer,d->unwrittenBuffer+t,d->unwritten-t);
-    d->unwritten -= t;
-      } else {
-    d->unwritten = 0;
-      }
-  }
-  if ( d->unwritten )
-      return 0;
-  else
-      return d->bufferSize;
+        if ( d->unwritten ) {
+            int t = ::write( d->handle, d->unwrittenBuffer, d->unwritten );
+            if ( t<0 ) t = 0;
+            if ( (unsigned)t!=d->unwritten ) {
+                memcpy(d->unwrittenBuffer,d->unwrittenBuffer+t,d->unwritten-t);
+                d->unwritten -= t;
+            } else {
+                d->unwritten = 0;
+            }
+        }
+        if ( d->unwritten )
+            return 0;
+        else
+            return d->bufferSize;
     }
-#endif
+//#endif
 }
 
 
 int AudioDevice::bytesWritten() {
-#ifdef Q_OS_WIN32
-    MMTIME pmmt = { TIME_BYTES, 0 };
-    if ( ( waveOutGetPosition( (HWAVEOUT)d->handle, &pmmt, sizeof(MMTIME) ) != MMSYSERR_NOERROR ) || ( pmmt.wType != TIME_BYTES ) ) {
-  qDebug( "failed to get audio device position" );
-  return -1;
-    }
-    return pmmt.u.cb;
-#else
+// #ifdef Q_OS_WIN32
+//     MMTIME pmmt = { TIME_BYTES, 0 };
+//     if ( ( waveOutGetPosition( (HWAVEOUT)d->handle, &pmmt, sizeof(MMTIME) ) != MMSYSERR_NOERROR ) || ( pmmt.wType != TIME_BYTES ) ) {
+//         qDebug( "failed to get audio device position" );
+//         return -1;
+//     }
+//     return pmmt.u.cb;
+// #else
     int buffered = 0;
     if ( ioctl( d->handle, SNDCTL_DSP_GETODELAY, &buffered ) ) {
-  qDebug( "failed to get audio device position" );
-  return -1;
+        qDebug( "failed to get audio device position" );
+        return -1;
     }
     return buffered;
-#endif
+//#endif
 }