1 files changed, 101 insertions, 49 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
@@ -10,13 +10,13 @@
 **
 ************************************************************************************/
 
 /*
  * $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>
@@ -138,33 +138,28 @@ VMemo::VMemo( QWidget *parent, const char *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)
-        {
+  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
-                {
+      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()");
+//            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()
 {
@@ -198,17 +193,17 @@ void VMemo::mousePressEvent( QMouseEvent *me )
         }
 
   /* 
          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;
@@ -269,54 +264,46 @@ 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)
-        {
+  if (cfg.readNumEntry("SixteenBit", 1)==1)  {
           format = AFMT_S16_LE;
           resolution = 16;
         }
-  else
-        {
-          format = AFMT_U8;
-          resolution = 8;
-        }
+//    else  {
+//      format = AFMT_U8;
+//      resolution = 8;
+//    }
   
-  if(systemZaurus) 
-        {
+  if(systemZaurus) {
           dsp = open("/dev/dsp1", O_RDWR); //Zaurus needs /dev/dsp1
           channels=1; //zaurus has one input channel
-        }
-  else 
+  }  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)
-        {
+  if(ioctl(dsp, SNDCTL_DSP_SETFMT , &format)==-1)  {
           perror("ioctl(\"SNDCTL_DSP_SETFMT\")");
           return -1;
         }
-  if(ioctl(dsp, SNDCTL_DSP_CHANNELS , &channels)==-1)
-        {
+  if(ioctl(dsp, SNDCTL_DSP_CHANNELS , &channels)==-1)  {
           perror("ioctl(\"SNDCTL_DSP_CHANNELS\")");
           return -1;
         }
-  if(ioctl(dsp, SNDCTL_DSP_SPEED , &speed)==-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)
-        {
+  if(ioctl(dsp, SOUND_PCM_READ_RATE , &rate)==-1)  {
           perror("ioctl(\"SOUND_PCM_READ_RATE\")");
           return -1;
         }
   
   return 1;
 }
@@ -351,32 +338,97 @@ int VMemo::openWAV(const char *filename)
   return 1;
 }
 
 void VMemo::record(void)
 {
   int length=0, result, value;
-  char sound[512];
+  qDebug("Recording");
   
-  while(recording)
-        {
+  if(format==AFMT_S16_LE)  {
+    signed short sound[512], monoBuffer[512];
+    while(recording)   {
           result = read(dsp, sound, 512); // 8192
           qApp->processEvents();
-
-          write(wav, sound, result);
-          length += result;
-
+      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();
+//    }
+//  }
+
+
+  
+//   char sound[512]; //char is 8 bit
+  
+//   while(recording)
+//  {
+//    result = read(dsp, sound, 512); // 8192
+//    qApp->processEvents();
+
+//    write(wav, sound, result);
+//    length += result;
+
+//    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\")");
   ::close(dsp);
+//  if(systemZaurus)
+        QMessageBox::message("Vmemo"," Done recording");
   
   QSound::play(Resource::findSound("vmemoe"));
 }