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 e0ddecf53390c13c73cbd2aaa4935306f48dd312..5a9f0d7a96517c93699108442785176be9fe6256 100644 (file)
--- a/src/screen_list.c
+++ b/src/screen_list.c
@@ -1,5 +1,5 @@
 /* ncmpc (Ncurses MPD Client)
- * (c) 2004-2010 The Music Player Daemon Project
+ * (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
@@ -29,6 +29,7 @@
 #include "screen_keydef.h"
 #include "screen_lyrics.h"
 #include "screen_outputs.h"
+#include "screen_chat.h"
 
 #include <string.h>
 
@@ -60,14 +61,15 @@ static const struct
 #ifdef ENABLE_OUTPUTS_SCREEN
        { "outputs", &screen_outputs },
 #endif
+#ifdef ENABLE_CHAT_SCREEN
+       { "chat", &screen_chat },
+#endif
 };
 
 void
 screen_list_init(WINDOW *w, unsigned cols, unsigned rows)
 {
-       unsigned i;
-
-       for (i = 0; i < G_N_ELEMENTS(screens); ++i) {
+       for (unsigned i = 0; i < G_N_ELEMENTS(screens); ++i) {
                const struct screen_functions *sf = screens[i].functions;
 
                if (sf->init)
@@ -78,9 +80,7 @@ screen_list_init(WINDOW *w, unsigned cols, unsigned rows)
 void
 screen_list_exit(void)
 {
-       unsigned i;
-
-       for (i = 0; i < G_N_ELEMENTS(screens); ++i) {
+       for (unsigned i = 0; i < G_N_ELEMENTS(screens); ++i) {
                const struct screen_functions *sf = screens[i].functions;
 
                if (sf->exit)
@@ -91,9 +91,7 @@ screen_list_exit(void)
 void
 screen_list_resize(unsigned cols, unsigned rows)
 {
-       unsigned i;
-
-       for (i = 0; i < G_N_ELEMENTS(screens); ++i) {
+       for (unsigned i = 0; i < G_N_ELEMENTS(screens); ++i) {
                const struct screen_functions *sf = screens[i].functions;
 
                if (sf->resize)
@@ -104,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 < G_N_ELEMENTS(screens); ++i)
+       for (unsigned i = 0; i < G_N_ELEMENTS(screens); ++i)
                if (screens[i].functions == sf)
                        return screens[i].name;
 
@@ -116,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 < G_N_ELEMENTS(screens); ++i)
+       for (unsigned i = 0; i < G_N_ELEMENTS(screens); ++i)
                if (strcmp(name, screens[i].name) == 0)
                        return screens[i].functions;