From db7eb9704427a35f55326ea23c0b19aef69fe0a0 Mon Sep 17 00:00:00 2001 From: Sandrine Avakian Date: Thu, 21 Jan 2016 16:49:00 +0100 Subject: [PATCH] Updating mediastreamer2. Fixing too many parameters error in audio_assistant. Now linphone-gtk is launching and lilblinphone-tester Single call suite is ok. --- gtk/audio_assistant.c | 6 +++--- mediastreamer2 | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gtk/audio_assistant.c b/gtk/audio_assistant.c index e8599f286..b972a08ec 100644 --- a/gtk/audio_assistant.c +++ b/gtk/audio_assistant.c @@ -213,7 +213,7 @@ void linphone_gtk_start_record_sound(GtkWidget *w, gpointer data){ LinphoneCore *lc = linphone_gtk_get_core(); MSFactory *factory = linphone_core_get_factory((void*)lc); AudioStream *stream = NULL; - MSSndCardManager *manager = ms_snd_card_manager_get(factory); + MSSndCardManager *manager = ms_snd_card_manager_get(); gboolean active=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w)); gint timeout_id; @@ -259,7 +259,7 @@ void linphone_gtk_start_play_record_sound(GtkWidget *w,gpointer data){ MSFactory *factory = linphone_core_get_factory((void*)lc); gboolean active=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w)); AudioStream *stream = NULL; - MSSndCardManager *manager = ms_snd_card_manager_get(factory); + MSSndCardManager *manager = ms_snd_card_manager_get(); if(active){ gchar *path = g_object_get_data(G_OBJECT(audio_assistant),"path"); @@ -455,7 +455,7 @@ static void prepare(GtkAssistant *w){ //Speaker page if(page == 1){ - MSSndCardManager *manager = ms_snd_card_manager_get(factory); + MSSndCardManager *manager = ms_snd_card_manager_get(); audio_stream = audio_stream_start_with_sndcards(&av_profile,9898,"127.0.0.1",19898,0,0,ms_snd_card_manager_get_card(manager,linphone_core_get_playback_device(lc)),ms_snd_card_manager_get_card(manager,linphone_core_get_capture_device(lc)),FALSE, factory); if (mic_audiolevel != NULL && audio_stream != NULL){ g_object_set_data(G_OBJECT(audio_assistant),"stream",audio_stream); diff --git a/mediastreamer2 b/mediastreamer2 index 816450630..2acfebd90 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 816450630d8c9fdc7e2591f43d47c6807d3fff16 +Subproject commit 2acfebd906a410425f73c38874ebc8fc718668d0