summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/vmemo/vmemo.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp
index 0c792c6..577db75 100644
--- a/core/applets/vmemo/vmemo.cpp
+++ b/core/applets/vmemo/vmemo.cpp
@@ -321,96 +321,97 @@ bool VMemo::startRecording() {
321 321
322 // if(useAlerts) 322 // if(useAlerts)
323 // QMessageBox::message("VMemo","Really Record?");//) ==1) 323 // QMessageBox::message("VMemo","Really Record?");//) ==1)
324 // return; 324 // return;
325 // } else { 325 // } else {
326 // if (!systemZaurus ) 326 // if (!systemZaurus )
327 // QSound::play(Resource::findSound("vmemob")); 327 // QSound::play(Resource::findSound("vmemob"));
328 // } 328 // }
329 qDebug("Start recording engines"); 329 qDebug("Start recording engines");
330 recording = TRUE; 330 recording = TRUE;
331 331
332 if (openDSP() == -1) { 332 if (openDSP() == -1) {
333 // QMessageBox::critical(0, "vmemo", "Could not open dsp device.\n"+errorMsg, "Abort"); 333 // QMessageBox::critical(0, "vmemo", "Could not open dsp device.\n"+errorMsg, "Abort");
334 // delete msgLabel; 334 // delete msgLabel;
335 recording = FALSE; 335 recording = FALSE;
336 msgLabel=0; 336 msgLabel=0;
337 delete msgLabel; 337 delete msgLabel;
338 338
339 return FALSE; 339 return FALSE;
340 } 340 }
341 341
342 config.setGroup("Defaults"); 342 config.setGroup("Defaults");
343 343
344 QDateTime dt = QDateTime::currentDateTime(); 344 QDateTime dt = QDateTime::currentDateTime();
345 345
346 QString fName; 346 QString fName;
347 config.setGroup( "System" ); 347 config.setGroup( "System" );
348 fName = QPEApplication::documentDir() ; 348 fName = QPEApplication::documentDir() ;
349 fileName = config.readEntry("RecLocation", fName); 349 fileName = config.readEntry("RecLocation", fName);
350 350
351 int s; 351 int s;
352 s=fileName.find(':'); 352 s=fileName.find(':');
353 if(s) 353 if(s)
354 fileName=fileName.right(fileName.length()-s-2); 354 fileName=fileName.right(fileName.length()-s-2);
355 qDebug("pathname will be "+fileName); 355 qDebug("pathname will be "+fileName);
356 356
357 if( fileName.left(1).find('/') == -1) 357 if( fileName.left(1).find('/') == -1)
358 fileName="/"+fileName; 358 fileName="/"+fileName;
359 if( fileName.right(1).find('/') == -1) 359 if( fileName.right(1).find('/') == -1)
360 fileName+="/"; 360 fileName+="/";
361 fName = "vm_"+ dt.toString()+ ".wav"; 361 fName = "vm_"+ dt.toString()+ ".wav";
362 362
363 fileName+=fName; 363 fileName+=fName;
364 // No spaces in the filename 364 // No spaces in the filename
365 fileName.replace(QRegExp("'"),""); 365 fileName.replace(QRegExp("'"),"");
366 fileName.replace(QRegExp(" "),"_"); 366 fileName.replace(QRegExp(" "),"_");
367 fileName.replace(QRegExp(":"),"."); 367 fileName.replace(QRegExp(":"),".");
368 fileName.replace(QRegExp(","),""); 368 fileName.replace(QRegExp(","),"");
369 fileName += ".wav";
369 370
370 qDebug("filename is "+fileName); 371 qDebug("filename is "+fileName);
371// open tmp file here 372// open tmp file here
372 char *pointer; 373 char *pointer;
373 pointer=tmpnam(NULL); 374 pointer=tmpnam(NULL);
374 qDebug("Opening tmp file %s",pointer); 375 qDebug("Opening tmp file %s",pointer);
375 376
376 if(openWAV(pointer ) == -1) { 377 if(openWAV(pointer ) == -1) {
377 378
378// if(openWAV(fileName.latin1()) == -1) { 379// if(openWAV(fileName.latin1()) == -1) {
379 QString err("Could not open the temp file\n"); 380 QString err("Could not open the temp file\n");
380 err += fileName; 381 err += fileName;
381 QMessageBox::critical(0, "vmemo", err, "Abort"); 382 QMessageBox::critical(0, "vmemo", err, "Abort");
382 ::close(dsp); 383 ::close(dsp);
383 return FALSE; 384 return FALSE;
384 } 385 }
385 if( record() ) { 386 if( record() ) {
386 387
387 QString cmd; 388 QString cmd;
388 cmd.sprintf("mv %s "+fileName, pointer); 389 cmd.sprintf("mv %s "+fileName, pointer);
389// move tmp file to regular file here 390// move tmp file to regular file here
390 system(cmd.latin1()); 391 system(cmd.latin1());
391 392
392 QArray<int> cats(1); 393 QArray<int> cats(1);
393 cats[0] = config.readNumEntry("Category", 0); 394 cats[0] = config.readNumEntry("Category", 0);
394 395
395 QString dlName("vm_"); 396 QString dlName("vm_");
396 dlName += dt.toString(); 397 dlName += dt.toString();
397 DocLnk l; 398 DocLnk l;
398 l.setFile(fileName); 399 l.setFile(fileName);
399 l.setName(dlName); 400 l.setName(dlName);
400 l.setType("audio/x-wav"); 401 l.setType("audio/x-wav");
401 l.setCategories(cats); 402 l.setCategories(cats);
402 l.writeLink(); 403 l.writeLink();
403 return TRUE; 404 return TRUE;
404 } else 405 } else
405 return FALSE; 406 return FALSE;
406 407
407} 408}
408 409
409void VMemo::stopRecording() { 410void VMemo::stopRecording() {
410 show(); 411 show();
411 qDebug("Stopped recording"); 412 qDebug("Stopped recording");
412 recording = FALSE; 413 recording = FALSE;
413 if(useAlerts) { 414 if(useAlerts) {
414 msgLabel->close(); 415 msgLabel->close();
415 msgLabel=0; 416 msgLabel=0;
416 delete msgLabel; 417 delete msgLabel;