-rw-r--r-- | core/applets/vmemo/vmemo.cpp | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp index 84d53e0..2d694d2 100644 --- a/core/applets/vmemo/vmemo.cpp +++ b/core/applets/vmemo/vmemo.cpp @@ -208,8 +208,9 @@ VMemo::VMemo( QWidget *parent, const char *_name ) struct utsname name; /* check for embedix kernel running on the zaurus*/ if (uname(&name) != -1) { QString release=name.release; + Config vmCfg("Vmemo"); vmCfg.setGroup("Defaults"); int toggleKey = setToggleButton(vmCfg.readNumEntry("toggleKey", -1)); @@ -232,9 +233,10 @@ VMemo::VMemo( QWidget *parent, const char *_name ) e << toggleKey; e << QString("QPE/VMemo"); e << QString("toggleRecord()"); } - if( vmCfg.readNumEntry("hideIcon",0) == 1 || toggleKey > 0) + + if( vmCfg.readNumEntry("hideIcon",0) == 1) hide(); } } @@ -243,8 +245,9 @@ VMemo::~VMemo() } void VMemo::receive( const QCString &msg, const QByteArray &data ) { + qDebug("receive"); QDataStream stream( data, IO_ReadOnly ); if (msg == "toggleRecord()") { if (recording) { fromToggle = TRUE; @@ -274,9 +277,9 @@ void VMemo::mouseReleaseEvent( QMouseEvent * ) bool VMemo::startRecording() { if ( recording) - return FALSE;; + return FALSE; Config config( "Vmemo" ); config.setGroup( "System" ); @@ -317,9 +320,10 @@ bool VMemo::startRecording() { int s; s=fileName.find(':'); if(s) fileName=fileName.right(fileName.length()-s-2); - qDebug("filename will be "+fileName); + qDebug("pathname will be "+fileName); + if( fileName.left(1).find('/') == -1) fileName="/"+fileName; if( fileName.right(1).find('/') == -1) fileName+="/"; @@ -333,9 +337,9 @@ bool VMemo::startRecording() { fileName.replace(QRegExp(":"),"."); fileName.replace(QRegExp(","),""); if(openWAV(fileName.latin1()) == -1) { - // QString err("Could not open the output file\n"); + // QString err("Could not open the output file\n"); // err += fileName; // QMessageBox::critical(0, "vmemo", err, "Abort"); close(dsp); return FALSE; @@ -359,12 +363,18 @@ bool VMemo::startRecording() { return TRUE; } void VMemo::stopRecording() { +show(); + qDebug("Stopped recording"); recording = FALSE; if(useAlerts) if( msgLabel) delete msgLabel; t_timer->stop(); + Config cfg("Vmemo"); + cfg.setGroup("Defaults"); + if( cfg.readNumEntry("hideIcon",0) == 1 ) + hide(); } int VMemo::openDSP() { @@ -383,12 +393,12 @@ int VMemo::openDSP() qDebug("samplerate: %d, channels %d, resolution %d", speed, channels, resolution); if(systemZaurus) { - dsp = open("/dev/dsp1", O_RDWR); //Zaurus needs /dev/dsp1 + dsp = open("/dev/dsp1", O_RDONLY); //Zaurus needs /dev/dsp1 channels=1; //zaurus has one input channel } else { - dsp = open("/dev/dsp", O_RDWR); + dsp = open("/dev/dsp", O_RDONLY); } if(dsp == -1) { perror("open(\"/dev/dsp\")"); @@ -564,9 +574,9 @@ void VMemo::record(void) write(wav, &length, 4); track.close(); - qDebug("Tracvk closed"); + qDebug("Track closed"); if( ioctl( dsp, SNDCTL_DSP_RESET,0) == -1) perror("ioctl(\"SNDCTL_DSP_RESET\")"); @@ -574,8 +584,9 @@ void VMemo::record(void) fileName = fileName.left(fileName.length()-4); // if(useAlerts) // QMessageBox::message("Vmemo"," Done1 recording\n"+ fileName); qDebug("done recording "+fileName); + QSound::play(Resource::findSound("vmemoe")); Config cfg("qpe"); cfg.setGroup("Volume"); |