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 | |
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 @@ -22,12 +22,14 @@ #include <sys/stat.h> #include <fcntl.h> #include <sys/ioctl.h> #include <linux/soundcard.h> #include <string.h> #include <stdlib.h> +#include <errno.h> +#include <string.h> typedef struct _waveheader { u_long main_chunk; /* 'RIFF' */ u_long length; /* filelen */ u_long chunk_type; /* 'WAVE' */ u_long sub_chunk; /* 'fmt ' */ @@ -252,55 +254,67 @@ 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; -// 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 { QSound::play(Resource::findSound("vmemob")); // } qDebug("Start recording"); 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; } Config vmCfg("VMemo"); vmCfg.setGroup("Defaults"); 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 fileName.replace(QRegExp("'"),""); fileName.replace(QRegExp(" "),"_"); fileName.replace(QRegExp(":"),"."); fileName.replace(QRegExp(","),""); 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); return; } QArray<int> cats(1); @@ -331,54 +345,63 @@ int VMemo::openDSP() speed = cfg.readNumEntry("SampleRate", 22050); channels = cfg.readNumEntry("Stereo", 1) ? 2 : 1; // 1 = stereo(2), 0 = mono(1) if (cfg.readNumEntry("SixteenBit", 1)==1) { format = AFMT_S16_LE; resolution = 16; } else { - format = AFMT_S8; + format = AFMT_U8; resolution = 8; } + qDebug("samplerate: %d, channels %d, resolution %d", speed, channels, resolution); if(systemZaurus) { dsp = open("/dev/dsp1", O_RDWR); //Zaurus needs /dev/dsp1 channels=1; //zaurus has one input channel } else { dsp = open("/dev/dsp", O_RDWR); } if(dsp == -1) { perror("open(\"/dev/dsp\")"); + + errorMsg="open(\"/dev/dsp\")\n "+(QString)strerror(errno); return -1; } 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; } return 1; } 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(); WaveHeader wh; wh.main_chunk = RIFF; @@ -427,13 +450,13 @@ void VMemo::record(void) qApp->processEvents(); length+=write(wav, monoBuffer, result/2); } printf("%d\r",length); fflush(stdout); } - } else { //AFMT_S8 + } else { //AFMT_U8 // 8bit unsigned unsigned short sound[512], monoBuffer[512]; while(recording) { result = read(dsp, sound, 512); // 8192 qApp->processEvents(); int j=0; @@ -488,11 +511,10 @@ void VMemo::record(void) write(wav, &length, 4); track.close(); if( ioctl( dsp, SNDCTL_DSP_RESET,0) == -1) perror("ioctl(\"SNDCTL_DSP_RESET\")"); ::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 @@ -27,12 +27,13 @@ class VMemo : public QWidget { Q_OBJECT public: VMemo( QWidget *parent, const char *name = NULL); ~VMemo(); QFile track; + QString fileName, errorMsg; public slots: void record(); void mousePressEvent( QMouseEvent * ); void mouseReleaseEvent( QMouseEvent * ); void receive( const QCString &msg, const QByteArray &data ); |