author | ar <ar> | 2004-02-07 23:00:09 (UTC) |
---|---|---|
committer | ar <ar> | 2004-02-07 23:00:09 (UTC) |
commit | 3f261fa6eac46b8d0d4ac8b8bb95b385435004da (patch) (unidiff) | |
tree | 3ce8d25b96a287e2df7b194513f2c3c0a27ecd0a | |
parent | 83a8f6fd9db949943d58d2f2a80304d516cf45d3 (diff) | |
download | opie-3f261fa6eac46b8d0d4ac8b8bb95b385435004da.zip opie-3f261fa6eac46b8d0d4ac8b8bb95b385435004da.tar.gz opie-3f261fa6eac46b8d0d4ac8b8bb95b385435004da.tar.bz2 |
correct sound calls for use with libopie2
-rw-r--r-- | noncore/net/wellenreiter/gui/configwindow.cpp | 4 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiter.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/noncore/net/wellenreiter/gui/configwindow.cpp b/noncore/net/wellenreiter/gui/configwindow.cpp index ca53471..48fe89c 100644 --- a/noncore/net/wellenreiter/gui/configwindow.cpp +++ b/noncore/net/wellenreiter/gui/configwindow.cpp | |||
@@ -314,18 +314,18 @@ void WellenreiterConfigWindow::performAction( const QString& type, | |||
314 | return; | 314 | return; |
315 | } | 315 | } |
316 | 316 | ||
317 | qDebug( "for event '%s' I'm going to perform action %d (script='%s')", (const char*) type, action, (const char*) script ); | 317 | qDebug( "for event '%s' I'm going to perform action %d (script='%s')", (const char*) type, action, (const char*) script ); |
318 | 318 | ||
319 | switch( action ) | 319 | switch( action ) |
320 | { | 320 | { |
321 | case 0: /* Ignore */ return; | 321 | case 0: /* Ignore */ return; |
322 | case 1: /* Play Alarm */ ODevice::inst()->alarmSound(); return; | 322 | case 1: /* Play Alarm */ ODevice::inst()->playAlarmSound(); return; |
323 | case 2: /* Play Click */ ODevice::inst()->touchSound(); return; | 323 | case 2: /* Play Click */ ODevice::inst()->playTouchSound(); return; |
324 | case 3: /* Blink LED */ break; //FIXME: Implement this | 324 | case 3: /* Blink LED */ break; //FIXME: Implement this |
325 | case 4: /* Run Script */ | 325 | case 4: /* Run Script */ |
326 | { | 326 | { |
327 | /** | 327 | /** |
328 | * | 328 | * |
329 | * Script Substitution Information: | 329 | * Script Substitution Information: |
330 | * | 330 | * |
331 | * $SSID = SSID | 331 | * $SSID = SSID |
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp index 43a04e3..db68e5b 100644 --- a/noncore/net/wellenreiter/gui/wellenreiter.cpp +++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp | |||
@@ -649,21 +649,21 @@ void Wellenreiter::timerEvent( QTimerEvent* ) | |||
649 | } | 649 | } |
650 | } | 650 | } |
651 | 651 | ||
652 | 652 | ||
653 | void Wellenreiter::doAction( const QString& action, const QString& protocol, OPacket* p ) | 653 | void Wellenreiter::doAction( const QString& action, const QString& protocol, OPacket* p ) |
654 | { | 654 | { |
655 | #ifdef QWS | 655 | #ifdef QWS |
656 | if ( action == "TouchSound" ) | 656 | if ( action == "TouchSound" ) |
657 | ODevice::inst()->touchSound(); | 657 | ODevice::inst()->playTouchSound(); |
658 | else if ( action == "AlarmSound" ) | 658 | else if ( action == "AlarmSound" ) |
659 | ODevice::inst()->alarmSound(); | 659 | ODevice::inst()->playAlarmSound(); |
660 | else if ( action == "KeySound" ) | 660 | else if ( action == "KeySound" ) |
661 | ODevice::inst()->keySound(); | 661 | ODevice::inst()->playKeySound(); |
662 | else if ( action == "LedOn" ) | 662 | else if ( action == "LedOn" ) |
663 | ODevice::inst()->setLedState( Led_Mail, Led_On ); | 663 | ODevice::inst()->setLedState( Led_Mail, Led_On ); |
664 | else if ( action == "LedOff" ) | 664 | else if ( action == "LedOff" ) |
665 | ODevice::inst()->setLedState( Led_Mail, Led_Off ); | 665 | ODevice::inst()->setLedState( Led_Mail, Led_Off ); |
666 | else if ( action == "LogMessage" ) | 666 | else if ( action == "LogMessage" ) |
667 | logwindow->log( QString().sprintf( "Got packet with protocol '%s'", (const char*) protocol ) ); | 667 | logwindow->log( QString().sprintf( "Got packet with protocol '%s'", (const char*) protocol ) ); |
668 | else if ( action == "MessageBox" ) | 668 | else if ( action == "MessageBox" ) |
669 | QMessageBox::information( this, "Notification!", | 669 | QMessageBox::information( this, "Notification!", |