Code

screen_song: check CMD_VIEW only if song screen is enabled
authorMax Kellermann <max@duempel.org>
Tue, 18 Nov 2008 23:06:12 +0000 (00:06 +0100)
committerMax Kellermann <max@duempel.org>
Tue, 18 Nov 2008 23:06:12 +0000 (00:06 +0100)
src/command.c
src/screen_browser.c
src/screen_play.c

index 9dae30be6da716bfe509a05ce90c6a808bfe987d..107167376e1db2162cbbc4c063f7dbb268615018 100644 (file)
@@ -142,8 +142,10 @@ static command_definition_t cmds[] = {
        { { '"', 0, 0 }, 0, CMD_GO_PARENT_DIRECTORY, "go-parent-directory",
          N_("Go to parent directory") },
 
+#ifdef ENABLE_SONG_SCREEN
        { { 'i', 0, 0 }, 0, CMD_VIEW, "view",
          N_("View the song") },
+#endif
 
        { { 'G', 0, 0 }, 0, CMD_LOCATE, "locate",
          N_("Locate song in browser") },
index d0a591ec49002824267b22034cf881cad70d4701..f8493c3ebfd0acf595b031853b4e4207f68de522 100644 (file)
@@ -529,6 +529,7 @@ browser_cmd(struct screen_browser *browser,
                return true;
 #endif
 
+#ifdef ENABLE_SONG_SCREEN
        case CMD_VIEW:
                entry = browser_get_selected(browser);
                if (entry == NULL || entry->entity == NULL ||
@@ -537,6 +538,7 @@ browser_cmd(struct screen_browser *browser,
 
                screen_song_switch(c, entry->entity->info.song);
                return true;
+#endif
 
        case CMD_LOCATE:
                entry = browser_get_selected(browser);
index 13b5e742b0ea389205ee702b2cff3f9b25237952..6cc7277ab73737893b1eda531fb91158ef64d9c7 100644 (file)
@@ -554,6 +554,7 @@ play_cmd(mpdclient_t *c, command_t cmd)
                return handle_mouse_event(c);
 #endif
 
+#ifdef ENABLE_SONG_SCREEN
        case CMD_VIEW:
                if (lw->selected < playlist_length(&c->playlist)) {
                        screen_song_switch(c, playlist_get(&c->playlist, lw->selected));
@@ -561,6 +562,7 @@ play_cmd(mpdclient_t *c, command_t cmd)
                }
 
                break;
+#endif
 
        case CMD_LOCATE:
                if (lw->selected < playlist_length(&c->playlist)) {