player_control: bundle "get" functions in pc_get_status()

The new player_status struct replaces a bunch of playerGetX()
functions.  When we add proper locking to the player_control struct,
we will only need to lock once for the "status" command.

1 files changed, 10 insertions, 11 deletions

diff --git a/src/player_control.h b/src/player_control.h
index 9cf5b137..e6b19ee6 100644
--- a/src/player_control.h
+++ b/src/player_control.h
@@ -60,6 +60,14 @@ enum player_error {
 	PLAYER_ERROR_FILENOTFOUND,
 };
 
+struct player_status {
+	enum player_state state;
+	uint16_t bit_rate;
+	struct audio_format audio_format;
+	float total_time;
+	float elapsed_time;
+};
+
 struct player_control {
 	unsigned buffer_chunks;
 
@@ -112,11 +120,8 @@ void playerPause(void);
 
 void playerKill(void);
 
-int getPlayerTotalTime(void);
-
-int getPlayerElapsedTime(void);
-
-unsigned long getPlayerBitRate(void);
+void
+pc_get_status(struct player_status *status);
 
 enum player_state getPlayerState(void);
 
@@ -151,12 +156,6 @@ float getPlayerCrossFade(void);
 
 double getPlayerTotalPlayTime(void);
 
-static inline const struct audio_format *
-player_get_audio_format(void)
-{
-	return &pc.audio_format;
-}
-
 void playerInit(void);
 
 #endif