aboutsummaryrefslogtreecommitdiffstats
path: root/src/player_control.h
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2008-10-10 14:47:58 +0200
committerMax Kellermann <max@duempel.org>2008-10-10 14:47:58 +0200
commit0b4dfae22e883d376bc44e1e2d78f201d045970b (patch)
tree755cbfeff4158a09c6970824612488b3702a8c7b /src/player_control.h
parent8c33b64847c5ead45ade665afc9ad16a04a693f2 (diff)
downloadmpd-0b4dfae22e883d376bc44e1e2d78f201d045970b.tar.gz
mpd-0b4dfae22e883d376bc44e1e2d78f201d045970b.tar.xz
mpd-0b4dfae22e883d376bc44e1e2d78f201d045970b.zip
player: added player_control.audio_format
This replaces the attributes bits, channels, sampleRate.
Diffstat (limited to '')
-rw-r--r--src/player_control.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/player_control.h b/src/player_control.h
index 372c445db..b763cc389 100644
--- a/src/player_control.h
+++ b/src/player_control.h
@@ -20,6 +20,7 @@
#define PLAYER_H
#include "notify.h"
+#include "audio_format.h"
#include <stdint.h>
@@ -86,9 +87,7 @@ struct player_control {
volatile enum player_state state;
volatile int8_t error;
volatile uint16_t bitRate;
- volatile int8_t bits;
- volatile int8_t channels;
- volatile uint32_t sampleRate;
+ struct audio_format audio_format;
volatile float totalTime;
volatile float elapsedTime;
volatile float fileTime;
@@ -157,9 +156,9 @@ double getPlayerTotalPlayTime(void);
unsigned int getPlayerSampleRate(void);
-int getPlayerBits(void);
+unsigned getPlayerBits(void);
-int getPlayerChannels(void);
+unsigned getPlayerChannels(void);
struct song *
playerCurrentDecodeSong(void);