From 16951099d1154bee369aec1437fa85ecb1c3218e Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 8 Aug 2012 22:27:00 +0200 Subject: player_control: inline trivial functions --- src/player_control.c | 30 ------------------------------ src/player_control.h | 35 +++++++++++++++++++++++++---------- 2 files changed, 25 insertions(+), 40 deletions(-) diff --git a/src/player_control.c b/src/player_control.c index d8d54dfd6..9201202a3 100644 --- a/src/player_control.c +++ b/src/player_control.c @@ -228,12 +228,6 @@ pc_get_status(struct player_control *pc, struct player_status *status) player_unlock(pc); } -enum player_state -pc_get_state(struct player_control *pc) -{ - return pc->state; -} - void pc_clear_error(struct player_control *pc) { @@ -243,12 +237,6 @@ pc_clear_error(struct player_control *pc) player_unlock(pc); } -enum player_error -pc_get_error(struct player_control *pc) -{ - return pc->error; -} - static char * pc_errored_song_uri(struct player_control *pc) { @@ -348,12 +336,6 @@ pc_set_cross_fade(struct player_control *pc, float cross_fade_seconds) idle_add(IDLE_OPTIONS); } -float -pc_get_mixramp_db(const struct player_control *pc) -{ - return pc->mixramp_db; -} - void pc_set_mixramp_db(struct player_control *pc, float mixramp_db) { @@ -362,12 +344,6 @@ pc_set_mixramp_db(struct player_control *pc, float mixramp_db) idle_add(IDLE_OPTIONS); } -float -pc_get_mixramp_delay(const struct player_control *pc) -{ - return pc->mixramp_delay_seconds; -} - void pc_set_mixramp_delay(struct player_control *pc, float mixramp_delay_seconds) { @@ -375,9 +351,3 @@ pc_set_mixramp_delay(struct player_control *pc, float mixramp_delay_seconds) idle_add(IDLE_OPTIONS); } - -double -pc_get_total_play_time(const struct player_control *pc) -{ - return pc->total_play_time; -} diff --git a/src/player_control.h b/src/player_control.h index 5a04ab0f9..b1371df8f 100644 --- a/src/player_control.h +++ b/src/player_control.h @@ -213,8 +213,11 @@ pc_kill(struct player_control *pc); void pc_get_status(struct player_control *pc, struct player_status *status); -enum player_state -pc_get_state(struct player_control *pc); +static inline enum player_state +pc_get_state(struct player_control *pc) +{ + return pc->state; +} void pc_clear_error(struct player_control *pc); @@ -227,8 +230,11 @@ pc_clear_error(struct player_control *pc); char * pc_get_error_message(struct player_control *pc); -enum player_error -pc_get_error(struct player_control *pc); +static inline enum player_error +pc_get_error(struct player_control *pc) +{ + return pc->error; +} void pc_stop(struct player_control *pc); @@ -257,16 +263,25 @@ pc_get_cross_fade(const struct player_control *pc); void pc_set_mixramp_db(struct player_control *pc, float mixramp_db); -float -pc_get_mixramp_db(const struct player_control *pc); +static inline float +pc_get_mixramp_db(const struct player_control *pc) +{ + return pc->mixramp_db; +} void pc_set_mixramp_delay(struct player_control *pc, float mixramp_delay_seconds); -float -pc_get_mixramp_delay(const struct player_control *pc); +static inline float +pc_get_mixramp_delay(const struct player_control *pc) +{ + return pc->mixramp_delay_seconds; +} -double -pc_get_total_play_time(const struct player_control *pc); +static inline double +pc_get_total_play_time(const struct player_control *pc) +{ + return pc->total_play_time; +} #endif -- cgit v1.2.3