diff options
author | Hyongtaek Lim <hyongtaek.lim@samsung.com> | 2015-09-07 18:39:27 +0900 |
---|---|---|
committer | Hyongtaek Lim <hyongtaek.lim@samsung.com> | 2015-09-07 18:40:07 +0900 |
commit | 9bc59586a61e67314fa2013d9821779e83e3dce7 (patch) | |
tree | 677988d6b15386a9f6cc178388751c15c4c1d169 | |
parent | 94442a8c0f0a3c984d8e218e3743bfe9de1f4279 (diff) | |
download | libmm-player-submit/tizen/20150908.102956.tar.gz libmm-player-submit/tizen/20150908.102956.tar.bz2 libmm-player-submit/tizen/20150908.102956.zip |
fix pointer type error at 64bitsubmit/tizen/20150908.102956submit/tizen/20150908.051058accepted/tizen/wearable/20150908.074135accepted/tizen/tv/20150908.074151accepted/tizen/mobile/20150908.074123
Signed-off-by: Hyongtaek Lim <hyongtaek.lim@samsung.com>
Change-Id: Icbccfb3ee3557f7ea574cbfd9b8bf109349f88f5
-rw-r--r-- | src/client/mm_player_client.c | 8 | ||||
-rw-r--r-- | src/include/mm_player.h | 4 | ||||
-rw-r--r-- | src/mm_player_common_priv.c | 2 | ||||
-rw-r--r-- | src/server/mm_player.c | 8 | ||||
-rw-r--r-- | src/server/mm_player_pd.c | 8 | ||||
-rw-r--r--[-rwxr-xr-x] | src/server/mm_player_priv.c | 16 |
6 files changed, 23 insertions, 23 deletions
diff --git a/src/client/mm_player_client.c b/src/client/mm_player_client.c index 5431b03..28b1430 100644 --- a/src/client/mm_player_client.c +++ b/src/client/mm_player_client.c @@ -106,7 +106,7 @@ static int __mmplayer_mused_set_state(mm_player_t* player, int state); /*=========================================================================================== | | | FUNCTION DEFINITIONS | -| | +| | ========================================================================================== */ int mm_player_mused_create(MMHandleType *player) @@ -182,7 +182,7 @@ _mmplayer_mused_init_gst(mm_player_t *player) { static gboolean initialized = FALSE; static const int max_argc = 50; - gint* argc = NULL; + gint* argc = NULL; gchar** argv = NULL; gchar** argv2 = NULL; GError *err = NULL; @@ -601,8 +601,8 @@ static int _mmplayer_mused_update_video_param(mm_player_t *player) wl_surface ); /* After setting window handle, set render rectangle */ gst_video_overlay_set_render_rectangle( - GST_VIDEO_OVERLAY( mainbin[MMPLAYER_M_V_SINK].gst ), - wl_window_x,wl_window_y,wl_window_width,wl_window_height); + GST_VIDEO_OVERLAY( mainbin[MMPLAYER_M_V_SINK].gst ), + wl_window_x,wl_window_y,wl_window_width,wl_window_height); #else int xwin_id = 0; xwin_id = *(int*)surface; diff --git a/src/include/mm_player.h b/src/include/mm_player.h index 1c326e3..6b65d8f 100644 --- a/src/include/mm_player.h +++ b/src/include/mm_player.h @@ -1306,7 +1306,7 @@ mm_player_get_attribute(g_player, &g_err_name, "content_duration", &duration, NU debug_log("pos: [%d/%d] msec\n", position, duration); * @endcode */ -int mm_player_get_position(MMHandleType player, MMPlayerPosFormatType format, int *pos); +int mm_player_get_position(MMHandleType player, MMPlayerPosFormatType format, unsigned long *pos); /** * This function is to get current buffer position of playback content. @@ -1328,7 +1328,7 @@ mm_player_get_buffer_position(g_player, MM_PLAYER_POS_FORMAT_PERCENT, &start_pos debug_log("buffer position: [%d] ~ [%d] \%\n", start_pos, stop_pos ); * @endcode */ -int mm_player_get_buffer_position(MMHandleType player, MMPlayerPosFormatType format, int *start_pos, int *stop_pos); +int mm_player_get_buffer_position(MMHandleType player, MMPlayerPosFormatType format, unsigned long *start_pos, unsigned long *stop_pos); /** * This function is to activate the section repeat. If it's set, selected section will be played \n diff --git a/src/mm_player_common_priv.c b/src/mm_player_common_priv.c index f3d8031..51fe447 100644 --- a/src/mm_player_common_priv.c +++ b/src/mm_player_common_priv.c @@ -23,7 +23,7 @@ /*=========================================================================================== | | | INCLUDE FILES | -| | +| | ========================================================================================== */ #include <glib.h> #include <gst/gst.h> diff --git a/src/server/mm_player.c b/src/server/mm_player.c index ac25a0d..0436ab9 100644 --- a/src/server/mm_player.c +++ b/src/server/mm_player.c @@ -538,7 +538,7 @@ int mm_player_set_position(MMHandleType player, MMPlayerPosFormatType format, in return result; } -int mm_player_get_position(MMHandleType player, MMPlayerPosFormatType format, int *pos) +int mm_player_get_position(MMHandleType player, MMPlayerPosFormatType format, unsigned long *pos) { int result = MM_ERROR_NONE; @@ -553,14 +553,14 @@ int mm_player_get_position(MMHandleType player, MMPlayerPosFormatType format, in MMPLAYER_CMD_LOCK( player ); - result = _mmplayer_get_position(player, (int)format, (unsigned long*)pos); + result = _mmplayer_get_position(player, (int)format, pos); MMPLAYER_CMD_UNLOCK( player ); return result; } -int mm_player_get_buffer_position(MMHandleType player, MMPlayerPosFormatType format, int *start_pos, int *stop_pos) +int mm_player_get_buffer_position(MMHandleType player, MMPlayerPosFormatType format, unsigned long *start_pos, unsigned long *stop_pos) { int result = MM_ERROR_NONE; @@ -569,7 +569,7 @@ int mm_player_get_buffer_position(MMHandleType player, MMPlayerPosFormatType for MMPLAYER_CMD_LOCK( player ); - result = _mmplayer_get_buffer_position(player, (int)format, (unsigned long*)start_pos, (unsigned long*)stop_pos ); + result = _mmplayer_get_buffer_position(player, (int)format, start_pos, stop_pos ); MMPLAYER_CMD_UNLOCK( player ); diff --git a/src/server/mm_player_pd.c b/src/server/mm_player_pd.c index 09f16cc..007cdf8 100644 --- a/src/server/mm_player_pd.c +++ b/src/server/mm_player_pd.c @@ -26,7 +26,7 @@ #include "mm_player_priv.h" /*--------------------------------------------------------------------------------------- -| LOCAL FUNCTION PROTOTYPES: | +| LOCAL FUNCTION PROTOTYPES: | ---------------------------------------------------------------------------------------*/ /* It's callback to process whenever there is some changes in PD downloader. */ @@ -37,7 +37,7 @@ static gboolean __pd_downloader_callback(GstBus *bus, GstMessage *msg, gpointer static gboolean __pd_downloader_post_message(mm_player_t * player, enum MMMessageType msgtype, MMMessageParamType* param); /*======================================================================================= -| FUNCTION DEFINITIONS | +| FUNCTION DEFINITIONS | =======================================================================================*/ static gboolean __pd_downloader_callback(GstBus *bus, GstMessage *msg, gpointer data) @@ -124,8 +124,8 @@ __pd_downloader_callback(GstBus *bus, GstMessage *msg, gpointer data) break; /* we only care about pipeline state changes */ - if (GST_MESSAGE_SRC (msg) != GST_OBJECT (pd->downloader_pipeline)) - break; + if (GST_MESSAGE_SRC (msg) != GST_OBJECT (pd->downloader_pipeline)) + break; src_name = gst_object_get_name (msg->src); debug_log ("%s changed state from %s to %s", src_name, diff --git a/src/server/mm_player_priv.c b/src/server/mm_player_priv.c index 5a67b2c..25bcd0d 100755..100644 --- a/src/server/mm_player_priv.c +++ b/src/server/mm_player_priv.c @@ -23,7 +23,7 @@ /*=========================================================================================== | | | INCLUDE FILES | -| | +| | ========================================================================================== */ #include <glib.h> #include <gst/gst.h> @@ -60,7 +60,7 @@ /*=========================================================================================== | | | LOCAL DEFINITIONS AND DECLARATIONS FOR MODULE | -| | +| | ========================================================================================== */ /*--------------------------------------------------------------------------- @@ -81,7 +81,7 @@ #define TRICK_PLAY_MUTE_THRESHOLD_MAX 2.0 #define TRICK_PLAY_MUTE_THRESHOLD_MIN 0.0 -#define MM_VOLUME_FACTOR_DEFAULT 1.0 +#define MM_VOLUME_FACTOR_DEFAULT 1.0 #define MM_VOLUME_FACTOR_MIN 0 #define MM_VOLUME_FACTOR_MAX 1.0 @@ -288,7 +288,7 @@ static gboolean __gst_seek_subtitle_data (GstElement * appsrc, guint64 position, /*=========================================================================================== | | | FUNCTION DEFINITIONS | -| | +| | ========================================================================================== */ #if 0 //debug @@ -327,7 +327,7 @@ static void __mmplayer_videostream_cb(GstElement *element, void *data, int width, int height, gpointer user_data) // @ { - mm_player_t* player = (mm_player_t*)user_data; + mm_player_t* player = (mm_player_t*)user_data; return_if_fail ( player ); @@ -352,7 +352,7 @@ int width, int height, gpointer user_data) // @ stream.height = height; stream.width = width; player->video_stream_cb(&stream, player->video_stream_cb_user_param); - } + } MMPLAYER_FLEAVE(); } @@ -8803,7 +8803,7 @@ _mmplayer_create_player(MMHandleType handle) // @ /* initialize factories if not using decodebin */ if( player->factories == NULL ) - __mmplayer_init_factories(player); + __mmplayer_init_factories(player); /* create lock. note that g_tread_init() has already called in gst_init() */ g_mutex_init(&player->fsink_lock); @@ -9403,7 +9403,7 @@ _mmplayer_set_message_callback(MMHandleType hplayer, MMMessageCallback callback, { mm_player_t* player = (mm_player_t*)hplayer; - return_val_if_fail(player, MM_ERROR_PLAYER_NOT_INITIALIZED); + return_val_if_fail(player, MM_ERROR_PLAYER_NOT_INITIALIZED); return __gst_set_message_callback(player, callback, user_param); } |