error checking

3 files changed, 58 insertions, 13 deletions

diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp
index 7021fae..e25a1ab 100644
--- a/core/applets/vmemo/vmemo.cpp
+++ b/core/applets/vmemo/vmemo.cpp
@@ -218,21 +218,22 @@ VMemo::VMemo( QWidget *parent, const char *_name )
       
         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( vmCfg.readNumEntry("hideIcon",0) == 1 || toggleKey > 0)
-            hide();
+    //         if( vmCfg.readNumEntry("hideIcon",0) == 1 || toggleKey > 0)
+    //             hide();
     }
 }
 
 VMemo::~VMemo()
 {
 }
@@ -284,19 +285,21 @@ bool VMemo::startRecording() {
      }
 
 //      if(useAlerts) 
 //  QMessageBox::message("VMemo","Really Record?");//) ==1)
 //             return;
 //     } else {
-        if (!systemZaurus )
-    QSound::play(Resource::findSound("vmemob"));
+  //         if (!systemZaurus )
+  //     QSound::play(Resource::findSound("vmemob"));
 //     }
-    qDebug("Start recording");
+  qDebug("Start recording engines");
     recording = TRUE;
+
     if (openDSP() == -1)  {
-        QMessageBox::critical(0, "vmemo", "Could not open dsp device.\n"+errorMsg, "Abort");
+    //        QMessageBox::critical(0, "vmemo", "Could not open dsp device.\n"+errorMsg, "Abort");
+    //      delete msgLabel;       
         recording = FALSE;
         return FALSE;
     }
   
   config.setGroup("Defaults");
   
@@ -324,15 +327,15 @@ bool VMemo::startRecording() {
   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\n");
-    err += fileName;
-    QMessageBox::critical(0, "vmemo", err, "Abort");
+    //    QString err("Could not open the output file\n");
+    //    err += fileName;
+    //    QMessageBox::critical(0, "vmemo", err, "Abort");
     close(dsp);
     return FALSE;
   }
   
   QArray<int> cats(1);
   cats[0] = config.readNumEntry("Category", 0);
@@ -345,12 +348,13 @@ bool VMemo::startRecording() {
   l.setType("audio/x-wav");
   l.setCategories(cats);
   l.writeLink();
 
   
   record();
+  //  delete msgLabel;
   return TRUE;
 }
 
 void VMemo::stopRecording() {
   recording = FALSE;
   if(useAlerts)
@@ -381,12 +385,13 @@ int VMemo::openDSP()
         dsp = open("/dev/dsp", O_RDWR);
     }
   
     if(dsp == -1)  {
         perror("open(\"/dev/dsp\")");
         errorMsg="open(\"/dev/dsp\")\n "+(QString)strerror(errno);
+    QMessageBox::critical(0, "vmemo", errorMsg, "Abort");
         return -1;
     }
   
     if(ioctl(dsp, SNDCTL_DSP_SETFMT , &format)==-1)  {
         perror("ioctl(\"SNDCTL_DSP_SETFMT\")");
         return -1;
@@ -444,13 +449,17 @@ void VMemo::record(void)
     int length=0, result, value;
     QString msg;
     msg.sprintf("Recording format %d", format);
     qDebug(msg);
 
     if(systemZaurus) {
+
+  msg.sprintf("Recording format zaurus");
+  qDebug(msg);
         signed short sound[512], monoBuffer[512];
+
         if(format==AFMT_S16_LE)  {
 
             while(recording)   {
 
                 result = read(dsp, sound, 512); // 8192
                 int j=0;
@@ -458,79 +467,115 @@ void VMemo::record(void)
                 if(systemZaurus) {
                     for (int i = 0; i < result; i++) { //since Z is mono do normally
                         monoBuffer[i] = sound[i];
                     }
 
                     length+=write(wav, monoBuffer, result);
+          if(length<0)
+            recording=false;
 
                 } else { //ipaq /stereo inputs
 
+
                     for (int i = 0; i < result; i+=2) {
-                        monoBuffer[j] = (sound[i]+sound[i+1])/2;
+/            monoBuffer[j] = sound[i];
+            //            monoBuffer[j] = (sound[i]+sound[i+1])/2;
+
                         j++;
                     }
 
-                    length+=write(wav, monoBuffer, result/2);
+          length+=write(wav, monoBuffer, result);
+          if(length<0)
+            recording=false;
+          //          length+=write(wav, monoBuffer, result/2);
                 }
                 qApp->processEvents();
 //                  printf("%d\r",length);
 //                  fflush(stdout);
             }
+    
         } else { //AFMT_U8 
 // 8bit unsigned
             unsigned short sound[512], monoBuffer[512];
             while(recording)   {
                 result = read(dsp, sound, 512); // 8192
                 int j=0;
+
                 if(systemZaurus) {
+
                     for (int i = 0; i < result; i++) { //since Z is mono do normally
                         monoBuffer[i] = sound[i];
                     }
+
                     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++;
                     }
+
                     length+=write(wav, monoBuffer, result/2);
+
+          if(length<0)
+            recording=false;
+
                 }
                 length += result;
 //                  printf("%d\r",length);
 //                  fflush(stdout);
             }
 
             qApp->processEvents();
         }
 
     } else { // this is specific for ipaqs that do not have 8 bit capabilities
 
+  msg.sprintf("Recording format other");
+  qDebug(msg);
+
         signed short sound[512], monoBuffer[512];
 
         while(recording)  {
+
             result = read(dsp, sound, 512); // 8192
+
             write(wav, sound, result);
             length += result;
+      if(length<0) {
 
-            qApp->processEvents();
+            recording=false;
+            perror("dev/dsp's is a lookin' messy");
+ QMessageBox::message("Vmemo"," Done1 recording\n"+ fileName);
         }
 //          printf("%d\r",length);
 //          fflush(stdout);
+      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();
+  qDebug("Tracvk closed");
   
     if( ioctl( dsp, SNDCTL_DSP_RESET,0) == -1)
         perror("ioctl(\"SNDCTL_DSP_RESET\")");
+
     ::close(dsp);
     fileName = fileName.left(fileName.length()-4);
 //     if(useAlerts) 
 //         QMessageBox::message("Vmemo"," Done1 recording\n"+ fileName);
     qDebug("done recording "+fileName);
     QSound::play(Resource::findSound("vmemoe"));
diff --git a/core/applets/vmemo/vmemo.pro b/core/applets/vmemo/vmemo.pro
index 298d989..734cf5c 100644
--- a/core/applets/vmemo/vmemo.pro
+++ b/core/applets/vmemo/vmemo.pro
@@ -2,13 +2,13 @@ TEMPLATE	= lib
         CONFIG  += qt warn_on release
         HEADERS=   vmemo.h vmemoimpl.h
         SOURCES=   vmemo.cpp vmemoimpl.cpp
         TARGET  = vmemoapplet
         DESTDIR         =$(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
-DEPENDPATH      += ../$(OPIEDIR)/include
+DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lqpe
         VERSION         = 1.0.0
 
 TRANSLATIONS = ../../i18n/pt_BR/libvmemoapplet.ts
 TRANSLATIONS += ../../i18n/es/libvmemoapplet.ts
 TRANSLATIONS += ../../i18n/pt/libvmemoapplet.ts
diff --git a/core/applets/vmemo/vmemoimpl.cpp b/core/applets/vmemo/vmemoimpl.cpp
index 9e6c7cd..ef4a3a6 100644
--- a/core/applets/vmemo/vmemoimpl.cpp
+++ b/core/applets/vmemo/vmemoimpl.cpp