author | llornkcor <llornkcor> | 2002-09-20 16:15:20 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-09-20 16:15:20 (UTC) |
commit | 40df2487c53a5ab484d33d619f5b6ed449c0b485 (patch) (unidiff) | |
tree | 9439fb7a35a16a798c4a07a612f001ab7f36d948 | |
parent | 5442f262a9e59becacdde4822f439b91d43795df (diff) | |
download | opie-40df2487c53a5ab484d33d619f5b6ed449c0b485.zip opie-40df2487c53a5ab484d33d619f5b6ed449c0b485.tar.gz opie-40df2487c53a5ab484d33d619f5b6ed449c0b485.tar.bz2 |
cleanup
-rw-r--r-- | core/applets/vmemo/vmemo.cpp | 34 |
1 files changed, 2 insertions, 32 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 | |||
@@ -208,14 +208,12 @@ static char * vmemo_xpm[] = { | |||
208 | 208 | ||
209 | VMemo::VMemo( QWidget *parent, const char *_name ) | 209 | VMemo::VMemo( QWidget *parent, const char *_name ) |
210 | : QWidget( parent, _name ) { | 210 | : QWidget( parent, _name ) { |
211 | setFixedHeight( 18 ); | 211 | setFixedHeight( 18 ); |
212 | setFixedWidth( 14 ); | 212 | setFixedWidth( 14 ); |
213 | 213 | ||
214 | recording = FALSE; | ||
215 | |||
216 | t_timer = new QTimer( this ); | 214 | t_timer = new QTimer( this ); |
217 | connect( t_timer, SIGNAL( timeout() ), SLOT( timerBreak() ) ); | 215 | connect( t_timer, SIGNAL( timeout() ), SLOT( timerBreak() ) ); |
218 | 216 | ||
219 | struct utsname name; /* check for embedix kernel running on the zaurus*/ | 217 | struct utsname name; /* check for embedix kernel running on the zaurus*/ |
220 | if (uname(&name) != -1) { | 218 | if (uname(&name) != -1) { |
221 | QString release=name.release; | 219 | QString release=name.release; |
@@ -234,13 +232,12 @@ VMemo::VMemo( QWidget *parent, const char *_name ) | |||
234 | 232 | ||
235 | myChannel = new QCopChannel( "QPE/VMemo", this ); | 233 | myChannel = new QCopChannel( "QPE/VMemo", this ); |
236 | connect( myChannel, SIGNAL(received(const QCString&, const QByteArray&)), | 234 | connect( myChannel, SIGNAL(received(const QCString&, const QByteArray&)), |
237 | this, SLOT(receive(const QCString&, const QByteArray&)) ); | 235 | this, SLOT(receive(const QCString&, const QByteArray&)) ); |
238 | 236 | ||
239 | if( toggleKey != -1 ) { | 237 | if( toggleKey != -1 ) { |
240 | // QPEApplication::grabKeyboard(); | ||
241 | QCopEnvelope e("QPE/Desktop", "keyRegister(int key, QString channel, QString message)"); | 238 | QCopEnvelope e("QPE/Desktop", "keyRegister(int key, QString channel, QString message)"); |
242 | // e << 4096; // Key_Escape | 239 | // e << 4096; // Key_Escape |
243 | // e << Key_F5; //4148 | 240 | // e << Key_F5; //4148 |
244 | e << toggleKey; | 241 | e << toggleKey; |
245 | e << QString("QPE/VMemo"); | 242 | e << QString("QPE/VMemo"); |
246 | e << QString("toggleRecord()"); | 243 | e << QString("toggleRecord()"); |
@@ -248,95 +245,72 @@ VMemo::VMemo( QWidget *parent, const char *_name ) | |||
248 | if(toggleKey == 1) | 245 | if(toggleKey == 1) |
249 | usingIcon=TRUE; | 246 | usingIcon=TRUE; |
250 | else | 247 | else |
251 | usingIcon=FALSE; | 248 | usingIcon=FALSE; |
252 | if( vmCfg.readNumEntry("hideIcon",0) == 1) | 249 | if( vmCfg.readNumEntry("hideIcon",0) == 1) |
253 | hide(); | 250 | hide(); |
251 | recording = FALSE; | ||
254 | } | 252 | } |
255 | } | 253 | } |
256 | 254 | ||
257 | VMemo::~VMemo() { | 255 | VMemo::~VMemo() { |
258 | } | 256 | } |
259 | 257 | ||
260 | void VMemo::receive( const QCString &msg, const QByteArray &data ) { | 258 | void VMemo::receive( const QCString &msg, const QByteArray &data ) { |
261 | qDebug("receive"); | 259 | qDebug("receive"); |
262 | QDataStream stream( data, IO_ReadOnly ); | 260 | QDataStream stream( data, IO_ReadOnly ); |
263 | 261 | ||
264 | if (msg == "toggleRecord()") { | 262 | if (msg == "toggleRecord()") { |
265 | |||
266 | if (recording) { | 263 | if (recording) { |
267 | fromToggle = TRUE; | 264 | fromToggle = TRUE; |
268 | mouseReleaseEvent(NULL); | ||
269 | stopRecording(); | 265 | stopRecording(); |
270 | } else { | 266 | } else { |
271 | fromToggle = TRUE; | 267 | fromToggle = TRUE; |
272 | // mousePressEvent(NULL); | ||
273 | startRecording(); | 268 | startRecording(); |
274 | } | 269 | } |
275 | } | 270 | } |
276 | } | 271 | } |
277 | 272 | ||
278 | void VMemo::paintEvent( QPaintEvent* ) { | 273 | void VMemo::paintEvent( QPaintEvent* ) { |
279 | QPainter p(this); | 274 | QPainter p(this); |
280 | p.drawPixmap( 0, 1,( const char** ) vmemo_xpm ); | 275 | p.drawPixmap( 0, 1,( const char** ) vmemo_xpm ); |
281 | } | 276 | } |
282 | 277 | ||
283 | void VMemo::mousePressEvent( QMouseEvent * me) { | 278 | void VMemo::mousePressEvent( QMouseEvent * me) { |
284 | // just to be safe | ||
285 | // if (recording) { | ||
286 | // recording = FALSE; | ||
287 | // return; | ||
288 | // } | ||
289 | /* No mousePress/mouseRelease recording on the iPAQ. The REC button on the iPAQ calls these functions | 279 | /* No mousePress/mouseRelease recording on the iPAQ. The REC button on the iPAQ calls these functions |
290 | mousePressEvent and mouseReleaseEvent with a NULL parameter. */ | 280 | mousePressEvent and mouseReleaseEvent with a NULL parameter. */ |
291 | // if ( me->button() != LeftButton && me != NULL /*&& !systemZaurus*/) { | ||
292 | 281 | ||
293 | // if (!systemZaurus && me != NULL) | 282 | // if (!systemZaurus && me != NULL) |
294 | // return; | 283 | // return; |
295 | // } | 284 | // } |
296 | 285 | ||
297 | if(!recording) | 286 | if(!recording) |
298 | startRecording(); | 287 | startRecording(); |
299 | else | 288 | else |
300 | stopRecording(); | 289 | stopRecording(); |
301 | } | 290 | } |
302 | 291 | ||
303 | void VMemo::mouseReleaseEvent( QMouseEvent * ) { | 292 | void VMemo::mouseReleaseEvent( QMouseEvent * ) { |
304 | // if(usingIcon && !recording) | ||
305 | // stopRecording(); | ||
306 | } | 293 | } |
307 | 294 | ||
308 | bool VMemo::startRecording() { | 295 | bool VMemo::startRecording() { |
309 | |||
310 | if ( recording) | ||
311 | return FALSE; | ||
312 | |||
313 | Config config( "Vmemo" ); | 296 | Config config( "Vmemo" ); |
314 | config.setGroup( "System" ); | 297 | config.setGroup( "System" ); |
315 | 298 | ||
316 | useAlerts = config.readBoolEntry("Alert",1); | 299 | useAlerts = config.readBoolEntry("Alert",1); |
317 | if(useAlerts) { | 300 | if(useAlerts) { |
318 | 301 | ||
319 | msgLabel = new QLabel( 0, "alertLabel" ); | 302 | msgLabel = new QLabel( 0, "alertLabel" ); |
320 | msgLabel->setText("<B><P><font size=+2>VMemo-Recording</font></B>"); | 303 | msgLabel->setText("<B><P><font size=+2>VMemo-Recording</font></B>"); |
321 | msgLabel->show(); | 304 | msgLabel->show(); |
322 | } | 305 | } |
323 | 306 | ||
324 | // if(useAlerts) | ||
325 | // QMessageBox::message("VMemo","Really Record?");//) ==1) | ||
326 | // return; | ||
327 | // } else { | ||
328 | // if (!systemZaurus ) | ||
329 | // QSound::play(Resource::findSound("vmemob")); | ||
330 | // } | ||
331 | qDebug("Start recording engines"); | 307 | qDebug("Start recording engines"); |
332 | recording = TRUE; | 308 | recording = TRUE; |
333 | 309 | ||
334 | if (openDSP() == -1) { | 310 | if (openDSP() == -1) { |
335 | // QMessageBox::critical(0, "vmemo", "Could not open dsp device.\n"+errorMsg, "Abort"); | ||
336 | // delete msgLabel; | ||
337 | recording = FALSE; | 311 | recording = FALSE; |
338 | msgLabel=0; | 312 | msgLabel=0; |
339 | delete msgLabel; | 313 | delete msgLabel; |
340 | 314 | ||
341 | return FALSE; | 315 | return FALSE; |
342 | } | 316 | } |
@@ -573,13 +547,13 @@ bool VMemo::record() { | |||
573 | } | 547 | } |
574 | length +=bytesWritten; | 548 | length +=bytesWritten; |
575 | 549 | ||
576 | if(length<0) { | 550 | if(length<0) { |
577 | recording=false; | 551 | recording=false; |
578 | perror("dev/dsp's is a lookin' messy"); | 552 | perror("dev/dsp's is a lookin' messy"); |
579 | QMessageBox::message("Vmemo"," Done1 recording\n"+ fileName); | 553 | QMessageBox::message("Vmemo","Error writing to file\n"+ fileName); |
580 | break; | 554 | break; |
581 | return FALSE; | 555 | return FALSE; |
582 | } | 556 | } |
583 | // printf("%d\r",length); | 557 | // printf("%d\r",length); |
584 | // fflush(stdout); | 558 | // fflush(stdout); |
585 | qApp->processEvents(); | 559 | qApp->processEvents(); |
@@ -603,18 +577,14 @@ bool VMemo::record() { | |||
603 | 577 | ||
604 | if( ioctl( dsp, SNDCTL_DSP_RESET,0) == -1) | 578 | if( ioctl( dsp, SNDCTL_DSP_RESET,0) == -1) |
605 | perror("ioctl(\"SNDCTL_DSP_RESET\")"); | 579 | perror("ioctl(\"SNDCTL_DSP_RESET\")"); |
606 | 580 | ||
607 | ::close(dsp); | 581 | ::close(dsp); |
608 | 582 | ||
609 | // if(useAlerts) | ||
610 | // QMessageBox::message("Vmemo"," Done1 recording\n"+ fileName); | ||
611 | qDebug("done recording "+fileName); | 583 | qDebug("done recording "+fileName); |
612 | 584 | ||
613 | // QSound::play(Resource::findSound("vmemoe")); | ||
614 | |||
615 | Config cfg("qpe"); | 585 | Config cfg("qpe"); |
616 | cfg.setGroup("Volume"); | 586 | cfg.setGroup("Volume"); |
617 | QString foo = cfg.readEntry("Mute","TRUE"); | 587 | QString foo = cfg.readEntry("Mute","TRUE"); |
618 | if(foo.find("TRUE",0,TRUE) != -1) | 588 | if(foo.find("TRUE",0,TRUE) != -1) |
619 | QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE; //mute | 589 | QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE; //mute |
620 | return TRUE; | 590 | return TRUE; |