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
a5b14a2e
Commit
a5b14a2e
authored
Jul 17, 2018
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Main: add local ConfigData reference
parent
bf582bd9
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
11 deletions
+12
-11
Main.cxx
src/Main.cxx
+12
-11
No files found.
src/Main.cxx
View file @
a5b14a2e
...
...
@@ -453,7 +453,7 @@ int main(int argc, char *argv[])
#endif
static
int
mpd_main_after_fork
(
const
Config
&
config
);
mpd_main_after_fork
(
const
Config
Data
&
raw_config
,
const
Config
&
config
);
#ifdef ANDROID
static
inline
...
...
@@ -495,13 +495,14 @@ try {
ParseCommandLine
(
argc
,
argv
,
options
);
#endif
const
auto
config
=
LoadConfig
(
GetGlobalConfig
());
const
auto
&
raw_config
=
GetGlobalConfig
();
const
auto
config
=
LoadConfig
(
raw_config
);
#ifdef ENABLE_DAEMON
glue_daemonize_init
(
&
options
);
#endif
TagLoadConfig
(
GetGlobalConfig
()
);
TagLoadConfig
(
raw_config
);
log_init
(
options
.
verbose
,
options
.
log_stderr
);
...
...
@@ -531,7 +532,7 @@ try {
daemonize_begin
(
options
.
daemon
);
#endif
return
mpd_main_after_fork
(
config
);
return
mpd_main_after_fork
(
raw_config
,
config
);
}
catch
(
const
std
::
exception
&
e
)
{
LogError
(
e
);
...
...
@@ -539,24 +540,24 @@ try {
}
static
int
mpd_main_after_fork
(
const
Config
&
config
)
mpd_main_after_fork
(
const
Config
Data
&
raw_config
,
const
Config
&
config
)
try
{
ConfigureFS
();
glue_mapper_init
();
initPermissions
();
spl_global_init
(
GetGlobalConfig
()
);
spl_global_init
(
raw_config
);
#ifdef ENABLE_ARCHIVE
archive_plugin_init_all
();
#endif
pcm_convert_global_init
();
decoder_plugin_init_all
(
GetGlobalConfig
()
);
decoder_plugin_init_all
(
raw_config
);
#ifdef ENABLE_DATABASE
const
bool
create_db
=
InitDatabaseAndStorage
(
GetGlobalConfig
()
);
const
bool
create_db
=
InitDatabaseAndStorage
(
raw_config
);
#endif
glue_sticker_init
();
...
...
@@ -571,9 +572,9 @@ try {
}
client_manager_init
();
input_stream_global_init
(
GetGlobalConfig
()
,
input_stream_global_init
(
raw_config
,
instance
->
io_thread
.
GetEventLoop
());
playlist_list_global_init
(
GetGlobalConfig
()
);
playlist_list_global_init
(
raw_config
);
#ifdef ENABLE_DAEMON
daemonize_commit
();
...
...
@@ -593,7 +594,7 @@ try {
instance
->
neighbors
->
Open
();
#endif
ZeroconfInit
(
GetGlobalConfig
()
,
instance
->
event_loop
);
ZeroconfInit
(
raw_config
,
instance
->
event_loop
);
for
(
auto
&
partition
:
instance
->
partitions
)
StartPlayerThread
(
partition
.
pc
);
...
...
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