| -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 @@ -12,27 +12,23 @@ // copyright 2002 Jeremy Cowgar <jc@cowgar.com> /* * $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' */ u_long length; /* filelen */ u_long chunk_type; /* 'WAVE' */ @@ -207,21 +203,16 @@ VMemo::VMemo( QWidget *parent, const char *_name ) t_timer = new QTimer( this ); 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"); int toggleKey = setToggleButton(vmCfg.readNumEntry("toggleKey", -1)); 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; myChannel = new QCopChannel( "QPE/VMemo", this ); @@ -243,9 +234,9 @@ VMemo::VMemo( QWidget *parent, const char *_name ) usingIcon=FALSE; if( vmCfg.readNumEntry("hideIcon",0) == 1) hide(); recording = FALSE; - } + // } } VMemo::~VMemo() { } @@ -307,10 +298,14 @@ bool VMemo::startRecording() { return FALSE; } 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; config.setGroup( "System" ); fName = QPEApplication::documentDir() ; @@ -325,27 +320,19 @@ bool VMemo::startRecording() { if( fileName.left(1).find('/') == -1) fileName="/"+fileName; 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 char *pointer; pointer=tmpnam(NULL); qDebug("Opening tmp file %s",pointer); if(openWAV(pointer ) == -1) { -// if(openWAV(fileName.latin1()) == -1) { QString err("Could not open the temp file\n"); err += fileName; QMessageBox::critical(0, "vmemo", err, "Abort"); ::close(dsp); @@ -365,9 +352,9 @@ bool VMemo::startRecording() { QArray<int> cats(1); cats[0] = config.readNumEntry("Category", 0); QString dlName("vm_"); - dlName += dt.toString(); + dlName += date; DocLnk l; l.setFile(fileName); l.setName(dlName); l.setType("audio/x-wav"); @@ -488,10 +475,10 @@ int VMemo::openWAV(const char *filename) { return 1; } bool VMemo::record() { - - int length=0, result, value; + length=0; + int result, value; QString msg; msg.sprintf("Recording format %d", format); qDebug(msg); Config config("Vmemo"); @@ -575,9 +562,30 @@ bool VMemo::record() { perror("ioctl(\"SNDCTL_DSP_RESET\")"); ::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"); cfg.setGroup("Volume"); QString foo = cfg.readEntry("Mute","TRUE"); 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 @@ -31,10 +31,11 @@ class VMemo : public QWidget Q_OBJECT 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; bool usingIcon, useADPCM; public slots: |