fix vmemo

1 files changed, 6 insertions, 4 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
@@ -125,226 +125,228 @@ static char * vmemo_xpm[] = {
   "g  c #8A8A8F",
   "h  c #6B6B6E",
   "i  c #ADADB2",
   "j  c #828289",
   "k  c #3E3E41",
   "l  c #CFCFD7",
   "m  c #4C4C50",
   "n  c #000000",
   "o  c #66666A",
   "p  c #505054",
   "q  c #838388",
   "r  c #A1A1A7",
   "s  c #A9A9AE",
   "t  c #A8A8B0",
   "u  c #5E5E63",
   "v  c #3A3A3E",
   "w  c #BDBDC6",
   "x  c #59595E",
   "y  c #76767C",
   "z  c #373738",
   "A  c #717174",
   "B  c #727278",
   "C  c #1C1C1E",
   "D  c #3C3C3F",
   "E  c #ADADB6",
   "F  c #54555A",
   "G  c #8B8C94",
   "H  c #5A5A5F",
   "I  c #BBBBC3",
   "J  c #C4C4CB",
   "K  c #909098",
   "L  c #737379",
   "M  c #343437",
   "N  c #8F8F98",
   "O  c #000407",
   "P  c #2D3137",
   "Q  c #B0B1BC",
   "R  c #3B3C40",
   "S  c #6E6E74",
   "T  c #95959C",
   "U  c #74747A",
   "V  c #1D1D1E",
   "W  c #91929A",
   "X  c #42444A",
   "Y  c #22282E",
   "Z  c #B0B2BC",
   "`  c #898A90",
   " . c #65656A",
   ".. c #999AA2",
   "+. c #52535A",
   "@. c #151B21",
   "#. c #515257",
   "$. c #B5B5BE",
   "%. c #616167",
   "&. c #1A1D22",
   "*. c #000713",
   "=. c #1F1F21",
   "                                ",
   "            . + @ #             ",
   "          $ % & * = -           ",
   "        ; > , ' ) ! ~           ",
   "        { ] ^ / ( _ :           ",
   "        < [ } | 1 2 3           ",
   "      4 5 6 7 8 9 0 a b c       ",
   "    d e f g h i j 3 k l m n     ",
   "      o p q r s t u v w n       ",
   "      o x y z A B C D E n       ",
   "      F G H I J K L M N O       ",
   "      P Q R S T U V W X         ",
   "        Y Z ` b  ...+.          ",
   "          @.#.$.%.&.            ",
   "            *.B =.              ",
   "      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;
 //    }
 
   if(!recording)
        startRecording();
    else
        stopRecording();
 }
 
 void VMemo::mouseReleaseEvent( QMouseEvent * ) {
 }
 
 bool VMemo::startRecording() {
   Config config( "Vmemo" );
   config.setGroup( "System" );
 
   useAlerts = config.readBoolEntry("Alert",1);
   if(useAlerts) {
 
     msgLabel = new QLabel( 0, "alertLabel" );
     msgLabel->setText("<B><P><font size=+2>VMemo-Recording</font></B>");
     msgLabel->show();
   }
 
   odebug << "Start recording engines" << oendl;
   recording = TRUE;
 
   if (openDSP() == -1)  {
     recording = FALSE;
     return FALSE;
   }
 
   config.setGroup("Defaults");
 
   date = TimeString::dateString( QDateTime::currentDateTime(),false,true);
   date.replace(QRegExp("'"),"");
   date.replace(QRegExp(" "),"_");
   date.replace(QRegExp(":"),"-");
   date.replace(QRegExp(","),"");
 
   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";
 
   fileName+=fName;
   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() ) {
@@ -572,98 +574,98 @@ bool VMemo::record() {
                                 qApp->processEvents();
                         }
 //												odebug << "result is " << result << oendl;
                 }
 				odebug << "file has length of " << length << " lasting " << (( length / speed) / channels) / 2  << " seconds" << oendl;
 
         value = length + 36;
 
         lseek(wav, 4, SEEK_SET);
         write(wav, &value, 4);
         lseek(wav, 40, SEEK_SET);
 
         write(wav, &length, 4);
 
         track.close();
         odebug << "Track closed" << oendl;
 
         if( ioctl( dsp, SNDCTL_DSP_RESET,0) == -1)
                 perror("ioctl(\"SNDCTL_DSP_RESET\")");
 
         ::close(dsp);
 
         Config cfgO("OpieRec");
         cfgO.setGroup("Sounds");
 
         int nFiles = cfgO.readNumEntry( "NumberofFiles",0);
 
         QString currentFileName = fileName;
         QString currentFile = "vm_"+ date;
 
         float numberOfRecordedSeconds = (float) length / (float)speed * (float)2;
 
         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 );
       //      odebug << "writing config numberOfRecordedSeconds "+time << oendl;
 
         cfgO.write();
 
         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;
 }
 
 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:
       return Key_Space;
       break;
     case 4:
       return Key_F12;
       break;
     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 )