command.c: put curly braces around a single large statement

[ncmpc.git] / src / screen_list.c

diff --git a/src/screen_list.c b/src/screen_list.c
index 09a7a219f92faeb69bb8f9dc723be0a239fb0d0c..a6bbf8df0587412f135d75c7d3ea8ce2534ad5bb 100644 (file)
--- a/src/screen_list.c
+++ b/src/screen_list.c
@@ -1,24 +1,34 @@
-/*
- * (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
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- *
+
  * This program is distributed in the hope that it will be useful,
  * 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 <string.h>
 
@@ -27,7 +37,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 },
@@ -52,14 +62,12 @@ static const struct
 #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)
@@ -72,7 +80,7 @@ screen_list_exit(void)
 {
        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)
@@ -85,7 +93,7 @@ screen_list_resize(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->resize)
@@ -98,7 +106,7 @@ screen_get_name(const struct screen_functions *sf)
 {
        unsigned i;
 
-       for (i = 0; i < NUM_SCREENS; ++i)
+       for (i = 0; i < G_N_ELEMENTS(screens); ++i)
                if (screens[i].functions == sf)
                        return screens[i].name;
 
@@ -110,7 +118,7 @@ screen_lookup_name(const char *name)
 {
        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;