screen_browser: include cleanup

[ncmpc.git] / src / screen_browser.h

diff --git a/src/screen_browser.h b/src/screen_browser.h
index 6ba092194833ef9bf6756921dcefeaac4defef06..e972bd5855d64ee9f4aa8e03167dbbf621009406 100644 (file)
--- a/src/screen_browser.h
+++ b/src/screen_browser.h
@@ -1,36 +1,31 @@
 /* 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
  * 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.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
+ */
 
 #ifndef SCREEN_BROWSER_H
 #define SCREEN_BROWSER_H
 
 #include "command.h"
 #include "config.h"
+#include "ncmpc_curses.h"
 
 #include <stdbool.h>
 
-#ifdef HAVE_NCURSESW_NCURSES_H
-#include <ncursesw/ncurses.h>
-#else
-#include <ncurses.h>
-#endif
-
 struct mpdclient;
 struct mpdclient_playlist;
 struct filelist;
@@ -41,6 +36,7 @@ struct screen_browser {
        struct list_window *lw;
 
        struct filelist *filelist;
+       const char *song_format;
 };
 
 #ifndef NCMPC_MINI
@@ -51,10 +47,9 @@ screen_browser_sync_highlights(struct filelist *fl,
 
 #else
 
-#include <glib.h>
 static inline void
-screen_browser_sync_highlights(G_GNUC_UNUSED struct filelist *fl,
-                              G_GNUC_UNUSED const struct mpdclient_playlist *playlist)
+screen_browser_sync_highlights(gcc_unused struct filelist *fl,
+                              gcc_unused const struct mpdclient_playlist *playlist)
 {
 }