mpdclient, gidle: move to client/

MusicPlayerDaemon · Sep 10, 2024 · 59dea70 · 59dea70
1 parent f14c0be
commit 59dea70
Show file tree

Hide file tree

Showing 28 changed files with 54 additions and 36 deletions.
diff --git a/meson.build b/meson.build
@@ -208,8 +208,6 @@ if not mini
   m_dep = cc.find_library('m', required: false)
 endif
 
-libmpdclient_dep = dependency('libmpdclient', version: '>= 2.16')
-
 if not mini
   pcre_dep = dependency('libpcre2-8', required: get_option('regex'))
 
@@ -263,15 +261,6 @@ if not mini
   endif
 endif
 
-if async_connect
-  sources += [
-    'src/net/SocketError.cxx',
-    'src/net/AsyncResolveConnect.cxx',
-    'src/event/net/ConnectSocket.cxx',
-    'src/aconnect.cxx',
-  ]
-endif
-
 if lirc_dep.found()
   sources += [
     'src/lirc.cxx',
@@ -380,15 +369,14 @@ subdir('src/io')
 subdir('src/system')
 subdir('src/net')
 subdir('src/event')
+subdir('src/client')
 subdir('src/ui')
 subdir('src/dialogs')
 subdir('src/page')
 
 ncmpc = executable('ncmpc',
   'src/Main.cxx',
   'src/Instance.cxx',
-  'src/gidle.cxx',
-  'src/mpdclient.cxx',
   'src/callbacks.cxx',
   'src/Queue.cxx',
   'src/filelist.cxx',
@@ -438,7 +426,7 @@ ncmpc = executable('ncmpc',
     m_dep,
     curses_dep,
     lirc_dep,
-    libmpdclient_dep,
+    client_dep,
     fmt_dep,
     ui_dep,
     dialogs_dep,

diff --git a/src/ChatPage.cxx b/src/ChatPage.cxx
@@ -5,13 +5,13 @@
 #include "PageMeta.hxx"
 #include "screen.hxx"
 #include "screen_status.hxx"
-#include "mpdclient.hxx"
 #include "i18n.h"
 #include "charset.hxx"
 #include "Command.hxx"
 #include "Options.hxx"
 #include "page/TextPage.hxx"
 #include "dialogs/TextInputDialog.hxx"
+#include "client/mpdclient.hxx"
 #include "util/StringAPI.hxx"
 
 #include <mpd/idle.h>

diff --git a/src/DelayedSeek.cxx b/src/DelayedSeek.cxx
@@ -2,7 +2,7 @@
 // Copyright The Music Player Daemon Project
 
 #include "DelayedSeek.hxx"
-#include "mpdclient.hxx"
+#include "client/mpdclient.hxx"
 
 void
 DelayedSeek::Commit() noexcept

diff --git a/src/EditPlaylistPage.cxx b/src/EditPlaylistPage.cxx
@@ -10,11 +10,9 @@
 #include "i18n.h"
 #include "Command.hxx"
 #include "Options.hxx"
-#include "mpdclient.hxx"
 #include "screen.hxx"
 #include "lib/fmt/ToSpan.hxx"
-
-#include <mpd/client.h>
+#include "client/mpdclient.hxx"
 
 #include <string>
 

diff --git a/src/FileBrowserPage.cxx b/src/FileBrowserPage.cxx
@@ -10,14 +10,14 @@
 #include "config.h" // IWYU pragma: keep
 #include "i18n.h"
 #include "charset.hxx"
-#include "mpdclient.hxx"
 #include "filelist.hxx"
 #include "screen_client.hxx"
 #include "Command.hxx"
 #include "Options.hxx"
 #include "dialogs/YesNoDialog.hxx"
 #include "ui/Bell.hxx"
 #include "lib/fmt/ToSpan.hxx"
+#include "client/mpdclient.hxx"
 #include "util/UriUtil.hxx"
 
 #include <mpd/client.h>

diff --git a/src/FileListPage.cxx b/src/FileListPage.cxx
@@ -12,12 +12,12 @@
 #include "Options.hxx"
 #include "charset.hxx"
 #include "strfsong.hxx"
-#include "mpdclient.hxx"
 #include "filelist.hxx"
 #include "Styles.hxx"
 #include "SongRowPaint.hxx"
 #include "time_format.hxx"
 #include "ui/paint.hxx"
+#include "client/mpdclient.hxx"
 #include "util/UriUtil.hxx"
 
 #include <mpd/client.h>

diff --git a/src/Instance.hxx b/src/Instance.hxx
@@ -6,9 +6,9 @@
 #include "config.h"
 #include "AsyncUserInput.hxx"
 #include "UserInputHandler.hxx"
-#include "mpdclient.hxx"
 #include "DelayedSeek.hxx"
 #include "screen.hxx"
+#include "client/mpdclient.hxx"
 #include "event/Loop.hxx"
 #include "event/CoarseTimerEvent.hxx"
 #include "event/FineTimerEvent.hxx"

diff --git a/src/LibraryPage.cxx b/src/LibraryPage.cxx
@@ -8,12 +8,12 @@
 #include "Command.hxx"
 #include "i18n.h"
 #include "charset.hxx"
-#include "mpdclient.hxx"
 #include "filelist.hxx"
 #include "Options.hxx"
 #include "screen.hxx"
 #include "page/ProxyPage.hxx"
 #include "lib/fmt/ToSpan.hxx"
+#include "client/mpdclient.hxx"
 
 #include <list>
 #include <string>

diff --git a/src/LyricsPage.cxx b/src/LyricsPage.cxx
@@ -9,12 +9,12 @@
 #include "i18n.h"
 #include "Command.hxx"
 #include "Options.hxx"
-#include "mpdclient.hxx"
 #include "screen.hxx"
 #include "plugin.hxx"
 #include "ncu.hxx"
 #include "page/TextPage.hxx"
 #include "lib/fmt/ToSpan.hxx"
+#include "client/mpdclient.hxx"
 #include "util/StringAPI.hxx"
 
 #include <string>

diff --git a/src/Main.cxx b/src/Main.cxx
@@ -4,7 +4,6 @@
 #include "config.h"
 #include "Instance.hxx"
 #include "ncmpc.hxx"
-#include "mpdclient.hxx"
 #include "callbacks.hxx"
 #include "charset.hxx"
 #include "Options.hxx"

diff --git a/src/OutputsPage.cxx b/src/OutputsPage.cxx
@@ -8,11 +8,11 @@
 #include "screen_status.hxx"
 #include "Command.hxx"
 #include "i18n.h"
-#include "mpdclient.hxx"
 #include "page/ListPage.hxx"
 #include "dialogs/TextInputDialog.hxx"
 #include "ui/ListRenderer.hxx"
 #include "ui/paint.hxx"
+#include "client/mpdclient.hxx"
 #include "util/FNVHash.hxx"
 #include "util/StringAPI.hxx"
 

diff --git a/src/QueuePage.cxx b/src/QueuePage.cxx
@@ -10,7 +10,6 @@
 #include "charset.hxx"
 #include "Command.hxx"
 #include "Options.hxx"
-#include "mpdclient.hxx"
 #include "strfsong.hxx"
 #include "Completion.hxx"
 #include "Styles.hxx"
@@ -23,6 +22,7 @@
 #include "dialogs/TextInputDialog.hxx"
 #include "ui/ListRenderer.hxx"
 #include "ui/ListText.hxx"
+#include "client/mpdclient.hxx"
 #include "event/CoarseTimerEvent.hxx"
 #include "util/SPrintf.hxx"
 

diff --git a/src/SearchPage.cxx b/src/SearchPage.cxx
@@ -10,12 +10,12 @@
 #include "Bindings.hxx"
 #include "GlobalBindings.hxx"
 #include "charset.hxx"
-#include "mpdclient.hxx"
 #include "FileListPage.hxx"
 #include "filelist.hxx"
 #include "dialogs/TextInputDialog.hxx"
 #include "ui/TextListRenderer.hxx"
 #include "lib/fmt/ToSpan.hxx"
+#include "client/mpdclient.hxx"
 #include "util/StringAPI.hxx"
 
 #include <iterator>

diff --git a/src/SongPage.cxx b/src/SongPage.cxx
@@ -8,11 +8,11 @@
 #include "screen.hxx"
 #include "charset.hxx"
 #include "time_format.hxx"
-#include "mpdclient.hxx"
 #include "page/ListPage.hxx"
 #include "ui/ListText.hxx"
 #include "ui/TextListRenderer.hxx"
 #include "lib/fmt/ToSpan.hxx"
+#include "client/mpdclient.hxx"
 #include "util/LocaleString.hxx"
 #include "util/StringAPI.hxx"
 #include "util/StringStrip.hxx"

diff --git a/src/TagListPage.cxx b/src/TagListPage.cxx
@@ -7,8 +7,8 @@
 #include "Command.hxx"
 #include "i18n.h"
 #include "charset.hxx"
-#include "mpdclient.hxx"
 #include "page/FindSupport.hxx"
+#include "client/mpdclient.hxx"
 #include "util/StringUTF8.hxx"
 
 #include <algorithm>

diff --git a/src/callbacks.cxx b/src/callbacks.cxx
@@ -4,9 +4,9 @@
 #include "callbacks.hxx"
 #include "screen.hxx"
 #include "screen_status.hxx"
-#include "mpdclient.hxx"
 #include "ncmpc.hxx"
 #include "ui/Bell.hxx"
+#include "client/mpdclient.hxx"
 
 #include <curses.h>
 

diff --git a/src/aconnect.cxx → src/client/aconnect.cxx b/src/aconnect.cxx → src/client/aconnect.cxx
diff --git a/src/aconnect.hxx → src/client/aconnect.hxx b/src/aconnect.hxx → src/client/aconnect.hxx
diff --git a/src/gidle.cxx → src/client/gidle.cxx b/src/gidle.cxx → src/client/gidle.cxx
diff --git a/src/gidle.hxx → src/client/gidle.hxx b/src/gidle.hxx → src/client/gidle.hxx
diff --git a/src/client/meson.build b/src/client/meson.build
@@ -0,0 +1,33 @@
+libmpdclient_dep = dependency('libmpdclient', version: '>= 2.16')
+
+client_sources = [
+  'gidle.cxx',
+  'mpdclient.cxx',
+]
+
+if async_connect
+  client_sources += [
+    '../net/SocketError.cxx',
+    '../net/AsyncResolveConnect.cxx',
+    '../event/net/ConnectSocket.cxx',
+    'aconnect.cxx',
+  ]
+endif
+
+client = static_library(
+  'client',
+  client_sources,
+  include_directories: inc,
+  dependencies: [
+    libmpdclient_dep,
+    event_dep,
+  ],
+)
+
+client_dep = declare_dependency(
+  link_with: client,
+  dependencies: [
+    libmpdclient_dep,
+    event_dep,
+  ],
+)
diff --git a/src/mpdclient.cxx → src/client/mpdclient.cxx b/src/mpdclient.cxx → src/client/mpdclient.cxx
diff --git a/src/mpdclient.hxx → src/client/mpdclient.hxx b/src/mpdclient.hxx → src/client/mpdclient.hxx
diff --git a/src/db_completion.cxx b/src/db_completion.cxx
@@ -4,7 +4,7 @@
 #include "db_completion.hxx"
 #include "Completion.hxx"
 #include "charset.hxx"
-#include "mpdclient.hxx"
+#include "client/mpdclient.hxx"
 #include "util/ScopeExit.hxx"
 
 #include <string>

diff --git a/src/player_command.cxx b/src/player_command.cxx
@@ -4,11 +4,11 @@
 #include "player_command.hxx"
 #include "DelayedSeek.hxx"
 #include "Command.hxx"
-#include "mpdclient.hxx"
 #include "Options.hxx"
 #include "i18n.h"
 #include "screen_client.hxx"
 #include "screen_status.hxx"
+#include "client/mpdclient.hxx"
 
 bool
 handle_player_command(struct mpdclient &c, DelayedSeek &seek, Command cmd)

diff --git a/src/save_playlist.cxx b/src/save_playlist.cxx
@@ -7,12 +7,12 @@
 #include "config.h" // IWYU pragma: keep
 #include "i18n.h"
 #include "charset.hxx"
-#include "mpdclient.hxx"
 #include "Completion.hxx"
 #include "screen.hxx"
 #include "screen_utils.hxx"
 #include "dialogs/TextInputDialog.hxx"
 #include "dialogs/YesNoDialog.hxx"
+#include "client/mpdclient.hxx"
 #include "co/InvokeTask.hxx"
 
 #include <mpd/client.h>

diff --git a/src/screen.cxx b/src/screen.cxx
@@ -8,7 +8,6 @@
 #include "Command.hxx"
 #include "config.h"
 #include "i18n.h"
-#include "mpdclient.hxx"
 #include "Options.hxx"
 #include "DelayedSeek.hxx"
 #include "player_command.hxx"
@@ -21,6 +20,7 @@
 #include "dialogs/TextInputDialog.hxx"
 #include "ui/Options.hxx"
 #include "co/Task.hxx"
+#include "client/mpdclient.hxx"
 #include "util/ScopeExit.hxx"
 #include "util/StringAPI.hxx"
 

diff --git a/src/screen_client.cxx b/src/screen_client.cxx
@@ -3,7 +3,7 @@
 
 #include "screen_client.hxx"
 #include "screen_status.hxx"
-#include "mpdclient.hxx"
+#include "client/mpdclient.hxx"
 #include "i18n.h"
 #include "charset.hxx"