summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e3f743b)
raw | patch | inline | side by side (parent: e3f743b)
author | Max Kellermann <max@duempel.org> | |
Wed, 30 Sep 2009 18:39:24 +0000 (20:39 +0200) | ||
committer | Max Kellermann <max@duempel.org> | |
Wed, 30 Sep 2009 18:39:24 +0000 (20:39 +0200) |
Makefile.am | patch | blob | history | |
src/screen.h | patch | blob | history | |
src/screen_browser.c | patch | blob | history | |
src/screen_file.c | patch | blob | history | |
src/screen_file.h | [new file with mode: 0644] | patch | blob |
src/screen_lyrics.c | patch | blob | history | |
src/screen_play.c | patch | blob | history | |
src/screen_song.c | patch | blob | history |
diff --git a/Makefile.am b/Makefile.am
index 49ba9f4aef877f0e725f8b81b4ff1b5f638dd408..8243a2f352f83d4738b3d411e2986ef96f425bbc 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
src/ncmpc.h \
src/defaults.h \
src/i18n.h \
+ src/screen_file.h \
src/screen_browser.h \
src/screen_text.h \
src/plugin.h \
diff --git a/src/screen.h b/src/screen.h
index b0f53c7c1b9a5bd5db15b10202b22c9c0daefc00..8923a7f57e2b87be0682f4be898008fc7d1667c8 100644 (file)
--- a/src/screen.h
+++ b/src/screen.h
int
screen_get_mouse_event(struct mpdclient *c, unsigned long *bstate, int *row);
-bool
-screen_file_goto_song(struct mpdclient *c, const struct mpd_song *song);
-
#ifdef ENABLE_SONG_SCREEN
void
screen_song_switch(struct mpdclient *c, const struct mpd_song *song);
diff --git a/src/screen_browser.c b/src/screen_browser.c
index c09497d0eac874588fb28059eec8cb2c2ef12173..7658cf3cc4f0d08308f0b9ef41648378f1311d94 100644 (file)
--- a/src/screen_browser.c
+++ b/src/screen_browser.c
*/
#include "screen_browser.h"
+#include "screen_file.h"
#include "i18n.h"
#include "options.h"
#include "charset.h"
diff --git a/src/screen_file.c b/src/screen_file.c
index 7fe55876c321b1d8795eb65f062c20f428df6f8f..f8d488306b9cf183014c21c59dd861f1000918bd 100644 (file)
--- a/src/screen_file.c
+++ b/src/screen_file.c
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
+#include "screen_file.h"
#include "config.h"
#include "i18n.h"
#include "options.h"
diff --git a/src/screen_file.h b/src/screen_file.h
--- /dev/null
+++ b/src/screen_file.h
@@ -0,0 +1,31 @@
+/* ncmpc (Ncurses MPD Client)
+ * (c) 2004-2009 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 NCMPC_SCREEN_FILE_H
+#define NCMPC_SCREEN_FILE_H
+
+#include <stdbool.h>
+
+struct mpdclient;
+struct mpd_song;
+
+bool
+screen_file_goto_song(struct mpdclient *c, const struct mpd_song *song);
+
+#endif
diff --git a/src/screen_lyrics.c b/src/screen_lyrics.c
index abf1055661e827c8577c66bd65f2a9141873e97d..33a0c3a2659e4ec0176ceb043029f4b924f46a59 100644 (file)
--- a/src/screen_lyrics.c
+++ b/src/screen_lyrics.c
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include <sys/stat.h>
+#include "screen_file.h"
#include "i18n.h"
#include "options.h"
#include "mpdclient.h"
#include "lyrics.h"
#include "screen_text.h"
+#include <sys/stat.h>
#include <stdlib.h>
#include <string.h>
#include <glib.h>
diff --git a/src/screen_play.c b/src/screen_play.c
index b2ceb636e1369595ab48086b04df1df13d98bac5..08c1ce34f5e463933fbed8b54cfaa725b20b2c3a 100644 (file)
--- a/src/screen_play.c
+++ b/src/screen_play.c
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
+#include "screen_file.h"
#include "config.h"
#include "i18n.h"
#include "charset.h"
diff --git a/src/screen_song.c b/src/screen_song.c
index fc4664840866d828eb81d9c28abab3d2122f1782..c83cd45b3a247b24cafc21b527297681437642a7 100644 (file)
--- a/src/screen_song.c
+++ b/src/screen_song.c
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
+#include "screen_file.h"
#include "i18n.h"
#include "screen.h"
#include "screen_utils.h"