From 56a452a8f3277b36df98d6b240df96237146e453 Mon Sep 17 00:00:00 2001 From: Sandrine Avakian Date: Tue, 19 Jan 2016 10:54:09 +0100 Subject: [PATCH] Update mediastreamer and player. --- coreapi/localplayer.c | 6 +++--- coreapi/private.h | 2 +- gtk/audio_assistant.c | 6 +++--- mediastreamer2 | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/coreapi/localplayer.c b/coreapi/localplayer.c index eb53eb640..91ce833a9 100644 --- a/coreapi/localplayer.c +++ b/coreapi/localplayer.c @@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include -static int _local_player_open(LinphonePlayer *obj, const char *filename); +static int _local_player_open(LinphonePlayer *obj, const char *filename, MSFactory *factory); static int _local_player_start(LinphonePlayer *obj); static int _local_player_pause(LinphonePlayer *obj); static int _local_player_seek(LinphonePlayer *obj, int time_ms); @@ -54,8 +54,8 @@ bool_t linphone_local_player_matroska_supported(void) { return ms_media_player_matroska_supported(); } -static int _local_player_open(LinphonePlayer *obj, const char *filename) { - return ms_media_player_open((MSMediaPlayer *)obj->impl, filename) ? 0 : -1; +static int _local_player_open(LinphonePlayer *obj, const char *filename,MSFactory* factory) { + return ms_media_player_open((MSMediaPlayer *)obj->impl, filename, factory) ? 0 : -1; } static int _local_player_start(LinphonePlayer *obj) { diff --git a/coreapi/private.h b/coreapi/private.h index f866f7477..db25d19d3 100644 --- a/coreapi/private.h +++ b/coreapi/private.h @@ -1227,7 +1227,7 @@ LINPHONE_PUBLIC int linphone_remote_provisioning_load_file( LinphoneCore* lc, co ****************************************************************************/ struct _LinphonePlayer{ - int (*open)(struct _LinphonePlayer* player, const char *filename); + int (*open)(struct _LinphonePlayer* player, const char *filename, MSFactory *factory); int (*start)(struct _LinphonePlayer* player); int (*pause)(struct _LinphonePlayer* player); int (*seek)(struct _LinphonePlayer* player, int time_ms); diff --git a/gtk/audio_assistant.c b/gtk/audio_assistant.c index b10a2c93a..56dcc2ad9 100644 --- a/gtk/audio_assistant.c +++ b/gtk/audio_assistant.c @@ -218,7 +218,7 @@ void linphone_gtk_start_record_sound(GtkWidget *w, gpointer data){ if(active){ gchar *path = get_record_file(); - stream=audio_stream_new(8888, 8889, FALSE); + stream=audio_stream_new(8888, 8889, FALSE, lc->factory); if(stream != NULL){ audio_stream_start_full(stream,&av_profile,"127.0.0.1",8888,"127.0.0.1",8889,0,0,NULL, path,NULL,ms_snd_card_manager_get_card(manager,linphone_core_get_capture_device(lc)),FALSE); @@ -261,7 +261,7 @@ void linphone_gtk_start_play_record_sound(GtkWidget *w,gpointer data){ if(active){ gchar *path = g_object_get_data(G_OBJECT(audio_assistant),"path"); - stream=audio_stream_new(8888, 8889, FALSE); + stream=audio_stream_new(8888, 8889, FALSE, lc->factory); if(path != NULL){ audio_stream_start_full(stream,&av_profile,"127.0.0.1",8888,"127.0.0.1",8889,0,0,path, NULL,ms_snd_card_manager_get_card(manager,linphone_core_get_playback_device(lc)),NULL,FALSE); @@ -453,7 +453,7 @@ static void prepare(GtkAssistant *w){ //Speaker page if(page == 1){ 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); + 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, lc->factory); if (mic_audiolevel != NULL && audio_stream != NULL){ g_object_set_data(G_OBJECT(audio_assistant),"stream",audio_stream); linphone_gtk_init_audio_meter(mic_audiolevel,(get_volume_t)audio_stream_get_record_volume,audio_stream); diff --git a/mediastreamer2 b/mediastreamer2 index 081c581af..8fc4323f8 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 081c581afc080352651dfbd6c4aefd24b7e2e400 +Subproject commit 8fc4323f8166b7432bdbf409fdeb426e08cdff32