Just eradicating bugs. Still not ready for public/general use.

----------------------------------------------------------------------

2 files changed, 108 insertions, 116 deletions

diff --git a/core/applets/vmemo/moc_vmemo.cpp b/core/applets/vmemo/moc_vmemo.cpp
index 7e68ac1..fbe1f6b 100644
--- a/core/applets/vmemo/moc_vmemo.cpp
+++ b/core/applets/vmemo/moc_vmemo.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 ** VMemo meta object code from reading C++ file 'vmemo.h'
 **
-** Created: Wed Feb 13 17:52:12 2002
+** Created: Wed Feb 13 21:49:42 2002
 **      by: The Qt MOC ($Id$)
 **
 ** WARNING! All changes made in this file will be lost!
diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp
index 6bd1622..73bd996 100644
--- a/core/applets/vmemo/vmemo.cpp
+++ b/core/applets/vmemo/vmemo.cpp
@@ -1,4 +1,4 @@
-/**************************************************************************************94x78**
+/************************************************************************************
 **
 ** 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
@@ -8,7 +8,7 @@
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
-*********************************************************************************************/
+************************************************************************************/
 
 /*
  * $Id$
@@ -27,29 +27,29 @@
 #include <stdlib.h>
 
 typedef struct _waveheader {
-  u_long  main_chunk; /* 'RIFF' */
-  u_long  length;   /* filelen */
-  u_long  chunk_type; /* 'WAVE' */
-
-  u_long  sub_chunk;  /* 'fmt ' */
-  u_long  sc_len;   /* length of sub_chunk, =16        (chunckSize)         */
-  u_short format;   /* should be 1 for PCM-code        (formatTag)          */
-  u_short modus;    /* 1 Mono, 2 Stereo                (channels)           */
+  u_long  main_chunk; /* 'RIFF'  */
+  u_long  length;     /* filelen */
+  u_long  chunk_type; /* 'WAVE'  */
+
+  u_long  sub_chunk;  /* 'fmt '                                               */
+  u_long  sc_len;     /* length of sub_chunk, =16        (chunckSize)         */
+  u_short format;     /* should be 1 for PCM-code        (formatTag)          */
+  u_short modus;      /* 1 Mono, 2 Stereo                (channels)           */
   u_long  sample_fq;  /* samples per second              (samplesPerSecond)   */
   u_long  byte_p_sec; /* avg bytes per second            (avgBytePerSecond)   */
   u_short byte_p_spl; /* samplesize; 1 or 2 bytes        (blockAlign)         */
   u_short bit_p_spl;  /* 8, 12 or 16 bit                 (bitsPerSample)      */
 
-  u_long  data_chunk; /* 'data' */
-  u_long  data_length;  /* samplecount */
+  u_long  data_chunk; /* 'data'      */
+  u_long  data_length;/* samplecount */
 } WaveHeader;
 
-#define RIFF    0x46464952
-#define WAVE    0x45564157
-#define FMT   0x20746D66
-#define DATA    0x61746164
-#define PCM_CODE  1
-#define WAVE_MONO 1
+#define RIFF        0x46464952
+#define WAVE        0x45564157
+#define FMT         0x20746D66
+#define DATA        0x61746164
+#define PCM_CODE    1
+#define WAVE_MONO   1
 #define WAVE_STEREO 2
 
 #include "vmemo.h"
@@ -62,6 +62,7 @@ typedef struct _waveheader {
 #include <qdatetime.h>
 #include <qsound.h>
 #include <qfile.h>
+#include <qmessagebox.h>
 
 int seq = 0;
 
@@ -138,16 +139,19 @@ VMemo::VMemo( QWidget *parent, const char *name )
 
   recording = FALSE;
   
-  struct utsname name; //check for embedix kernel running on the zaurus, if lineo change string, this break
-  if (uname(&name) != -1) {
-      QString release=name.release;
-      if(release.find("embedix",0,TRUE) !=-1) {
-          systemZaurus=TRUE;
-          printf("System release: %s\n", name.release);
-      } else
-          systemZaurus=FALSE;
-  }
-
+  struct utsname name; /* check for embedix kernel running on the zaurus, if 
+                                                  lineo change string, this break
+                                           */
+  if (uname(&name) != -1)
+        {
+          QString release=name.release;
+          qWarning("System release: %s\n", name.release);
+          if(release.find("embedix",0,TRUE) !=-1)
+                  systemZaurus=TRUE;
+          else
+                  systemZaurus=FALSE;
+        }
+  
 }
 
 VMemo::~VMemo()
@@ -162,28 +166,35 @@ void VMemo::paintEvent( QPaintEvent* )
 
 void VMemo::mousePressEvent( QMouseEvent * )
 {
+  // just to be safe
+  if (recording)
+        {
+          recording = FALSE;
+          return;
+        }
+
   qWarning("VMemo::mousePress()");
   QSound::play(Resource::findSound("vmemob"));
 
   recording = TRUE;
   qWarning("VMemo::mousePress() -> Starting to record");
   if (openDSP() == -1)
-  {
-    // ### Display an error box
-    qWarning("VMemo::mousePress() -> DSP error");
-    recording = FALSE;
-    return;
-  }
-
+        {
+          // ### Display an error box
+          QMessageBox::critical(0, "VMemo", "Could not open dsp device.", "Abort");
+          recording = FALSE;
+          return;
+        }
+  
   Config vmCfg("VMemo");
   vmCfg.setGroup("Defaults");
 
   QDateTime dt = QDateTime::currentDateTime();
   QString fileName;
   if(systemZaurus)
-      fileName=vmCfg.readEntry("Dir", "/mnt/cf/"); // zaurus does not have /mnt/ramfs
+        fileName=vmCfg.readEntry("Dir", "/mnt/cf/"); // zaurus does not have /mnt/ramfs
   else
-      fileName=vmCfg.readEntry("Dir", "/mnt/ramfs/");
+        fileName=vmCfg.readEntry("Dir", "/mnt/ramfs/");
 
   fileName += "vm_";
   fileName += dt.toString();
@@ -196,13 +207,13 @@ void VMemo::mousePressEvent( QMouseEvent * )
   fileName.replace(QRegExp(","),"");
 
   if(openWAV(fileName.latin1()) == -1)
-  {
-    // ### Display an error box
-    qWarning("VMemo::mousePress() -> WAV error");
-    close(dsp);
-    return;
-  }
-
+        {
+          // ### Display an error box
+          qWarning("VMemo::mousePress() -> WAV error");
+          close(dsp);
+          return;
+        }
+  
   QArray<int> cats(1);
   cats[0] = vmCfg.readNumEntry("Category", 0);
 
@@ -222,7 +233,6 @@ void VMemo::mouseReleaseEvent( QMouseEvent * )
 {
   qWarning("VMemo::mouseRelese() -> Done recording");
   recording = FALSE;
-  QSound::play(Resource::findSound("vmemoe"));
 }
 
 int VMemo::openDSP()
@@ -233,81 +243,64 @@ int VMemo::openDSP()
   speed = cfg.readNumEntry("SampleRate", 11025);
   channels = cfg.readNumEntry("Stereo", 1) ? 2 : 1; // 1 = stereo(2), 0 = mono(1)
   if (cfg.readNumEntry("SixteenBit", 1))
-  {
-    format = AFMT_S16_LE;
-    resolution = 16;
-  }
+        {
+          format = AFMT_S16_LE;
+          resolution = 16;
+        }
   else
-  {
-    format = AFMT_U8;
-    resolution = 8;
-  }
+        {
+          format = AFMT_U8;
+          resolution = 8;
+        }
   
   if(systemZaurus)
-      dsp = open("/dev/dsp1", O_RDWR); //Zaurus needs /dev/dsp1
+        dsp = open("/dev/dsp1", O_RDWR); //Zaurus needs /dev/dsp1
   else 
-      dsp = open("/dev/dsp", O_RDWR);
-
-  qWarning("speed = %i", speed);
-
+        dsp = open("/dev/dsp", O_RDWR);
+  
   if(dsp == -1)
-  {
+        {
       perror("open(\"/dev/dsp\")");
       return -1;
-  }
-
-  if(ioctl(dsp, SNDCTL_DSP_SETFMT , &format)==-1) {
-    perror("ioctl(\"SNDCTL_DSP_SETFMT\")");
-    return -1;
-  }
-  if(ioctl(dsp, SNDCTL_DSP_CHANNELS , &channels)==-1) {
-      perror("ioctl(\"SNDCTL_DSP_CHANNELS\")");
-      return -1;
-  }
-  if(ioctl(dsp, SNDCTL_DSP_SPEED , &speed)==-1) {
-      perror("ioctl(\"SNDCTL_DSP_SPEED\")");
-      return -1;
-  }
-  if(ioctl(dsp, SOUND_PCM_READ_RATE , &rate)==-1)  {
-      perror("ioctl(\"SOUND_PCM_READ_RATE\")");
-      return -1;
-  }
-  qWarning("speed = %i", speed);
-
+        }
+  
+  if(ioctl(dsp, SNDCTL_DSP_SETFMT , &format)==-1)
+        {
+          perror("ioctl(\"SNDCTL_DSP_SETFMT\")");
+          return -1;
+        }
+  if(ioctl(dsp, SNDCTL_DSP_CHANNELS , &channels)==-1)
+        {
+          perror("ioctl(\"SNDCTL_DSP_CHANNELS\")");
+          return -1;
+        }
+  if(ioctl(dsp, SNDCTL_DSP_SPEED , &speed)==-1)
+        {
+          perror("ioctl(\"SNDCTL_DSP_SPEED\")");
+          return -1;
+        }
+  if(ioctl(dsp, SOUND_PCM_READ_RATE , &rate)==-1)
+        {
+          perror("ioctl(\"SOUND_PCM_READ_RATE\")");
+          return -1;
+        }
+  
   return 1;
 }
 
 int VMemo::openWAV(const char *filename)
 {
-  char buffer[256];
-
   qDebug("Creating %s ",filename);
   track.setName(filename);
   if(!track.open(IO_WriteOnly|IO_Truncate|IO_Raw))
-  {
-    qDebug("Could not open file");
-    return -1;
-  }
+        {
+          qDebug("Could not open file");
+          return -1;
+        }
   wav=track.handle();
 
   WaveHeader wh;
 
-  /*
-  wh.main_chunk = RIFF;
-  wh.length     = 0;
-  wh.chunk_type = WAVE;
-  wh.sub_chunk  = FMT;
-  wh.sc_len     = 16;
-  wh.format     = PCM_CODE;
-  wh.modus      = channels;
-  wh.sample_fq  = speed;
-  wh.byte_p_spl = ((resolution == 8) ? 1 : 2) * (channels ? 2 : 1);
-  wh.byte_p_sec = resolution; //speed * wh.modus * wh.byte_p_spl;
-  wh.bit_p_spl  = resolution;
-  wh.data_chunk = DATA;
-  wh.data_length= 0;
-  */
-
   wh.main_chunk = RIFF;
   wh.length     = 0;
   wh.chunk_type = WAVE;
@@ -321,12 +314,6 @@ int VMemo::openWAV(const char *filename)
   wh.byte_p_sec = wh.sample_fq * wh.bit_p_spl;
   wh.byte_p_spl = channels * (wh.bit_p_spl % 8);
 
-  qWarning("channels = %i\n"
-       "samplesPerSecond = %i\n"
-       "avgBytesPerSecond = %i\n"
-       "blockAlign = %i\n"
-       "bitsPerSecond = %i\n", wh.modus, wh.sample_fq, wh.byte_p_sec, wh.byte_p_spl, wh.bit_p_spl);
-
   wh.data_chunk = DATA;
   wh.data_length= 0;
 
@@ -343,13 +330,15 @@ void VMemo::record(void)
   qWarning("VMemo::record()");
 
   while(recording)
-  {
-    result = read(dsp, sound, 8192);
-    write(wav, sound, result);
-    length += result;
-    qApp->processEvents();
-  }
-
+        {
+          result = read(dsp, sound, 512); // 8192
+          qApp->processEvents();
+          write(wav, sound, result);
+          qApp->processEvents();
+          length += result;
+          qApp->processEvents();
+        }
+  
   qWarning("VMemo::record() -> Done recording");
   qWarning("VMemo::record() -> Closing dsp");
 
@@ -361,8 +350,11 @@ void VMemo::record(void)
   track.close();
 
   if( ioctl( dsp, SNDCTL_DSP_RESET,0) == -1)// ); //tell driver to stop for a while
-  perror("ioctl(\"SNDCTL_DSP_RESET\")");
+        perror("ioctl(\"SNDCTL_DSP_RESET\")");
   ::close(dsp);
 
+  qWarning("VMemo::record() -> playing done recording sound");
+  QSound::play(Resource::findSound("vmemoe"));
   qWarning("VMemo::record() -> terminating");
+  QMessageBox::information(0, "VMemo", "Recording Done", 1);
 }