author | llornkcor <llornkcor> | 2002-07-26 01:14:13 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-07-26 01:14:13 (UTC) |
commit | 630a8f6e4ff5eddaee0089e383c42cc198c68ced (patch) (side-by-side diff) | |
tree | 7d743e08c5964eb96f0fb5090d977fdf702c3f44 /core/applets | |
parent | f3678966b4f08e9cc99b5f625c028e6f2d29a8ae (diff) | |
download | opie-630a8f6e4ff5eddaee0089e383c42cc198c68ced.zip opie-630a8f6e4ff5eddaee0089e383c42cc198c68ced.tar.gz opie-630a8f6e4ff5eddaee0089e383c42cc198c68ced.tar.bz2 |
made 2nd button release stop recording, and fixed umlimited time recording
-rw-r--r-- | core/applets/vmemo/vmemo.cpp | 24 | ||||
-rw-r--r-- | core/applets/vmemo/vmemo.h | 2 |
2 files changed, 17 insertions, 9 deletions
diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp index b5239eb..035965e 100644 --- a/core/applets/vmemo/vmemo.cpp +++ b/core/applets/vmemo/vmemo.cpp @@ -260,11 +260,13 @@ VMemo::~VMemo() { void VMemo::receive( const QCString &msg, const QByteArray &data ) { qDebug("receive"); QDataStream stream( data, IO_ReadOnly ); + if (msg == "toggleRecord()") { + if (recording) { fromToggle = TRUE; mouseReleaseEvent(NULL); -// stopRecording(); + stopRecording(); } else { fromToggle = TRUE; // mousePressEvent(NULL); @@ -359,13 +361,13 @@ bool VMemo::startRecording() { fName = "vm_"+ dt.toString()+ ".wav"; fileName+=fName; - qDebug("filename is "+fileName); // 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); @@ -380,7 +382,7 @@ bool VMemo::startRecording() { ::close(dsp); return FALSE; } - record(); + if( record() ) { QString cmd; cmd.sprintf("mv %s "+fileName, pointer); @@ -398,8 +400,10 @@ bool VMemo::startRecording() { l.setType("audio/x-wav"); l.setCategories(cats); l.writeLink(); - return TRUE; + } else + return FALSE; + } void VMemo::stopRecording() { @@ -504,7 +508,8 @@ int VMemo::openWAV(const char *filename) { return 1; } -void VMemo::record(void) { +bool VMemo::record() { + int length=0, result, value; QString msg; msg.sprintf("Recording format %d", format); @@ -512,7 +517,7 @@ void VMemo::record(void) { Config config("Vmemo"); config.setGroup("Record"); int sRate=config.readNumEntry("SizeLimit", 30); - + if(sRate > 0) t_timer->start( sRate * 1000+1000, TRUE); // if(systemZaurus) { @@ -537,8 +542,9 @@ void VMemo::record(void) { perror("recording error "); // qDebug(currentFileName); QMessageBox::message(tr("Note"),tr("error recording")); - recording=FALSE;; + recording=FALSE; break; + return FALSE; } if(useADPCM) { @@ -558,6 +564,8 @@ void VMemo::record(void) { recording=false; perror("dev/dsp's is a lookin' messy"); QMessageBox::message("Vmemo"," Done1 recording\n"+ fileName); + break; + return FALSE; } // printf("%d\r",length); // fflush(stdout); @@ -597,7 +605,7 @@ void VMemo::record(void) { QString foo = cfg.readEntry("Mute","TRUE"); if(foo.find("TRUE",0,TRUE) != -1) QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE; //mute - +return TRUE; } int VMemo::setToggleButton(int tog) { diff --git a/core/applets/vmemo/vmemo.h b/core/applets/vmemo/vmemo.h index 167af2a..9ee08ff 100644 --- a/core/applets/vmemo/vmemo.h +++ b/core/applets/vmemo/vmemo.h @@ -38,7 +38,7 @@ public: QTimer *t_timer; bool usingIcon, useADPCM; public slots: - void record(); + bool record(); void mousePressEvent( QMouseEvent * ); void mouseReleaseEvent( QMouseEvent * ); void receive( const QCString &msg, const QByteArray &data ); |