fix vmemo

1 files changed, 7 insertions, 5 deletions

diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp
index 07ef15c..d5808b7 100644
--- a/core/applets/vmemo/vmemo.cpp
+++ b/core/applets/vmemo/vmemo.cpp
@@ -197,82 +197,84 @@ static char * vmemo_xpm[] = {
   "      n n n n n n n n n         "};
 
 
 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;
 
+//    myChannel = new QCopChannel( "QPE/VMemo", this );
     myChannel = new QCopChannel( "QPE/VMemo", this );
+
     connect( myChannel, SIGNAL(received(const QCString&,const QByteArray&)),
              this, SLOT(receive(const QCString&,const QByteArray&)) );
 
+
     if( toggleKey != -1 ) {
                 odebug << "Register key " << toggleKey << "" << oendl;
       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()");
+      e << QCString("QPE/VMemo");
+      e << QCString("toggleRecord()");
     }
     if(toggleKey == 1)
         usingIcon = TRUE;
     else
         usingIcon = FALSE;
 //     if( vmCfg.readNumEntry("hideIcon",0) == 1)
 	if (!usingIcon)
 			hide();
     recording = FALSE;
     // }
 }
 
 VMemo::~VMemo() {
 }
 
 int VMemo::position()
 {
     return 6;
 }
 
 void VMemo::receive( const QCString &msg, const QByteArray &data ) {
-  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 );
 }
 
 void VMemo::mousePressEvent( QMouseEvent * /*me*/) {
   /*  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;
@@ -499,49 +501,49 @@ bool VMemo::record() {
         odebug << msg << oendl;
 
         Config config("Vmemo");
         config.setGroup("Record");
         int sRate = config.readNumEntry("SizeLimit", 30);
 				odebug << "VMEMO rate" << sRate << oendl;
 
          if(sRate > 0) {
  						t_timer->start( sRate * 1000+1000, TRUE);
  				}
 
      msg.sprintf("Recording format other");
      odebug << msg << oendl;
 
     config.setGroup("Defaults");
     useADPCM = config.readBoolEntry("use_ADPCM", 0);
 
     int bufsize = config.readNumEntry("BufferSize",1024);
     unsigned short sound[bufsize]; //, monoBuffer[bufsize];
     char abuf[bufsize / 2];
     short sbuf[bufsize];
 		odebug << "ready to record"<< oendl;
         if(useADPCM) {
 						odebug << "usr ADPCM" << oendl;
-						
+
                 while(recording) {
                         result = ::read(dsp, sbuf, bufsize); // adpcm read
                         if( result <= 0) {
                                 perror("recording error ");
                                 QMessageBox::message(tr("Note"),tr("error recording"));
                                 recording = FALSE;
                                 break;
                                 return FALSE;
                         }
                         adpcm_coder( sbuf, abuf, result/2, &encoder_state);
                         bytesWritten = ::write(wav, abuf, result/4); // adpcm write
                         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;
                         }
                                    printf("%d\r", length);
                                    fflush(stdout);
                         qApp->processEvents();
                 }
@@ -644,26 +646,26 @@ int VMemo::setToggleButton(int tog) {
     case 5:
       return Key_F9;
       break;
     case 6:
       return Key_F10;
       break;
     case 7:
       return Key_F11;
       break;
     case 8:
       return Key_F13;
       break;
     };
   }
   return -1;
 }
 
 void VMemo::timerBreak() {
   //stop
     stopRecording();
   QMessageBox::message("Vmemo","Vmemo recording has ended");
 }
 
 
-EXPORT_OPIE_APPLET_v1( VMemo )
+//EXPORT_OPIE_APPLET_v1( VMemo )