[ekiga] Fix sound event names



commit 8ad91998ca8121c569d6f3e0ac7d2c467783435b
Author: Eugen Dedu <eugen dedu univ-fcomte fr>
Date:   Sun Aug 3 23:42:32 2014 +0200

    Fix sound event names
    
    For ex., there was no sound when receiving a call.  Bug introduced with
    gconf->gsettings migration.

 lib/engine/components/opal/opal-account.cpp |    2 +-
 lib/engine/gui/gtk-frontend/main_window.cpp |   16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/lib/engine/components/opal/opal-account.cpp b/lib/engine/components/opal/opal-account.cpp
index 6d38516..d64b5f9 100644
--- a/lib/engine/components/opal/opal-account.cpp
+++ b/lib/engine/components/opal/opal-account.cpp
@@ -1057,7 +1057,7 @@ Opal::Account::handle_message_waiting_information (const std::string info)
     if (message_waiting_number > 0) {
       boost::shared_ptr<Ekiga::AudioOutputCore> audiooutput = audiooutput_core.lock ();
       if (audiooutput)
-       audiooutput->play_event ("new_voicemail_sound");
+       audiooutput->play_event ("new-voicemail-sound");
     }
     updated ();
   }
diff --git a/lib/engine/gui/gtk-frontend/main_window.cpp b/lib/engine/gui/gtk-frontend/main_window.cpp
index dae3ee5..2b4b01e 100644
--- a/lib/engine/gui/gtk-frontend/main_window.cpp
+++ b/lib/engine/gui/gtk-frontend/main_window.cpp
@@ -544,7 +544,7 @@ static void on_setup_call_cb (boost::shared_ptr<Ekiga::CallManager> manager,
     if (mw->priv->current_call)
       return; // No call setup needed if already in a call
 
-    mw->priv->audiooutput_core->start_play_event ("incoming_call_sound", 4000, 256);
+    mw->priv->audiooutput_core->start_play_event ("incoming-call-sound", 4000, 256);
 
     mw->priv->current_call = call;
     mw->priv->calling_state = Called;
@@ -574,7 +574,7 @@ static void on_ringing_call_cb (boost::shared_ptr<Ekiga::CallManager>  /*manager
   EkigaMainWindow *mw = EKIGA_MAIN_WINDOW (self);
 
   if (call->is_outgoing ()) {
-    mw->priv->audiooutput_core->start_play_event("ring_tone_sound", 3000, 256);
+    mw->priv->audiooutput_core->start_play_event("ring-tone-sound", 3000, 256);
   }
 }
 
@@ -599,8 +599,8 @@ static void on_established_call_cb (boost::shared_ptr<Ekiga::CallManager>  /*man
 
   /* Manage sound events */
 
-  mw->priv->audiooutput_core->stop_play_event("incoming_call_sound");
-  mw->priv->audiooutput_core->stop_play_event("ring_tone_sound");
+  mw->priv->audiooutput_core->stop_play_event("incoming-call-sound");
+  mw->priv->audiooutput_core->stop_play_event("ring-tone-sound");
 
   /* Show call window */
     boost::shared_ptr<GtkFrontend> gtk_frontend = mw->priv->gtk_frontend.lock ();
@@ -630,8 +630,8 @@ static void on_cleared_call_cb (boost::shared_ptr<Ekiga::CallManager>  /*manager
   ekiga_main_window_flash_message (mw, "%s", reason.c_str ());
 
   /* Sound events */
-  mw->priv->audiooutput_core->stop_play_event("incoming_call_sound");
-  mw->priv->audiooutput_core->stop_play_event("ring_tone_sound");
+  mw->priv->audiooutput_core->stop_play_event("incoming-call-sound");
+  mw->priv->audiooutput_core->stop_play_event("ring-tone-sound");
 
   /* Hide call window */
   g_timeout_add_seconds (2, on_delayed_hide_call_window_cb, mw);
@@ -668,8 +668,8 @@ static void on_missed_call_cb (boost::shared_ptr<Ekiga::CallManager>  /*manager*
     gtk_widget_set_sensitive (GTK_WIDGET (mw->priv->preview_button), true);
 
     /* Clear sounds */
-    mw->priv->audiooutput_core->stop_play_event ("incoming_call_sound");
-    mw->priv->audiooutput_core->stop_play_event ("ring_tone_sound");
+    mw->priv->audiooutput_core->stop_play_event ("incoming-call-sound");
+    mw->priv->audiooutput_core->stop_play_event ("ring-tone-sound");
   }
 }
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]