| -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 @@ * $Id$ */ -// Sun 03-17-2002 L.J.Potter <ljp@llornkcor.com> +// copyright 2002 and 2003 L.J.Potter <ljp@llornkcor.com> + extern "C" { #include "adpcm.h" } -#include <sys/utsname.h> -#include <sys/time.h> -#include <sys/types.h> #include <unistd.h> #include <stdio.h> -#include <sys/stat.h> #include <fcntl.h> #include <sys/ioctl.h> #include <linux/soundcard.h> -#include <string.h> -#include <stdlib.h> #include <errno.h> + typedef struct _waveheader { u_long main_chunk; /* 'RIFF' */ @@ -209,8 +205,4 @@ VMemo::VMemo( QWidget *parent, const char *_name ) connect( t_timer, SIGNAL( timeout() ), SLOT( timerBreak() ) ); - struct utsname name; /* check for embedix kernel running on the zaurus*/ - if (uname(&name) != -1) { - QString release=name.release; - Config vmCfg("Vmemo"); vmCfg.setGroup("Defaults"); @@ -218,8 +210,7 @@ VMemo::VMemo( QWidget *parent, const char *_name ) useADPCM = vmCfg.readBoolEntry("use_ADPCM", 0); - qDebug("toggleKey %d", toggleKey); - - if(release.find("embedix",0,TRUE) !=-1) - systemZaurus=TRUE; + qDebug("toggleKey %d", toggleKey); + if ( QFile::exists ( "/dev/sharp_buz" ) || QFile::exists ( "/dev/sharp_led" )) + systemZaurus=TRUE; else systemZaurus=FALSE; @@ -245,5 +236,5 @@ VMemo::VMemo( QWidget *parent, const char *_name ) hide(); recording = FALSE; - } + // } } @@ -309,6 +300,10 @@ bool VMemo::startRecording() { config.setGroup("Defaults"); - - QDateTime dt = QDateTime::currentDateTime(); + + date = TimeString::dateString( QDateTime::currentDateTime(),false,true); + date.replace(QRegExp("'"),""); + date.replace(QRegExp(" "),"_"); + date.replace(QRegExp(":"),"."); + date.replace(QRegExp(","),""); QString fName; @@ -327,14 +322,7 @@ bool VMemo::startRecording() { if( fileName.right(1).find('/') == -1) fileName+="/"; - fName = "vm_"+ dt.toString()+ ".wav"; + fName = "vm_"+ date+ ".wav"; fileName+=fName; - // No spaces in the filename - fileName.replace(QRegExp("'"),""); - fileName.replace(QRegExp(" "),"_"); - fileName.replace(QRegExp(":"),"."); - fileName.replace(QRegExp(","),""); - - qDebug("filename is "+fileName); // open tmp file here @@ -345,5 +333,4 @@ bool VMemo::startRecording() { if(openWAV(pointer ) == -1) { -// if(openWAV(fileName.latin1()) == -1) { QString err("Could not open the temp file\n"); err += fileName; @@ -367,5 +354,5 @@ bool VMemo::startRecording() { QString dlName("vm_"); - dlName += dt.toString(); + dlName += date; DocLnk l; l.setFile(fileName); @@ -490,6 +477,6 @@ int VMemo::openWAV(const char *filename) { bool VMemo::record() { - - int length=0, result, value; + length=0; + int result, value; QString msg; msg.sprintf("Recording format %d", format); @@ -577,5 +564,26 @@ bool VMemo::record() { ::close(dsp); - qDebug("done recording "+fileName); + Config cfgO("OpieRec"); + cfgO.setGroup("Sounds"); + + int nFiles = cfgO.readNumEntry( "NumberofFiles",0); + + QString currentFileName = fileName; + QString currentFile = "vm_"+ date; + + float numberOfRecordedSeconds=(float) length / (float)speed * (float)2; + + cfgO.writeEntry( "NumberofFiles", nFiles + 1); + cfgO.writeEntry( QString::number( nFiles + 1), currentFile); + cfgO.writeEntry( currentFile, currentFileName); + + QString time; + time.sprintf("%.2f", numberOfRecordedSeconds); + cfgO.writeEntry( currentFileName, time ); + // qDebug("writing config numberOfRecordedSeconds "+time); + + cfgO.write(); + + qDebug("done recording "+fileName); 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: VMemo( QWidget *parent, const char *name = NULL); ~VMemo(); - QFile track; - QString fileName, errorMsg; + QFile track; + int length; + QString fileName, errorMsg, date; QLabel* msgLabel; QTimer *t_timer; |