Move screens to subdirectory

src/Makefile.am

@@ -2,6 +2,25 @@ bin_PROGRAMS = ncmpcpp
 ncmpcpp_SOURCES = \
 	curses/scrollpad.cpp \
 	curses/window.cpp \
+	screens/browser.cpp \
+	screens/clock.cpp \
+	screens/help.cpp \
+	screens/lastfm.cpp \
+	screens/lyrics.cpp \
+	screens/media_library.cpp \
+	screens/outputs.cpp \
+	screens/playlist.cpp \
+	screens/playlist_editor.cpp \
+	screens/screen.cpp \
+	screens/screen_type.cpp \
+	screens/search_engine.cpp \
+	screens/sel_items_adder.cpp \
+	screens/server_info.cpp \
+	screens/song_info.cpp \
+	screens/sort_playlist.cpp \
+	screens/tag_editor.cpp \
+	screens/tiny_tag_editor.cpp \
+	screens/visualizer.cpp \
 	utility/comparators.cpp \
 	utility/html.cpp \
 	utility/option_parser.cpp \
@@ -10,46 +29,27 @@ ncmpcpp_SOURCES = \
 	utility/wide_string.cpp \
 	actions.cpp \
 	bindings.cpp \
-	browser.cpp \
 	charset.cpp \
-	clock.cpp \
 	configuration.cpp \
 	curl_handle.cpp \
 	display.cpp \
 	enums.cpp \
 	format.cpp \
 	global.cpp \
-	help.cpp \
 	helpers.cpp \
-	lastfm.cpp \
 	lastfm_service.cpp \
-	lyrics.cpp \
 	lyrics_fetcher.cpp \
 	macro_utilities.cpp \
-	media_library.cpp \
 	mpdpp.cpp \
 	mutable_song.cpp \
 	ncmpcpp.cpp \
-	outputs.cpp \
-	playlist.cpp \
-	playlist_editor.cpp \
-	screen.cpp \
-	screen_type.cpp \
-	search_engine.cpp \
-	sel_items_adder.cpp \
-	server_info.cpp \
 	settings.cpp \
 	song.cpp \
-	song_info.cpp \
 	song_list.cpp \
-	sort_playlist.cpp \
 	status.cpp \
 	statusbar.cpp \
-	tag_editor.cpp \
 	tags.cpp \
-	tiny_tag_editor.cpp \
-	title.cpp \
-	visualizer.cpp
+	title.cpp
 
 # set the include path found by configure
 INCLUDES= $(all_includes)
@@ -62,7 +62,25 @@ noinst_HEADERS = \
 	curses/scrollpad.h \
 	curses/strbuffer.h \
 	curses/window.h \
-	helpers/song_iterator_maker.h \
+	screens/browser.h \
+	screens/clock.h \
+	screens/help.h \
+	screens/lastfm.h \
+	screens/lyrics.h \
+	screens/media_library.h \
+	screens/outputs.h \
+	screens/playlist_editor.h \
+	screens/screen.h \
+	screens/screen_switcher.h \
+	screens/screen_type.h \
+	screens/search_engine.h \
+	screens/sel_items_adder.h \
+	screens/server_info.h \
+	screens/song_info.h \
+	screens/sort_playlist.h \
+	screens/tag_editor.h \
+	screens/tiny_tag_editor.h \
+	screens/visualizer.h \
 	utility/comparators.h \
 	utility/const.h \
 	utility/conversion.h \
@@ -75,9 +93,7 @@ noinst_HEADERS = \
 	utility/type_conversions.h \
 	utility/wide_string.h \
 	bindings.h \
-	browser.h \
 	charset.h \
-	clock.h \
 	configuration.h \
 	curl_handle.h \
 	display.h \
@@ -85,36 +101,20 @@ noinst_HEADERS = \
 	format.h \
 	format_impl.h \
 	global.h \
-	help.h \
 	helpers.h \
+	helpers/song_iterator_maker.h \
 	interfaces.h \
-	lastfm.h \
 	lastfm_service.h \
-	lyrics.h \
 	lyrics_fetcher.h \
 	macro_utilities.h \
-	media_library.h \
 	mpdpp.h \
 	mutable_song.h \
-	outputs.h \
-	playlist_editor.h \
 	regex_filter.h \
 	runnable_item.h \
-	screen.h \
-	screen_switcher.h \
-	screen_type.h \
-	search_engine.h \
-	sel_items_adder.h \
-	server_info.h \
 	settings.h \
 	song.h \
-	song_info.h \
 	song_list.h \
-	sort_playlist.h \
 	status.h \
 	statusbar.h \
-	tag_editor.h \
 	tags.h \
-	tiny_tag_editor.h \
-	title.h \
-	visualizer.h
+	title.h

src/actions.cpp

@@ -42,26 +42,26 @@
 
 #include "curses/menu_impl.h"
 #include "bindings.h"
-#include "browser.h"
-#include "clock.h"
-#include "help.h"
-#include "media_library.h"
-#include "lastfm.h"
-#include "lyrics.h"
-#include "playlist.h"
-#include "playlist_editor.h"
-#include "sort_playlist.h"
-#include "search_engine.h"
-#include "sel_items_adder.h"
-#include "server_info.h"
-#include "song_info.h"
-#include "outputs.h"
+#include "screens/browser.h"
+#include "screens/clock.h"
+#include "screens/help.h"
+#include "screens/media_library.h"
+#include "screens/lastfm.h"
+#include "screens/lyrics.h"
+#include "screens/playlist.h"
+#include "screens/playlist_editor.h"
+#include "screens/sort_playlist.h"
+#include "screens/search_engine.h"
+#include "screens/sel_items_adder.h"
+#include "screens/server_info.h"
+#include "screens/song_info.h"
+#include "screens/outputs.h"
 #include "utility/readline.h"
 #include "utility/string.h"
 #include "utility/type_conversions.h"
-#include "tag_editor.h"
-#include "tiny_tag_editor.h"
-#include "visualizer.h"
+#include "screens/tag_editor.h"
+#include "screens/tiny_tag_editor.h"
+#include "screens/visualizer.h"
 #include "title.h"
 #include "tags.h"
 

src/display.cpp

@@ -21,15 +21,15 @@
 #include <cassert>
 
 #include "curses/menu_impl.h"
-#include "browser.h"
+#include "screens/browser.h"
 #include "charset.h"
 #include "display.h"
 #include "format_impl.h"
 #include "helpers.h"
-#include "song_info.h"
-#include "playlist.h"
+#include "screens/song_info.h"
+#include "screens/playlist.h"
 #include "global.h"
-#include "tag_editor.h"
+#include "screens/tag_editor.h"
 #include "utility/string.h"
 #include "utility/type_conversions.h"
 

src/display.h

@@ -25,7 +25,7 @@
 #include "format.h"
 #include "menu.h"
 #include "mutable_song.h"
-#include "search_engine.h"
+#include "screens/search_engine.h"
 #include "song_list.h"
 
 namespace Display {

src/global.h

@@ -25,7 +25,7 @@
 #include <random>
 
 #include "mpdpp.h"
-#include "screen.h"
+#include "screens/screen.h"
 
 namespace Global {
 

src/helpers.cpp

@@ -24,7 +24,7 @@
 
 #include "enums.h"
 #include "helpers.h"
-#include "playlist.h"
+#include "screens/playlist.h"
 #include "statusbar.h"
 #include "utility/functional.h"
 

src/helpers.h

@@ -23,8 +23,8 @@
 
 #include "interfaces.h"
 #include "mpdpp.h"
-#include "playlist.h"
-#include "screen.h"
+#include "screens/playlist.h"
+#include "screens/screen.h"
 #include "settings.h"
 #include "song_list.h"
 #include "status.h"

src/interfaces.h

@@ -26,7 +26,7 @@
 #include <string>
 #include "enums.h"
 #include "gcc.h"
-#include "screen.h"
+#include "screens/screen.h"
 #include "song.h"
 
 struct Searchable

src/macro_utilities.h

@@ -23,7 +23,7 @@
 
 #include <cassert>
 #include "actions.h"
-#include "screen_type.h"
+#include "screens/screen_type.h"
 
 namespace Actions {
 

src/ncmpcpp.cpp

@@ -33,18 +33,18 @@
 
 #include "actions.h"
 #include "bindings.h"
-#include "browser.h"
+#include "screens/browser.h"
 #include "charset.h"
 #include "configuration.h"
 #include "global.h"
 #include "helpers.h"
-#include "lyrics.h"
-#include "outputs.h"
-#include "playlist.h"
+#include "screens/lyrics.h"
+#include "screens/outputs.h"
+#include "screens/playlist.h"
 #include "settings.h"
 #include "status.h"
 #include "statusbar.h"
-#include "visualizer.h"
+#include "screens/visualizer.h"
 #include "title.h"
 #include "utility/conversion.h"
 

src/screens/browser.cpp

@@ -24,18 +24,18 @@
 #include <boost/locale/conversion.hpp>
 #include <time.h>
 
-#include "browser.h"
+#include "screens/browser.h"
 #include "charset.h"
 #include "display.h"
 #include "global.h"
 #include "helpers.h"
-#include "playlist.h"
+#include "screens/playlist.h"
 #include "curses/menu_impl.h"
-#include "screen_switcher.h"
+#include "screens/screen_switcher.h"
 #include "settings.h"
 #include "status.h"
 #include "statusbar.h"
-#include "tag_editor.h"
+#include "screens/tag_editor.h"
 #include "title.h"
 #include "tags.h"
 #include "helpers/song_iterator_maker.h"

src/screens/browser.h

@@ -24,7 +24,7 @@
 #include "interfaces.h"
 #include "mpdpp.h"
 #include "regex_filter.h"
-#include "screen.h"
+#include "screens/screen.h"
 #include "song_list.h"
 
 struct BrowserWindow: NC::Menu<MPD::Item>, SongList

src/screens/clock.cpp

@@ -20,7 +20,7 @@
 
 /// NOTICE: Major part of this code is ported from ncmpc's clock screen
 
-#include "clock.h"
+#include "screens/clock.h"
 
 #ifdef ENABLE_CLOCK
 
@@ -28,12 +28,12 @@
 #include <cstring>
 
 #include "global.h"
-#include "playlist.h"
+#include "screens/playlist.h"
 #include "settings.h"
 #include "status.h"
 #include "statusbar.h"
 #include "title.h"
-#include "screen_switcher.h"
+#include "screens/screen_switcher.h"
 
 using Global::MainHeight;
 using Global::MainStartY;

src/screens/clock.h

@@ -27,7 +27,7 @@
 
 #include "curses/window.h"
 #include "interfaces.h"
-#include "screen.h"
+#include "screens/screen.h"
 
 struct Clock: Screen<NC::Window>, Tabbable
 {

src/screens/help.cpp

@@ -22,13 +22,13 @@
 
 #include "bindings.h"
 #include "global.h"
-#include "help.h"
+#include "screens/help.h"
 #include "settings.h"
 #include "status.h"
 #include "utility/string.h"
 #include "utility/wide_string.h"
 #include "title.h"
-#include "screen_switcher.h"
+#include "screens/screen_switcher.h"
 
 using Global::MainHeight;
 using Global::MainStartY;

src/screens/help.h

@@ -23,7 +23,7 @@
 
 #include "actions.h"
 #include "interfaces.h"
-#include "screen.h"
+#include "screens/screen.h"
 
 struct Help: Screen<NC::Scrollpad>, Tabbable
 {

src/screens/lastfm.cpp

@@ -18,14 +18,14 @@
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
 
-#include "lastfm.h"
+#include "screens/lastfm.h"
 
 #include "helpers.h"
 #include "charset.h"
 #include "global.h"
 #include "statusbar.h"
 #include "title.h"
-#include "screen_switcher.h"
+#include "screens/screen_switcher.h"
 
 using Global::MainHeight;
 using Global::MainStartY;

src/screens/lastfm.h

@@ -28,7 +28,7 @@
 
 #include "interfaces.h"
 #include "lastfm_service.h"
-#include "screen.h"
+#include "screens/screen.h"
 #include "utility/wide_string.h"
 
 struct Lastfm: Screen<NC::Scrollpad>, Tabbable

src/screens/lyrics.cpp

@@ -28,19 +28,19 @@
 #include <thread>
 
 #include "curses/scrollpad.h"
-#include "browser.h"
+#include "screens/browser.h"
 #include "charset.h"
 #include "curl_handle.h"
 #include "format_impl.h"
 #include "global.h"
 #include "helpers.h"
-#include "lyrics.h"
-#include "playlist.h"
+#include "screens/lyrics.h"
+#include "screens/playlist.h"
 #include "settings.h"
 #include "song.h"
 #include "statusbar.h"
 #include "title.h"
-#include "screen_switcher.h"
+#include "screens/screen_switcher.h"
 #include "utility/string.h"
 
 using Global::MainHeight;

src/screens/lyrics.h

@@ -29,7 +29,7 @@
 
 #include "interfaces.h"
 #include "lyrics_fetcher.h"
-#include "screen.h"
+#include "screens/screen.h"
 #include "song.h"
 #include "utility/shared_resource.h"
 

src/screens/media_library.cpp

@@ -30,8 +30,8 @@
 #include "global.h"
 #include "curses/menu_impl.h"
 #include "mpdpp.h"
-#include "playlist.h"
-#include "media_library.h"
+#include "screens/playlist.h"
+#include "screens/media_library.h"
 #include "status.h"
 #include "statusbar.h"
 #include "helpers/song_iterator_maker.h"
@@ -39,7 +39,7 @@
 #include "utility/functional.h"
 #include "utility/type_conversions.h"
 #include "title.h"
-#include "screen_switcher.h"
+#include "screens/screen_switcher.h"
 
 using Global::MainHeight;
 using Global::MainStartY;

src/screens/media_library.h

@@ -25,7 +25,7 @@
 
 #include "interfaces.h"
 #include "regex_filter.h"
-#include "screen.h"
+#include "screens/screen.h"
 #include "song_list.h"
 
 struct MediaLibrary: Screen<NC::Window *>, Filterable, HasColumns, HasSongs, Searchable, Tabbable

src/screens/outputs.cpp

@@ -18,7 +18,7 @@
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
 
-#include "outputs.h"
+#include "screens/outputs.h"
 
 #ifdef ENABLE_OUTPUTS
 
@@ -30,7 +30,7 @@
 #include "status.h"
 #include "statusbar.h"
 #include "title.h"
-#include "screen_switcher.h"
+#include "screens/screen_switcher.h"
 
 using Global::MainHeight;
 using Global::MainStartY;

src/screens/outputs.h

@@ -28,7 +28,7 @@
 #include "interfaces.h"
 #include "menu.h"
 #include "mpdpp.h"
-#include "screen.h"
+#include "screens/screen.h"
 
 struct Outputs: Screen<NC::Menu<MPD::Output>>, Tabbable
 {

src/screens/playlist.cpp

@@ -26,8 +26,8 @@
 #include "display.h"
 #include "global.h"
 #include "helpers.h"
-#include "playlist.h"
-#include "screen_switcher.h"
+#include "screens/playlist.h"
+#include "screens/screen_switcher.h"
 #include "song.h"
 #include "status.h"
 #include "statusbar.h"

src/screens/playlist.h

@@ -26,7 +26,7 @@
 
 #include "interfaces.h"
 #include "regex_filter.h"
-#include "screen.h"
+#include "screens/screen.h"
 #include "song.h"
 #include "song_list.h"
 

src/screens/playlist_editor.cpp

@@ -28,17 +28,17 @@
 #include "display.h"
 #include "global.h"
 #include "helpers.h"
-#include "playlist.h"
-#include "playlist_editor.h"
+#include "screens/playlist.h"
+#include "screens/playlist_editor.h"
 #include "mpdpp.h"
 #include "status.h"
 #include "statusbar.h"
-#include "tag_editor.h"
+#include "screens/tag_editor.h"
 #include "helpers/song_iterator_maker.h"
 #include "utility/functional.h"
 #include "utility/comparators.h"
 #include "title.h"
-#include "screen_switcher.h"
+#include "screens/screen_switcher.h"
 
 using Global::MainHeight;
 using Global::MainStartY;

src/screens/playlist_editor.h

@@ -25,7 +25,7 @@
 
 #include "interfaces.h"
 #include "regex_filter.h"
-#include "screen.h"
+#include "screens/screen.h"
 #include "song_list.h"
 
 struct PlaylistEditor: Screen<NC::Window *>, Filterable, HasColumns, HasSongs, Searchable, Tabbable

src/screens/screen.cpp

@@ -21,7 +21,7 @@
 #include <cassert>
 
 #include "global.h"
-#include "screen.h"
+#include "screens/screen.h"
 #include "settings.h"
 
 using Global::myScreen;

src/screens/screen.h

@@ -23,7 +23,7 @@
 
 #include "curses/menu.h"
 #include "curses/scrollpad.h"
-#include "screen_type.h"
+#include "screens/screen_type.h"
 
 void drawSeparator(int x);
 void genericMouseButtonPressed(NC::Window &w, MEVENT me);

src/screens/screen_type.cpp

@@ -19,25 +19,25 @@
  ***************************************************************************/
 
 #include "config.h"
-#include "screen_type.h"
+#include "screens/screen_type.h"
 
-#include "browser.h"
-#include "clock.h"
-#include "help.h"
-#include "lastfm.h"
-#include "lyrics.h"
-#include "media_library.h"
-#include "outputs.h"
-#include "playlist.h"
-#include "playlist_editor.h"
-#include "search_engine.h"
-#include "sel_items_adder.h"
-#include "server_info.h"
-#include "song_info.h"
-#include "sort_playlist.h"
-#include "tag_editor.h"
-#include "tiny_tag_editor.h"
-#include "visualizer.h"
+#include "screens/browser.h"
+#include "screens/clock.h"
+#include "screens/help.h"
+#include "screens/lastfm.h"
+#include "screens/lyrics.h"
+#include "screens/media_library.h"
+#include "screens/outputs.h"
+#include "screens/playlist.h"
+#include "screens/playlist_editor.h"
+#include "screens/search_engine.h"
+#include "screens/sel_items_adder.h"
+#include "screens/server_info.h"
+#include "screens/song_info.h"
+#include "screens/sort_playlist.h"
+#include "screens/tag_editor.h"
+#include "screens/tiny_tag_editor.h"
+#include "screens/visualizer.h"
 
 std::string screenTypeToString(ScreenType st)
 {

src/screens/search_engine.cpp

@@ -26,15 +26,15 @@
 #include "display.h"
 #include "global.h"
 #include "helpers.h"
-#include "playlist.h"
-#include "search_engine.h"
+#include "screens/playlist.h"
+#include "screens/search_engine.h"
 #include "settings.h"
 #include "status.h"
 #include "statusbar.h"
 #include "helpers/song_iterator_maker.h"
 #include "utility/comparators.h"
 #include "title.h"
-#include "screen_switcher.h"
+#include "screens/screen_switcher.h"
 
 using Global::MainHeight;
 using Global::MainStartY;

src/screens/search_engine.h

@@ -26,7 +26,7 @@
 #include "interfaces.h"
 #include "mpdpp.h"
 #include "regex_filter.h"
-#include "screen.h"
+#include "screens/screen.h"
 #include "song_list.h"
 
 struct SEItem

src/screens/sel_items_adder.cpp

@@ -21,16 +21,16 @@
 #include <algorithm>
 
 #include "curses/menu_impl.h"
-#include "browser.h"
+#include "screens/browser.h"
 #include "global.h"
 #include "helpers.h"
 #include "mpdpp.h"
-#include "playlist.h"
-#include "sel_items_adder.h"
+#include "screens/playlist.h"
+#include "screens/sel_items_adder.h"
 #include "settings.h"
 #include "statusbar.h"
 #include "utility/comparators.h"
-#include "screen_switcher.h"
+#include "screens/screen_switcher.h"
 #include "charset.h"
 
 SelectedItemsAdder *mySelectedItemsAdder;

src/screens/sel_items_adder.h

@@ -24,7 +24,7 @@
 #include "runnable_item.h"
 #include "interfaces.h"
 #include "regex_filter.h"
-#include "screen.h"
+#include "screens/screen.h"
 #include "song.h"
 
 struct SelectedItemsAdder: Screen<NC::Menu<RunnableItem<std::string, void()>> *>, HasActions, Searchable, Tabbable

src/screens/server_info.cpp

@@ -23,9 +23,9 @@
 
 #include "global.h"
 #include "helpers.h"
-#include "server_info.h"
+#include "screens/server_info.h"
 #include "statusbar.h"
-#include "screen_switcher.h"
+#include "screens/screen_switcher.h"
 
 using Global::MainHeight;
 using Global::MainStartY;

src/screens/server_info.h

@@ -24,7 +24,7 @@
 #include <boost/date_time/posix_time/posix_time_types.hpp>
 
 #include "interfaces.h"
-#include "screen.h"
+#include "screens/screen.h"
 
 struct ServerInfo: Screen<NC::Scrollpad>, Tabbable
 {

src/screens/song_info.cpp

@@ -20,11 +20,11 @@
 
 #include "global.h"
 #include "helpers.h"
-#include "song_info.h"
-#include "tag_editor.h"
+#include "screens/song_info.h"
+#include "screens/tag_editor.h"
 #include "tags.h"
 #include "title.h"
-#include "screen_switcher.h"
+#include "screens/screen_switcher.h"
 
 #ifdef HAVE_TAGLIB_H
 # include "fileref.h"

src/screens/song_info.h

@@ -23,7 +23,7 @@
 
 #include "interfaces.h"
 #include "mutable_song.h"
-#include "screen.h"
+#include "screens/screen.h"
 
 struct SongInfo: Screen<NC::Scrollpad>, Tabbable
 {

src/screens/sort_playlist.cpp

@@ -23,12 +23,12 @@
 #include "display.h"
 #include "global.h"
 #include "helpers.h"
-#include "playlist.h"
+#include "screens/playlist.h"
 #include "settings.h"
-#include "sort_playlist.h"
+#include "screens/sort_playlist.h"
 #include "statusbar.h"
 #include "utility/comparators.h"
-#include "screen_switcher.h"
+#include "screens/screen_switcher.h"
 
 SortPlaylistDialog *mySortPlaylistDialog;
 

src/screens/sort_playlist.h

@@ -23,7 +23,7 @@
 
 #include "runnable_item.h"
 #include "interfaces.h"
-#include "screen.h"
+#include "screens/screen.h"
 #include "song.h"
 
 struct SortPlaylistDialog

src/screens/tag_editor.cpp

@@ -18,7 +18,7 @@
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
 
-#include "tag_editor.h"
+#include "screens/tag_editor.h"
 
 #ifdef HAVE_TAGLIB_H
 
@@ -27,21 +27,21 @@
 #include <fstream>
 
 #include "actions.h"
-#include "browser.h"
+#include "screens/browser.h"
 #include "charset.h"
 #include "display.h"
 #include "global.h"
 #include "helpers.h"
 #include "curses/menu_impl.h"
-#include "playlist.h"
-#include "song_info.h"
+#include "screens/playlist.h"
+#include "screens/song_info.h"
 #include "statusbar.h"
 #include "helpers/song_iterator_maker.h"
 #include "utility/functional.h"
 #include "utility/comparators.h"
 #include "title.h"
 #include "tags.h"
-#include "screen_switcher.h"
+#include "screens/screen_switcher.h"
 
 using Global::myScreen;
 using Global::MainHeight;

src/screens/tag_editor.h

@@ -30,7 +30,7 @@
 #include "interfaces.h"
 #include "mutable_song.h"
 #include "regex_filter.h"
-#include "screen.h"
+#include "screens/screen.h"
 #include "song_list.h"
 
 struct TagsWindow: NC::Menu<MPD::MutableSong>, SongList

src/screens/tiny_tag_editor.cpp

@@ -18,7 +18,7 @@
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
 
-#include "tiny_tag_editor.h"
+#include "screens/tiny_tag_editor.h"
 
 #ifdef HAVE_TAGLIB_H
 
@@ -29,19 +29,19 @@
 #include <tag.h>
 
 #include "curses/menu_impl.h"
-#include "browser.h"
+#include "screens/browser.h"
 #include "charset.h"
 #include "display.h"
 #include "helpers.h"
 #include "global.h"
-#include "song_info.h"
-#include "playlist.h"
-#include "search_engine.h"
+#include "screens/song_info.h"
+#include "screens/playlist.h"
+#include "screens/search_engine.h"
 #include "statusbar.h"
-#include "tag_editor.h"
+#include "screens/tag_editor.h"
 #include "title.h"
 #include "tags.h"
-#include "screen_switcher.h"
+#include "screens/screen_switcher.h"
 #include "utility/string.h"
 
 using Global::MainHeight;

src/screens/tiny_tag_editor.h

@@ -27,7 +27,7 @@
 
 #include "interfaces.h"
 #include "mutable_song.h"
-#include "screen.h"
+#include "screens/screen.h"
 
 struct TinyTagEditor: Screen<NC::Menu<NC::Buffer>>, HasActions
 {

src/screens/visualizer.cpp

@@ -18,7 +18,7 @@
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
 
-#include "visualizer.h"
+#include "screens/visualizer.h"
 
 #ifdef ENABLE_VISUALIZER
 
@@ -36,7 +36,7 @@
 #include "status.h"
 #include "statusbar.h"
 #include "title.h"
-#include "screen_switcher.h"
+#include "screens/screen_switcher.h"
 #include "status.h"
 #include "enums.h"
 

src/screens/visualizer.h

@@ -28,7 +28,7 @@
 #include <boost/date_time/posix_time/posix_time_types.hpp>
 #include "curses/window.h"
 #include "interfaces.h"
-#include "screen.h"
+#include "screens/screen.h"
 
 #ifdef HAVE_FFTW3_H
 # include <fftw3.h>

src/settings.h

@@ -32,7 +32,7 @@
 #include "enums.h"
 #include "format.h"
 #include "lyrics_fetcher.h"
-#include "screen_type.h"
+#include "screens/screen_type.h"
 
 struct Column
 {

src/song_list.cpp

@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include "helpers/song_iterator_maker.h"
-#include "song_info.h"
+#include "screens/song_info.h"
 #include "utility/functional.h"
 
 SongIterator SongMenu::currentS()

src/status.cpp

@@ -23,23 +23,23 @@
 #include <netinet/in.h>
 
 #include "curses/menu_impl.h"
-#include "browser.h"
+#include "screens/browser.h"
 #include "charset.h"
 #include "format_impl.h"
 #include "global.h"
 #include "helpers.h"
-#include "lyrics.h"
-#include "media_library.h"
-#include "outputs.h"
-#include "playlist.h"
-#include "playlist_editor.h"
-#include "search_engine.h"
-#include "sel_items_adder.h"
+#include "screens/lyrics.h"
+#include "screens/media_library.h"
+#include "screens/outputs.h"
+#include "screens/playlist.h"
+#include "screens/playlist_editor.h"
+#include "screens/search_engine.h"
+#include "screens/sel_items_adder.h"
 #include "settings.h"
 #include "status.h"
 #include "statusbar.h"
-#include "tag_editor.h"
-#include "visualizer.h"
+#include "screens/tag_editor.h"
+#include "screens/visualizer.h"
 #include "title.h"
 #include "utility/string.h"
 

src/statusbar.cpp

@@ -23,7 +23,7 @@
 #include "status.h"
 #include "statusbar.h"
 #include "bindings.h"
-#include "playlist.h"
+#include "screens/playlist.h"
 #include "utility/wide_string.h"
 
 using Global::wFooter;