oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'v0.23.x'

This commit is contained in:
Max Kellermann 2022-11-12 12:29:21 +01:00
parent f1dc1af85d c2d0f35e7a
commit 98c24d1a32
5 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
meson.build
View File

@ -392,6 +392,7 @@ endif
if enable_database if enable_database
sources += [ sources += [
'src/storage/StorageState.cxx',
'src/queue/PlaylistUpdate.cxx', 'src/queue/PlaylistUpdate.cxx',
'src/command/StorageCommands.cxx', 'src/command/StorageCommands.cxx',
'src/command/DatabaseCommands.cxx', 'src/command/DatabaseCommands.cxx',

4
python/build/meson.py
View File

@ -82,8 +82,8 @@ endian = '{endian}'
def configure(toolchain, src, build, args=()): def configure(toolchain, src, build, args=()):
cross_file = make_cross_file(toolchain) cross_file = make_cross_file(toolchain)
configure = [ configure = [
'meson', 'meson', 'setup',
src, build, build, src,
'--prefix', toolchain.install_prefix, '--prefix', toolchain.install_prefix,

2
src/storage/meson.build
View File

@ -17,7 +17,6 @@ storage_glue = static_library(
'CompositeStorage.cxx', 'CompositeStorage.cxx',
'MemoryDirectoryReader.cxx', 'MemoryDirectoryReader.cxx',
'Configured.cxx', 'Configured.cxx',
'StorageState.cxx',
include_directories: inc, include_directories: inc,
dependencies: [ dependencies: [
boost_dep, boost_dep,
@ -31,4 +30,3 @@ storage_glue_dep = declare_dependency(
storage_plugins_dep, storage_plugins_dep,
], ],
) )

3
test/meson.build
View File

@ -271,7 +271,8 @@ if enable_database
dependencies: [ dependencies: [
log_dep, log_dep,
tag_dep, tag_dep,
storage_glue_dep, fs_dep,
storage_plugins_dep,
gtest_dep, gtest_dep,
], ],
), ),

8
test/test_translate_song.cxx
View File

@ -14,6 +14,7 @@
#include "ls.hxx" #include "ls.hxx"
#include "Log.hxx" #include "Log.hxx"
#include "db/DatabaseSong.hxx" #include "db/DatabaseSong.hxx"
#include "storage/Registry.hxx"
#include "storage/StorageInterface.hxx" #include "storage/StorageInterface.hxx"
#include "storage/plugins/LocalStorage.hxx" #include "storage/plugins/LocalStorage.hxx"
#include "Mapper.hxx" #include "Mapper.hxx"
@ -36,6 +37,13 @@ uri_supported_scheme(const char *uri) noexcept
return strncmp(uri, "http://", 7) == 0; return strncmp(uri, "http://", 7) == 0;
} }
const StoragePlugin *
GetStoragePluginByUri(const char *) noexcept
{
// dummy symbol
return nullptr;
}
static constexpr auto music_directory = PATH_LITERAL("/music"); static constexpr auto music_directory = PATH_LITERAL("/music");
static Storage *storage; static Storage *storage;