From bdd86e69fbe697ed6023f6e18ddb1eb347bc38c8 Mon Sep 17 00:00:00 2001 From: Hyunsoo Park Date: Wed, 8 Jan 2020 16:36:45 +0900 Subject: [PATCH] Fix build error due to toolchain upgrade (gcc6->gcc9) Change-Id: Ib1caeea8b393775c6ffe38e608ae17e8b71ab429 Signed-off-by: Hyunsoo Park --- packaging/libmm-streamrecorder.spec | 2 +- src/mm_streamrecorder_gstcommon.c | 1 + test/mm_streamrecorder_testsuite.c | 11 ++++------- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/packaging/libmm-streamrecorder.spec b/packaging/libmm-streamrecorder.spec index f679aff..187f587 100644 --- a/packaging/libmm-streamrecorder.spec +++ b/packaging/libmm-streamrecorder.spec @@ -1,6 +1,6 @@ Name: libmm-streamrecorder Summary: Media Stream Recorder library -Version: 0.0.28 +Version: 0.0.29 Release: 0 Group: Multimedia/Other License: Apache-2.0 diff --git a/src/mm_streamrecorder_gstcommon.c b/src/mm_streamrecorder_gstcommon.c index 64d4d5e..2ab6911 100644 --- a/src/mm_streamrecorder_gstcommon.c +++ b/src/mm_streamrecorder_gstcommon.c @@ -293,6 +293,7 @@ int _mmstreamrecorder_gst_set_state(MMHandleType handle, GstElement *pipeline, G switch (getChangeReturn) { case GST_STATE_CHANGE_NO_PREROLL: _mmstreamrec_dbg_log("status=GST_STATE_CHANGE_NO_PREROLL."); + /* fall through */ case GST_STATE_CHANGE_SUCCESS: /* if we reached the final target state, exit */ if (pipeline_state == target_state) { diff --git a/test/mm_streamrecorder_testsuite.c b/test/mm_streamrecorder_testsuite.c index c6f570d..ee4ac19 100644 --- a/test/mm_streamrecorder_testsuite.c +++ b/test/mm_streamrecorder_testsuite.c @@ -314,7 +314,7 @@ const char *visible_mode[] = { ---------------------------------------------------------------------------*/ static void print_menu(); void get_me_out(); -static gboolean cmd_input(GIOChannel *channel); +static gboolean cmd_input(GIOChannel *channel, GIOCondition cond, gpointer data); static gboolean init(int type); static gboolean mode_change(); int streamrecordertest_set_attr_int(const char* attr_subcategory, int value); @@ -930,7 +930,9 @@ static void setting_menu(gchar buf) * @remark * @see */ -static gboolean cmd_input(GIOChannel *channel) +static gboolean cmd_input(GIOChannel *channel, + GIOCondition cond, + gpointer data) { gchar *buf = NULL; gsize read_size; @@ -1081,10 +1083,7 @@ static gboolean mode_change() { int err = MM_ERROR_NONE; int state = STREAMRECORDER_NONE; - int device_count = 0; - int facing_direction = 0; char media_type = '\0'; - char *evassink_name = NULL; bool check = FALSE; state = streamrecorder_get_state(); @@ -1182,8 +1181,6 @@ static gboolean mode_change() } - debug_msg_t("evassink name[%s], device count[%d], facing direction[%d]", evassink_name, device_count, facing_direction); - if (!init(hstreamrecorder->mode)) { err_msg_t("testsuite init() failed."); return -1; -- 2.7.4