Compiler.h: reimplement GCC_CHECK_VERSION() using GCC_MAKE_VERSION()

[ncmpc.git] / src / player_command.c

diff --git a/src/player_command.c b/src/player_command.c
index 3161792dc1ff7f9d265f3509318395af263a081d..d4ff4ae280830e749adee8f1ce6ae01aaffc093f 100644 (file)
--- a/src/player_command.c
+++ b/src/player_command.c
@@ -22,7 +22,7 @@
 #include "options.h"
 #include "i18n.h"
 #include "screen_client.h"
-#include "screen_message.h"
+#include "screen_status.h"
 
 int seek_id = -1;
 int seek_target_time;
@@ -32,12 +32,10 @@ static guint seek_source_id;
 static void
 commit_seek(struct mpdclient *c)
 {
-       struct mpd_connection *connection;
-
        if (seek_id < 0)
                return;
 
-       connection = mpdclient_get_connection(c);
+       struct mpd_connection *connection = mpdclient_get_connection(c);
        if (connection == NULL) {
                seek_id = -1;
                return;
@@ -101,14 +99,14 @@ setup_seek(struct mpdclient *c)
 bool
 handle_player_command(struct mpdclient *c, command_t cmd)
 {
-       struct mpd_connection *connection;
-
        if (!mpdclient_is_connected(c) || c->status == NULL)
                return false;
 
        cancel_seek_timer();
 
        switch(cmd) {
+               struct mpd_connection *connection;
+
                /*
        case CMD_PLAY:
                mpdclient_cmd_play(c, MPD_PLAY_AT_BEGINNING);
@@ -174,7 +172,7 @@ handle_player_command(struct mpdclient *c, command_t cmd)
                        break;
 
                if (mpd_run_shuffle(connection))
-                       screen_status_message(_("Shuffled playlist"));
+                       screen_status_message(_("Shuffled queue"));
                else
                        mpdclient_handle_error(c);
                break;
@@ -184,7 +182,7 @@ handle_player_command(struct mpdclient *c, command_t cmd)
                        break;
 
                if (mpdclient_cmd_clear(c))
-                       screen_status_message(_("Cleared playlist"));
+                       screen_status_message(_("Cleared queue"));
                break;
        case CMD_REPEAT:
                connection = mpdclient_get_connection(c);