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 | |
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 | 66 | ||||
-rw-r--r-- | core/applets/vmemo/vmemo.h | 1 |
2 files changed, 45 insertions, 22 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 @@ -27,2 +27,4 @@ #include <stdlib.h> +#include <errno.h> +#include <string.h> @@ -257,8 +259,8 @@ void VMemo::mousePressEvent( QMouseEvent *me ) -// 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; @@ -270,3 +272,3 @@ void VMemo::mousePressEvent( QMouseEvent *me ) 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; @@ -279,13 +281,26 @@ 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/"); + QString fName; + Config cfg( "Sound" ); + cfg.setGroup( "System" ); + fileName = cfg.readEntry("RecLocation",QPEApplication::documentDir() ); - fileName += "vm_"; - fileName += dt.toString(); - fileName += ".wav"; + 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 @@ -297,5 +312,4 @@ 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"); @@ -336,3 +350,3 @@ int VMemo::openDSP() } else { - format = AFMT_S8; + format = AFMT_U8; resolution = 8; @@ -340,2 +354,3 @@ int VMemo::openDSP() + qDebug("samplerate: %d, channels %d, resolution %d", speed, channels, resolution); @@ -350,2 +365,4 @@ int VMemo::openDSP() perror("open(\"/dev/dsp\")"); + + errorMsg="open(\"/dev/dsp\")\n "+(QString)strerror(errno); return -1; @@ -355,2 +372,3 @@ int VMemo::openDSP() perror("ioctl(\"SNDCTL_DSP_SETFMT\")"); + errorMsg="ioctl(\"SNDCTL_DSP_SETFMT\")\n%d\n"+(QString)strerror(errno),format; return -1; @@ -359,2 +377,3 @@ int VMemo::openDSP() perror("ioctl(\"SNDCTL_DSP_CHANNELS\")"); + errorMsg="ioctl(\"SNDCTL_DSP_CHANNELS\")\n%d\n"+(QString)strerror(errno),channels; return -1; @@ -363,2 +382,3 @@ int VMemo::openDSP() perror("ioctl(\"SNDCTL_DSP_SPEED\")"); + errorMsg="ioctl(\"SNDCTL_DSP_SPEED\")\n%d\n"+(QString)strerror(errno),speed; return -1; @@ -367,2 +387,3 @@ int VMemo::openDSP() perror("ioctl(\"SOUND_PCM_READ_RATE\")"); + errorMsg="ioctl(\"SOUND_PCM_READ_RATE\")\n%d\n"+(QString)strerror(errno),rate; return -1; @@ -376,4 +397,6 @@ 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; + } @@ -432,3 +455,3 @@ void VMemo::record(void) } - } else { //AFMT_S8 + } else { //AFMT_U8 // 8bit unsigned @@ -493,5 +516,4 @@ void VMemo::record(void) ::close(dsp); -// if(useAlerts) -// QMessageBox::message("Vmemo"," Done recording"); -// else + 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 @@ -32,2 +32,3 @@ public: QFile track; + QString fileName, errorMsg; |