diff --git a/src/screen_list.c b/src/screen_list.c
index 76ae8b155c53978580ac3237364fcbfe18771e19..5ef6ddba172224f0168389df77aec598c0b573b0 100644 (file)
--- a/src/screen_list.c
+++ b/src/screen_list.c
-/*
- * (c) 2004 by Kalle Wallin <kaw@linux.se>
- * Copyright (C) 2008 Max Kellermann <max@duempel.org>
+/* ncmpc (Ncurses MPD Client)
+ * (c) 2004-2010 The Music Player Daemon Project
+ * Project homepage: http://musicpd.org
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "screen_list.h"
+#include "screen_interface.h"
#include "screen.h"
+#include "screen_help.h"
+#include "screen_queue.h"
+#include "screen_file.h"
+#include "screen_artist.h"
+#include "screen_search.h"
+#include "screen_song.h"
+#include "screen_keydef.h"
+#include "screen_lyrics.h"
+#include "screen_outputs.h"
+#include "screen_chat.h"
#include <string.h>
static const struct
{
- int id;
const char *name;
const struct screen_functions *functions;
} screens[] = {
- { SCREEN_PLAYLIST_ID, "playlist", &screen_playlist },
- { SCREEN_BROWSE_ID, "browse", &screen_browse },
+ { "playlist", &screen_queue },
+ { "browse", &screen_browse },
#ifdef ENABLE_ARTIST_SCREEN
- { SCREEN_ARTIST_ID, "artist", &screen_artist },
+ { "artist", &screen_artist },
+#endif
+#ifdef ENABLE_HELP_SCREEN
+ { "help", &screen_help },
#endif
- { SCREEN_HELP_ID, "help", &screen_help },
#ifdef ENABLE_SEARCH_SCREEN
- { SCREEN_SEARCH_ID, "search", &screen_search },
+ { "search", &screen_search },
+#endif
+#ifdef ENABLE_SONG_SCREEN
+ { "song", &screen_song },
#endif
#ifdef ENABLE_KEYDEF_SCREEN
- { SCREEN_KEYDEF_ID, "keydef", &screen_keydef },
+ { "keydef", &screen_keydef },
#endif
#ifdef ENABLE_LYRICS_SCREEN
- { SCREEN_LYRICS_ID, "lyrics", &screen_lyrics },
+ { "lyrics", &screen_lyrics },
+#endif
+#ifdef ENABLE_OUTPUTS_SCREEN
+ { "outputs", &screen_outputs },
+#endif
+#ifdef ENABLE_CHAT_SCREEN
+ { "chat", &screen_chat },
#endif
};
-static const unsigned NUM_SCREENS = sizeof(screens) / sizeof(screens[0]);
-
void
screen_list_init(WINDOW *w, unsigned cols, unsigned rows)
{
unsigned i;
- for (i = 0; i < NUM_SCREENS; ++i) {
+ for (i = 0; i < G_N_ELEMENTS(screens); ++i) {
const struct screen_functions *sf = screens[i].functions;
if (sf->init)
{
unsigned i;
- for (i = 0; i < NUM_SCREENS; ++i) {
+ for (i = 0; i < G_N_ELEMENTS(screens); ++i) {
const struct screen_functions *sf = screens[i].functions;
if (sf->exit)
{
unsigned i;
- for (i = 0; i < NUM_SCREENS; ++i) {
+ for (i = 0; i < G_N_ELEMENTS(screens); ++i) {
const struct screen_functions *sf = screens[i].functions;
if (sf->resize)
}
const char *
-screen_get_name(unsigned i)
+screen_get_name(const struct screen_functions *sf)
{
- assert(i < NUM_SCREENS);
+ unsigned i;
- return screens[i].name;
+ for (i = 0; i < G_N_ELEMENTS(screens); ++i)
+ if (screens[i].functions == sf)
+ return screens[i].name;
+
+ return NULL;
}
const struct screen_functions *
{
unsigned i;
- for (i = 0; i < NUM_SCREENS; ++i)
+ for (i = 0; i < G_N_ELEMENTS(screens); ++i)
if (strcmp(name, screens[i].name) == 0)
return screens[i].functions;
return NULL;
}
-
-const struct screen_functions *
-screen_get_functions(unsigned i)
-{
- assert(i < NUM_SCREENS);
-
- return screens[i].functions;
-}
-
-int
-lookup_mode(const struct screen_functions *sf)
-{
- unsigned i;
-
- for (i = 0; i < NUM_SCREENS; ++i)
- if (screens[i].functions == sf)
- return i;
-
- return -1;
-}