changed header file, and zaurus mono input

1 files changed, 24 insertions, 18 deletions

diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp
index 73bd996..83f19f5 100644
--- a/core/applets/vmemo/vmemo.cpp
+++ b/core/applets/vmemo/vmemo.cpp
@@ -1,91 +1,93 @@
 /************************************************************************************
 **
 ** 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.
 **
 ************************************************************************************/
 
 /*
  * $Id$
  */
 
 #include <sys/utsname.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <linux/soundcard.h>
 #include <string.h>
 #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_long  sc_len;     /* length of sub_chunk, =16     
+                         (chunckSize) format len */
   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 */
 } WaveHeader;
 
 #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"
 
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 #include <qpe/config.h>
 
 #include <qpainter.h>
 #include <qdatetime.h>
 #include <qsound.h>
 #include <qfile.h>
 #include <qmessagebox.h>
 
 int seq = 0;
 
 /* XPM */
 static char * vmemo_xpm[] = {
 "14 14 47 1",
 "   c None",
 ".  c #101010",
 "+  c #0D0D0D",
 "@  c #0B0B0B",
 "#  c #393939",
 "$  c #6C6C6C",
 "%  c #5D5D5D",
 "&  c #4E4E4E",
 "*  c #1C1C1C",
 "=  c #131313",
 "-  c #7B7B7B",
 ";  c #303030",
 ">  c #383838",
 ",  c #3F3F3F",
 "'  c #343434",
 ")  c #060606",
 "!  c #444444",
 "~  c #646464",
 "{  c #505050",
 "]  c #717171",
@@ -197,164 +199,168 @@ void VMemo::mousePressEvent( QMouseEvent * )
 	fileName=vmCfg.readEntry("Dir", "/mnt/ramfs/");
 
   fileName += "vm_";
   fileName += dt.toString();
   fileName += ".wav";
 
   // No spaces in the filename
   fileName.replace(QRegExp("'"),"");
   fileName.replace(QRegExp(" "),"_");
   fileName.replace(QRegExp(":"),".");
   fileName.replace(QRegExp(","),"");
 
   if(openWAV(fileName.latin1()) == -1)
 	{
 	  // ### Display an error box
 	  qWarning("VMemo::mousePress() -> WAV error");
 	  close(dsp);
 	  return;
 	}
   
   QArray<int> cats(1);
   cats[0] = vmCfg.readNumEntry("Category", 0);
 
   QString dlName("vm_");
   dlName += dt.toString();
   DocLnk l;
   l.setFile(fileName);
   l.setName(dlName);
   l.setType("audio/x-wav");
   l.setCategories(cats);
   l.writeLink();
 
   record();
 }
 
 void VMemo::mouseReleaseEvent( QMouseEvent * )
 {
   qWarning("VMemo::mouseRelese() -> Done recording");
   recording = FALSE;
 }
 
 int VMemo::openDSP()
 {
   Config cfg("Sound");
   cfg.setGroup("Record");
 
   speed = cfg.readNumEntry("SampleRate", 11025);
   channels = cfg.readNumEntry("Stereo", 1) ? 2 : 1; // 1 = stereo(2), 0 = mono(1)
-  if (cfg.readNumEntry("SixteenBit", 1))
+  if (cfg.readNumEntry("SixteenBit", 1)==1)
 	{
 	  format = AFMT_S16_LE;
 	  resolution = 16;
 	}
   else
 	{
 	  format = AFMT_U8;
 	  resolution = 8;
 	}
   
   if(systemZaurus)
+  {
 	dsp = open("/dev/dsp1", O_RDWR); //Zaurus needs /dev/dsp1
+  channels=1; //zaurus has one input channel
+  }
   else 
 	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;
 	}
   
   return 1;
 }
 
 int VMemo::openWAV(const char *filename)
 {
   qDebug("Creating %s ",filename);
   track.setName(filename);
   if(!track.open(IO_WriteOnly|IO_Truncate|IO_Raw))
 	{
 	  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.bit_p_spl  = resolution;
-  wh.byte_p_sec = wh.sample_fq * wh.bit_p_spl;
-  wh.byte_p_spl = channels * (wh.bit_p_spl % 8);
-
+  wh.main_chunk = RIFF;// RIFF
+  wh.chunk_type = WAVE;//WAVE
+  wh.sub_chunk  = FMT;// fmt
+  wh.sc_len     = 16;// format length = 16
+  wh.format     = PCM_CODE;// PCM
+  wh.modus      = channels;// channels
+  wh.sample_fq  = speed;//samplerate
+  wh.byte_p_sec = speed * channels *  resolution/8;// av bytes per second
+  wh.byte_p_spl = channels * (resolution / 8);  //block align
+  wh.bit_p_spl  = resolution;//bits per sample 8, or 16
   wh.data_chunk = DATA;
-  wh.data_length= 0;
-
+  wh.data_length= 0; // <---
+//    qDebug("Write header channels %d, speed %d, b/s %d, blockalign %d, bitrate %d"
+//           , wh.modus, wh.sample_fq, wh.byte_p_sec, wh.byte_p_spl, wh.bit_p_spl );
   write (wav, &wh, sizeof(WaveHeader));
 
   return 1;
 }
 
 void VMemo::record(void)
 {
   int length=0, result, value;
   char sound[8192];
 
   qWarning("VMemo::record()");
 
   while(recording)
 	{
 	  result = read(dsp, sound, 512); // 8192
 	  qApp->processEvents();
 	  write(wav, sound, result);
 	  qApp->processEvents();
 	  length += result;
 	  qApp->processEvents();
+//    printf("%d\r",length);
+//    fflush(stdout);
 	}
   
   qWarning("VMemo::record() -> Done recording");
   qWarning("VMemo::record() -> Closing dsp");
 
   value = length+36;
   lseek(wav, 4, SEEK_SET);
   write(wav, &value, 4);
   lseek(wav, 40, SEEK_SET);
   write(wav, &length, 4);
+//  qDebug("File length %d, samplecount %d", value, length);
   track.close();
 
   if( ioctl( dsp, SNDCTL_DSP_RESET,0) == -1)// ); //tell driver to stop for a while
 	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);
 }