author | llornkcor <llornkcor> | 2002-04-20 14:19:26 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-04-20 14:19:26 (UTC) |
commit | 90c114cefd8d8675fa3992b5049d01a14eb7712c (patch) (unidiff) | |
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 | |||
@@ -25,6 +25,8 @@ | |||
25 | #include <linux/soundcard.h> | 25 | #include <linux/soundcard.h> |
26 | #include <string.h> | 26 | #include <string.h> |
27 | #include <stdlib.h> | 27 | #include <stdlib.h> |
28 | #include <errno.h> | ||
29 | #include <string.h> | ||
28 | 30 | ||
29 | typedef struct _waveheader { | 31 | typedef struct _waveheader { |
30 | u_long main_chunk; /* 'RIFF' */ | 32 | u_long main_chunk; /* 'RIFF' */ |
@@ -255,12 +257,12 @@ void VMemo::mousePressEvent( QMouseEvent *me ) | |||
255 | if (!systemZaurus && me != NULL) | 257 | if (!systemZaurus && me != NULL) |
256 | return; | 258 | return; |
257 | 259 | ||
258 | // Config config( "Sound" ); | 260 | Config config( "Sound" ); |
259 | // config.setGroup( "System" ); | 261 | config.setGroup( "System" ); |
260 | // useAlerts = config.readBoolEntry("Alert"); | 262 | useAlerts = config.readBoolEntry("Alert"); |
261 | 263 | ||
262 | // if(useAlerts) { | 264 | // if(useAlerts) |
263 | // if( QMessageBox::warning(this,"VMemo","Really Record?","Yes","No",0,0,1) ==1) | 265 | // QMessageBox::message("VMemo","Really Record?");//) ==1) |
264 | // return; | 266 | // return; |
265 | // } else { | 267 | // } else { |
266 | QSound::play(Resource::findSound("vmemob")); | 268 | QSound::play(Resource::findSound("vmemob")); |
@@ -268,7 +270,7 @@ void VMemo::mousePressEvent( QMouseEvent *me ) | |||
268 | qDebug("Start recording"); | 270 | qDebug("Start recording"); |
269 | recording = TRUE; | 271 | recording = TRUE; |
270 | if (openDSP() == -1) { | 272 | if (openDSP() == -1) { |
271 | QMessageBox::critical(0, "VMemo", "Could not open dsp device.", "Abort"); | 273 | QMessageBox::critical(0, "VMemo", "Could not open dsp device.\n"+errorMsg, "Abort"); |
272 | recording = FALSE; | 274 | recording = FALSE; |
273 | return; | 275 | return; |
274 | } | 276 | } |
@@ -277,17 +279,30 @@ void VMemo::mousePressEvent( QMouseEvent *me ) | |||
277 | vmCfg.setGroup("Defaults"); | 279 | vmCfg.setGroup("Defaults"); |
278 | 280 | ||
279 | QDateTime dt = QDateTime::currentDateTime(); | 281 | QDateTime dt = QDateTime::currentDateTime(); |
280 | QString fileName; | ||
281 | 282 | ||
282 | if(systemZaurus) | 283 | QString fName; |
283 | fileName=vmCfg.readEntry("Dir", "/mnt/cf/"); // zaurus does not have /mnt/ramfs | 284 | Config cfg( "Sound" ); |
284 | else | 285 | cfg.setGroup( "System" ); |
285 | fileName=vmCfg.readEntry("Dir", "/mnt/ramfs/"); | 286 | fileName = cfg.readEntry("RecLocation",QPEApplication::documentDir() ); |
286 | 287 | ||
287 | fileName += "vm_"; | 288 | int s; |
288 | fileName += dt.toString(); | 289 | s=fileName.find(':'); |
289 | fileName += ".wav"; | 290 | if(s) |
291 | fileName=fileName.right(fileName.length()-s-2)+"/"; | ||
290 | 292 | ||
293 | // if( !fileName.right(1).find('/') == -1) | ||
294 | // fileName+="/audio/"; | ||
295 | // else | ||
296 | // fileName+="audio/"; | ||
297 | |||
298 | // if(systemZaurus) | ||
299 | // fileName=vmCfg.readEntry("Dir", "/mnt/cf/"); // zaurus does not have /mnt/ramfs | ||
300 | // else | ||
301 | // fileName=vmCfg.readEntry("Dir", "/mnt/ramfs/"); | ||
302 | |||
303 | fName = "vm_"+ dt.toString()+ ".wav"; | ||
304 | fileName+=fName; | ||
305 | qDebug("filename is "+fileName); | ||
291 | // No spaces in the filename | 306 | // No spaces in the filename |
292 | fileName.replace(QRegExp("'"),""); | 307 | fileName.replace(QRegExp("'"),""); |
293 | fileName.replace(QRegExp(" "),"_"); | 308 | fileName.replace(QRegExp(" "),"_"); |
@@ -295,9 +310,8 @@ void VMemo::mousePressEvent( QMouseEvent *me ) | |||
295 | fileName.replace(QRegExp(","),""); | 310 | fileName.replace(QRegExp(","),""); |
296 | 311 | ||
297 | if(openWAV(fileName.latin1()) == -1) { | 312 | if(openWAV(fileName.latin1()) == -1) { |
298 | QString err("Could not open the output file: "); | 313 | QString err("Could not open the output file\n"); |
299 | err += fileName; | 314 | err += fileName; |
300 | |||
301 | QMessageBox::critical(0, "VMemo", err, "Abort"); | 315 | QMessageBox::critical(0, "VMemo", err, "Abort"); |
302 | close(dsp); | 316 | close(dsp); |
303 | return; | 317 | return; |
@@ -334,10 +348,11 @@ int VMemo::openDSP() | |||
334 | format = AFMT_S16_LE; | 348 | format = AFMT_S16_LE; |
335 | resolution = 16; | 349 | resolution = 16; |
336 | } else { | 350 | } else { |
337 | format = AFMT_S8; | 351 | format = AFMT_U8; |
338 | resolution = 8; | 352 | resolution = 8; |
339 | } | 353 | } |
340 | 354 | ||
355 | qDebug("samplerate: %d, channels %d, resolution %d", speed, channels, resolution); | ||
341 | 356 | ||
342 | if(systemZaurus) { | 357 | if(systemZaurus) { |
343 | dsp = open("/dev/dsp1", O_RDWR); //Zaurus needs /dev/dsp1 | 358 | dsp = open("/dev/dsp1", O_RDWR); //Zaurus needs /dev/dsp1 |
@@ -348,23 +363,29 @@ int VMemo::openDSP() | |||
348 | 363 | ||
349 | if(dsp == -1) { | 364 | if(dsp == -1) { |
350 | perror("open(\"/dev/dsp\")"); | 365 | perror("open(\"/dev/dsp\")"); |
366 | |||
367 | errorMsg="open(\"/dev/dsp\")\n "+(QString)strerror(errno); | ||
351 | return -1; | 368 | return -1; |
352 | } | 369 | } |
353 | 370 | ||
354 | if(ioctl(dsp, SNDCTL_DSP_SETFMT , &format)==-1) { | 371 | if(ioctl(dsp, SNDCTL_DSP_SETFMT , &format)==-1) { |
355 | perror("ioctl(\"SNDCTL_DSP_SETFMT\")"); | 372 | perror("ioctl(\"SNDCTL_DSP_SETFMT\")"); |
373 | errorMsg="ioctl(\"SNDCTL_DSP_SETFMT\")\n%d\n"+(QString)strerror(errno),format; | ||
356 | return -1; | 374 | return -1; |
357 | } | 375 | } |
358 | if(ioctl(dsp, SNDCTL_DSP_CHANNELS , &channels)==-1) { | 376 | if(ioctl(dsp, SNDCTL_DSP_CHANNELS , &channels)==-1) { |
359 | perror("ioctl(\"SNDCTL_DSP_CHANNELS\")"); | 377 | perror("ioctl(\"SNDCTL_DSP_CHANNELS\")"); |
378 | errorMsg="ioctl(\"SNDCTL_DSP_CHANNELS\")\n%d\n"+(QString)strerror(errno),channels; | ||
360 | return -1; | 379 | return -1; |
361 | } | 380 | } |
362 | if(ioctl(dsp, SNDCTL_DSP_SPEED , &speed)==-1) { | 381 | if(ioctl(dsp, SNDCTL_DSP_SPEED , &speed)==-1) { |
363 | perror("ioctl(\"SNDCTL_DSP_SPEED\")"); | 382 | perror("ioctl(\"SNDCTL_DSP_SPEED\")"); |
383 | errorMsg="ioctl(\"SNDCTL_DSP_SPEED\")\n%d\n"+(QString)strerror(errno),speed; | ||
364 | return -1; | 384 | return -1; |
365 | } | 385 | } |
366 | if(ioctl(dsp, SOUND_PCM_READ_RATE , &rate)==-1) { | 386 | if(ioctl(dsp, SOUND_PCM_READ_RATE , &rate)==-1) { |
367 | perror("ioctl(\"SOUND_PCM_READ_RATE\")"); | 387 | perror("ioctl(\"SOUND_PCM_READ_RATE\")"); |
388 | errorMsg="ioctl(\"SOUND_PCM_READ_RATE\")\n%d\n"+(QString)strerror(errno),rate; | ||
368 | return -1; | 389 | return -1; |
369 | } | 390 | } |
370 | 391 | ||
@@ -374,8 +395,10 @@ int VMemo::openDSP() | |||
374 | int VMemo::openWAV(const char *filename) | 395 | int VMemo::openWAV(const char *filename) |
375 | { | 396 | { |
376 | track.setName(filename); | 397 | track.setName(filename); |
377 | if(!track.open(IO_WriteOnly|IO_Truncate|IO_Raw)) | 398 | if(!track.open(IO_WriteOnly|IO_Truncate|IO_Raw)) { |
399 | errorMsg=filename; | ||
378 | return -1; | 400 | return -1; |
401 | } | ||
379 | 402 | ||
380 | wav=track.handle(); | 403 | wav=track.handle(); |
381 | 404 | ||
@@ -430,7 +453,7 @@ void VMemo::record(void) | |||
430 | printf("%d\r",length); | 453 | printf("%d\r",length); |
431 | fflush(stdout); | 454 | fflush(stdout); |
432 | } | 455 | } |
433 | } else { //AFMT_S8 | 456 | } else { //AFMT_U8 |
434 | // 8bit unsigned | 457 | // 8bit unsigned |
435 | unsigned short sound[512], monoBuffer[512]; | 458 | unsigned short sound[512], monoBuffer[512]; |
436 | while(recording) { | 459 | while(recording) { |
@@ -491,8 +514,7 @@ void VMemo::record(void) | |||
491 | if( ioctl( dsp, SNDCTL_DSP_RESET,0) == -1) | 514 | if( ioctl( dsp, SNDCTL_DSP_RESET,0) == -1) |
492 | perror("ioctl(\"SNDCTL_DSP_RESET\")"); | 515 | perror("ioctl(\"SNDCTL_DSP_RESET\")"); |
493 | ::close(dsp); | 516 | ::close(dsp); |
494 | // if(useAlerts) | 517 | if(useAlerts) |
495 | // QMessageBox::message("Vmemo"," Done recording"); | 518 | QMessageBox::message("Vmemo"," Done recording\n"+ fileName); |
496 | // else | ||
497 | QSound::play(Resource::findSound("vmemoe")); | 519 | QSound::play(Resource::findSound("vmemoe")); |
498 | } | 520 | } |
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 | |||
@@ -30,6 +30,7 @@ public: | |||
30 | VMemo( QWidget *parent, const char *name = NULL); | 30 | VMemo( QWidget *parent, const char *name = NULL); |
31 | ~VMemo(); | 31 | ~VMemo(); |
32 | QFile track; | 32 | QFile track; |
33 | QString fileName, errorMsg; | ||
33 | 34 | ||
34 | public slots: | 35 | public slots: |
35 | void record(); | 36 | void record(); |