screen_queue: no typedef for completion_callback_data_t

[ncmpc.git] / src / screen_list.c

diff --git a/src/screen_list.c b/src/screen_list.c
index 39ec8e9f36f5b3f9afcf15f407bc74ff57566e57..5a9f0d7a96517c93699108442785176be9fe6256 100644 (file)
--- a/src/screen_list.c
+++ b/src/screen_list.c
@@ -1,6 +1,6 @@
-/*
- * (c) 2004 by Kalle Wallin <kaw@linux.se>
- * Copyright (C) 2008 Max Kellermann <max@duempel.org>
+/* ncmpc (Ncurses MPD Client)
+ * (c) 2004-2017 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
@@ -11,14 +11,25 @@
  * 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>
 
@@ -27,7 +38,7 @@ static const struct
        const char *name;
        const struct screen_functions *functions;
 } screens[] = {
-       { "playlist", &screen_playlist },
+       { "playlist", &screen_queue },
        { "browse", &screen_browse },
 #ifdef ENABLE_ARTIST_SCREEN
        { "artist", &screen_artist },
@@ -38,22 +49,27 @@ static const struct
 #ifdef ENABLE_SEARCH_SCREEN
        { "search", &screen_search },
 #endif
+#ifdef ENABLE_SONG_SCREEN
+       { "song", &screen_song },
+#endif
 #ifdef ENABLE_KEYDEF_SCREEN
        { "keydef", &screen_keydef },
 #endif
 #ifdef ENABLE_LYRICS_SCREEN
        { "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 (unsigned i = 0; i < G_N_ELEMENTS(screens); ++i) {
                const struct screen_functions *sf = screens[i].functions;
 
                if (sf->init)
@@ -64,9 +80,7 @@ screen_list_init(WINDOW *w, unsigned cols, unsigned rows)
 void
 screen_list_exit(void)
 {
-       unsigned i;
-
-       for (i = 0; i < NUM_SCREENS; ++i) {
+       for (unsigned i = 0; i < G_N_ELEMENTS(screens); ++i) {
                const struct screen_functions *sf = screens[i].functions;
 
                if (sf->exit)
@@ -77,9 +91,7 @@ screen_list_exit(void)
 void
 screen_list_resize(unsigned cols, unsigned rows)
 {
-       unsigned i;
-
-       for (i = 0; i < NUM_SCREENS; ++i) {
+       for (unsigned i = 0; i < G_N_ELEMENTS(screens); ++i) {
                const struct screen_functions *sf = screens[i].functions;
 
                if (sf->resize)
@@ -90,9 +102,7 @@ screen_list_resize(unsigned cols, unsigned rows)
 const char *
 screen_get_name(const struct screen_functions *sf)
 {
-       unsigned i;
-
-       for (i = 0; i < NUM_SCREENS; ++i)
+       for (unsigned i = 0; i < G_N_ELEMENTS(screens); ++i)
                if (screens[i].functions == sf)
                        return screens[i].name;
 
@@ -102,9 +112,7 @@ screen_get_name(const struct screen_functions *sf)
 const struct screen_functions *
 screen_lookup_name(const char *name)
 {
-       unsigned i;
-
-       for (i = 0; i < NUM_SCREENS; ++i)
+       for (unsigned i = 0; i < G_N_ELEMENTS(screens); ++i)
                if (strcmp(name, screens[i].name) == 0)
                        return screens[i].functions;