Merge remote branches 'avuton/master' and 'jn/dev'

[ncmpc.git] / src / screen_browser.h

diff --git a/src/screen_browser.h b/src/screen_browser.h
index 57a575bca2d192ae671c8b33ef2720f1aa8938e8..f6cfd5a57d21c0c604d888bbd299bc9cc65048fe 100644 (file)
--- a/src/screen_browser.h
+++ b/src/screen_browser.h
@@ -1,5 +1,5 @@
 /* ncmpc (Ncurses MPD Client)
- * (c) 2004-2009 The Music Player Daemon Project
+ * (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
@@ -20,8 +20,9 @@
 #ifndef SCREEN_BROWSER_H
 #define SCREEN_BROWSER_H
 
-#include "screen.h"
+#include "command.h"
 #include "config.h"
+#include "ncmpc_curses.h"
 
 #include <stdbool.h>
 
@@ -43,9 +44,23 @@ void
 screen_browser_sync_highlights(struct filelist *fl,
                               const struct mpdclient_playlist *playlist);
 
+#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)
+{
+}
+
 #endif
 
-const char *browser_lw_callback(unsigned index, bool *highlight, char** second_column, void *filelist);
+void
+screen_browser_paint_directory(WINDOW *w, unsigned width,
+                              bool selected, const char *name);
+
+void
+screen_browser_paint(const struct screen_browser *browser);
 
 struct filelist_entry *
 browser_get_selected_entry(const struct screen_browser *browser);