author | llornkcor <llornkcor> | 2003-08-10 23:00:44 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2003-08-10 23:00:44 (UTC) |
commit | 41b3267ce7142a62ac3d3d6eef3feb33f00deda5 (patch) (unidiff) | |
tree | 2b9a5d64a867101ec09e4f662acfa6d71ef36aac /core/applets/vmemo | |
parent | 0a95378893ef32a775182f9fa3a93381c05a9670 (diff) | |
download | opie-41b3267ce7142a62ac3d3d6eef3feb33f00deda5.zip opie-41b3267ce7142a62ac3d3d6eef3feb33f00deda5.tar.gz opie-41b3267ce7142a62ac3d3d6eef3feb33f00deda5.tar.bz2 |
change filename used, and other things
-rw-r--r-- | core/applets/vmemo/vmemo.cpp | 70 | ||||
-rw-r--r-- | core/applets/vmemo/vmemo.h | 5 |
2 files changed, 42 insertions, 33 deletions
diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp index 7af3d8b..6ec4583 100644 --- a/core/applets/vmemo/vmemo.cpp +++ b/core/applets/vmemo/vmemo.cpp | |||
@@ -14,23 +14,19 @@ | |||
14 | * $Id$ | 14 | * $Id$ |
15 | */ | 15 | */ |
16 | // Sun 03-17-2002 L.J.Potter <ljp@llornkcor.com> | 16 | // copyright 2002 and 2003 L.J.Potter <ljp@llornkcor.com> |
17 | |||
17 | extern "C" { | 18 | extern "C" { |
18 | #include "adpcm.h" | 19 | #include "adpcm.h" |
19 | } | 20 | } |
20 | 21 | ||
21 | #include <sys/utsname.h> | ||
22 | #include <sys/time.h> | ||
23 | #include <sys/types.h> | ||
24 | #include <unistd.h> | 22 | #include <unistd.h> |
25 | #include <stdio.h> | 23 | #include <stdio.h> |
26 | #include <sys/stat.h> | ||
27 | #include <fcntl.h> | 24 | #include <fcntl.h> |
28 | #include <sys/ioctl.h> | 25 | #include <sys/ioctl.h> |
29 | #include <linux/soundcard.h> | 26 | #include <linux/soundcard.h> |
30 | 27 | ||
31 | #include <string.h> | ||
32 | #include <stdlib.h> | ||
33 | #include <errno.h> | 28 | #include <errno.h> |
34 | 29 | ||
30 | |||
35 | typedef struct _waveheader { | 31 | typedef struct _waveheader { |
36 | u_long main_chunk; /* 'RIFF' */ | 32 | u_long main_chunk; /* 'RIFF' */ |
@@ -209,8 +205,4 @@ VMemo::VMemo( QWidget *parent, const char *_name ) | |||
209 | connect( t_timer, SIGNAL( timeout() ), SLOT( timerBreak() ) ); | 205 | connect( t_timer, SIGNAL( timeout() ), SLOT( timerBreak() ) ); |
210 | 206 | ||
211 | struct utsname name; /* check for embedix kernel running on the zaurus*/ | ||
212 | if (uname(&name) != -1) { | ||
213 | QString release=name.release; | ||
214 | |||
215 | Config vmCfg("Vmemo"); | 207 | Config vmCfg("Vmemo"); |
216 | vmCfg.setGroup("Defaults"); | 208 | vmCfg.setGroup("Defaults"); |
@@ -218,8 +210,7 @@ VMemo::VMemo( QWidget *parent, const char *_name ) | |||
218 | useADPCM = vmCfg.readBoolEntry("use_ADPCM", 0); | 210 | useADPCM = vmCfg.readBoolEntry("use_ADPCM", 0); |
219 | 211 | ||
220 | qDebug("toggleKey %d", toggleKey); | 212 | qDebug("toggleKey %d", toggleKey); |
221 | 213 | if ( QFile::exists ( "/dev/sharp_buz" ) || QFile::exists ( "/dev/sharp_led" )) | |
222 | if(release.find("embedix",0,TRUE) !=-1) | 214 | systemZaurus=TRUE; |
223 | systemZaurus=TRUE; | ||
224 | else | 215 | else |
225 | systemZaurus=FALSE; | 216 | systemZaurus=FALSE; |
@@ -245,5 +236,5 @@ VMemo::VMemo( QWidget *parent, const char *_name ) | |||
245 | hide(); | 236 | hide(); |
246 | recording = FALSE; | 237 | recording = FALSE; |
247 | } | 238 | // } |
248 | } | 239 | } |
249 | 240 | ||
@@ -309,6 +300,10 @@ bool VMemo::startRecording() { | |||
309 | 300 | ||
310 | config.setGroup("Defaults"); | 301 | config.setGroup("Defaults"); |
311 | 302 | ||
312 | QDateTime dt = QDateTime::currentDateTime(); | 303 | date = TimeString::dateString( QDateTime::currentDateTime(),false,true); |
304 | date.replace(QRegExp("'"),""); | ||
305 | date.replace(QRegExp(" "),"_"); | ||
306 | date.replace(QRegExp(":"),"."); | ||
307 | date.replace(QRegExp(","),""); | ||
313 | 308 | ||
314 | QString fName; | 309 | QString fName; |
@@ -327,14 +322,7 @@ bool VMemo::startRecording() { | |||
327 | if( fileName.right(1).find('/') == -1) | 322 | if( fileName.right(1).find('/') == -1) |
328 | fileName+="/"; | 323 | fileName+="/"; |
329 | fName = "vm_"+ dt.toString()+ ".wav"; | 324 | fName = "vm_"+ date+ ".wav"; |
330 | 325 | ||
331 | fileName+=fName; | 326 | fileName+=fName; |
332 | // No spaces in the filename | ||
333 | fileName.replace(QRegExp("'"),""); | ||
334 | fileName.replace(QRegExp(" "),"_"); | ||
335 | fileName.replace(QRegExp(":"),"."); | ||
336 | fileName.replace(QRegExp(","),""); | ||
337 | |||
338 | |||
339 | qDebug("filename is "+fileName); | 327 | qDebug("filename is "+fileName); |
340 | // open tmp file here | 328 | // open tmp file here |
@@ -345,5 +333,4 @@ bool VMemo::startRecording() { | |||
345 | if(openWAV(pointer ) == -1) { | 333 | if(openWAV(pointer ) == -1) { |
346 | 334 | ||
347 | // if(openWAV(fileName.latin1()) == -1) { | ||
348 | QString err("Could not open the temp file\n"); | 335 | QString err("Could not open the temp file\n"); |
349 | err += fileName; | 336 | err += fileName; |
@@ -367,5 +354,5 @@ bool VMemo::startRecording() { | |||
367 | 354 | ||
368 | QString dlName("vm_"); | 355 | QString dlName("vm_"); |
369 | dlName += dt.toString(); | 356 | dlName += date; |
370 | DocLnk l; | 357 | DocLnk l; |
371 | l.setFile(fileName); | 358 | l.setFile(fileName); |
@@ -490,6 +477,6 @@ int VMemo::openWAV(const char *filename) { | |||
490 | 477 | ||
491 | bool VMemo::record() { | 478 | bool VMemo::record() { |
492 | 479 | length=0; | |
493 | int length=0, result, value; | 480 | int result, value; |
494 | QString msg; | 481 | QString msg; |
495 | msg.sprintf("Recording format %d", format); | 482 | msg.sprintf("Recording format %d", format); |
@@ -577,5 +564,26 @@ bool VMemo::record() { | |||
577 | ::close(dsp); | 564 | ::close(dsp); |
578 | 565 | ||
579 | qDebug("done recording "+fileName); | 566 | Config cfgO("OpieRec"); |
567 | cfgO.setGroup("Sounds"); | ||
568 | |||
569 | int nFiles = cfgO.readNumEntry( "NumberofFiles",0); | ||
570 | |||
571 | QString currentFileName = fileName; | ||
572 | QString currentFile = "vm_"+ date; | ||
573 | |||
574 | float numberOfRecordedSeconds=(float) length / (float)speed * (float)2; | ||
575 | |||
576 | cfgO.writeEntry( "NumberofFiles", nFiles + 1); | ||
577 | cfgO.writeEntry( QString::number( nFiles + 1), currentFile); | ||
578 | cfgO.writeEntry( currentFile, currentFileName); | ||
579 | |||
580 | QString time; | ||
581 | time.sprintf("%.2f", numberOfRecordedSeconds); | ||
582 | cfgO.writeEntry( currentFileName, time ); | ||
583 | // qDebug("writing config numberOfRecordedSeconds "+time); | ||
584 | |||
585 | cfgO.write(); | ||
586 | |||
587 | qDebug("done recording "+fileName); | ||
580 | 588 | ||
581 | Config cfg("qpe"); | 589 | Config cfg("qpe"); |
diff --git a/core/applets/vmemo/vmemo.h b/core/applets/vmemo/vmemo.h index 9ee08ff..31d0a25 100644 --- a/core/applets/vmemo/vmemo.h +++ b/core/applets/vmemo/vmemo.h | |||
@@ -33,6 +33,7 @@ public: | |||
33 | VMemo( QWidget *parent, const char *name = NULL); | 33 | VMemo( QWidget *parent, const char *name = NULL); |
34 | ~VMemo(); | 34 | ~VMemo(); |
35 | QFile track; | 35 | QFile track; |
36 | QString fileName, errorMsg; | 36 | int length; |
37 | QString fileName, errorMsg, date; | ||
37 | QLabel* msgLabel; | 38 | QLabel* msgLabel; |
38 | QTimer *t_timer; | 39 | QTimer *t_timer; |