correct sound calls for use with libopie2

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
@@ -298,50 +298,50 @@ void WellenreiterConfigWindow::performAction( const QString& type,
         action = newNetworkAction->currentItem();
         script = newNetworkScript->text();
     }
     else if ( type == "managed" || type == "adhoc" )
     {
         action = newClientAction->currentItem();
         script = newClientScript->text();
     }
     else if ( type == "station" )
     {
         action = newStationAction->currentItem();
         script = newStationScript->text();
     }
     else
     {
         qWarning( "WellenreiterConfigWindow::performAction(): unknown type '%s'", (const char*) type );
         return;
     }
 
     qDebug( "for event '%s' I'm going to perform action %d (script='%s')", (const char*) type, action, (const char*) script );
 
     switch( action )
     {
         case 0: /* Ignore */ return;
-        case 1: /* Play Alarm */ ODevice::inst()->alarmSound(); return;
-        case 2: /* Play Click */ ODevice::inst()->touchSound(); return;
+        case 1: /* Play Alarm */ ODevice::inst()->playAlarmSound(); return;
+        case 2: /* Play Click */ ODevice::inst()->playTouchSound(); return;
         case 3: /* Blink LED */ break; //FIXME: Implement this
         case 4: /* Run Script */
         {
             /**
                 *
                 * Script Substitution Information:
                 *
                 * $SSID = SSID
                 * $MAC = MAC
                 * $WEP = Wep
                 * $CHAN = Channel
                 *
                 **/
             script = script.replace( QRegExp( "$SSID" ), essid );
             script = script.replace( QRegExp( "$MAC" ), mac );
             script = script.replace( QRegExp( "$WEP" ), wep ? QString( "true" ) : QString( "false" ) );
             script = script.replace( QRegExp( "$CHAN" ), QString::number( channel ) );
 
             qDebug( "going to call script '%s'", (const char*) script );
             ::system( script );
             qDebug( "script returned." );
             return;
         }
         default: assert( false );
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
@@ -633,53 +633,53 @@ void Wellenreiter::startClicked()
     }
 }
 
 
 void Wellenreiter::timerEvent( QTimerEvent* )
 {
     qDebug( "Wellenreiter::timerEvent()" );
     OPacket* p = pcap->next();
     if ( !p ) // no more packets available
     {
         stopClicked();
     }
     else
     {
         receivePacket( p );
         delete p;
     }
 }
 
 
 void Wellenreiter::doAction( const QString& action, const QString& protocol, OPacket* p )
 {
     #ifdef QWS
     if ( action == "TouchSound" )
-        ODevice::inst()->touchSound();
+        ODevice::inst()->playTouchSound();
     else if ( action == "AlarmSound" )
-        ODevice::inst()->alarmSound();
+        ODevice::inst()->playAlarmSound();
     else if ( action == "KeySound" )
-        ODevice::inst()->keySound();
+        ODevice::inst()->playKeySound();
     else if ( action == "LedOn" )
         ODevice::inst()->setLedState( Led_Mail, Led_On );
     else if ( action == "LedOff" )
         ODevice::inst()->setLedState( Led_Mail, Led_Off );
     else if ( action == "LogMessage" )
         logwindow->log( QString().sprintf( "Got packet with protocol '%s'", (const char*) protocol ) );
     else if ( action == "MessageBox" )
         QMessageBox::information( this, "Notification!",
         QString().sprintf( "Got packet with protocol '%s'", (const char*) protocol ) );
     #else
     #warning Actions do not work with Qt/X11 yet
     #endif
 }
 
 void Wellenreiter::joinNetwork(const QString& type, const QString& essid, int channel, const QString& macaddr)
 {
     #ifdef QWS
     if ( !iface )
     {
         QMessageBox::warning( this, tr( "Can't do that!" ), tr( "No wireless\ninterface available." ) );
         return;
     }
 
     if ( sniffing )