fucked up- no workie.. back out

5 files changed, 292 insertions, 147 deletions

diff --git a/core/multimedia/opieplayer/wavplugin/Makefile.in b/core/multimedia/opieplayer/wavplugin/Makefile.in
index a46b925..bcbe7f2 100644
--- a/core/multimedia/opieplayer/wavplugin/Makefile.in
+++ b/core/multimedia/opieplayer/wavplugin/Makefile.in
@@ -100,12 +100,10 @@ REQUIRES=
 ####### Compile
 
 wavplugin.o: wavplugin.cpp \
-		wavplugin.h \
-		../mediaplayerplugininterface.h
+		wavplugin.h
 
 wavpluginimpl.o: wavpluginimpl.cpp \
 		wavplugin.h \
-		../mediaplayerplugininterface.h \
 		wavpluginimpl.h
 
 
diff --git a/core/multimedia/opieplayer/wavplugin/wavplugin.cpp b/core/multimedia/opieplayer/wavplugin/wavplugin.cpp
index 7f63b3b..0be667f 100644
--- a/core/multimedia/opieplayer/wavplugin/wavplugin.cpp
+++ b/core/multimedia/opieplayer/wavplugin/wavplugin.cpp
@@ -17,8 +17,6 @@
 ** not clear to you.
 **
 **********************************************************************/
-// L.J.Potter added changes Fri 02-15-2002
-
 #include <stdio.h>
 #include <stdarg.h>
 #include <stdlib.h>
@@ -27,7 +25,6 @@
 #include <qfile.h>
 #include "wavplugin.h"
 
-
 //#define debugMsg(a)     qDebug(a)
 #define debugMsg(a)
 
@@ -49,7 +46,7 @@ struct ChunkData {
 };
 
 
-const int sound_buffer_size = 512; // 4096; // you got to be kidding right?
+const int sound_buffer_size = 4096;
 
 
 class WavPluginData {
@@ -63,134 +60,293 @@ public:
     int out,max;
     int samples_due;
     int samples;
-
+    int freq;
+    int chan;
+    int sampleRate;
+    int resolution;
+    
     WavPluginData() {
-  max = out = sound_buffer_size;
-  wavedata_remaining = 0;
-  samples_due = 0;
-  samples = -1;
+        max = out = sound_buffer_size;
+        wavedata_remaining = 0;
+        samples_due = 0;
+        samples = -1;
     }
 
-    // expands out samples to the frequency of 44kHz
+      // expands out samples to the frequency of 44kHz
     bool add( short *output, long count, long& done, bool stereo )
-    {
-  done = 0;
-    qApp->processEvents();
-
-  if ( input == 0 ) {
-      qDebug("no input");
-      return FALSE;
-  }
-
-        while ( count ) {
-            int l,r;
-            if ( getSample(l, r) == FALSE ) {
-                qDebug("didn't get sample");
+        {
+            qDebug("add");
+            done = 0;
+
+            if ( input == 0 ) {
+                qDebug("no input");
                 return FALSE;
             }
-              samples_due += chunkdata.samplesPerSec;
-             while ( count && (samples_due > chunkdata.samplesPerSec) ) {
-                *output++ = l;
-                if ( stereo )
-                    *output++ = r;
-                samples_due -= chunkdata.samplesPerSec;
-                count--;
-                done++;
+
+            while ( count ) {
+                int l,r;
+                if ( getSample(l, r) == FALSE ) {
+                    qDebug("didn't get sample");
+                    return FALSE;
+                }
+                samples_due += 44100;
+                while ( count && (samples_due > chunkdata.samplesPerSec) ) {
+                    *output++ = l;
+                    if ( stereo )
+                        *output++ = r;
+                    samples_due -= chunkdata.samplesPerSec;
+                    count--;
+                    done++;
+                }
             }
+
+            return TRUE;
         }
-        return TRUE;
-    }
 
     bool initialise() {
-  if ( input == 0 )
-      return FALSE;
+        qDebug("initialize");
+ if ( input == 0 )
+            return FALSE;
+
+        wavedata_remaining = -1;
+
+        while ( wavedata_remaining == -1 ) {
+              // Keep reading chunks...
+            const int n = sizeof(chunk) - sizeof(chunk.data);
+            int t = input->readBlock( (char*)&chunk, n );
+            if ( t != n ) {
+                if ( t == -1 )
+                    return FALSE;
+                return TRUE;
+            }
+            if ( qstrncmp(chunk.id,"data",4) == 0 ) {
+                samples = wavedata_remaining = chunk.size;
+            } else if ( qstrncmp(chunk.id,"RIFF",4) == 0 ) {
+                char d[4];
+                if ( input->readBlock(d,4) != 4 ) {
+                    return FALSE;
+                }
+                if ( qstrncmp(d,"WAVE",4) != 0 ) {
+                      // skip
+                    if ( chunk.size > 1000000000 || !input->at(input->at()+chunk.size-4) ) {
+                        return FALSE;
+                    }
+                }
+            } else if ( qstrncmp(chunk.id,"fmt ",4) == 0 ) {
+                if ( input->readBlock((char*)&chunkdata,sizeof(chunkdata)) != sizeof(chunkdata) ) {
+                    return FALSE;
+                }
+#define WAVE_FORMAT_PCM 1
+                if ( chunkdata.formatTag != WAVE_FORMAT_PCM ) {
+                    qDebug("WAV file: UNSUPPORTED FORMAT %d",chunkdata.formatTag);
+                      return FALSE;
+                }
+            }
 
-  wavedata_remaining = -1;
 
-  while ( wavedata_remaining == -1 ) {
-      // Keep reading chunks...
-      const int n = sizeof(chunk) - sizeof(chunk.data);
-      int t = input->readBlock( (char*)&chunk, n );
-      if ( t != n ) {
-    if ( t == -1 )
-        return FALSE;
-    return TRUE;
-      }
-      if ( qstrncmp(chunk.id,"data",4) == 0 ) {
-    samples = wavedata_remaining = chunk.size;
-      } else if ( qstrncmp(chunk.id,"RIFF",4) == 0 ) {
-    char d[4];
-    if ( input->readBlock(d,4) != 4 ) {
-        return FALSE;
-    }
-    if ( qstrncmp(d,"WAVE",4) != 0 ) {
-        // skip
-        if ( chunk.size > 1000000000 || !input->at(input->at()+chunk.size-4) ) {
-      return FALSE;
-        }
-    }
-      } else if ( qstrncmp(chunk.id,"fmt ",4) == 0 ) {
-    if ( input->readBlock((char*)&chunkdata,sizeof(chunkdata)) != sizeof(chunkdata) ) {
-        return FALSE;
-    }
-#define WAVE_FORMAT_PCM 1
-    if ( chunkdata.formatTag != WAVE_FORMAT_PCM ) {
-        qDebug("WAV file: UNSUPPORTED FORMAT %d",chunkdata.formatTag);
-        return FALSE;
-    }
-      } else {
-    // ignored chunk
-    if ( chunk.size > 1000000000 || !input->at(input->at()+chunk.size) ) {
-        return FALSE;
-    }
-      }
-  } // while
-  qDebug("bits %d", chunkdata.wBitsPerSample);
-  return TRUE;
+
+            
+            else {
+                  // ignored chunk
+                if ( chunk.size > 1000000000 || !input->at(input->at()+chunk.size) ) {
+                    return FALSE;
+                }
+            }
+        } // while
+
+        return TRUE;
     }
 
 
-    // gets a sample from the file
+      // gets a sample from the file
     bool getSample(int& l, int& r)
-    {
-  l = r = 0;
+        {
+            l = r = 0;
 
-  if ( input == 0 )
-      return FALSE;
+            if ( input == 0 )
+                return FALSE;
 
-  if ( (wavedata_remaining < 0) || !max )
-      return FALSE;
+            if ( (wavedata_remaining < 0) || !max )
+                return FALSE;
 
-  if ( out >= max ) {
-      max = input->readBlock( (char*)data, (uint)QMIN(sound_buffer_size,wavedata_remaining) );
+            if ( out >= max ) {
+                max = input->readBlock( (char*)data, (uint)QMIN(sound_buffer_size,wavedata_remaining) );
 
-      wavedata_remaining -= max;
+                wavedata_remaining -= max;
 
-      out = 0;
-      if ( max <= 0 ) {
-    max = 0;
-    return TRUE;
-      }
-  }
-  if ( chunkdata.wBitsPerSample == 8 ) {
-      l = (data[out++] - 128) * 128;
-  } else {
-      l = ((short*)data)[out/2];
-      out += 2;
-  }
-  if ( chunkdata.channels == 1 ) {
-      r = l;
-  } else {
-      if ( chunkdata.wBitsPerSample == 8 ) {
-    r = (data[out++] - 128) * 128;
-      } else {
-    r = ((short*)data)[out/2];
-    out += 2;
-      }
-  }
-  return TRUE;
-    } // getSample
+                out = 0;
+                if ( max <= 0 ) {
+                    max = 0;
+                    return TRUE;
+                }
+            }
+            if ( resolution == 8 ) {
+                l = (data[out++] - 128) * 128;
+            } else {
+                l = ((short*)data)[out/2];
+                out += 2;
+            }
+            if ( chan == 1 ) {
+                r = l;
+            } else {
+                if ( resolution == 8 ) {
+                    r = (data[out++] - 128) * 128;
+                } else {
+                    r = ((short*)data)[out/2];
+                    out += 2;
+                }
+            }
+            return TRUE;
+        } // getSample
+
+//////////////////////////////////////////////////////
+int getWavSettings(int fd)
+{ //this came from wmrecord
+
+    char t1[4];
+    unsigned long l1;
+    int found;
+    short fmt;
+    unsigned short ch, brate;
+    unsigned long srate;
+
+
+      /* First read in the RIFF identifier. If this is missing then the
+       * file is not a valid WAVE file.
+       */
+    if (read(fd, t1, 4)<4) {
+        qDebug(" Could not read from sound file.\n");
+        return -1;
+    }
+    if (strncmp(t1, "RIFF", 4)) {
+        qDebug(" not a valid WAV file.\n");
+        return -1;
+    }
+      /* Advance the file pointer to the next relevant field. */
+    lseek(fd, 4, SEEK_CUR);
+      /* Read in the WAVE identifier. */
+    if (read(fd, t1, 4)<4) {
+        qDebug("Could not read from sound file.\n");
+        return -1;
+    }
+    if (strncmp(t1, "WAVE", 4)) {
+        qDebug("not a valid WAV file.\n");
+        return -1;
+    }
 
+      /* Search through the file for the format chunk. If the end of the
+       * file is reached without finding the chunk, then the file is not a
+       * valid WAVE file.
+       */
+    found = 0;
+    while (!found) {
+        if (read(fd, t1, 4)<4) {
+            qDebug("Could not read from sound file.\n");
+            return -1;
+        }
+        if (strncmp(t1, "fmt ", 4)) {
+              /* Determine the length of the chunk found and skip to the next
+               * chunk. The chunk length is always stored in the four bytes
+               * following the chunk id.
+               */
+            if (read(fd, &l1, 4)<4) {
+                qDebug("Could not read from sound file.\n");
+                return -1;
+            }
+            lseek(fd, l1, SEEK_CUR);
+        }
+        else {
+              /* This is the format chunk, which stores the playback settings
+               * for the recording.
+               */
+              /* Skip the length field, since we don't really need it. */
+            lseek(fd, 4, SEEK_CUR);
+              /* Read in the format tag. If it has a value of 1, then there is
+               * no compression and we can attempt to play the file
+               * back. Otherwise, return.
+               */
+            if (read(fd, &fmt, 2)<2) {
+                qDebug("Could not read from format chunk.\n");
+                return -1;
+            }
+            if (fmt != 1) {
+                qDebug("Wave file contains compressed data."
+                       " Unable to continue.\n");
+                return -1;
+            }
+              /* Get the stereo mode. */
+            if (read(fd, &ch, 2)<2) {
+                qDebug("Could not read from format chunk.\n");
+                return -1;
+            }
+            else {
+                chan = ch;
+                qDebug("File has %d channels", chan);
+            }
+              /* Get the sample rate. */
+            if (read(fd, &srate, 4)<4) {
+                qDebug("Could not read from format chunk.\n");
+                return -1;
+            }
+            else {
+                sampleRate = srate;
+                qDebug("File has samplerate of %d", sampleRate);
+            }
+              /* Get the bit rate. This is at the end of the format chunk. */
+            lseek(fd, 6, SEEK_CUR);
+            if (read(fd, &brate, 2)<2) {
+                qDebug("Could not read from format chunk.\n");
+                return -1;
+            }
+            else {
+                resolution =  brate;
+                qDebug("File has bitrate of %d", resolution);
+            }
+
+            found++;
+        }
+    }
+
+      /* Search through the file for the data chunk. If the end of the
+       * file is reached without finding the chunk, then the file is not a
+       * valid WAVE file.
+       */
+    found = 0;
+    while (!found) {
+        if (read(fd, t1, 4)<4) {
+            qDebug("Could not read from sound file.\n");
+            return -1;
+        }
+        if (strncmp(t1, "data", 4)) {
+              /* Determine the length of the chunk found and skip to the next
+               * chunk. The chunk length is always stored in the four bytes
+               * following the chunk id.
+               */
+            if (read(fd, &l1, 4)<4) {
+                qDebug("Could not read from sound file.\n");
+                return -1;
+            }
+            lseek(fd, l1, SEEK_CUR);
+        }
+        else {
+              /* This is the data chunk, which stores the recording. */
+              /* Get the length field. */
+            if (read(fd, &l1, 4)<4) {
+                qDebug("Could not read from sound file.\n");
+                return -1;
+            }
+            else  {
+                samples =l1;
+                qDebug("file has length of %d\nlasting %d seconds",l1, (( l1 / sampleRate) / chan) / 2 ); // ????
+                return l1;
+            }
+        }
+    }
+
+    return 0;
+}
+    
+//////////////////////////////////////////////////   
 };
 
 
@@ -207,7 +363,7 @@ WavPlugin::~WavPlugin() {
 
 
 bool WavPlugin::isFileSupported( const QString& path ) {
-//    qDebug( "WavPlugin::isFileSupported" );
+    debugMsg( "WavPlugin::isFileSupported" );
 
     char *ext = strrchr( path.latin1(), '.' );
 
@@ -226,7 +382,7 @@ bool WavPlugin::isFileSupported( const QString& path ) {
 
 
 bool WavPlugin::open( const QString& path ) {
-//    qDebug( "WavPlugin::open" );
+    qDebug( "WavPlugin::open" );
 
     d->max = d->out = sound_buffer_size;
     d->wavedata_remaining = 0;
@@ -234,12 +390,13 @@ bool WavPlugin::open( const QString& path ) {
 
     d->input = new QFile( path );
     if ( d->input->open(IO_ReadOnly) == FALSE ) {
-  qDebug("couldn't open file");
-  delete d->input;
-  d->input = 0;
-  return FALSE;
+        qDebug("couldn't open file");
+        delete d->input;
+        d->input = 0;
+        return FALSE;
     }
-
+   
+//    d->getWavSettings( d->input.handle());
     d->initialise();
 
     return TRUE;
@@ -247,7 +404,7 @@ bool WavPlugin::open( const QString& path ) {
 
 
 bool WavPlugin::close() {
-//    qDebug( "WavPlugin::close" );
+    qDebug( "WavPlugin::close" );
 
     d->input->close();
     delete d->input;
@@ -257,44 +414,45 @@ bool WavPlugin::close() {
 
 
 bool WavPlugin::isOpen() {
-//    qDebug( "WavPlugin::isOpen" );
+    qDebug( "WavPlugin::isOpen" );
     return ( d->input != 0 );
 }
 
 
 int WavPlugin::audioStreams() {
-//    qDebug( "WavPlugin::audioStreams" );
+    qDebug( "WavPlugin::audioStreams" );
     return 1;
 }
 
 
 int WavPlugin::audioChannels( int ) {
-//    qDebug( "WavPlugin::audioChannels" );
-    return d->chunkdata.channels;// 2; // ### Always scale audio to stereo samples
+    debugMsg( "WavPlugin::audioChannels" );
+    return d->chan;
 }
 
 
 int WavPlugin::audioFrequency( int ) {
-//    qDebug( "WavPlugin::audioFrequency %d", d->chunkdata.samplesPerSec );
-    return  d->chunkdata.samplesPerSec; //44100; // ### Always scale to frequency of 44100
+    qDebug( "WavPlugin::audioFrequency" );
+    return d->freq;
 }
 
 
 int WavPlugin::audioSamples( int ) {
-//    qDebug( "WavPlugin::audioSamples" );
-    return d->samples / d->chunkdata.channels/2; // ### Scaled samples will be made stereo,
-        // Therefore if source is mono we will double the number of samples
+    qDebug( "WavPlugin::audioSamples" );
+    return d->samples; 
+//      return d->samples * 2 / d->chunkdata.channels; // ### Scaled samples will be made stereo,
+//          // Therefore if source is mono we will double the number of samples
 }
 
 
 bool WavPlugin::audioSetSample( long, int ) {
-//    qDebug( "WavPlugin::audioSetSample" );
+    qDebug( "WavPlugin::audioSetSample" );
     return FALSE;
 }
 
 
 long WavPlugin::audioGetSample( int ) {
-//    qDebug( "WavPlugin::audioGetSample" );
+    qDebug( "WavPlugin::audioGetSample" );
     return 0;
 }
 
@@ -324,18 +482,13 @@ bool WavPlugin::audioReadStereoSamples( short *output, long samples, long& sampl
 */
 
 bool WavPlugin::audioReadSamples( short *output, int channels, long samples, long& samplesMade, int ) {
-//    qDebug( "WavPlugin::audioReadSamples" );
+    qDebug( "WavPlugin::audioReadSamples" );
     return d->add( output, samples, samplesMade, channels != 1 );
 }
 
 double WavPlugin::getTime() {
-//    qDebug( "WavPlugin::getTime" );
+    qDebug( "WavPlugin::getTime" );
     return 0.0;
 }
 
-int WavPlugin::audioBitsPerSample( int ) {
-//    qDebug( "WavPlugin::audioFormat %d", d->chunkdata.wBitsPerSample );
-    return d->chunkdata.wBitsPerSample; // 
-}
-
 
diff --git a/core/multimedia/opieplayer/wavplugin/wavplugin.h b/core/multimedia/opieplayer/wavplugin/wavplugin.h
index 6afd67e..19d1a8e 100644
--- a/core/multimedia/opieplayer/wavplugin/wavplugin.h
+++ b/core/multimedia/opieplayer/wavplugin/wavplugin.h
@@ -17,15 +17,12 @@
 ** not clear to you.
 **
 **********************************************************************/
-// L.J.Potter added changes Fri 02-15-2002
-
 #ifndef WAV_PLUGIN_H 
 #define WAV_PLUGIN_H
 
-
 #include <qstring.h>
 #include <qapplication.h>
-#include "../mediaplayerplugininterface.h"
+#include <qpe/mediaplayerplugininterface.h>
 
 
 // #define OLD_MEDIAPLAYER_API
@@ -54,7 +51,6 @@ public:
     int audioStreams();
     int audioChannels( int stream ); 
     int audioFrequency( int stream );
-    int audioBitsPerSample( int stream );
     int audioSamples( int stream );
     bool audioSetSample( long sample, int stream );
     long audioGetSample( int stream );
diff --git a/core/multimedia/opieplayer/wavplugin/wavpluginimpl.cpp b/core/multimedia/opieplayer/wavplugin/wavpluginimpl.cpp
index 1f7b85b..2923180 100644
--- a/core/multimedia/opieplayer/wavplugin/wavpluginimpl.cpp
+++ b/core/multimedia/opieplayer/wavplugin/wavpluginimpl.cpp
@@ -20,7 +20,6 @@
 #include "wavplugin.h"
 #include "wavpluginimpl.h"
 
-
 WavPluginImpl::WavPluginImpl()
     : libmadplugin(0), ref(0)
 {
diff --git a/core/multimedia/opieplayer/wavplugin/wavpluginimpl.h b/core/multimedia/opieplayer/wavplugin/wavpluginimpl.h
index ee32f54..71f5f20 100644
--- a/core/multimedia/opieplayer/wavplugin/wavpluginimpl.h
+++ b/core/multimedia/opieplayer/wavplugin/wavpluginimpl.h
@@ -20,8 +20,7 @@
 #ifndef WAV_PLUGIN_IMPL_H 
 #define WAV_PLUGIN_IMPL_H
 
-
-#include "../mediaplayerplugininterface.h"
+#include <qpe/mediaplayerplugininterface.h>
 
 
 class WavPlugin;