aboutsummaryrefslogtreecommitdiffstats
path: root/src/PlayerCommands.cxx
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2013-04-08 22:11:42 +0200
committerMax Kellermann <max@duempel.org>2013-04-08 22:11:42 +0200
commit2c4b99817025c8aa2734877bb74af36f90436330 (patch)
tree13622752eb0f0ada915c3e407222e662f050bd03 /src/PlayerCommands.cxx
parent8becbb8b085278ba6441ec750e23ab3b2f79b386 (diff)
parent0a9c7ff6cf9ce560767f3971fd88843976b9dc61 (diff)
downloadmpd-2c4b99817025c8aa2734877bb74af36f90436330.tar.gz
mpd-2c4b99817025c8aa2734877bb74af36f90436330.tar.xz
mpd-2c4b99817025c8aa2734877bb74af36f90436330.zip
Merge tag 'release-0.17.4'
Diffstat (limited to 'src/PlayerCommands.cxx')
-rw-r--r--src/PlayerCommands.cxx18
1 files changed, 11 insertions, 7 deletions
diff --git a/src/PlayerCommands.cxx b/src/PlayerCommands.cxx
index 32cd16d9d..1c1c346b7 100644
--- a/src/PlayerCommands.cxx
+++ b/src/PlayerCommands.cxx
@@ -169,19 +169,23 @@ handle_status(Client *client,
}
if (player_status.state != PLAYER_STATE_STOP) {
- struct audio_format_string af_string;
-
client_printf(client,
COMMAND_STATUS_TIME ": %i:%i\n"
"elapsed: %1.3f\n"
- COMMAND_STATUS_BITRATE ": %u\n"
- COMMAND_STATUS_AUDIO ": %s\n",
+ COMMAND_STATUS_BITRATE ": %u\n",
(int)(player_status.elapsed_time + 0.5),
(int)(player_status.total_time + 0.5),
player_status.elapsed_time,
- player_status.bit_rate,
- audio_format_to_string(&player_status.audio_format,
- &af_string));
+ player_status.bit_rate);
+
+ if (audio_format_defined(&player_status.audio_format)) {
+ struct audio_format_string af_string;
+
+ client_printf(client,
+ COMMAND_STATUS_AUDIO ": %s\n",
+ audio_format_to_string(&player_status.audio_format,
+ &af_string));
+ }
}
if ((updateJobId = isUpdatingDB())) {