From f2676e51017c753d038a7312643f5d864e7f1d21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?= Date: Thu, 30 Jul 2015 17:50:47 +0200 Subject: [PATCH] Fix sound control in GTK+ interface --- gtk/incall_view.c | 6 +++--- mediastreamer2 | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gtk/incall_view.c b/gtk/incall_view.c index 8056bb1de..15b1396bb 100644 --- a/gtk/incall_view.c +++ b/gtk/incall_view.c @@ -637,11 +637,11 @@ typedef enum { VOLUME_CTRL_PLAYBACK, VOLUME_CTRL_RECORD } VolumeControlType; static void volume_control_value_changed(GtkScaleButton *button, gdouble value, gpointer user_data) { LinphoneCall *call = (LinphoneCall *)g_object_get_data(G_OBJECT(button), "call"); - VolumeControlType method = (VolumeControlType)g_object_get_data(G_OBJECT(button), "method"); + VolumeControlType type = (VolumeControlType)g_object_get_data(G_OBJECT(button), "type"); - if(method == VOLUME_CTRL_PLAYBACK) { + if(type == VOLUME_CTRL_PLAYBACK) { linphone_call_set_speaker_volume_gain(call, value); - } else if(method == VOLUME_CTRL_RECORD) { + } else if(type == VOLUME_CTRL_RECORD) { linphone_call_set_microphone_volume_gain(call, value); } } diff --git a/mediastreamer2 b/mediastreamer2 index 65ed768f7..0d7e58065 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 65ed768f7dde2571ffa731ad5264a93dbdc51cc1 +Subproject commit 0d7e5806533abe0043e10766ff985dd80c273dab