-rw-r--r-- | core/applets/vmemo/vmemo.cpp | 36 |
1 files changed, 3 insertions, 33 deletions
diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp index c5d0a5b..4c07b3a 100644 --- a/core/applets/vmemo/vmemo.cpp +++ b/core/applets/vmemo/vmemo.cpp @@ -212,6 +212,4 @@ VMemo::VMemo( QWidget *parent, const char *_name ) setFixedWidth( 14 ); - recording = FALSE; - t_timer = new QTimer( this ); connect( t_timer, SIGNAL( timeout() ), SLOT( timerBreak() ) ); @@ -238,5 +236,4 @@ VMemo::VMemo( QWidget *parent, const char *_name ) if( toggleKey != -1 ) { - // QPEApplication::grabKeyboard(); QCopEnvelope e("QPE/Desktop", "keyRegister(int key, QString channel, QString message)"); // e << 4096; // Key_Escape @@ -252,4 +249,5 @@ VMemo::VMemo( QWidget *parent, const char *_name ) if( vmCfg.readNumEntry("hideIcon",0) == 1) hide(); + recording = FALSE; } } @@ -263,12 +261,9 @@ void VMemo::receive( const QCString &msg, const QByteArray &data ) { if (msg == "toggleRecord()") { - if (recording) { fromToggle = TRUE; - mouseReleaseEvent(NULL); stopRecording(); } else { fromToggle = TRUE; - // mousePressEvent(NULL); startRecording(); } @@ -282,14 +277,8 @@ void VMemo::paintEvent( QPaintEvent* ) { void VMemo::mousePressEvent( QMouseEvent * me) { - // 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 && me != NULL /*&& !systemZaurus*/) { - // if (!systemZaurus && me != NULL) +// if (!systemZaurus && me != NULL) // return; // } @@ -302,13 +291,7 @@ void VMemo::mousePressEvent( QMouseEvent * me) { void VMemo::mouseReleaseEvent( QMouseEvent * ) { -// if(usingIcon && !recording) -// stopRecording(); } bool VMemo::startRecording() { - - if ( recording) - return FALSE; - Config config( "Vmemo" ); config.setGroup( "System" ); @@ -322,17 +305,8 @@ bool VMemo::startRecording() { } - // if(useAlerts) - // QMessageBox::message("VMemo","Really Record?");//) ==1) - // return; - // } else { - // if (!systemZaurus ) - // QSound::play(Resource::findSound("vmemob")); - // } qDebug("Start recording engines"); recording = TRUE; if (openDSP() == -1) { - // QMessageBox::critical(0, "vmemo", "Could not open dsp device.\n"+errorMsg, "Abort"); - // delete msgLabel; recording = FALSE; msgLabel=0; @@ -577,5 +551,5 @@ bool VMemo::record() { recording=false; perror("dev/dsp's is a lookin' messy"); - QMessageBox::message("Vmemo"," Done1 recording\n"+ fileName); + QMessageBox::message("Vmemo","Error writing to file\n"+ fileName); break; return FALSE; @@ -607,10 +581,6 @@ bool VMemo::record() { ::close(dsp); - // if(useAlerts) - // QMessageBox::message("Vmemo"," Done1 recording\n"+ fileName); qDebug("done recording "+fileName); -// QSound::play(Resource::findSound("vmemoe")); - Config cfg("qpe"); cfg.setGroup("Volume"); |