[ekiga] Changed the Ekiga::AudioOuputCore::add_event method to map_event
- From: Julien Puydt <jpuydt src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ekiga] Changed the Ekiga::AudioOuputCore::add_event method to map_event
- Date: Mon, 27 Sep 2010 18:49:38 +0000 (UTC)
commit 5fc34efba70c1d2635f1654fee420135edea17f5
Author: Julien Puydt <jpuydt gnome org>
Date: Mon Sep 27 15:24:57 2010 +0200
Changed the Ekiga::AudioOuputCore::add_event method to map_event
It seemed clearer.
lib/engine/audiooutput/audiooutput-core.cpp | 2 +-
lib/engine/audiooutput/audiooutput-core.h | 4 ++--
.../audiooutput/audiooutput-gmconf-bridge.cpp | 10 +++++-----
3 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/lib/engine/audiooutput/audiooutput-core.cpp b/lib/engine/audiooutput/audiooutput-core.cpp
index 49ed03c..3199135 100644
--- a/lib/engine/audiooutput/audiooutput-core.cpp
+++ b/lib/engine/audiooutput/audiooutput-core.cpp
@@ -111,7 +111,7 @@ void AudioOutputCore::visit_managers (boost::function1<bool, AudioOutputManager
go_on = visitor (*(*iter));
}
-void AudioOutputCore::add_event (const std::string & event_name, const std::string & file_name, AudioOutputPS ps, bool enabled)
+void AudioOutputCore::map_event (const std::string & event_name, const std::string & file_name, AudioOutputPS ps, bool enabled)
{
audio_event_scheduler.set_file_name(event_name, file_name, ps, enabled);
}
diff --git a/lib/engine/audiooutput/audiooutput-core.h b/lib/engine/audiooutput/audiooutput-core.h
index e894084..91b10f8 100644
--- a/lib/engine/audiooutput/audiooutput-core.h
+++ b/lib/engine/audiooutput/audiooutput-core.h
@@ -171,14 +171,14 @@ namespace Ekiga
/*** Event Management ***/
- /** Add a mapping between event and file name to the event list
+ /** Add or update a mapping between event and file name to the event list
* An event shall refer to a specific sound file. This mapping is set here.
* @param event_name the name of the event.
* @param file_name the name of the file.
* @param ps whether the event shall be played on the primary or secondary device preferrably.
* @param enabled if the event is enabled.
*/
- void add_event (const std::string & event_name, const std::string & file_name, AudioOutputPS ps, bool enabled);
+ void map_event (const std::string & event_name, const std::string & file_name, AudioOutputPS ps, bool enabled);
/** Play a sound specified by a file name
* Play a sound file once.
diff --git a/lib/engine/audiooutput/audiooutput-gmconf-bridge.cpp b/lib/engine/audiooutput/audiooutput-gmconf-bridge.cpp
index d66fd6a..4f1fca1 100644
--- a/lib/engine/audiooutput/audiooutput-gmconf-bridge.cpp
+++ b/lib/engine/audiooutput/audiooutput-gmconf-bridge.cpp
@@ -148,7 +148,7 @@ void AudioOutputCoreConfBridge::on_property_changed (std::string key, GmConfEntr
file_name = c_file_name;
g_free (c_file_name);
enabled = gm_conf_get_bool (SOUND_EVENTS_KEY "enable_busy_tone_sound");
- audiooutput_core.add_event (name, file_name, primary, enabled);
+ audiooutput_core.map_event (name, file_name, primary, enabled);
}
if ( (key == SOUND_EVENTS_KEY "incoming_call_sound") ||
@@ -165,7 +165,7 @@ void AudioOutputCoreConfBridge::on_property_changed (std::string key, GmConfEntr
file_name = c_file_name;
g_free (c_file_name);
enabled = gm_conf_get_bool (SOUND_EVENTS_KEY "enable_incoming_call_sound");
- audiooutput_core.add_event (name, file_name, secondary, enabled);
+ audiooutput_core.map_event (name, file_name, secondary, enabled);
}
if ( (key == SOUND_EVENTS_KEY "new_message_sound") ||
@@ -182,7 +182,7 @@ void AudioOutputCoreConfBridge::on_property_changed (std::string key, GmConfEntr
file_name = c_file_name;
g_free (c_file_name);
enabled = gm_conf_get_bool (SOUND_EVENTS_KEY "enable_new_message_sound");
- audiooutput_core.add_event (name, file_name, secondary, enabled);
+ audiooutput_core.map_event (name, file_name, secondary, enabled);
}
@@ -200,7 +200,7 @@ void AudioOutputCoreConfBridge::on_property_changed (std::string key, GmConfEntr
file_name = c_file_name;
g_free (c_file_name);
enabled = gm_conf_get_bool (SOUND_EVENTS_KEY "enable_new_voicemail_sound");
- audiooutput_core.add_event (name, file_name, secondary, enabled);
+ audiooutput_core.map_event (name, file_name, secondary, enabled);
}
if ( (key == SOUND_EVENTS_KEY "ring_tone_sound") ||
@@ -217,7 +217,7 @@ void AudioOutputCoreConfBridge::on_property_changed (std::string key, GmConfEntr
file_name = c_file_name;
g_free (c_file_name);
enabled = gm_conf_get_bool (SOUND_EVENTS_KEY "enable_ring_tone_sound");
- audiooutput_core.add_event (name, file_name, primary, enabled);
+ audiooutput_core.map_event (name, file_name, primary, enabled);
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]