added jeremy's copyright, and maybe fixed or broke things for ipaq

1 files changed, 11 insertions, 20 deletions

diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp
index 118fcde..e14d532 100644
--- a/core/applets/vmemo/vmemo.cpp
+++ b/core/applets/vmemo/vmemo.cpp
@@ -1,59 +1,60 @@
 /************************************************************************************
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ************************************************************************************/
+// copyright 2002 Jeremy Cowgar <jc@cowgar.com>
 /*
  * $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>
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <linux/soundcard.h>
 
 #include <string.h>
 #include <stdlib.h>
 #include <errno.h>
 
 typedef struct _waveheader {
   u_long  main_chunk; /* 'RIFF'  */
   u_long  length;     /* filelen */
   u_long  chunk_type; /* 'WAVE'  */
   u_long  sub_chunk;  /* 'fmt '                                               */
   u_long  sc_len;     /* length of sub_chunk, =16     
                          (chunckSize) format len */
   u_short format;     /* should be 1 for PCM-code        (formatTag)          */
 
   u_short modus;      /* 1 Mono, 2 Stereo                (channels)           */
   u_long  sample_fq;  /* samples per second              (samplesPerSecond)   */
   u_long  byte_p_sec; /* avg bytes per second            (avgBytePerSecond)   */
   u_short byte_p_spl; /* samplesize; 1 or 2 bytes        (blockAlign)         */
   u_short bit_p_spl;  /* 8, 12 or 16 bit                 (bitsPerSample)      */
 
   u_long  data_chunk; /* 'data'      */
 
   u_long  data_length;/* samplecount */
 } WaveHeader;
 
 #define RIFF        0x46464952
 #define WAVE        0x45564157
 #define FMT         0x20746D66
 #define DATA        0x61746164
 #define PCM_CODE    1
 #define WAVE_MONO   1
 #define WAVE_STEREO 2
 
 #include "vmemo.h"
 
@@ -209,100 +210,100 @@ 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&)) );
 
 //              // 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()
 {
 }
 
 void VMemo::receive( const QCString &msg, const QByteArray &data )
 {
   QDataStream stream( data, IO_ReadOnly );
   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 *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 defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX)
-        if (!systemZaurus )
-            return;
-#endif
+//  #if defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX)
+//          if (!systemZaurus )
+//              return;
+//  #endif
     
      Config config( "Sound" );
      config.setGroup( "System" );
      useAlerts = config.readBoolEntry("Alert");
 
 //      if(useAlerts) 
 //  QMessageBox::message("VMemo","Really Record?");//) ==1)
 //             return;
 //     } else {
         if (!systemZaurus )
     QSound::play(Resource::findSound("vmemob"));
 //     }
     qDebug("Start recording");
     recording = TRUE;
     if (openDSP() == -1)  {
         QMessageBox::critical(0, "VMemo", "Could not open dsp device.\n"+errorMsg, "Abort");
         recording = FALSE;
         return;
     }
   
   Config vmCfg("VMemo");
   vmCfg.setGroup("Defaults");
   
   QDateTime dt = QDateTime::currentDateTime();
 
   QString fName;
   Config cfg( "Sound" );
   cfg.setGroup( "System" );
    fName = QPEApplication::documentDir() ;
   fileName = cfg.readEntry("RecLocation", fName);
 
   int s;
   s=fileName.find(':');
   if(s)
      fileName=fileName.right(fileName.length()-s-2);
   qDebug("filename will be "+fileName);   
    if( fileName.right(1).find('/') == -1)
            fileName+="/";
 
 //   if(systemZaurus) 
 //   fileName=vmCfg.readEntry("Dir", "/mnt/cf/"); // zaurus does not have /mnt/ramfs
 //   else
 //   fileName=vmCfg.readEntry("Dir", "/mnt/ramfs/");
   
   fName = "vm_"+ dt.toString()+ ".wav";
   
   fileName+=fName;
      qDebug("filename is "+fileName);
@@ -391,134 +392,124 @@ int VMemo::openDSP()
         return -1;
     }
   
     return 1;
 }
 
 int VMemo::openWAV(const char *filename)
 {
   track.setName(filename);
   if(!track.open(IO_WriteOnly|IO_Truncate|IO_Raw)) {
       errorMsg=filename;
     return -1;
   }
 
   wav=track.handle();
   
   WaveHeader wh;
 
   wh.main_chunk = RIFF;
   wh.length=0; 
   wh.chunk_type = WAVE;
   wh.sub_chunk  = FMT;
   wh.sc_len     = 16;
   wh.format     = PCM_CODE;
   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;
     qDebug("Recording");
 
     if(systemZaurus) {
         signed short sound[512], monoBuffer[512];
         if(format==AFMT_S16_LE)  {
             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);
                 }
-                printf("%d\r",length);
-                fflush(stdout);
+//                  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
-                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();
+//                  printf("%d\r",length);
+//                  fflush(stdout);
             }
 
             qApp->processEvents();
         }
 
     } else {
 
         signed short sound[512], monoBuffer[512];
 
         while(recording)  {
             result = read(dsp, sound, 512); // 8192
-            qApp->processEvents();
-
             write(wav, sound, result);
             length += result;
 
             qApp->processEvents();
         }
-        printf("%d\r",length);
-        fflush(stdout);
+//          printf("%d\r",length);
+//          fflush(stdout);
           //  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);
     fileName = fileName.left(fileName.length()-4);
     if(useAlerts) 
         QMessageBox::message("Vmemo"," Done recording\n"+ fileName);
     qDebug("done recording "+fileName);
     QSound::play(Resource::findSound("vmemoe"));
 }