Readability/sensible ordering
This commit is contained in:
parent
ec4be8d9dc
commit
d848dc0560
@ -71,8 +71,15 @@ print_status(struct mpd_connection *conn, struct worker_meta *meta)
|
|||||||
|
|
||||||
const enum mpd_state state = mpd_status_get_state(status);
|
const enum mpd_state state = mpd_status_get_state(status);
|
||||||
|
|
||||||
if (state == MPD_STATE_STOP || state == MPD_STATE_UNKNOWN) {
|
char *play_icon = NULL;
|
||||||
// Early exit
|
switch (state) {
|
||||||
|
case MPD_STATE_PLAY:
|
||||||
|
play_icon = "";
|
||||||
|
break;
|
||||||
|
case MPD_STATE_PAUSE:
|
||||||
|
play_icon = "";
|
||||||
|
break;
|
||||||
|
default:
|
||||||
printf("\n");
|
printf("\n");
|
||||||
mpd_status_free(status);
|
mpd_status_free(status);
|
||||||
fflush(stdout);
|
fflush(stdout);
|
||||||
@ -82,6 +89,13 @@ print_status(struct mpd_connection *conn, struct worker_meta *meta)
|
|||||||
const bool repeat = mpd_status_get_repeat(status);
|
const bool repeat = mpd_status_get_repeat(status);
|
||||||
const bool random = mpd_status_get_random(status);
|
const bool random = mpd_status_get_random(status);
|
||||||
|
|
||||||
|
char state_icon[16];
|
||||||
|
strcpy(state_icon, "");
|
||||||
|
if (repeat)
|
||||||
|
strcat(state_icon, " ");
|
||||||
|
if (random)
|
||||||
|
strcat(state_icon, " ");
|
||||||
|
|
||||||
const unsigned queue_pos = mpd_status_get_song_pos(status);
|
const unsigned queue_pos = mpd_status_get_song_pos(status);
|
||||||
const unsigned queue_length = mpd_status_get_queue_length(status);
|
const unsigned queue_length = mpd_status_get_queue_length(status);
|
||||||
const unsigned elapsed = mpd_status_get_elapsed_time(status);
|
const unsigned elapsed = mpd_status_get_elapsed_time(status);
|
||||||
@ -106,22 +120,6 @@ print_status(struct mpd_connection *conn, struct worker_meta *meta)
|
|||||||
if (mpd_connection_get_error(conn) != MPD_ERROR_SUCCESS)
|
if (mpd_connection_get_error(conn) != MPD_ERROR_SUCCESS)
|
||||||
return handle_error(conn);
|
return handle_error(conn);
|
||||||
|
|
||||||
char *play_icon;
|
|
||||||
if (state == MPD_STATE_PLAY) {
|
|
||||||
play_icon = "";
|
|
||||||
} else if (state == MPD_STATE_PAUSE) {
|
|
||||||
play_icon = "";
|
|
||||||
} else {
|
|
||||||
play_icon = "";
|
|
||||||
}
|
|
||||||
|
|
||||||
char state_icon[16];
|
|
||||||
strcpy(state_icon, "");
|
|
||||||
if (repeat)
|
|
||||||
strcat(state_icon, " ");
|
|
||||||
if (random)
|
|
||||||
strcat(state_icon, " ");
|
|
||||||
|
|
||||||
// the full song label. would be cool if this was customizable at runtime
|
// the full song label. would be cool if this was customizable at runtime
|
||||||
char full_label[strlen(artist) + strlen(title) + 4];
|
char full_label[strlen(artist) + strlen(title) + 4];
|
||||||
sprintf(full_label, "%s - %s", artist, title);
|
sprintf(full_label, "%s - %s", artist, title);
|
||||||
|
Loading…
Reference in New Issue
Block a user