1 files changed, 2 insertions, 32 deletions

diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp
index c5d0a5b..4c07b3a 100644
--- a/core/applets/vmemo/vmemo.cpp
+++ b/core/applets/vmemo/vmemo.cpp
@@ -206,18 +206,16 @@ static char * vmemo_xpm[] = {
   "      n n n n n n n n n         "};
 
 
 VMemo::VMemo( QWidget *parent, const char *_name )
   : QWidget( parent, _name ) {
   setFixedHeight( 18 );
   setFixedWidth( 14 );
   
-  recording = FALSE;
-
   t_timer = new QTimer( this );
   connect( t_timer, SIGNAL( timeout() ), SLOT( timerBreak() ) );
   
   struct utsname name; /* check for embedix kernel running on the zaurus*/
   if (uname(&name) != -1) {
     QString release=name.release;
 
     Config vmCfg("Vmemo");
@@ -232,113 +230,89 @@ VMemo::VMemo( QWidget *parent, const char *_name )
     else 
       systemZaurus=FALSE;
       
     myChannel = new QCopChannel( "QPE/VMemo", this );
     connect( myChannel, SIGNAL(received(const QCString&, const QByteArray&)),
              this, SLOT(receive(const QCString&, const QByteArray&)) );
 
     if( toggleKey != -1 ) {
-      //            QPEApplication::grabKeyboard();
       QCopEnvelope e("QPE/Desktop", "keyRegister(int key, QString channel, QString message)");
       //           e << 4096; // Key_Escape
       //          e << Key_F5; //4148
       e << toggleKey;
       e << QString("QPE/VMemo");
       e << QString("toggleRecord()");
     }
     if(toggleKey == 1)
         usingIcon=TRUE;
     else
         usingIcon=FALSE;
     if( vmCfg.readNumEntry("hideIcon",0) == 1)
       hide();
+    recording = FALSE;
   }
 }
 
 VMemo::~VMemo() {
 }
 
 void VMemo::receive( const QCString &msg, const QByteArray &data ) {
   qDebug("receive");
   QDataStream stream( data, IO_ReadOnly );
 
   if (msg == "toggleRecord()")  {
-
       if (recording) {
           fromToggle = TRUE;
-          mouseReleaseEvent(NULL);
           stopRecording();
       }  else {
           fromToggle = TRUE;
-            //      mousePressEvent(NULL);
           startRecording();
       }
   }
 }
 
 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;
-//         }
   /*  No mousePress/mouseRelease recording on the iPAQ. The REC button on the iPAQ calls these functions
          mousePressEvent and mouseReleaseEvent with a NULL parameter.  */
-//    if ( me->button() != LeftButton && me != NULL /*&& !systemZaurus*/) {
         
   //  if (!systemZaurus && me != NULL)
 //        return;
 //    }
 
   if(!recording)
        startRecording();
    else
        stopRecording();
 }
 
 void VMemo::mouseReleaseEvent( QMouseEvent * ) {
-//      if(usingIcon && !recording)
-//          stopRecording();
 }
 
 bool VMemo::startRecording() {
-
-  if ( recording)
-    return FALSE;
-
   Config config( "Vmemo" );
   config.setGroup( "System" );
 
   useAlerts = config.readBoolEntry("Alert",1);
   if(useAlerts) {
 
     msgLabel = new QLabel( 0, "alertLabel" );
     msgLabel->setText("<B><P><font size=+2>VMemo-Recording</font></B>");
     msgLabel->show();
   }
 
-  //      if(useAlerts) 
-  //  QMessageBox::message("VMemo","Really Record?");//) ==1)
-  //             return;
-  //     } else {
-  //         if (!systemZaurus )
-  //     QSound::play(Resource::findSound("vmemob"));
-  //     }
   qDebug("Start recording engines");
   recording = TRUE;
 
   if (openDSP() == -1)  {
-    //        QMessageBox::critical(0, "vmemo", "Could not open dsp device.\n"+errorMsg, "Abort");
-    //      delete msgLabel;       
     recording = FALSE;
     msgLabel=0;
     delete msgLabel;
     
     return FALSE;
   }
   
   config.setGroup("Defaults");
@@ -571,17 +545,17 @@ bool VMemo::record() {
 
             length+=write(wav, monoBuffer, result);
         }
         length +=bytesWritten;
 
       if(length<0) {
         recording=false;
         perror("dev/dsp's is a lookin' messy");
-        QMessageBox::message("Vmemo"," Done1 recording\n"+ fileName);
+        QMessageBox::message("Vmemo","Error writing to file\n"+ fileName);
           break;
           return FALSE;
       }
       //       printf("%d\r",length);
       //       fflush(stdout);
       qApp->processEvents();
     }
     //  qDebug("file has length of %d lasting %d seconds",
@@ -601,22 +575,18 @@ bool VMemo::record() {
   track.close();
   qDebug("Track closed");
   
   if( ioctl( dsp, SNDCTL_DSP_RESET,0) == -1)
     perror("ioctl(\"SNDCTL_DSP_RESET\")");
 
   ::close(dsp);
 
-  //     if(useAlerts) 
-  //         QMessageBox::message("Vmemo"," Done1 recording\n"+ fileName);
   qDebug("done recording "+fileName);
 
-//  QSound::play(Resource::findSound("vmemoe"));
-
   Config cfg("qpe");
   cfg.setGroup("Volume");
   QString foo = cfg.readEntry("Mute","TRUE");
   if(foo.find("TRUE",0,TRUE) != -1)
     QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE; //mute
 return TRUE;
 }