summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/vmemo/vmemo.cpp46
1 files changed, 36 insertions, 10 deletions
diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp
index 2c3edf1..b77e3b8 100644
--- a/core/applets/vmemo/vmemo.cpp
+++ b/core/applets/vmemo/vmemo.cpp
@@ -251,29 +251,43 @@ void VMemo::receive( const QCString &msg, const QByteArray &data )
{
qDebug("receive");
QDataStream stream( data, IO_ReadOnly );
if (msg == "toggleRecord()") {
if (recording) {
fromToggle = TRUE;
- stopRecording();
+ mouseReleaseEvent(NULL);
+// stopRecording();
} else {
fromToggle = TRUE;
+ // mousePressEvent(NULL);
startRecording();
}
}
}
void VMemo::paintEvent( QPaintEvent* )
{
QPainter p(this);
p.drawPixmap( 0, 1,( const char** ) vmemo_xpm );
}
-void VMemo::mousePressEvent( QMouseEvent * )
+void VMemo::mousePressEvent( QMouseEvent * me)
{
- if(!recording)
+ // just to be safe
+ if (recording) {
+ recording = FALSE;
+ return;
+ }
+ /* No mousePress/mouseRelease recording on the iPAQ. The REC button on the iPAQ calls these functions
+ mousePressEvent and mouseReleaseEvent with a NULL parameter. */
+ if ( me->button() != LeftButton)
+
+ // if (!systemZaurus && me != NULL)
+ return;
+
+ if(!recording)
startRecording();
else
stopRecording();
}
void VMemo::mouseReleaseEvent( QMouseEvent * )
@@ -344,20 +358,32 @@ bool VMemo::startRecording() {
// No spaces in the filename
fileName.replace(QRegExp("'"),"");
fileName.replace(QRegExp(" "),"_");
fileName.replace(QRegExp(":"),".");
fileName.replace(QRegExp(","),"");
- if(openWAV(fileName.latin1()) == -1) {
- // QString err("Could not open the output file\n");
- // err += fileName;
- // QMessageBox::critical(0, "vmemo", err, "Abort");
- close(dsp);
+// 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);
return FALSE;
}
-
+ QString cmd;
+ cmd.sprintf("mv %s "+fileName,pointer);
+
+// move tmp file to regular file here
+ system(cmd.latin1());
+
QArray<int> cats(1);
cats[0] = config.readNumEntry("Category", 0);
QString dlName("vm_");
dlName += dt.toString();
DocLnk l;
@@ -644,8 +670,8 @@ int VMemo::setToggleButton(int tog) {
return -1;
}
void VMemo::timerBreak() {
//stop
stopRecording();
- QMessageBox::message("Vmemo","Vmemo recording has \ntimed out");
+ QMessageBox::message("Vmemo","Vmemo recording has ended");
}