| -rw-r--r-- | core/applets/vmemo/vmemo.cpp | 178 |
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 @@ -214,6 +214,7 @@ VMemo::VMemo( QWidget *parent, const char *_name ) 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; @@ -224,3 +225,3 @@ VMemo::VMemo( QWidget *parent, const char *_name ) if( toggleKey != -1 ) { - // keyRegister(key, channel, message) + qDebug("Register key %d", toggleKey); QCopEnvelope e("QPE/Launcher", "keyRegister(int,QCString,QCString)"); @@ -233,7 +234,7 @@ VMemo::VMemo( QWidget *parent, const char *_name ) 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; @@ -251,3 +252,3 @@ int VMemo::position() void VMemo::receive( const QCString &msg, const QByteArray &data ) { - odebug << "receive" << oendl; + odebug << "Vmemo receive" << oendl; QDataStream stream( data, IO_ReadOnly ); @@ -330,6 +331,6 @@ bool VMemo::startRecording() { 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 @@ -387,4 +388,4 @@ void VMemo::stopRecording() { cfg.setGroup("Defaults"); - if( cfg.readNumEntry("hideIcon",0) == 1 ) - hide(); +// if( cfg.readNumEntry("hideIcon",0) == 1 ) +// hide(); } @@ -485,12 +486,12 @@ int VMemo::openWAV(const char *filename) { 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); @@ -502,7 +503,5 @@ bool VMemo::record() { - 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"); @@ -511,2 +510,7 @@ bool VMemo::record() { + int bufsize = vmCfg.readNumEntry("BufferSize",1024); + signed short sound[bufsize], monoBuffer[bufsize]; + char abuf[bufsize / 2]; + short sbuf[bufsize]; + while(recording) { @@ -514,12 +518,12 @@ bool VMemo::record() { 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; } @@ -528,75 +532,75 @@ bool VMemo::record() { 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; } |