From 4e0e1a64f100879787dcb0f53f66124db9056f39 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 30 Sep 2009 20:39:24 +0200 Subject: [PATCH] moved screen_file_goto_song() prototype to screen_file.h --- Makefile.am | 1 + src/screen.h | 3 --- src/screen_browser.c | 1 + src/screen_file.c | 1 + src/screen_file.h | 31 +++++++++++++++++++++++++++++++ src/screen_lyrics.c | 3 ++- src/screen_play.c | 1 + src/screen_song.c | 1 + 8 files changed, 38 insertions(+), 4 deletions(-) create mode 100644 src/screen_file.h diff --git a/Makefile.am b/Makefile.am index 49ba9f4..8243a2f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -41,6 +41,7 @@ ncmpc_headers = \ 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 b0f53c7..8923a7f 100644 --- a/src/screen.h +++ b/src/screen.h @@ -122,9 +122,6 @@ screen_is_visible(const struct screen_functions *sf); 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 c09497d..7658cf3 100644 --- a/src/screen_browser.c +++ b/src/screen_browser.c @@ -18,6 +18,7 @@ */ #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 7fe5587..f8d4883 100644 --- a/src/screen_file.c +++ b/src/screen_file.c @@ -17,6 +17,7 @@ * 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 new file mode 100644 index 0000000..775bc61 --- /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 + +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 abf1055..33a0c3a 100644 --- a/src/screen_lyrics.c +++ b/src/screen_lyrics.c @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include +#include "screen_file.h" #include "i18n.h" #include "options.h" #include "mpdclient.h" @@ -27,6 +27,7 @@ #include "lyrics.h" #include "screen_text.h" +#include #include #include #include diff --git a/src/screen_play.c b/src/screen_play.c index b2ceb63..08c1ce3 100644 --- a/src/screen_play.c +++ b/src/screen_play.c @@ -17,6 +17,7 @@ * 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 fc46648..c83cd45 100644 --- a/src/screen_song.c +++ b/src/screen_song.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "screen_file.h" #include "i18n.h" #include "screen.h" #include "screen_utils.h" -- 2.30.2