2 files changed, 33 insertions, 65 deletions

diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp
index 5ce6fa9..006e0ba 100644
--- a/core/applets/vmemo/vmemo.cpp
+++ b/core/applets/vmemo/vmemo.cpp
@@ -125,129 +125,87 @@ static char * vmemo_xpm[] = {
 "        ;#{]!)",
 "        ^~/(_)",
 "       ./:@<[)",
 "  }.  .|]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(sayHi()), this, SLOT(sayHi()) );
   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;
           qWarning("System release: %s\n", name.release);
           if(release.find("embedix",0,TRUE) !=-1)
                   systemZaurus=TRUE;
           else
                 {
-                  int fr;
                   systemZaurus=FALSE;
-
-                  if ((fr = fork()) == -1)
-                        {
-                          qWarning("Fork failed");
-                        }
-                  else if (fr == 0)
-                        {
-                          int key, max;
-                          fd_set fdr;
-                          char buffer[10];
-
-                          key = open("/dev/touchscreen/key", O_RDONLY);
-                          if (key == -1)
-                                {
-                                  qWarning("Could not open key");
-                                  exit(1);
-                                }
-
-                          while(1)
-                                {
-                                  FD_ZERO(&fdr);
-                                  FD_SET(key, &fdr);
-                                  max = key;
-
-                                  qWarning("while");
-
-                                  read(key, buffer, 10);
-                                  if(*buffer == (char)129)
-                                        {
-                                          qWarning("REC = stop");
-                                          QCopEnvelope( "QPE/VMemo", "toggleRecord()");
-                                          QCopEnvelope( "QPE/VMemo", "sayHi()");
-                                        }
-                                  else if(*buffer == (char)1)
-                                        {
-                                          qWarning("REC = start");
-                                          QCopEnvelope( "QPE/VMemo", "toggleRecord()");
-                                          QCopEnvelope( "QPE/VMemo", "sayHi()");
-                                        }
-                                }
-                        }
-                  else if(fr)
-                        qWarning("parent: Fork = good");
+                  
+                  // 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()");
                 }
         }
   qWarning("VMemo done init");
 }
 
 VMemo::~VMemo()
 {
 }
 
-void VMemo::sayHi()
-{
-  qWarning("Hi");
-}
-
 void VMemo::receive( const QCString &msg, const QByteArray &data )
 {
     QDataStream stream( data, IO_ReadOnly );
-        qWarning(msg);
-    if ( msg == "toggleRecord()" ) {
-          qWarning("Hello");
-    }
+        qWarning("VMemo::receive: %s", (const char *)msg);
+        if (msg == "toggleRecord()")
+          {
+                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 * )
 {
-  QCopEnvelope( "QPE/VMemo", "sayHi()");
-
   // 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
           QMessageBox::critical(0, "VMemo", "Could not open dsp device.", "Abort");
@@ -382,53 +340,64 @@ int VMemo::openWAV(const char *filename)
   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[8192];
+  int length=0, result, value; //, i;
+  char sound[512]; //, leftBuffer[256], rightBuffer[256];
   
   qWarning("VMemo::record()");
   
   while(recording)
         {
           result = read(dsp, sound, 512); // 8192
           qApp->processEvents();
-          write(wav, sound, result);
+
+          /* attempt to write only one channel...didnt work.
+          for (i = 0; i < result; i++) {
+                leftBuffer[i] = sound[2*i];
+                rightBuffer[i] = sound[2*i+1];
+          }
+          */
           qApp->processEvents();
+
+          /* needed to only write one channel. comment out above "write/length" code.
+          write(wav, leftBuffer, result / 2);
+          length += result/2;
+          */
+
+          write(wav, sound, result);
           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)
         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);
 }
diff --git a/core/applets/vmemo/vmemo.h b/core/applets/vmemo/vmemo.h
index 824309e..d96cd94 100644
--- a/core/applets/vmemo/vmemo.h
+++ b/core/applets/vmemo/vmemo.h
@@ -23,33 +23,32 @@
 #include <qfile.h>
 #include <qpe/qcopenvelope_qws.h>
 
 class VMemo : public QWidget
 {
   Q_OBJECT
 public:
   VMemo( QWidget *parent, const char *name = NULL);
   ~VMemo();
   QFile track;  
 
 public slots:
   void record();
   void mousePressEvent( QMouseEvent * );
   void mouseReleaseEvent( QMouseEvent * );
   void receive( const QCString &msg, const QByteArray &data );
-  void sayHi();
 
 private:
  void paintEvent( QPaintEvent* );
 
   int openDSP();
   int openWAV(const char *filename);
 
   QPixmap vmemoPixmap;
   QCopChannel *myChannel;
   bool systemZaurus;
   int dsp, wav, rate, speed, channels, format, resolution;
   bool recording;
 };
 
 #endif // __VMEMO_H__