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
917cedf8
Commit
917cedf8
authored
8 years ago
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
output/Thread: move AudioFormat logging code around
parent
193dd716
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
11 deletions
+15
-11
OutputThread.cxx
src/output/OutputThread.cxx
+15
-11
No files found.
src/output/OutputThread.cxx
View file @
917cedf8
...
...
@@ -141,6 +141,15 @@ AudioOutput::Open()
open
=
true
;
}
if
(
f
!=
source
.
GetInputAudioFormat
()
||
f
!=
out_audio_format
)
{
struct
audio_format_string
afs1
,
afs2
,
afs3
;
FormatDebug
(
output_domain
,
"converting in=%s -> f=%s -> out=%s"
,
audio_format_to_string
(
source
.
GetInputAudioFormat
(),
&
afs1
),
audio_format_to_string
(
f
,
&
afs2
),
audio_format_to_string
(
out_audio_format
,
&
afs3
));
}
}
void
...
...
@@ -155,6 +164,12 @@ AudioOutput::OpenOutputAndConvert(AudioFormat desired_audio_format)
name
,
plugin
.
name
));
}
struct
audio_format_string
af_string
;
FormatDebug
(
output_domain
,
"opened plugin=%s name=
\"
%s
\"
audio_format=%s"
,
plugin
.
name
,
name
,
audio_format_to_string
(
out_audio_format
,
&
af_string
));
try
{
convert_filter_set
(
convert_filter
.
Get
(),
out_audio_format
);
}
catch
(
const
std
::
runtime_error
&
e
)
{
...
...
@@ -178,17 +193,6 @@ AudioOutput::OpenOutputAndConvert(AudioFormat desired_audio_format)
std
::
throw_with_nested
(
FormatRuntimeError
(
"Failed to convert for
\"
%s
\"
[%s]"
,
name
,
plugin
.
name
));
}
struct
audio_format_string
af_string
;
FormatDebug
(
output_domain
,
"opened plugin=%s name=
\"
%s
\"
audio_format=%s"
,
plugin
.
name
,
name
,
audio_format_to_string
(
out_audio_format
,
&
af_string
));
if
(
source
.
GetInputAudioFormat
()
!=
out_audio_format
)
FormatDebug
(
output_domain
,
"converting from %s"
,
audio_format_to_string
(
source
.
GetInputAudioFormat
(),
&
af_string
));
}
void
...
...
This diff is collapsed.
Click to expand it.
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