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
3983caa2
Commit
3983caa2
authored
Jul 17, 2018
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Listen: use struct ConfigData
parent
0b4e0b7b
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
6 deletions
+7
-6
Listen.cxx
src/Listen.cxx
+4
-4
Listen.hxx
src/Listen.hxx
+2
-1
Main.cxx
src/Main.cxx
+1
-1
No files found.
src/Listen.cxx
View file @
3983caa2
...
...
@@ -21,7 +21,7 @@
#include "Listen.hxx"
#include "client/Listener.hxx"
#include "config/Param.hxx"
#include "config/
Global
.hxx"
#include "config/
Data
.hxx"
#include "config/Option.hxx"
#include "system/Error.hxx"
#include "util/RuntimeError.hxx"
...
...
@@ -79,16 +79,16 @@ listen_systemd_activation(ClientListener &listener)
#endif
void
listen_global_init
(
ClientListener
&
listener
)
listen_global_init
(
const
ConfigData
&
config
,
ClientListener
&
listener
)
{
int
port
=
config
_get_p
ositive
(
ConfigOption
::
PORT
,
DEFAULT_PORT
);
int
port
=
config
.
GetP
ositive
(
ConfigOption
::
PORT
,
DEFAULT_PORT
);
#ifdef ENABLE_SYSTEMD_DAEMON
if
(
listen_systemd_activation
(
listener
))
return
;
#endif
for
(
const
auto
*
param
=
config
_get_p
aram
(
ConfigOption
::
BIND_TO_ADDRESS
);
for
(
const
auto
*
param
=
config
.
GetP
aram
(
ConfigOption
::
BIND_TO_ADDRESS
);
param
!=
nullptr
;
param
=
param
->
next
)
{
try
{
listen_add_config_param
(
listener
,
port
,
param
);
...
...
src/Listen.hxx
View file @
3983caa2
...
...
@@ -20,11 +20,12 @@
#ifndef MPD_LISTEN_HXX
#define MPD_LISTEN_HXX
struct
ConfigData
;
class
ClientListener
;
extern
int
listen_port
;
void
listen_global_init
(
ClientListener
&
listener
);
listen_global_init
(
const
ConfigData
&
config
,
ClientListener
&
listener
);
#endif
src/Main.cxx
View file @
3983caa2
...
...
@@ -530,7 +530,7 @@ try {
initialize_decoder_and_player
(
raw_config
,
config
.
replay_gain
);
listen_global_init
(
*
instance
->
partitions
.
front
().
listener
);
listen_global_init
(
raw_config
,
*
instance
->
partitions
.
front
().
listener
);
#ifdef ENABLE_DAEMON
daemonize_set_user
();
...
...
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