2 files changed, 25 insertions, 17 deletions

diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp
index cb3e45e..2c3edf1 100644
--- a/core/applets/vmemo/vmemo.cpp
+++ b/core/applets/vmemo/vmemo.cpp
@@ -233,9 +233,12 @@ VMemo::VMemo( QWidget *parent, const char *_name )
       e << toggleKey;
       e << QString("QPE/VMemo");
       e << QString("toggleRecord()");
     }
-
+    if(toggleKey == 1)
+        usingIcon=TRUE;
+    else
+        usingIcon=FALSE;
     if( vmCfg.readNumEntry("hideIcon",0) == 1)
       hide();
   }
 }
@@ -266,14 +269,18 @@ void VMemo::paintEvent( QPaintEvent* )
 }
 
 void VMemo::mousePressEvent( QMouseEvent * )
 {
+   if(!recording)
   startRecording();
+   else
+       stopRecording();
 }
 
 void VMemo::mouseReleaseEvent( QMouseEvent * )
 {
-  stopRecording();
+//      if(usingIcon && !recording)
+//          stopRecording();
 }
 
 bool VMemo::startRecording() {
 
@@ -359,20 +366,22 @@ bool VMemo::startRecording() {
   l.setType("audio/x-wav");
   l.setCategories(cats);
   l.writeLink();
 
-  
   record();
-  //  delete msgLabel;
+
   return TRUE;
 }
 
 void VMemo::stopRecording() {
 show();
  qDebug("Stopped recording");
   recording = FALSE;
-  if(useAlerts)
-    if( msgLabel) delete msgLabel;
+    if(useAlerts) {
+        msgLabel->close();
+        msgLabel=0;
+        delete msgLabel;
+    }
   t_timer->stop();
   Config cfg("Vmemo");
   cfg.setGroup("Defaults");
     if( cfg.readNumEntry("hideIcon",0) == 1 )
@@ -479,17 +488,17 @@ void VMemo::record(void)
   if(systemZaurus) {
 
     msg.sprintf("Recording format zaurus");
     qDebug(msg);
-    signed short sound[512], monoBuffer[512];
+    signed short sound[1024], monoBuffer[1024];
   
     if(format==AFMT_S16_LE)  {
 
 
 
       while(recording)   {
 
-        result = read(dsp, sound, 512); // 8192
+        result = read(dsp, sound, 1024); // 8192
         //        int j=0;
 
         for (int i = 0; i < result; i++) { //since Z is mono do normally
           monoBuffer[i] = sound[i];
@@ -497,9 +506,8 @@ void VMemo::record(void)
 
         length+=write(wav, monoBuffer, result);
         if(length<0)
           recording=false;
-
         //           for (int i = 0; i < result; i+=2) {
         //             monoBuffer[j] = sound[i];
         //             //            monoBuffer[j] = (sound[i]+sound[i+1])/2;
 
@@ -511,11 +519,11 @@ void VMemo::record(void)
       }
     
     } else { //AFMT_U8 
       // 8bit unsigned
-      unsigned short sound[512], monoBuffer[512];
+      unsigned short sound[1024], monoBuffer[1024];
       while(recording)   {
-        result = read(dsp, sound, 512); // 8192
+        result = read(dsp, sound, 1024); // 8192
         //        int j=0;
 
         //        if(systemZaurus) {
 
@@ -543,16 +551,17 @@ void VMemo::record(void)
 
     msg.sprintf("Recording format other");
     qDebug(msg);
 
-    signed short sound[512];//, monoBuffer[512];
+    signed short sound[1024];//, monoBuffer[512];
 
     while(recording)  {
 
-      result = read(dsp, sound, 512); // 8192
+      result = read(dsp, sound, 1024); // 8192
 
       write(wav, sound, result);
       length += result;
+
       if(length<0) {
 
         recording=false;
         perror("dev/dsp's is a lookin' messy");
@@ -588,9 +597,9 @@ void VMemo::record(void)
   //     if(useAlerts) 
   //         QMessageBox::message("Vmemo"," Done1 recording\n"+ fileName);
   qDebug("done recording "+fileName);
 
-  QSound::play(Resource::findSound("vmemoe"));
+//  QSound::play(Resource::findSound("vmemoe"));
 
   Config cfg("qpe");
   cfg.setGroup("Volume");
   QString foo = cfg.readEntry("Mute","TRUE");
@@ -636,8 +645,7 @@ int VMemo::setToggleButton(int tog) {
 }
 
 void VMemo::timerBreak() {
   //stop
-  recording=false;
-
+    stopRecording();
   QMessageBox::message("Vmemo","Vmemo recording has \ntimed out");
 }
diff --git a/core/applets/vmemo/vmemo.h b/core/applets/vmemo/vmemo.h
index 51ace35..823c7b8 100644
--- a/core/applets/vmemo/vmemo.h
+++ b/core/applets/vmemo/vmemo.h
@@ -35,9 +35,9 @@ public:
   QFile track;  
   QString fileName, errorMsg;
   QLabel* msgLabel;
   QTimer *t_timer;
-
+bool usingIcon;
 public slots:
   void record();
   void mousePressEvent( QMouseEvent * );
   void mouseReleaseEvent( QMouseEvent * );