Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
61a119b6
Commit
61a119b6
authored
Jul 17, 2018
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
playlist/Registry: use struct ConfigData
parent
ea5096ac
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
6 deletions
+7
-6
Main.cxx
src/Main.cxx
+1
-1
PlaylistRegistry.cxx
src/playlist/PlaylistRegistry.cxx
+3
-3
PlaylistRegistry.hxx
src/playlist/PlaylistRegistry.hxx
+2
-1
dump_playlist.cxx
test/dump_playlist.cxx
+1
-1
No files found.
src/Main.cxx
View file @
61a119b6
...
...
@@ -572,7 +572,7 @@ try {
client_manager_init
();
input_stream_global_init
(
GetGlobalConfig
(),
instance
->
io_thread
.
GetEventLoop
());
playlist_list_global_init
();
playlist_list_global_init
(
GetGlobalConfig
()
);
#ifdef ENABLE_DAEMON
daemonize_commit
();
...
...
src/playlist/PlaylistRegistry.cxx
View file @
61a119b6
...
...
@@ -36,7 +36,7 @@
#include "util/UriUtil.hxx"
#include "util/StringUtil.hxx"
#include "util/Macros.hxx"
#include "config/
Global
.hxx"
#include "config/
Data
.hxx"
#include "config/Block.hxx"
#include <assert.h>
...
...
@@ -75,14 +75,14 @@ static bool playlist_plugins_enabled[n_playlist_plugins];
if (playlist_plugins_enabled[playlist_plugin_iterator - playlist_plugins])
void
playlist_list_global_init
(
void
)
playlist_list_global_init
(
const
ConfigData
&
config
)
{
const
ConfigBlock
empty
;
for
(
unsigned
i
=
0
;
playlist_plugins
[
i
]
!=
nullptr
;
++
i
)
{
const
struct
playlist_plugin
*
plugin
=
playlist_plugins
[
i
];
const
auto
*
param
=
config
_find_b
lock
(
ConfigBlockOption
::
PLAYLIST_PLUGIN
,
config
.
FindB
lock
(
ConfigBlockOption
::
PLAYLIST_PLUGIN
,
"name"
,
plugin
->
name
);
if
(
param
==
nullptr
)
param
=
&
empty
;
...
...
src/playlist/PlaylistRegistry.hxx
View file @
61a119b6
...
...
@@ -23,6 +23,7 @@
#include "input/Ptr.hxx"
#include "Compiler.h"
struct
ConfigData
;
class
Mutex
;
class
SongEnumerator
;
...
...
@@ -38,7 +39,7 @@ extern const struct playlist_plugin *const playlist_plugins[];
* Initializes all playlist plugins.
*/
void
playlist_list_global_init
();
playlist_list_global_init
(
const
ConfigData
&
config
);
/**
* Deinitializes all playlist plugins.
...
...
test/dump_playlist.cxx
View file @
61a119b6
...
...
@@ -68,7 +68,7 @@ try {
io_thread
.
Start
();
input_stream_global_init
(
GetGlobalConfig
(),
io_thread
.
GetEventLoop
());
playlist_list_global_init
();
playlist_list_global_init
(
GetGlobalConfig
()
);
decoder_plugin_init_all
(
GetGlobalConfig
());
/* open the playlist */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment