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
7467b850
Commit
7467b850
authored
Jun 08, 2017
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
output/Thread: rename audio_format to in_audio_format
parent
7dea615f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
Thread.cxx
src/output/Thread.cxx
+5
-5
No files found.
src/output/Thread.cxx
View file @
7467b850
...
@@ -86,14 +86,14 @@ AudioOutput::CloseFilter() noexcept
...
@@ -86,14 +86,14 @@ AudioOutput::CloseFilter() noexcept
}
}
inline
void
inline
void
AudioOutput
::
Open
(
const
AudioFormat
audio_format
,
const
MusicPipe
&
pipe
)
AudioOutput
::
Open
(
const
AudioFormat
in_
audio_format
,
const
MusicPipe
&
pipe
)
{
{
assert
(
audio_format
.
IsValid
());
assert
(
in_
audio_format
.
IsValid
());
AudioFormat
f
;
AudioFormat
f
;
try
{
try
{
f
=
source
.
Open
(
audio_format
,
pipe
,
f
=
source
.
Open
(
in_
audio_format
,
pipe
,
prepared_replay_gain_filter
,
prepared_replay_gain_filter
,
prepared_other_replay_gain_filter
,
prepared_other_replay_gain_filter
,
prepared_filter
);
prepared_filter
);
...
@@ -139,9 +139,9 @@ AudioOutput::Open(const AudioFormat audio_format, const MusicPipe &pipe)
...
@@ -139,9 +139,9 @@ AudioOutput::Open(const AudioFormat audio_format, const MusicPipe &pipe)
}
}
}
}
if
(
f
!=
source
.
GetInputAudioFormat
()
||
f
!=
out_audio_format
)
if
(
f
!=
in_audio_format
||
f
!=
out_audio_format
)
FormatDebug
(
output_domain
,
"converting in=%s -> f=%s -> out=%s"
,
FormatDebug
(
output_domain
,
"converting in=%s -> f=%s -> out=%s"
,
ToString
(
source
.
GetInputAudioFormat
()
).
c_str
(),
ToString
(
in_audio_format
).
c_str
(),
ToString
(
f
).
c_str
(),
ToString
(
f
).
c_str
(),
ToString
(
out_audio_format
).
c_str
());
ToString
(
out_audio_format
).
c_str
());
}
}
...
...
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