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
6cc1ff5e
Commit
6cc1ff5e
authored
Dec 03, 2016
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
decoder/Control: make ReplayGainConfig const
parent
3000b9dc
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
6 deletions
+8
-6
DecoderControl.cxx
src/decoder/DecoderControl.cxx
+4
-2
DecoderControl.hxx
src/decoder/DecoderControl.hxx
+3
-2
Thread.cxx
src/player/Thread.cxx
+1
-2
No files found.
src/decoder/DecoderControl.cxx
View file @
6cc1ff5e
...
...
@@ -27,8 +27,10 @@
#include <assert.h>
DecoderControl
::
DecoderControl
(
Mutex
&
_mutex
,
Cond
&
_client_cond
)
:
mutex
(
_mutex
),
client_cond
(
_client_cond
)
{}
DecoderControl
::
DecoderControl
(
Mutex
&
_mutex
,
Cond
&
_client_cond
,
const
ReplayGainConfig
&
_replay_gain_config
)
:
mutex
(
_mutex
),
client_cond
(
_client_cond
),
replay_gain_config
(
_replay_gain_config
)
{}
DecoderControl
::~
DecoderControl
()
{
...
...
src/decoder/DecoderControl.hxx
View file @
6cc1ff5e
...
...
@@ -158,7 +158,7 @@ struct DecoderControl {
*/
MusicPipe
*
pipe
;
ReplayGainConfig
replay_gain_config
;
const
ReplayGainConfig
replay_gain_config
;
ReplayGainMode
replay_gain_mode
=
ReplayGainMode
::
OFF
;
float
replay_gain_db
=
0
;
...
...
@@ -170,7 +170,8 @@ struct DecoderControl {
* @param _mutex see #mutex
* @param _client_cond see #client_cond
*/
DecoderControl
(
Mutex
&
_mutex
,
Cond
&
_client_cond
);
DecoderControl
(
Mutex
&
_mutex
,
Cond
&
_client_cond
,
const
ReplayGainConfig
&
_replay_gain_config
);
~
DecoderControl
();
/**
...
...
src/player/Thread.cxx
View file @
6cc1ff5e
...
...
@@ -345,7 +345,6 @@ Player::StartDecoder(MusicPipe &_pipe)
{
/* copy ReplayGain parameters to the decoder */
const
ScopeLock
protect
(
pc
.
mutex
);
dc
.
replay_gain_config
=
pc
.
replay_gain_config
;
dc
.
replay_gain_mode
=
pc
.
replay_gain_mode
;
}
...
...
@@ -1164,7 +1163,7 @@ player_task(void *arg)
SetThreadName
(
"player"
);
DecoderControl
dc
(
pc
.
mutex
,
pc
.
cond
);
DecoderControl
dc
(
pc
.
mutex
,
pc
.
cond
,
pc
.
replay_gain_config
);
decoder_thread_start
(
dc
);
MusicBuffer
buffer
(
pc
.
buffer_chunks
);
...
...
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