make buffersize user config BufferSize, default 1024, remove some mishmash

1 files changed, 91 insertions, 87 deletions

diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp
index 622b1df..1ead4dd 100644
--- a/core/applets/vmemo/vmemo.cpp
+++ b/core/applets/vmemo/vmemo.cpp
@@ -199,70 +199,71 @@ static char * vmemo_xpm[] = {
 
 using namespace Opie::Ui;
 VMemo::VMemo( QWidget *parent, const char *_name )
   : QWidget( parent, _name ) {
   setFixedHeight( 18 );
   setFixedWidth( 14 );
 
   t_timer = new QTimer( this );
   connect( t_timer, SIGNAL( timeout() ), SLOT( timerBreak() ) );
 
     Config vmCfg("Vmemo");
     vmCfg.setGroup("Defaults");
     int toggleKey = setToggleButton(vmCfg.readNumEntry("toggleKey", -1));
     useADPCM = vmCfg.readBoolEntry("use_ADPCM", 0);
 
     odebug << "toggleKey " << toggleKey << "" << oendl;
-    if ( QFile::exists ( "/dev/sharp_buz" ) || QFile::exists ( "/dev/sharp_led" ))
-         systemZaurus=TRUE;
-    else
-      systemZaurus=FALSE;
+
+//     if ( QFile::exists ( "/dev/sharp_buz" ) || QFile::exists ( "/dev/sharp_led" ))
+//          systemZaurus=TRUE;
+//     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 ) {
-      // keyRegister(key, channel, message)
+				qDebug("Register key %d", toggleKey);
       QCopEnvelope e("QPE/Launcher", "keyRegister(int,QCString,QCString)");
       //           e << 4096; // Key_Escape
       //          e << Key_F5; //4148
       e << toggleKey;
       e << QString("QPE/VMemo");
       e << QString("toggleRecord()");
     }
     if(toggleKey == 1)
-        usingIcon=TRUE;
+        usingIcon = TRUE;
     else
-        usingIcon=FALSE;
-    if( vmCfg.readNumEntry("hideIcon",0) == 1)
-      hide();
+        usingIcon = FALSE;
+//     if( vmCfg.readNumEntry("hideIcon",0) == 1)
+//       hide();
     recording = FALSE;
     // }
 }
 
 VMemo::~VMemo() {
 }
 
 int VMemo::position()
 {
     return 6;
 }
 
 void VMemo::receive( const QCString &msg, const QByteArray &data ) {
-  odebug << "receive" << oendl;
+  odebug << "Vmemo receive" << oendl;
   QDataStream stream( data, IO_ReadOnly );
 
   if (msg == "toggleRecord()")  {
       if (recording) {
           fromToggle = TRUE;
           stopRecording();
       }  else {
           fromToggle = TRUE;
           startRecording();
       }
   }
 }
 
 void VMemo::paintEvent( QPaintEvent* ) {
   QPainter p(this);
   p.drawPixmap( 0, 1,( const char** )  vmemo_xpm );
@@ -315,36 +316,36 @@ bool VMemo::startRecording() {
 
   QString fName;
   config.setGroup( "System" );
   fName = QPEApplication::documentDir() ;
   fileName = config.readEntry("RecLocation", fName);
 
   int s;
   s=fileName.find(':');
   if(s)
     fileName=fileName.right(fileName.length()-s-2);
   odebug << "pathname will be "+fileName << oendl;
 
   if( fileName.left(1).find('/') == -1)
     fileName="/"+fileName;
   if( fileName.right(1).find('/') == -1)
     fileName+="/";
-  fName = "vm_"+ date+ ".wav";
+  fName = "vm_"+ date + ".wav";
 
   fileName+=fName;
-  odebug << "filename is "+fileName << oendl;
+  odebug << "filename is " + fileName << oendl;
 // open tmp file here
   char *pointer;
   pointer=tmpnam(NULL);
   odebug << "Opening tmp file " << pointer << "" << oendl;
 
   if(openWAV(pointer ) == -1)  {
 
     QString err("Could not open the temp file\n");
     err += fileName;
     QMessageBox::critical(0, "vmemo", err, "Abort");
     ::close(dsp);
     return FALSE;
   }
   if( record() ) {
 
   QString cmd;
@@ -372,34 +373,34 @@ bool VMemo::startRecording() {
       return FALSE;
 
 }
 
 void VMemo::stopRecording() {
     show();
     odebug << "Stopped recording" << oendl;
     recording = FALSE;
     if(useAlerts) {
         msgLabel->close();
         msgLabel=0;
         delete msgLabel;
     }
     t_timer->stop();
     Config cfg("Vmemo");
     cfg.setGroup("Defaults");
-    if( cfg.readNumEntry("hideIcon",0) == 1 )
-        hide();
+//     if( cfg.readNumEntry("hideIcon",0) == 1 )
+//         hide();
 }
 
 int VMemo::openDSP() {
   Config cfg("Vmemo");
   cfg.setGroup("Record");
 
   speed = cfg.readNumEntry("SampleRate", 22050);
   channels = cfg.readNumEntry("Stereo", 1) ? 2 : 1; // 1 = stereo(2), 0 = mono(1)
   if (cfg.readNumEntry("SixteenBit", 1)==1)  {
     format = AFMT_S16_LE;
     resolution = 16;
   } else {
     format = AFMT_U8;
     resolution = 8;
   }
 
@@ -470,148 +471,151 @@ int VMemo::openWAV(const char *filename) {
       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;
 }
 
 bool VMemo::record() {
-   length=0;
-   int result, value;
-  QString msg;
-  msg.sprintf("Recording format %d", format);
-  odebug << msg << oendl;
-  Config config("Vmemo");
-  config.setGroup("Record");
-  int sRate=config.readNumEntry("SizeLimit", 30);
-  if(sRate > 0)
-      t_timer->start( sRate * 1000+1000, TRUE);
+		length = 0;
+		int result, value;
+		QString msg;
+		msg.sprintf("Recording format %d", format);
+		odebug << msg << oendl;
+		Config config("Vmemo");
+		config.setGroup("Record");
+		int sRate=config.readNumEntry("SizeLimit", 30);
+		if(sRate > 0)
+				t_timer->start( sRate * 1000+1000, TRUE);
 
 //    if(systemZaurus) {
 //    } else { // 16 bit only capabilities
 
     msg.sprintf("Recording format other");
     odebug << msg << oendl;
 
-    int bufsize=1024;
-    int bytesWritten=0;
-    signed short sound[1024], monoBuffer[1024];
-    char abuf[bufsize/2];
-    short sbuf[bufsize];
+
+    int bytesWritten = 0;
+
     Config vmCfg("Vmemo");
     vmCfg.setGroup("Defaults");
     useADPCM = vmCfg.readBoolEntry("use_ADPCM", 0);
 
+	int bufsize = vmCfg.readNumEntry("BufferSize",1024);
+	signed short sound[bufsize], monoBuffer[bufsize];
+    char abuf[bufsize / 2];
+    short sbuf[bufsize];
+
     while(recording)  {
 
         if(useADPCM)
-            result = read( dsp, sbuf, bufsize); // 8192
+            result = ::read(dsp, sbuf, bufsize); // 8192
         else
-            result = read(dsp, sound, 1024); // 8192
+            result = ::read(dsp, sound, bufsize); // 8192
         if( result <= 0) {
-          perror("recording error ");
+						perror("recording error ");
 //          odebug << currentFileName << oendl;
-          QMessageBox::message(tr("Note"),tr("error recording"));
-          recording=FALSE;
-          break;
-          return FALSE;
+						QMessageBox::message(tr("Note"),tr("error recording"));
+						recording = FALSE;
+						break;
+						return FALSE;
         }
 
         if(useADPCM) {
             adpcm_coder( sbuf, abuf, result/2, &encoder_state);
-            bytesWritten =  ::write(wav, abuf, result/4);
+            bytesWritten = ::write(wav, abuf, result/4);
 
         } else {
-            for (int i = 0; i < result; i++) { //since Z is mono do normally
-                monoBuffer[i] = sound[i];
-            }
+//             for (int i = 0; i < result; i++) { //since Z is mono do normally
+//                 monoBuffer[i] = sound[i];
+//             }
 
-            length+=write(wav, monoBuffer, result);
+            length += write(wav, sound, result);
         }
-        length +=bytesWritten;
-
-      if(length<0) {
-        recording=false;
-        perror("dev/dsp's is a lookin' messy");
-        QMessageBox::message("Vmemo","Error writing to file\n"+ fileName);
-          break;
-          return FALSE;
-      }
-      //       odebug << "" << length << "\r" << oendl;
-      //       fflush(stdout);
-      qApp->processEvents();
+        length += bytesWritten;
+
+				if(length<0) {
+						recording = false;
+						perror("dev/dsp's is a lookin' messy");
+						QMessageBox::message("Vmemo","Error writing to file\n"+ fileName);
+						break;
+						return FALSE;
+				}
+					//       odebug << "" << length << "\r" << oendl;
+					//       fflush(stdout);
+				qApp->processEvents();
     }
-    //  qDebug("file has length of %d lasting %d seconds",
-    //         length, (( length / speed) / channels) / 2 );
-    //  }
+			//  qDebug("file has length of %d lasting %d seconds",
+			//         length, (( length / speed) / channels) / 2 );
+			//  }
 
-  //>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>><<<<<<<<<<<<<<<<<<<<<<<<<<<<//
+			//>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>><<<<<<<<<<<<<<<<<<<<<<<<<<<<//
 
-  value = length+36;
+		value = length + 36;
 
-  lseek(wav, 4, SEEK_SET);
-  write(wav, &value, 4);
-  lseek(wav, 40, SEEK_SET);
+		lseek(wav, 4, SEEK_SET);
+		write(wav, &value, 4);
+		lseek(wav, 40, SEEK_SET);
 
-  write(wav, &length, 4);
+		write(wav, &length, 4);
 
-  track.close();
-  odebug << "Track closed" << oendl;
+		track.close();
+		odebug << "Track closed" << oendl;
 
-  if( ioctl( dsp, SNDCTL_DSP_RESET,0) == -1)
-    perror("ioctl(\"SNDCTL_DSP_RESET\")");
+		if( ioctl( dsp, SNDCTL_DSP_RESET,0) == -1)
+				perror("ioctl(\"SNDCTL_DSP_RESET\")");
 
-  ::close(dsp);
+		::close(dsp);
 
-      Config cfgO("OpieRec");
-      cfgO.setGroup("Sounds");
+		Config cfgO("OpieRec");
+		cfgO.setGroup("Sounds");
 
-      int nFiles = cfgO.readNumEntry( "NumberofFiles",0);
+		int nFiles = cfgO.readNumEntry( "NumberofFiles",0);
 
-      QString currentFileName = fileName;
-      QString currentFile = "vm_"+ date;
+		QString currentFileName = fileName;
+		QString currentFile = "vm_"+ date;
 
-      float numberOfRecordedSeconds=(float) length / (float)speed * (float)2;
+		float numberOfRecordedSeconds=(float) length / (float)speed * (float)2;
 
-      cfgO.writeEntry( "NumberofFiles", nFiles + 1);
-      cfgO.writeEntry( QString::number( nFiles + 1), currentFile);
-      cfgO.writeEntry( currentFile, currentFileName);
+		cfgO.writeEntry( "NumberofFiles", nFiles + 1);
+		cfgO.writeEntry( QString::number( nFiles + 1), currentFile);
+		cfgO.writeEntry( currentFile, currentFileName);
 
-      QString time;
-      time.sprintf("%.2f", numberOfRecordedSeconds);
-      cfgO.writeEntry( currentFileName, time );
+		QString time;
+		time.sprintf("%.2f", numberOfRecordedSeconds);
+		cfgO.writeEntry( currentFileName, time );
       //      odebug << "writing config numberOfRecordedSeconds "+time << oendl;
 
-      cfgO.write();
+		cfgO.write();
 
-      odebug << "done recording "+fileName << oendl;
+		odebug << "done recording "+fileName << oendl;
 
-  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;
+		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;
 }
 
 int VMemo::setToggleButton(int tog) {
 
   for( int i=0; i < 10;i++) {
     switch (tog) {
     case 0:
       return -1;
       break;
     case 1:
       return 0;
       break;
     case 2:
         return Key_F24; //was Escape
       break;
     case 3: