From c7f23e6494381894299a9b90678c97c9837c0a5a Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Mon, 17 Mar 2014 11:40:36 +0100 Subject: [PATCH] set default value of video renderer --- coreapi/bellesip_sal/sal_impl.c | 2 +- gtk/propertybox.c | 2 ++ mediastreamer2 | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/coreapi/bellesip_sal/sal_impl.c b/coreapi/bellesip_sal/sal_impl.c index bfe90e035..04bee6085 100644 --- a/coreapi/bellesip_sal/sal_impl.c +++ b/coreapi/bellesip_sal/sal_impl.c @@ -178,7 +178,7 @@ static void process_io_error(void *user_ctx, const belle_sip_io_error_event_t *e /*also reset auth count on IO error*/ op->auth_requests=0; if (op->callbacks.process_io_error) { - op->callbacks.process_io_error(op,event); + op->callbacks.process_io_error(op,event); } } else { /*ms_error("sal process_io_error not implemented yet for non transaction");*/ diff --git a/gtk/propertybox.c b/gtk/propertybox.c index 4d4c3ffad..b2b54715f 100644 --- a/gtk/propertybox.c +++ b/gtk/propertybox.c @@ -1297,6 +1297,8 @@ void linphone_gtk_fill_video_renderers(GtkWidget *pb){ GtkCellRenderer *renderer=gtk_cell_renderer_text_new(); GtkTreeModel *model=GTK_TREE_MODEL(store=gtk_list_store_new(2,G_TYPE_STRING,G_TYPE_STRING)); + if (current_renderer==NULL) current_renderer=video_stream_get_default_video_renderer(); + gtk_combo_box_set_model(GTK_COMBO_BOX(combo),model); gtk_cell_layout_clear(GTK_CELL_LAYOUT(combo)); gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(combo),renderer,TRUE); diff --git a/mediastreamer2 b/mediastreamer2 index 9117185fd..2b0eca38c 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 9117185fd8b0a4679cc198cded64dad7d85628e0 +Subproject commit 2b0eca38c556b1bb57b23b05679f2fd34dac478e