diff --git a/sflphone-client-gnome/src/actions.c b/sflphone-client-gnome/src/actions.c
index 07665212d2cab038e42a607f3ef5eb81952dc94c..6850ed911437aff65070e8947d07dcf384cd5897 100644
--- a/sflphone-client-gnome/src/actions.c
+++ b/sflphone-client-gnome/src/actions.c
@@ -1156,7 +1156,7 @@ void sflphone_fill_codec_list_per_account (account_t **account)
GQueue *codeclist;
gboolean active = FALSE;
- order = (gchar**) dbus_get_active_codec_list ( (*account)->accountID);
+ order = (gchar**) dbus_get_active_audio_codec_list ( (*account)->accountID);
codeclist = (*account)->codecs;
diff --git a/sflphone-client-gnome/src/callable_obj.c b/sflphone-client-gnome/src/callable_obj.c
index d00f4019a6b24019d885b65b7951b11425da7202..811e71640038634768d5ae412fe53344cd2d0a27 100644
--- a/sflphone-client-gnome/src/callable_obj.c
+++ b/sflphone-client-gnome/src/callable_obj.c
@@ -101,7 +101,7 @@ gchar* call_get_audio_codec (callable_obj_t *obj)
int samplerate;
if (obj) {
- audio_codec = dbus_get_current_codec_name (obj);
+ audio_codec = dbus_get_current_audio_codec_name (obj);
codec = codec_list_get_by_name (audio_codec, NULL);
if (codec) {
diff --git a/sflphone-client-gnome/src/codeclist.c b/sflphone-client-gnome/src/codeclist.c
index 4d263df510cbea0969b963e4f6a3319091b15079..58e1b3ee619a471abbf13fd96d0690094a32e91a 100644
--- a/sflphone-client-gnome/src/codeclist.c
+++ b/sflphone-client-gnome/src/codeclist.c
@@ -80,7 +80,7 @@ void codec_capabilities_load (void)
codecsCapabilities = g_queue_new();
// This is a global list inherited by all accounts
- codecs = (gchar**) dbus_codec_list ();
+ codecs = (gchar**) dbus_audio_codec_list ();
if (codecs != NULL) {
// Add the codecs in the list
@@ -88,7 +88,7 @@ void codec_capabilities_load (void)
codec_t *c;
payload = atoi (*codecs);
- specs = (gchar **) dbus_codec_details (payload);
+ specs = (gchar **) dbus_audio_codec_details (payload);
codec_create_new_with_specs (payload, specs, TRUE, &c);
g_queue_push_tail (codecsCapabilities, (gpointer*) c);
}
@@ -127,7 +127,7 @@ void codec_create_new (gint payload, gboolean active, codec_t **c)
codec = g_new0 (codec_t, 1);
codec->_payload = payload;
- specs = (gchar **) dbus_codec_details (payload);
+ specs = (gchar **) dbus_audio_codec_details (payload);
codec->name = specs[0];
codec->sample_rate = atoi (specs[1]);
codec->_bitrate = atoi (specs[2]);
@@ -347,7 +347,7 @@ void codec_list_update_to_daemon (account_t *acc)
* (codecList+c) = NULL;
// call dbus function with array of strings
- dbus_set_active_codec_list (codecList, acc->accountID);
+ dbus_set_active_audio_codec_list (codecList, acc->accountID);
// Delete memory
for (i = 0; i < c; i++) {
diff --git a/sflphone-client-gnome/src/dbus/callmanager-introspec.xml b/sflphone-client-gnome/src/dbus/callmanager-introspec.xml
index c17c741fa8113b700266a3eed351c7a553b69015..c90a1f6cf5559fc704806feeaaaa77d922e75564 100644
--- a/sflphone-client-gnome/src/dbus/callmanager-introspec.xml
+++ b/sflphone-client-gnome/src/dbus/callmanager-introspec.xml
@@ -378,7 +378,7 @@
</arg>
</method>
- <method name="getCurrentCodecName" tp:name-for-bindings="getCurrentCodecName">
+ <method name="getCurrentAudioCodecName" tp:name-for-bindings="getCurrentAudioCodecName">
<tp:docstring>
Unused
</tp:docstring>
@@ -394,7 +394,7 @@
<arg type="s" name="message" direction="in"/>
</method>
- <signal name="currentSelectedCodec" tp:name-for-bindings="currentSelectedCodec">
+ <signal name="currentSelectedAudioCodec" tp:name-for-bindings="currentSelectedAudioCodec">
<tp:docstring>
Unused
</tp:docstring>
diff --git a/sflphone-client-gnome/src/dbus/configurationmanager-introspec.xml b/sflphone-client-gnome/src/dbus/configurationmanager-introspec.xml
index 6236fc40c1e63f0de548614b3433313b67c32ee1..6eadae9396d4405c308a1811429f6951ca8de3fc 100755
--- a/sflphone-client-gnome/src/dbus/configurationmanager-introspec.xml
+++ b/sflphone-client-gnome/src/dbus/configurationmanager-introspec.xml
@@ -409,7 +409,7 @@
<!-- Codecs-related methods -->
- <method name="getCodecList" tp:name-for-bindings="getCodecList">
+ <method name="getAudioCodecList" tp:name-for-bindings="getAudioCodecList">
<tp:docstring>
</tp:docstring>
<annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
@@ -419,7 +419,7 @@
</arg>
</method>
- <method name="getCodecDetails" tp:name-for-bindings="getCodecDetails">
+ <method name="getAudioCodecDetails" tp:name-for-bindings="getAudioCodecDetails">
<tp:docstring>
</tp:docstring>
<arg type="i" name="payload" direction="in">
@@ -433,7 +433,7 @@
</arg>
</method>
- <method name="getActiveCodecList" tp:name-for-bindings="getActiveCodecList">
+ <method name="getActiveAudioCodecList" tp:name-for-bindings="getActiveAudioCodecList">
<tp:docstring>
</tp:docstring>
<annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
@@ -447,7 +447,7 @@
</arg>
</method>
- <method name="setActiveCodecList" tp:name-for-bindings="setActiveCodecList">
+ <method name="setActiveAudioCodecList" tp:name-for-bindings="setActiveAudioCodecList">
<tp:docstring>
</tp:docstring>
<annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="VectorString"/>
diff --git a/sflphone-client-gnome/src/dbus/dbus.c b/sflphone-client-gnome/src/dbus/dbus.c
index 1838cbee8fd318e142f30ce96b1ae071edcc4dc3..91ca2962eb5374af94eb16711794947335d80ee6 100644
--- a/sflphone-client-gnome/src/dbus/dbus.c
+++ b/sflphone-client-gnome/src/dbus/dbus.c
@@ -100,8 +100,8 @@ zrtp_negotiation_failed_cb (DBusGProxy *proxy UNUSED, const gchar* callID,
}
static void
-curent_selected_codec (DBusGProxy *proxy UNUSED, const gchar* callID UNUSED,
- const gchar* codecName UNUSED, void * foo UNUSED)
+current_selected_audio_codec (DBusGProxy *proxy UNUSED, const gchar* callID UNUSED,
+ const gchar* codecName UNUSED, void * foo UNUSED)
{
}
@@ -573,14 +573,14 @@ dbus_connect (GError **error)
dbus_g_proxy_connect_signal (callManagerProxy, "zrtpNegotiationFailed",
G_CALLBACK (zrtp_negotiation_failed_cb), NULL, NULL);
- /* Current codec */
+ /* Current audio codec */
dbus_g_object_register_marshaller (
g_cclosure_user_marshal_VOID__STRING_STRING_STRING, G_TYPE_NONE,
G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID);
- dbus_g_proxy_add_signal (callManagerProxy, "currentSelectedCodec",
+ dbus_g_proxy_add_signal (callManagerProxy, "currentSelectedAudioCodec",
G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID);
- dbus_g_proxy_connect_signal (callManagerProxy, "currentSelectedCodec",
- G_CALLBACK (curent_selected_codec), NULL, NULL);
+ dbus_g_proxy_connect_signal (callManagerProxy, "currentSelectedAudioCodec",
+ G_CALLBACK (current_selected_audio_codec), NULL, NULL);
/* Register a marshaller for STRING,STRING */
dbus_g_object_register_marshaller (
@@ -1208,16 +1208,16 @@ dbus_unregister (int pid)
}
gchar**
-dbus_codec_list()
+dbus_audio_codec_list()
{
GError *error = NULL;
gchar** array = NULL;
- org_sflphone_SFLphone_ConfigurationManager_get_codec_list (
+ org_sflphone_SFLphone_ConfigurationManager_get_audio_codec_list (
configurationManagerProxy, &array, &error);
if (error) {
- ERROR ("Failed to call get_codec_list() on ConfigurationManager: %s",
+ ERROR ("Failed to call get_audio_codec_list() on ConfigurationManager: %s",
error->message);
g_error_free (error);
}
@@ -1226,16 +1226,16 @@ dbus_codec_list()
}
gchar**
-dbus_codec_details (int payload)
+dbus_audio_codec_details (int payload)
{
GError *error = NULL;
gchar ** array;
- org_sflphone_SFLphone_ConfigurationManager_get_codec_details (
+ org_sflphone_SFLphone_ConfigurationManager_get_audio_codec_details (
configurationManagerProxy, payload, &array, &error);
if (error) {
- ERROR ("Failed to call get_codec_details() on ConfigurationManager: %s",
+ ERROR ("Failed to call get_audio_codec_details() on ConfigurationManager: %s",
error->message);
g_error_free (error);
}
@@ -1244,35 +1244,35 @@ dbus_codec_details (int payload)
}
gchar*
-dbus_get_current_codec_name (const callable_obj_t * c)
+dbus_get_current_audio_codec_name (const callable_obj_t * c)
{
gchar* codecName = "";
GError* error = NULL;
- org_sflphone_SFLphone_CallManager_get_current_codec_name (callManagerProxy,
+ org_sflphone_SFLphone_CallManager_get_current_audio_codec_name (callManagerProxy,
c->_callID, &codecName, &error);
if (error) {
g_error_free (error);
}
- DEBUG ("dbus_get_current_codec_name : codecName : %s", codecName);
+ DEBUG ("%s: codecName : %s", __PRETTY_FUNCTION__, codecName);
return codecName;
}
gchar**
-dbus_get_active_codec_list (gchar *accountID)
+dbus_get_active_audio_codec_list (gchar *accountID)
{
gchar ** array;
GError *error = NULL;
- org_sflphone_SFLphone_ConfigurationManager_get_active_codec_list (
+ org_sflphone_SFLphone_ConfigurationManager_get_active_audio_codec_list (
configurationManagerProxy, accountID, &array, &error);
if (error) {
- ERROR ("Failed to call get_active_codec_list() on ConfigurationManager: %s",
+ ERROR ("Failed to call get_active_audio_codec_list() on ConfigurationManager: %s",
error->message);
g_error_free (error);
}
@@ -1281,15 +1281,15 @@ dbus_get_active_codec_list (gchar *accountID)
}
void
-dbus_set_active_codec_list (const gchar** list, const gchar *accountID)
+dbus_set_active_audio_codec_list (const gchar** list, const gchar *accountID)
{
GError *error = NULL;
- org_sflphone_SFLphone_ConfigurationManager_set_active_codec_list (
+ org_sflphone_SFLphone_ConfigurationManager_set_active_audio_codec_list (
configurationManagerProxy, list, accountID, &error);
if (error) {
- ERROR ("Failed to call set_active_codec_list() on ConfigurationManager: %s",
+ ERROR ("Failed to call set_active_audio_codec_list() on ConfigurationManager: %s",
error->message);
g_error_free (error);
}
diff --git a/sflphone-client-gnome/src/dbus/dbus.h b/sflphone-client-gnome/src/dbus/dbus.h
index e7ee1f29571ebe48a009edc4a60e5b533fb0db9c..196915d20dab4deab679e697534d659a15f95030 100644
--- a/sflphone-client-gnome/src/dbus/dbus.h
+++ b/sflphone-client-gnome/src/dbus/dbus.h
@@ -215,42 +215,42 @@ gdouble dbus_get_volume (const gchar * device);
void dbus_play_dtmf (const gchar * key);
/**
- * ConfigurationManager - Get the codecs list
- * @return gchar** The list of codecs
+ * ConfigurationManager - Get the audio codecs list
+ * @return gchar** The list of audiocodecs
*/
-gchar** dbus_codec_list();
+gchar** dbus_audio_codec_list();
/**
- * ConfigurationManager - Get the codec details
- * @param payload The payload of the codec
- * @return gchar** The codec details
+ * ConfigurationManager - Get the audio codec details
+ * @param payload The payload of the audio codec
+ * @return gchar** The audio codec details
*/
-gchar** dbus_codec_details (int payload);
+gchar** dbus_audio_codec_details (int payload);
/**
- * ConfigurationManager - Get the default codec list
- * The default codec list are the codecs selected by the server if the user hasn't made any changes
- * @return gchar** The default codec list
+ * ConfigurationManager - Get the default audio codec list
+ * The default audio codec list are the audio codecs selected by the server if the user hasn't made any changes
+ * @return gchar** The default audio codec list
*/
-gchar** dbus_default_codec_list();
+gchar** dbus_default_audio_codec_list();
/**
- * ConfigurationManager - Get the list of the codecs used for media negociation
- * @return gchar** The list of codecs
+ * ConfigurationManager - Get the list of the audio codecs used for media negotiation
+ * @return gchar** The list of audio codecs
*/
-gchar** dbus_get_active_codec_list (gchar *accountID);
+gchar** dbus_get_active_audio_codec_list (gchar *accountID);
/**
- * ConfigurationManager - Set the list of codecs used for media negociation
- * @param list The list of codecs
+ * ConfigurationManager - Set the list of audio codecs used for media negociation
+ * @param list The list of audio codecs
*/
-void dbus_set_active_codec_list (const gchar** list, const gchar*);
+void dbus_set_active_audio_codec_list (const gchar** list, const gchar*);
/**
- * CallManager - return the codec name
+ * CallManager - return the audio codec name
* @param callable_obj_t* current call
*/
-gchar* dbus_get_current_codec_name (const callable_obj_t * c);
+gchar* dbus_get_current_audio_codec_name (const callable_obj_t * c);
/**
* ConfigurationManager - Get the list of available output audio plugins