summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/vmemo/vmemo.cpp58
-rw-r--r--core/applets/vmemo/vmemo.h2
2 files changed, 34 insertions, 26 deletions
diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp
index cb3e45e..2c3edf1 100644
--- a/core/applets/vmemo/vmemo.cpp
+++ b/core/applets/vmemo/vmemo.cpp
@@ -236,3 +236,6 @@ VMemo::VMemo( QWidget *parent, const char *_name )
}
-
+ if(toggleKey == 1)
+ usingIcon=TRUE;
+ else
+ usingIcon=FALSE;
if( vmCfg.readNumEntry("hideIcon",0) == 1)
@@ -269,3 +272,6 @@ void VMemo::mousePressEvent( QMouseEvent * )
{
- startRecording();
+ if(!recording)
+ startRecording();
+ else
+ stopRecording();
}
@@ -274,3 +280,4 @@ void VMemo::mouseReleaseEvent( QMouseEvent * )
{
- stopRecording();
+// if(usingIcon && !recording)
+// stopRecording();
}
@@ -361,6 +368,5 @@ bool VMemo::startRecording() {
l.writeLink();
-
record();
- // delete msgLabel;
+
return TRUE;
@@ -369,12 +375,15 @@ bool VMemo::startRecording() {
void VMemo::stopRecording() {
-show();
- qDebug("Stopped recording");
- recording = FALSE;
- if(useAlerts)
- if( msgLabel) delete msgLabel;
- t_timer->stop();
- Config cfg("Vmemo");
- cfg.setGroup("Defaults");
+ show();
+ qDebug("Stopped recording");
+ recording = FALSE;
+ if(useAlerts) {
+ msgLabel->close();
+ msgLabel=0;
+ delete msgLabel;
+ }
+ t_timer->stop();
+ Config cfg("Vmemo");
+ cfg.setGroup("Defaults");
if( cfg.readNumEntry("hideIcon",0) == 1 )
- hide();
+ hide();
}
@@ -482,3 +491,3 @@ void VMemo::record(void)
qDebug(msg);
- signed short sound[512], monoBuffer[512];
+ signed short sound[1024], monoBuffer[1024];
@@ -490,3 +499,3 @@ void VMemo::record(void)
- result = read(dsp, sound, 512); // 8192
+ result = read(dsp, sound, 1024); // 8192
// int j=0;
@@ -500,4 +509,3 @@ void VMemo::record(void)
recording=false;
-
- // for (int i = 0; i < result; i+=2) {
+ // for (int i = 0; i < result; i+=2) {
// monoBuffer[j] = sound[i];
@@ -514,5 +522,5 @@ void VMemo::record(void)
// 8bit unsigned
- unsigned short sound[512], monoBuffer[512];
+ unsigned short sound[1024], monoBuffer[1024];
while(recording) {
- result = read(dsp, sound, 512); // 8192
+ result = read(dsp, sound, 1024); // 8192
// int j=0;
@@ -546,3 +554,3 @@ void VMemo::record(void)
- signed short sound[512];//, monoBuffer[512];
+ signed short sound[1024];//, monoBuffer[512];
@@ -550,3 +558,3 @@ void VMemo::record(void)
- result = read(dsp, sound, 512); // 8192
+ result = read(dsp, sound, 1024); // 8192
@@ -554,2 +562,3 @@ void VMemo::record(void)
length += result;
+
if(length<0) {
@@ -591,3 +600,3 @@ void VMemo::record(void)
- QSound::play(Resource::findSound("vmemoe"));
+// QSound::play(Resource::findSound("vmemoe"));
@@ -639,4 +648,3 @@ void VMemo::timerBreak() {
//stop
- recording=false;
-
+ stopRecording();
QMessageBox::message("Vmemo","Vmemo recording has \ntimed out");
diff --git a/core/applets/vmemo/vmemo.h b/core/applets/vmemo/vmemo.h
index 51ace35..823c7b8 100644
--- a/core/applets/vmemo/vmemo.h
+++ b/core/applets/vmemo/vmemo.h
@@ -38,3 +38,3 @@ public:
QTimer *t_timer;
-
+bool usingIcon;
public slots: