media: Add media_player prefix for callback

This adds media_player prefix to callback so it is inline with pause
which now uses such callback due to possible clash with libc
definition.

1 files changed, 35 insertions, 33 deletions

diff --git a/profiles/audio/media.c b/profiles/audio/media.c
index f93b74e67..521902ed8 100644
--- a/profiles/audio/media.c
+++ b/profiles/audio/media.c
@@ -1052,7 +1052,7 @@ static void media_player_remove(void *data)
 	media_player_destroy(mp);
 }
 
-static GList *list_settings(void *user_data)
+static GList *media_player_list_settings(void *user_data)
 {
 	struct media_player *mp = user_data;
 
@@ -1064,7 +1064,7 @@ static GList *list_settings(void *user_data)
 	return g_hash_table_get_keys(mp->settings);
 }
 
-static const char *get_setting(const char *key, void *user_data)
+static const char *media_player_get_setting(const char *key, void *user_data)
 {
 	struct media_player *mp = user_data;
 
@@ -1073,7 +1073,7 @@ static const char *get_setting(const char *key, void *user_data)
 	return g_hash_table_lookup(mp->settings, key);
 }
 
-static const char *get_player_name(void *user_data)
+static const char *media_player_get_player_name(void *user_data)
 {
 	struct media_player *mp = user_data;
 
@@ -1127,7 +1127,8 @@ static void set_repeat_setting(DBusMessageIter *iter, const char *value)
 	dbus_message_iter_close_container(iter, &var);
 }
 
-static int set_setting(const char *key, const char *value, void *user_data)
+static int media_player_set_setting(const char *key, const char *value,
+				    void *user_data)
 {
 	struct media_player *mp = user_data;
 	const char *iface = MEDIA_PLAYER_INTERFACE;
@@ -1164,7 +1165,7 @@ static int set_setting(const char *key, const char *value, void *user_data)
 	return 0;
 }
 
-static GList *list_metadata(void *user_data)
+static GList *media_player_list_metadata(void *user_data)
 {
 	struct media_player *mp = user_data;
 
@@ -1176,7 +1177,7 @@ static GList *list_metadata(void *user_data)
 	return g_hash_table_get_keys(mp->track);
 }
 
-static uint64_t get_uid(void *user_data)
+static uint64_t media_player_get_uid(void *user_data)
 {
 	struct media_player *mp = user_data;
 
@@ -1188,7 +1189,7 @@ static uint64_t get_uid(void *user_data)
 	return 0;
 }
 
-static const char *get_metadata(const char *key, void *user_data)
+static const char *media_player_get_metadata(const char *key, void *user_data)
 {
 	struct media_player *mp = user_data;
 
@@ -1200,14 +1201,14 @@ static const char *get_metadata(const char *key, void *user_data)
 	return g_hash_table_lookup(mp->track, key);
 }
 
-static const char *get_status(void *user_data)
+static const char *media_player_get_status(void *user_data)
 {
 	struct media_player *mp = user_data;
 
 	return mp->status;
 }
 
-static uint32_t get_position(void *user_data)
+static uint32_t media_player_get_position(void *user_data)
 {
 	struct media_player *mp = user_data;
 	double timedelta;
@@ -1224,14 +1225,15 @@ static uint32_t get_position(void *user_data)
 	return mp->position + sec * 1000 + msec;
 }
 
-static uint32_t get_duration(void *user_data)
+static uint32_t media_player_get_duration(void *user_data)
 {
 	struct media_player *mp = user_data;
 
 	return mp->duration;
 }
 
-static void set_volume(int8_t volume, struct btd_device *dev, void *user_data)
+static void media_player_set_volume(int8_t volume, struct btd_device *dev,
+				    void *user_data)
 {
 	struct media_player *mp = user_data;
 
@@ -1257,7 +1259,7 @@ static bool media_player_send(struct media_player *mp, const char *name)
 	return true;
 }
 
-static bool play(void *user_data)
+static bool media_player_play(void *user_data)
 {
 	struct media_player *mp = user_data;
 
@@ -1269,7 +1271,7 @@ static bool play(void *user_data)
 	return media_player_send(mp, "Play");
 }
 
-static bool stop(void *user_data)
+static bool media_player_stop(void *user_data)
 {
 	struct media_player *mp = user_data;
 
@@ -1293,7 +1295,7 @@ static bool media_player_pause(void *user_data)
 	return media_player_send(mp, "Pause");
 }
 
-static bool next(void *user_data)
+static bool media_player_next(void *user_data)
 {
 	struct media_player *mp = user_data;
 
@@ -1305,7 +1307,7 @@ static bool next(void *user_data)
 	return media_player_send(mp, "Next");
 }
 
-static bool previous(void *user_data)
+static bool media_player_previous(void *user_data)
 {
 	struct media_player *mp = user_data;
 
@@ -1318,22 +1320,22 @@ static bool previous(void *user_data)
 }
 
 static struct avrcp_player_cb player_cb = {
-	.list_settings = list_settings,
-	.get_setting = get_setting,
-	.set_setting = set_setting,
-	.list_metadata = list_metadata,
-	.get_uid = get_uid,
-	.get_metadata = get_metadata,
-	.get_position = get_position,
-	.get_duration = get_duration,
-	.get_status = get_status,
-	.get_name = get_player_name,
-	.set_volume = set_volume,
-	.play = play,
-	.stop = stop,
+	.list_settings = media_player_list_settings,
+	.get_setting = media_player_get_setting,
+	.set_setting = media_player_set_setting,
+	.list_metadata = media_player_list_metadata,
+	.get_uid = media_player_get_uid,
+	.get_metadata = media_player_get_metadata,
+	.get_position = media_player_get_position,
+	.get_duration = media_player_get_duration,
+	.get_status = media_player_get_status,
+	.get_name = media_player_get_player_name,
+	.set_volume = media_player_set_volume,
+	.play = media_player_play,
+	.stop = media_player_stop,
 	.pause = media_player_pause,
-	.next = next,
-	.previous = previous,
+	.next = media_player_next,
+	.previous = media_player_previous,
 };
 
 static void media_player_exit(DBusConnection *connection, void *user_data)
@@ -1357,7 +1359,7 @@ static gboolean set_status(struct media_player *mp, DBusMessageIter *iter)
 	if (g_strcmp0(mp->status, value) == 0)
 		return TRUE;
 
-	mp->position = get_position(mp);
+	mp->position = media_player_get_position(mp);
 	g_timer_start(mp->timer);
 
 	g_free(mp->status);
@@ -1380,7 +1382,7 @@ static gboolean set_position(struct media_player *mp, DBusMessageIter *iter)
 
 	value /= 1000;
 
-	if (value > get_position(mp))
+	if (value > media_player_get_position(mp))
 		status = "forward-seek";
 	else
 		status = "reverse-seek";
@@ -1579,7 +1581,7 @@ static gboolean parse_player_metadata(struct media_player *mp,
 
 	mp->position = 0;
 	g_timer_start(mp->timer);
-	uid = get_uid(mp);
+	uid = media_player_get_uid(mp);
 
 	avrcp_player_event(mp->player, AVRCP_EVENT_TRACK_CHANGED, &uid);
 	avrcp_player_event(mp->player, AVRCP_EVENT_TRACK_REACHED_START, NULL);