1 files changed, 157 insertions, 105 deletions

diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp
index 48dd193..9d69130 100644
--- a/core/applets/vmemo/vmemo.cpp
+++ b/core/applets/vmemo/vmemo.cpp
@@ -1,64 +1,64 @@
 /************************************************************************************
 **
 ** 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$
  */
-
+// Sun 03-17-2002  L.J.Potter <ljp@llornkcor.com>
 #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) 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>
@@ -96,287 +96,339 @@ static char * vmemo_xpm[] = {
 "(  c #4C4C4C",
 "_  c #353535",
 ":  c #0E0E0E",
 "<  c #080808",
 "[  c #262626",
 "}  c #121212",
 "|  c #7F7F7F",
 "1  c #464646",
 "2  c #0C0C0C",
 "3  c #727272",
 "4  c #292929",
 "5  c #656565",
 "6  c #565656",
 "7  c #434343",
 "8  c #272727",
 "9  c #0F0F0F",
 "0  c #3A3A3A",
 "a  c #090909",
 "b  c #535353",
 "c  c #545454",
 "d  c #494949",
 "e  c #7A7A7A",
 "f  c #202020",
 "g  c #3D3D3D",
 "h  c #1F1F1F",
 "         .+@  ",
 "        #$%&* ",
 "       =-;>,')",
 "       .$;!~,)",
 "        ;#{]!)",
 "        ^~/(_)",
 "       ./:@<[)",
 "  }.  .|]1;;2 ",
 " #-$;^/3&;;4@ ",
 ".$;;#5:67;89  ",
 ":%;0%&ab;8.   ",
 "@cd%e!fg49    ",
 " h0,!_;2@     ",
 "  )))))       "};
 
 VMemo::VMemo( QWidget *parent, const char *name )
     : QWidget( parent, name )
 {
   setFixedHeight( 18 );
   setFixedWidth( 14 );
   
   recording = FALSE;
   
-  myChannel = new QCopChannel( "QPE/VMemo", this );
-  connect( myChannel, SIGNAL(received(const QCString&, const QByteArray&)),
-                   this, SLOT(receive(const QCString&, const QByteArray&)) );
-  
-  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;
-          else
-                {
-                  systemZaurus=FALSE;
-                  
-                  // Register the REC key press.
-                  QCopEnvelope e("QPE/Desktop", "keyRegister(int key, QString channel, QString message)");
-                  e << 4096;
-                  e << QString("QPE/VMemo");
-                  e << QString("toggleRecord()");
-                }
-        }
+  struct utsname name; /* check for embedix kernel running on the zaurus*/
+  if (uname(&name) != -1) {
+      QString release=name.release;
+      if(release.find("embedix",0,TRUE) !=-1)
+          systemZaurus=TRUE;
+      else {
+          systemZaurus=FALSE;
+//            myChannel = new QCopChannel( "QPE/VMemo", this );
+//            connect( myChannel, SIGNAL(received(const QCString&, const QByteArray&)),
+//                     this, SLOT(receive(const QCString&, const QByteArray&)) );
+      
+//              // Register the REC key press, for ipaq only
+//            QCopEnvelope e("QPE/Desktop", "keyRegister(int key, QString channel, QString message)");
+//            e << 4096;
+//            e << QString("QPE/VMemo");
+//            e << QString("toggleRecord()");
+      }
+  }
 }
 
 VMemo::~VMemo()
 {
 }
 
 void VMemo::receive( const QCString &msg, const QByteArray &data )
 {
   QDataStream stream( data, IO_ReadOnly );
   if (msg == "toggleRecord()")
-        {
-          if (recording)
-                mouseReleaseEvent(NULL);
-          else
-                mousePressEvent(NULL);
-        }
+  {
+    if (recording)
+    mouseReleaseEvent(NULL);
+    else
+    mousePressEvent(NULL);
+  }
 }
 
 void VMemo::paintEvent( QPaintEvent* )
 {
   QPainter p(this);
   p.drawPixmap( 0, 1,( const char** )  vmemo_xpm );
 }
 
 void VMemo::mousePressEvent( QMouseEvent *me )
 {
   // just to be safe
   if (recording)
-        {
-          recording = FALSE;
-          return;
-        }
+  {
+    recording = FALSE;
+    return;
+  }
 
   /* 
-         No mousePress/mouseRelease recording on the iPAQ. The REC button on the iPAQ calls these functions
-         mousePressEvent and mouseReleaseEvent with a NULL parameter.
+   No mousePress/mouseRelease recording on the iPAQ. The REC button on the iPAQ calls these functions
+   mousePressEvent and mouseReleaseEvent with a NULL parameter.
   */
-  if (!systemZaurus && me != NULL)
-        return;
+//        if (!systemZaurus && me != NULL)
+//        return;
   
   QSound::play(Resource::findSound("vmemob"));
-  
+  qDebug("Start recording");
   recording = TRUE;
   if (openDSP() == -1)
-        {
-          QMessageBox::critical(0, "VMemo", "Could not open dsp device.", "Abort");
-          recording = FALSE;
-          return;
-        }
+  {
+    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();
   fileName += ".wav";
   
   // No spaces in the filename
   fileName.replace(QRegExp("'"),"");
   fileName.replace(QRegExp(" "),"_");
   fileName.replace(QRegExp(":"),".");
   fileName.replace(QRegExp(","),"");
   
   if(openWAV(fileName.latin1()) == -1)
-        {
-          QString err("Could not open the output file: ");
-          err += fileName;
+  {
+    QString err("Could not open the output file: ");
+    err += fileName;
 
-          QMessageBox::critical(0, "VMemo", err, "Abort");
-          close(dsp);
-          return;
-        }
+    QMessageBox::critical(0, "VMemo", err, "Abort");
+    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 * )
 {
   recording = FALSE;
 }
 
 int VMemo::openDSP()
 {
   Config cfg("Sound");
   cfg.setGroup("Record");
   
   speed = cfg.readNumEntry("SampleRate", 22050);
   channels = cfg.readNumEntry("Stereo", 1) ? 2 : 1; // 1 = stereo(2), 0 = mono(1)
-  if (cfg.readNumEntry("SixteenBit", 1)==1)
-        {
-          format = AFMT_S16_LE;
-          resolution = 16;
-        }
-  else
-        {
-          format = AFMT_U8;
-          resolution = 8;
-        }
+  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(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)
-        {
+  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;
-        }
+  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)
 {
   track.setName(filename);
-  if(!track.open(IO_WriteOnly|IO_Truncate|IO_Raw))
-          return -1;
+  if(!track.open(IO_WriteOnly|IO_Truncate|IO_Raw)) 
+    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_sec = speed * channels *  resolution/8;
   wh.byte_p_spl = channels * (resolution / 8); 
   wh.bit_p_spl  = resolution;
   wh.data_chunk = DATA;
   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[512];
+  qDebug("Recording");
+
+  if(format==AFMT_S16_LE)  {
+    signed short sound[512], monoBuffer[512];
+    while(recording)   {
+      result = read(dsp, sound, 512); // 8192
+      qApp->processEvents();
+      int j=0;
+       if(systemZaurus) {
+             for (int i = 0; i < result; i++) { //since Z is mono do normally
+               monoBuffer[i] = sound[i];
+             }
+             qApp->processEvents();
+             length+=write(wav, monoBuffer, result);
+         } else { //ipaq /stereo inputs
+            for (int i = 0; i < result; i+=2) {
+                monoBuffer[j] = (sound[i]+sound[i+1])/2;
+                j++;
+            }
+            qApp->processEvents();
+            length+=write(wav, monoBuffer, result/2);
+        }
+     printf("%d\r",length);
+     fflush(stdout);
+   }
+  }
+  // else { //AFMT_U8 // don't try this yet.. as player doesn't understand
+// 8bit unsigned
+ //       unsigned short sound[512], monoBuffer[512];
+//       while(recording)
+//   {
+//     result = read(dsp, sound, 512); // 8192
+//     qApp->processEvents();
+//     int j=0;
+//       if(systemZaurus) 
+//         {
+//             for (int i = 0; i < result; i++) { //since Z is mono do normally
+//               monoBuffer[i] = sound[i];
+//           }
+//             qApp->processEvents();
+//             length+=write(wav, monoBuffer, result);
+//         } else { //ipaq /stereo inputs
+//             for (int i = 0; i < result; i+=2) {
+//                 monoBuffer[j] = (sound[i]+sound[i+1])/2;
+//                 j++;
+//             }
+//             qApp->processEvents();
+//             length+=write(wav, monoBuffer, result/2);
+//         }
+// //    length += result;
+//     printf("%d\r",length);
+//     fflush(stdout);
+
+//      qApp->processEvents();
+//    }
+//  }
+
+
   
-  while(recording)
-        {
-          result = read(dsp, sound, 512); // 8192
-          qApp->processEvents();
+//   char sound[512]; //char is 8 bit
+  
+//   while(recording)
+//  {
+//    result = read(dsp, sound, 512); // 8192
+//    qApp->processEvents();
 
-          write(wav, sound, result);
-          length += result;
+//    write(wav, sound, result);
+//    length += result;
 
-          qApp->processEvents();
-        }
+//    qApp->processEvents();
+//  }
+//  qDebug("file has length of %d lasting %d seconds",
+//         length, (( length / speed) / channels) / 2 );
+// medialplayer states wrong length in secs
+  
   
   value = length+36;
   lseek(wav, 4, SEEK_SET);
   write(wav, &value, 4);
   lseek(wav, 40, SEEK_SET);
   write(wav, &length, 4);
   track.close();
   
   if( ioctl( dsp, SNDCTL_DSP_RESET,0) == -1)
-        perror("ioctl(\"SNDCTL_DSP_RESET\")");
+  perror("ioctl(\"SNDCTL_DSP_RESET\")");
   ::close(dsp);
+//  if(systemZaurus)
+        QMessageBox::message("Vmemo"," Done recording");
   
   QSound::play(Resource::findSound("vmemoe"));
 }