summaryrefslogtreecommitdiff
authorar <ar>2004-02-07 23:00:09 (UTC)
committer ar <ar>2004-02-07 23:00:09 (UTC)
commit3f261fa6eac46b8d0d4ac8b8bb95b385435004da (patch) (unidiff)
tree3ce8d25b96a287e2df7b194513f2c3c0a27ecd0a
parent83a8f6fd9db949943d58d2f2a80304d516cf45d3 (diff)
downloadopie-3f261fa6eac46b8d0d4ac8b8bb95b385435004da.zip
opie-3f261fa6eac46b8d0d4ac8b8bb95b385435004da.tar.gz
opie-3f261fa6eac46b8d0d4ac8b8bb95b385435004da.tar.bz2
correct sound calls for use with libopie2
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/wellenreiter/gui/configwindow.cpp4
-rw-r--r--noncore/net/wellenreiter/gui/wellenreiter.cpp6
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
@@ -310,26 +310,26 @@ void WellenreiterConfigWindow::performAction( const QString& type,
310 } 310 }
311 else 311 else
312 { 312 {
313 qWarning( "WellenreiterConfigWindow::performAction(): unknown type '%s'", (const char*) type ); 313 qWarning( "WellenreiterConfigWindow::performAction(): unknown type '%s'", (const char*) 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
332 * $MAC = MAC 332 * $MAC = MAC
333 * $WEP = Wep 333 * $WEP = Wep
334 * $CHAN = Channel 334 * $CHAN = Channel
335 * 335 *
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
@@ -645,29 +645,29 @@ void Wellenreiter::timerEvent( QTimerEvent* )
645 else 645 else
646 { 646 {
647 receivePacket( p ); 647 receivePacket( p );
648 delete p; 648 delete p;
649 } 649 }
650} 650}
651 651
652 652
653void Wellenreiter::doAction( const QString& action, const QString& protocol, OPacket* p ) 653void 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!",
670 QString().sprintf( "Got packet with protocol '%s'", (const char*) protocol ) ); 670 QString().sprintf( "Got packet with protocol '%s'", (const char*) protocol ) );
671 #else 671 #else
672 #warning Actions do not work with Qt/X11 yet 672 #warning Actions do not work with Qt/X11 yet
673 #endif 673 #endif