Remove build warnings [-Wdiscarded-qualifiers]

Change-Id: Ieb75e1cea6bd799bcb7568a1b27ab6706c592af3
Signed-off-by: Hyunsoo Park <hance.park@samsung.com>

diff --git a/packaging/libmm-streamrecorder.spec b/packaging/libmm-streamrecorder.spec
index 2a41463..dacda35 100644 (file)
--- a/packaging/libmm-streamrecorder.spec
+++ b/packaging/libmm-streamrecorder.spec
@@ -1,6 +1,6 @@
 Name:       libmm-streamrecorder
 Summary:    Media Stream Recorder library
 Name:       libmm-streamrecorder
 Summary:    Media Stream Recorder library

-Version:    0.0.38
+Version:    0.0.39

 Release:    0
 Group:      Multimedia/Other
 License:    Apache-2.0
 Release:    0
 Group:      Multimedia/Other
 License:    Apache-2.0

diff --git a/src/mm_streamrecorder_ini.c b/src/mm_streamrecorder_ini.c
index c01e877..778fff0 100644 (file)
--- a/src/mm_streamrecorder_ini.c
+++ b/src/mm_streamrecorder_ini.c
@@ -29,16 +29,15 @@
 static gboolean loaded = FALSE;
 
 /* global variables here */
 static gboolean loaded = FALSE;
 
 /* global variables here */

-static  void    __get_element_list(mm_streamrecorder_ini_t* ini, gchar* str, int keyword_type);
+static  void    __get_element_list(mm_streamrecorder_ini_t* ini, const gchar* str, int keyword_type);

 
 static void __mm_streamrecorder_ini_check_status(void);
 
 /* macro */
 #define MM_STREAMRECORDER_INI_GET_STRING(x_dict, x_item, x_ini, x_default) \
 do { \
 
 static void __mm_streamrecorder_ini_check_status(void);
 
 /* macro */
 #define MM_STREAMRECORDER_INI_GET_STRING(x_dict, x_item, x_ini, x_default) \
 do { \

-       gchar *str = NULL; \

        gint length = 0; \
        gint length = 0; \

-       str = iniparser_getstring(x_dict, x_ini, x_default); \
+       const gchar *str = iniparser_getstring(x_dict, x_ini, x_default); \

        if (str) { \
                length = strlen(str); \
                if ((length > 1) && (length < STREAMRECORDER_INI_MAX_STRLEN)) \
        if (str) { \
                length = strlen(str); \
                if ((length > 1) && (length < STREAMRECORDER_INI_MAX_STRLEN)) \


@@ -97,7 +96,7 @@ int _mm_streamrecorder_ini_load(mm_streamrecorder_ini_t *ini)
                ini->reset_pause_time = iniparser_getint(dict, "general:reset pause time", DEFAULT_RESET_PAUSE_TIME);
                ini->screen_record = iniparser_getint(dict, "general:screen record", DEFAULT_SCREEN_RECORD);
                ini->hw_encoder_supported = iniparser_getboolean(dict, "general:hw encoder supported", DEFAULT_HW_ENCODER_SUPPORTED);
                ini->reset_pause_time = iniparser_getint(dict, "general:reset pause time", DEFAULT_RESET_PAUSE_TIME);
                ini->screen_record = iniparser_getint(dict, "general:screen record", DEFAULT_SCREEN_RECORD);
                ini->hw_encoder_supported = iniparser_getboolean(dict, "general:hw encoder supported", DEFAULT_HW_ENCODER_SUPPORTED);

-               MM_STREAMRECORDER_INI_GET_STRING(dict, ini->video_codec_element_hw, (const char *)"general:video codec element hw", (char *)DEFAULT_VIDEO_SOURCE);
+               MM_STREAMRECORDER_INI_GET_STRING(dict, ini->video_codec_element_hw, "general:video codec element hw", DEFAULT_VIDEO_SOURCE);

 
                /*encodebin */
                ini->encsink_bin_profile = iniparser_getint(dict, "encodebin:encsink bin profile", DEFAULT_ENCSINK_BIN_PROFILE);
 
                /*encodebin */
                ini->encsink_bin_profile = iniparser_getint(dict, "encodebin:encsink bin profile", DEFAULT_ENCSINK_BIN_PROFILE);


@@ -107,17 +106,17 @@ int _mm_streamrecorder_ini_load(mm_streamrecorder_ini_t *ini)
                ini->encsink_bin_auto_audio_convert = iniparser_getboolean(dict, "encodebin:encsink bin auto audio convert", DEFAULT_ENCSINK_BIN_AUTO_CONVERT);
 
                /* pipeline */
                ini->encsink_bin_auto_audio_convert = iniparser_getboolean(dict, "encodebin:encsink bin auto audio convert", DEFAULT_ENCSINK_BIN_AUTO_CONVERT);
 
                /* pipeline */

-               MM_STREAMRECORDER_INI_GET_STRING(dict, ini->name_of_encsink_src, (const char *)"pipeline:encsink bin source", (char *)DEFAULT_VIDEO_SOURCE);
-               MM_STREAMRECORDER_INI_GET_STRING(dict, ini->name_of_audio_src, (const char *)"pipeline:name of audio src", (char *)DEFAULT_AUDIO_SRC);
-               MM_STREAMRECORDER_INI_GET_STRING(dict, ini->h264_video_encoder, (const char *)"pipeline:h264 encoder", (char *)DEFAULT_NAME_OF_H264_VIDEO_ENCODER);
-               MM_STREAMRECORDER_INI_GET_STRING(dict, ini->h263_video_encoder, (const char *)"pipeline:h263 encoder", (char *)DEFAULT_NAME_OF_H263_VIDEO_ENCODER);
-               MM_STREAMRECORDER_INI_GET_STRING(dict, ini->mpeg4_video_encoder, (const char *)"pipeline:mpeg4 encoder", (char *)DEFAULT_NAME_OF_MPEG4_VIDEO_ENCODER);
-               MM_STREAMRECORDER_INI_GET_STRING(dict, ini->name_of_encsink_bin_audio_encoder, (const char *)"pipeline:name of audio encoder", (char *)DEFAULT_NAME_OF_AUDIO_ENCODER);
-               MM_STREAMRECORDER_INI_GET_STRING(dict, ini->encsink_bin_use_parser, (const char *)"pipeline:use parser", (char *)DEFAULT_USE_PARSER);
-               MM_STREAMRECORDER_INI_GET_STRING(dict, ini->name_of_encsink_bin_video_converter, (const char *)"pipeline:name of video converter", (char *)DEFAULT_NAME_OF_VIDEO_CONVERTER);
-               MM_STREAMRECORDER_INI_GET_STRING(dict, ini->name_of_encsink_bin_3GPMUXER, (const char *)"pipeline:name of 3GP muxer", (char *)DEFAULT_NAME_OF_3GP_MUXER);
-               MM_STREAMRECORDER_INI_GET_STRING(dict, ini->name_of_encsink_bin_MP4MUXER, (const char *)"pipeline:name of MP4 muxer", (char *)DEFAULT_NAME_OF_MP4_MUXER);
-               MM_STREAMRECORDER_INI_GET_STRING(dict, ini->name_of_encsink_sink, (const char *)"pipeline:name of sink", (char *)DEFAULT_NAME_OF_BIN_SINK);
+               MM_STREAMRECORDER_INI_GET_STRING(dict, ini->name_of_encsink_src, "pipeline:encsink bin source", DEFAULT_VIDEO_SOURCE);
+               MM_STREAMRECORDER_INI_GET_STRING(dict, ini->name_of_audio_src, "pipeline:name of audio src", DEFAULT_AUDIO_SRC);
+               MM_STREAMRECORDER_INI_GET_STRING(dict, ini->h264_video_encoder, "pipeline:h264 encoder", DEFAULT_NAME_OF_H264_VIDEO_ENCODER);
+               MM_STREAMRECORDER_INI_GET_STRING(dict, ini->h263_video_encoder, "pipeline:h263 encoder", DEFAULT_NAME_OF_H263_VIDEO_ENCODER);
+               MM_STREAMRECORDER_INI_GET_STRING(dict, ini->mpeg4_video_encoder, "pipeline:mpeg4 encoder", DEFAULT_NAME_OF_MPEG4_VIDEO_ENCODER);
+               MM_STREAMRECORDER_INI_GET_STRING(dict, ini->name_of_encsink_bin_audio_encoder, "pipeline:name of audio encoder", DEFAULT_NAME_OF_AUDIO_ENCODER);
+               MM_STREAMRECORDER_INI_GET_STRING(dict, ini->encsink_bin_use_parser, "pipeline:use parser", DEFAULT_USE_PARSER);
+               MM_STREAMRECORDER_INI_GET_STRING(dict, ini->name_of_encsink_bin_video_converter, "pipeline:name of video converter", DEFAULT_NAME_OF_VIDEO_CONVERTER);
+               MM_STREAMRECORDER_INI_GET_STRING(dict, ini->name_of_encsink_bin_3GPMUXER, "pipeline:name of 3GP muxer", DEFAULT_NAME_OF_3GP_MUXER);
+               MM_STREAMRECORDER_INI_GET_STRING(dict, ini->name_of_encsink_bin_MP4MUXER, "pipeline:name of MP4 muxer", DEFAULT_NAME_OF_MP4_MUXER);
+               MM_STREAMRECORDER_INI_GET_STRING(dict, ini->name_of_encsink_sink, "pipeline:name of sink", DEFAULT_NAME_OF_BIN_SINK);

 
                /* audio parameter */
                ini->audio_frame_minimum_space = iniparser_getint(dict, "audio param:audio frame minimum space", DEFAULT_AUDIO_FRAME_MINIMUM_SPACE);
 
                /* audio parameter */
                ini->audio_frame_minimum_space = iniparser_getint(dict, "audio param:audio frame minimum space", DEFAULT_AUDIO_FRAME_MINIMUM_SPACE);


@@ -127,8 +126,8 @@ int _mm_streamrecorder_ini_load(mm_streamrecorder_ini_t *ini)
                ini->video_frame_wait_time = iniparser_getint(dict, "video param:video frame wait time", DEFAULT_VIDEO_FRAME_WAIT_TIME);
 
                /*supported attribute*/
                ini->video_frame_wait_time = iniparser_getint(dict, "video param:video frame wait time", DEFAULT_VIDEO_FRAME_WAIT_TIME);
 
                /*supported attribute*/

-               MMSTREAMRECORDER_INI_GET_INT_FROM_LIST(dict, ini->supported_video_width, STREAMRECORDER_ATTRIBUTE_NUM_MAX, "attribute:supported width", (char *)DEFAULT_SUPPORTED_WIDTH);
-               MMSTREAMRECORDER_INI_GET_INT_FROM_LIST(dict, ini->supported_video_height, STREAMRECORDER_ATTRIBUTE_NUM_MAX, "attribute:supported height", (char *)DEFAULT_SUPPORTED_HEIGHT);
+               MMSTREAMRECORDER_INI_GET_INT_FROM_LIST(dict, ini->supported_video_width, STREAMRECORDER_ATTRIBUTE_NUM_MAX, "attribute:supported width", DEFAULT_SUPPORTED_WIDTH);
+               MMSTREAMRECORDER_INI_GET_INT_FROM_LIST(dict, ini->supported_video_height, STREAMRECORDER_ATTRIBUTE_NUM_MAX, "attribute:supported height", DEFAULT_SUPPORTED_HEIGHT);

                __get_element_list(ini, iniparser_getstring(dict, "attribute:supported audio encoders", (char*)DEFAULT_SUPPORTED_AUDIO_ENCODERS), KEYWORD_AUDIO_ENCODERS);
                __get_element_list(ini, iniparser_getstring(dict, "attribute:supported video encoders", (char*)DEFAULT_SUPPORTED_VIDEO_ENCODERS), KEYWORD_VIDEO_ENCODERS);
                __get_element_list(ini, iniparser_getstring(dict, "attribute:supported file formats", (char*)DEFAULT_SUPPORTED_FILE_FORMATS), KEYWORD_FILE_FORMATS);
                __get_element_list(ini, iniparser_getstring(dict, "attribute:supported audio encoders", (char*)DEFAULT_SUPPORTED_AUDIO_ENCODERS), KEYWORD_AUDIO_ENCODERS);
                __get_element_list(ini, iniparser_getstring(dict, "attribute:supported video encoders", (char*)DEFAULT_SUPPORTED_VIDEO_ENCODERS), KEYWORD_VIDEO_ENCODERS);
                __get_element_list(ini, iniparser_getstring(dict, "attribute:supported file formats", (char*)DEFAULT_SUPPORTED_FILE_FORMATS), KEYWORD_FILE_FORMATS);


@@ -245,7 +244,7 @@ int _mm_streamrecorder_ini_load(mm_streamrecorder_ini_t *ini)
 }
 
 static
 }
 
 static

-void    __get_element_list(mm_streamrecorder_ini_t* ini, gchar* str, int keyword_type)
+void    __get_element_list(mm_streamrecorder_ini_t* ini, const gchar* str, int keyword_type)

 {
        gchar** list = NULL;
        gchar** walk = NULL;
 {
        gchar** list = NULL;
        gchar** walk = NULL;