Temporarly disabled the mousePress and Release events on the iPAQ only due

to the sticky keyboard problem.

1 files changed, 25 insertions, 46 deletions

diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp
index aa23ba7..48dd193 100644
--- a/core/applets/vmemo/vmemo.cpp
+++ b/core/applets/vmemo/vmemo.cpp
@@ -153,5 +153,4 @@ VMemo::VMemo( QWidget *parent, const char *name )
 	  QString release=name.release;
-	  qWarning("System release: %s\n", name.release);
 	  if(release.find("embedix",0,TRUE) !=-1)
-		  systemZaurus=TRUE;
+		systemZaurus=TRUE;
 	  else
@@ -167,3 +166,2 @@ VMemo::VMemo( QWidget *parent, const char *name )
 	}
-  qWarning("VMemo done init");
 }
@@ -176,11 +174,10 @@ void VMemo::receive( const QCString &msg, const QByteArray &data )
 {
-    QDataStream stream( data, IO_ReadOnly );
-	qWarning("VMemo::receive: %s", (const char *)msg);
-	if (msg == "toggleRecord()")
-	  {
-		if (recording)
-		  mouseReleaseEvent(NULL);
-		else
-		  mousePressEvent(NULL);
-	  }
+  QDataStream stream( data, IO_ReadOnly );
+  if (msg == "toggleRecord()")
+	{
+	  if (recording)
+		mouseReleaseEvent(NULL);
+	  else
+		mousePressEvent(NULL);
+	}
 }
@@ -193,3 +190,3 @@ void VMemo::paintEvent( QPaintEvent* )
 
-void VMemo::mousePressEvent( QMouseEvent * )
+void VMemo::mousePressEvent( QMouseEvent *me )
 {
@@ -201,4 +198,10 @@ void VMemo::mousePressEvent( QMouseEvent * )
 	}
+
+  /* 
+	 No mousePress/mouseRelease recording on the iPAQ. The REC button on the iPAQ calls these functions
+	 mousePressEvent and mouseReleaseEvent with a NULL parameter.
+  */
+  if (!systemZaurus && me != NULL)
+	return;
   
-  qWarning("VMemo::mousePress()");
   QSound::play(Resource::findSound("vmemob"));
@@ -206,6 +209,4 @@ void VMemo::mousePressEvent( QMouseEvent * )
   recording = TRUE;
-  qWarning("VMemo::mousePress() -> Starting to record");
   if (openDSP() == -1)
 	{
-	  // ### Display an error box
 	  QMessageBox::critical(0, "VMemo", "Could not open dsp device.", "Abort");
@@ -220,2 +221,3 @@ void VMemo::mousePressEvent( QMouseEvent * )
   QString fileName;
+
   if(systemZaurus)
@@ -237,4 +239,6 @@ void VMemo::mousePressEvent( QMouseEvent * )
 	{
-	  // ### Display an error box
-	  qWarning("VMemo::mousePress() -> WAV error");
+	  QString err("Could not open the output file: ");
+	  err += fileName;
+
+	  QMessageBox::critical(0, "VMemo", err, "Abort");
 	  close(dsp);
@@ -260,3 +264,2 @@ void VMemo::mouseReleaseEvent( QMouseEvent * )
 {
-  qWarning("VMemo::mouseRelese() -> Done recording");
   recording = FALSE;
@@ -322,9 +325,6 @@ int VMemo::openWAV(const char *filename)
 {
-  qDebug("Creating %s ",filename);
   track.setName(filename);
   if(!track.open(IO_WriteOnly|IO_Truncate|IO_Raw))
-	{
-	  qDebug("Could not open file");
 	  return -1;
-	}
+
   wav=track.handle();
@@ -355,6 +355,4 @@ void VMemo::record(void)
 {
-  int length=0, result, value; //, i;
-  char sound[512]; //, leftBuffer[256], rightBuffer[256];
-  
-  qWarning("VMemo::record()");
+  int length=0, result, value;
+  char sound[512];
   
@@ -365,15 +363,2 @@ void VMemo::record(void)
 
-	  /* attempt to write only one channel...didnt work.
-	  for (i = 0; i < result; i++) {
-		leftBuffer[i] = sound[2*i];
-		rightBuffer[i] = sound[2*i+1];
-	  }
-	  */
-	  qApp->processEvents();
-
-	  /* needed to only write one channel. comment out above "write/length" code.
-	  write(wav, leftBuffer, result / 2);
-	  length += result/2;
-	  */
-
 	  write(wav, sound, result);
@@ -384,5 +369,2 @@ void VMemo::record(void)
   
-  qWarning("VMemo::record() -> Done recording");
-  qWarning("VMemo::record() -> Closing dsp");
-  
   value = length+36;
@@ -398,6 +380,3 @@ void VMemo::record(void)
   
-  qWarning("VMemo::record() -> playing done recording sound");
   QSound::play(Resource::findSound("vmemoe"));
-  qWarning("VMemo::record() -> terminating");
-  //QMessageBox::information(0, "VMemo", "Recording Done", 1);
 }