summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-09-21 22:26:31 (UTC)
committer llornkcor <llornkcor>2002-09-21 22:26:31 (UTC)
commitb570ab8d46fc134f16d5959861869e36af50bd38 (patch) (unidiff)
tree5aaaa321728b7b2f8f21c11b173d3f35b4ae4dcf
parentf4a389bf66404f7c7474c4ef27491f5910da550b (diff)
downloadopie-b570ab8d46fc134f16d5959861869e36af50bd38.zip
opie-b570ab8d46fc134f16d5959861869e36af50bd38.tar.gz
opie-b570ab8d46fc134f16d5959861869e36af50bd38.tar.bz2
close alert is dsp error
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/vmemo/vmemo.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp
index 4c07b3a..226f058 100644
--- a/core/applets/vmemo/vmemo.cpp
+++ b/core/applets/vmemo/vmemo.cpp
@@ -300,27 +300,24 @@ bool VMemo::startRecording() {
300 if(useAlerts) { 300 if(useAlerts) {
301 301
302 msgLabel = new QLabel( 0, "alertLabel" ); 302 msgLabel = new QLabel( 0, "alertLabel" );
303 msgLabel->setText("<B><P><font size=+2>VMemo-Recording</font></B>"); 303 msgLabel->setText("<B><P><font size=+2>VMemo-Recording</font></B>");
304 msgLabel->show(); 304 msgLabel->show();
305 } 305 }
306 306
307 qDebug("Start recording engines"); 307 qDebug("Start recording engines");
308 recording = TRUE; 308 recording = TRUE;
309 309
310 if (openDSP() == -1) { 310 if (openDSP() == -1) {
311 recording = FALSE; 311 recording = FALSE;
312 msgLabel=0;
313 delete msgLabel;
314
315 return FALSE; 312 return FALSE;
316 } 313 }
317 314
318 config.setGroup("Defaults"); 315 config.setGroup("Defaults");
319 316
320 QDateTime dt = QDateTime::currentDateTime(); 317 QDateTime dt = QDateTime::currentDateTime();
321 318
322 QString fName; 319 QString fName;
323 config.setGroup( "System" ); 320 config.setGroup( "System" );
324 fName = QPEApplication::documentDir() ; 321 fName = QPEApplication::documentDir() ;
325 fileName = config.readEntry("RecLocation", fName); 322 fileName = config.readEntry("RecLocation", fName);
326 323
@@ -418,26 +415,30 @@ int VMemo::openDSP() {
418 } 415 }
419 416
420 qDebug("samplerate: %d, channels %d, resolution %d", speed, channels, resolution); 417 qDebug("samplerate: %d, channels %d, resolution %d", speed, channels, resolution);
421 418
422 if(systemZaurus) { 419 if(systemZaurus) {
423 dsp = open("/dev/dsp1", O_RDONLY); //Zaurus needs /dev/dsp1 420 dsp = open("/dev/dsp1", O_RDONLY); //Zaurus needs /dev/dsp1
424 channels=1; //zaurus has one input channel 421 channels=1; //zaurus has one input channel
425 } else { 422 } else {
426 dsp = open("/dev/dsp", O_RDONLY); 423 dsp = open("/dev/dsp", O_RDONLY);
427 } 424 }
428 425
429 if(dsp == -1) { 426 if(dsp == -1) {
430 perror("open(\"/dev/dsp\")"); 427 msgLabel->close();
431 errorMsg="open(\"/dev/dsp\")\n "+(QString)strerror(errno); 428 msgLabel=0;
429 delete msgLabel;
430
431 perror("open(\"/dev/dsp\")");
432 errorMsg="open(\"/dev/dsp\")\n "+(QString)strerror(errno);
432 QMessageBox::critical(0, "vmemo", errorMsg, "Abort"); 433 QMessageBox::critical(0, "vmemo", errorMsg, "Abort");
433 return -1; 434 return -1;
434 } 435 }
435 436
436 if(ioctl(dsp, SNDCTL_DSP_SETFMT , &format)==-1) { 437 if(ioctl(dsp, SNDCTL_DSP_SETFMT , &format)==-1) {
437 perror("ioctl(\"SNDCTL_DSP_SETFMT\")"); 438 perror("ioctl(\"SNDCTL_DSP_SETFMT\")");
438 return -1; 439 return -1;
439 } 440 }
440 if(ioctl(dsp, SNDCTL_DSP_CHANNELS , &channels)==-1) { 441 if(ioctl(dsp, SNDCTL_DSP_CHANNELS , &channels)==-1) {
441 perror("ioctl(\"SNDCTL_DSP_CHANNELS\")"); 442 perror("ioctl(\"SNDCTL_DSP_CHANNELS\")");
442 return -1; 443 return -1;
443 } 444 }