author | llornkcor <llornkcor> | 2002-04-20 14:19:26 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-04-20 14:19:26 (UTC) |
commit | 90c114cefd8d8675fa3992b5049d01a14eb7712c (patch) (side-by-side diff) | |
tree | 779366706fbabc90e5efcd88e54c6e7c6f7e6bfd /core/applets/vmemo | |
parent | 0850b6d2e7908e66c8a14eb3e7fafcc63e0b800c (diff) | |
download | opie-90c114cefd8d8675fa3992b5049d01a14eb7712c.zip opie-90c114cefd8d8675fa3992b5049d01a14eb7712c.tar.gz opie-90c114cefd8d8675fa3992b5049d01a14eb7712c.tar.bz2 |
more informative error messages
-rw-r--r-- | core/applets/vmemo/vmemo.cpp | 116 | ||||
-rw-r--r-- | core/applets/vmemo/vmemo.h | 1 |
2 files changed, 70 insertions, 47 deletions
diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp index 4d4d598..4c55dc7 100644 --- a/core/applets/vmemo/vmemo.cpp +++ b/core/applets/vmemo/vmemo.cpp @@ -26,4 +26,6 @@ #include <string.h> #include <stdlib.h> +#include <errno.h> +#include <string.h> typedef struct _waveheader { @@ -207,13 +209,13 @@ VMemo::VMemo( QWidget *parent, const char *_name ) else { systemZaurus=FALSE; - myChannel = new QCopChannel( "QPE/VMemo", this ); - connect( myChannel, SIGNAL(received(const QCString&, const QByteArray&)), - this, SLOT(receive(const QCString&, const QByteArray&)) ); + myChannel = new QCopChannel( "QPE/VMemo", this ); + connect( myChannel, SIGNAL(received(const QCString&, const QByteArray&)), + this, SLOT(receive(const QCString&, const QByteArray&)) ); // // Register the REC key press, for ipaq only - QCopEnvelope e("QPE/Desktop", "keyRegister(int key, QString channel, QString message)"); - e << 4096; - e << QString("QPE/VMemo"); - e << QString("toggleRecord()"); + QCopEnvelope e("QPE/Desktop", "keyRegister(int key, QString channel, QString message)"); + e << 4096; + e << QString("QPE/VMemo"); + e << QString("toggleRecord()"); } } @@ -253,13 +255,13 @@ void VMemo::mousePressEvent( QMouseEvent *me ) mousePressEvent and mouseReleaseEvent with a NULL parameter. */ - if (!systemZaurus && me != NULL) - return; + if (!systemZaurus && me != NULL) + return; -// Config config( "Sound" ); -// config.setGroup( "System" ); -// useAlerts = config.readBoolEntry("Alert"); + Config config( "Sound" ); + config.setGroup( "System" ); + useAlerts = config.readBoolEntry("Alert"); -// if(useAlerts) { -// if( QMessageBox::warning(this,"VMemo","Really Record?","Yes","No",0,0,1) ==1) +// if(useAlerts) +// QMessageBox::message("VMemo","Really Record?");//) ==1) // return; // } else { @@ -269,5 +271,5 @@ void VMemo::mousePressEvent( QMouseEvent *me ) recording = TRUE; if (openDSP() == -1) { - QMessageBox::critical(0, "VMemo", "Could not open dsp device.", "Abort"); + QMessageBox::critical(0, "VMemo", "Could not open dsp device.\n"+errorMsg, "Abort"); recording = FALSE; return; @@ -278,15 +280,28 @@ void VMemo::mousePressEvent( QMouseEvent *me ) QDateTime dt = QDateTime::currentDateTime(); - QString fileName; - if(systemZaurus) - fileName=vmCfg.readEntry("Dir", "/mnt/cf/"); // zaurus does not have /mnt/ramfs - else - fileName=vmCfg.readEntry("Dir", "/mnt/ramfs/"); - - fileName += "vm_"; - fileName += dt.toString(); - fileName += ".wav"; + QString fName; + Config cfg( "Sound" ); + cfg.setGroup( "System" ); + fileName = cfg.readEntry("RecLocation",QPEApplication::documentDir() ); + + int s; + s=fileName.find(':'); + if(s) + fileName=fileName.right(fileName.length()-s-2)+"/"; + +// if( !fileName.right(1).find('/') == -1) +// fileName+="/audio/"; +// else +// fileName+="audio/"; + +// if(systemZaurus) +// fileName=vmCfg.readEntry("Dir", "/mnt/cf/"); // zaurus does not have /mnt/ramfs +// else +// fileName=vmCfg.readEntry("Dir", "/mnt/ramfs/"); + fName = "vm_"+ dt.toString()+ ".wav"; + fileName+=fName; + qDebug("filename is "+fileName); // No spaces in the filename fileName.replace(QRegExp("'"),""); @@ -296,7 +311,6 @@ void VMemo::mousePressEvent( QMouseEvent *me ) if(openWAV(fileName.latin1()) == -1) { - QString err("Could not open the output file: "); + QString err("Could not open the output file\n"); err += fileName; - QMessageBox::critical(0, "VMemo", err, "Abort"); close(dsp); @@ -335,8 +349,9 @@ int VMemo::openDSP() resolution = 16; } else { - format = AFMT_S8; + format = AFMT_U8; resolution = 8; } - + + qDebug("samplerate: %d, channels %d, resolution %d", speed, channels, resolution); if(systemZaurus) { @@ -349,4 +364,6 @@ int VMemo::openDSP() if(dsp == -1) { perror("open(\"/dev/dsp\")"); + + errorMsg="open(\"/dev/dsp\")\n "+(QString)strerror(errno); return -1; } @@ -354,16 +371,20 @@ int VMemo::openDSP() if(ioctl(dsp, SNDCTL_DSP_SETFMT , &format)==-1) { perror("ioctl(\"SNDCTL_DSP_SETFMT\")"); + errorMsg="ioctl(\"SNDCTL_DSP_SETFMT\")\n%d\n"+(QString)strerror(errno),format; return -1; } if(ioctl(dsp, SNDCTL_DSP_CHANNELS , &channels)==-1) { perror("ioctl(\"SNDCTL_DSP_CHANNELS\")"); + errorMsg="ioctl(\"SNDCTL_DSP_CHANNELS\")\n%d\n"+(QString)strerror(errno),channels; return -1; } if(ioctl(dsp, SNDCTL_DSP_SPEED , &speed)==-1) { perror("ioctl(\"SNDCTL_DSP_SPEED\")"); + errorMsg="ioctl(\"SNDCTL_DSP_SPEED\")\n%d\n"+(QString)strerror(errno),speed; return -1; } if(ioctl(dsp, SOUND_PCM_READ_RATE , &rate)==-1) { perror("ioctl(\"SOUND_PCM_READ_RATE\")"); + errorMsg="ioctl(\"SOUND_PCM_READ_RATE\")\n%d\n"+(QString)strerror(errno),rate; return -1; } @@ -375,6 +396,8 @@ int VMemo::openWAV(const char *filename) { track.setName(filename); - if(!track.open(IO_WriteOnly|IO_Truncate|IO_Raw)) + if(!track.open(IO_WriteOnly|IO_Truncate|IO_Raw)) { + errorMsg=filename; return -1; + } wav=track.handle(); @@ -431,5 +454,5 @@ void VMemo::record(void) fflush(stdout); } - } else { //AFMT_S8 + } else { //AFMT_U8 // 8bit unsigned unsigned short sound[512], monoBuffer[512]; @@ -439,17 +462,17 @@ void VMemo::record(void) int j=0; if(systemZaurus) { - for (int i = 0; i < result; i++) { //since Z is mono do normally - monoBuffer[i] = sound[i]; - } - qApp->processEvents(); - length+=write(wav, monoBuffer, result); - } else { //ipaq /stereo inputs - for (int i = 0; i < result; i+=2) { - monoBuffer[j] = (sound[i]+sound[i+1])/2; - j++; - } - qApp->processEvents(); - length+=write(wav, monoBuffer, result/2); - } + for (int i = 0; i < result; i++) { //since Z is mono do normally + monoBuffer[i] = sound[i]; + } + qApp->processEvents(); + length+=write(wav, monoBuffer, result); + } else { //ipaq /stereo inputs + for (int i = 0; i < result; i+=2) { + monoBuffer[j] = (sound[i]+sound[i+1])/2; + j++; + } + qApp->processEvents(); + length+=write(wav, monoBuffer, result/2); + } length += result; printf("%d\r",length); @@ -492,7 +515,6 @@ void VMemo::record(void) perror("ioctl(\"SNDCTL_DSP_RESET\")"); ::close(dsp); -// if(useAlerts) -// QMessageBox::message("Vmemo"," Done recording"); -// else - QSound::play(Resource::findSound("vmemoe")); + if(useAlerts) + QMessageBox::message("Vmemo"," Done recording\n"+ fileName); + QSound::play(Resource::findSound("vmemoe")); } diff --git a/core/applets/vmemo/vmemo.h b/core/applets/vmemo/vmemo.h index f30476f..3972877 100644 --- a/core/applets/vmemo/vmemo.h +++ b/core/applets/vmemo/vmemo.h @@ -31,4 +31,5 @@ public: ~VMemo(); QFile track; + QString fileName, errorMsg; public slots: |