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
f51e5551
Commit
f51e5551
authored
Jun 16, 2019
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
decoder/mad: change "mp3_" suffix to "mad_"
parent
61a3c69a
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
10 deletions
+10
-10
MadDecoderPlugin.cxx
src/decoder/plugins/MadDecoderPlugin.cxx
+10
-10
No files found.
src/decoder/plugins/MadDecoderPlugin.cxx
View file @
f51e5551
...
...
@@ -105,7 +105,7 @@ mad_fixed_to_24_buffer(int32_t *dest, const struct mad_synth *synth,
}
static
bool
m
p3
_plugin_init
(
const
ConfigBlock
&
block
)
m
ad
_plugin_init
(
const
ConfigBlock
&
block
)
{
gapless_playback
=
block
.
GetBlockValue
(
"gapless"
,
DEFAULT_GAPLESS_MP3_PLAYBACK
);
...
...
@@ -643,7 +643,7 @@ parse_lame(struct lame *lame, struct mad_bitptr *ptr, int *bitlen)
}
static
inline
SongTime
m
p3
_frame_duration
(
const
struct
mad_frame
*
frame
)
m
ad
_frame_duration
(
const
struct
mad_frame
*
frame
)
{
return
ToSongTime
(
frame
->
header
.
duration
);
}
...
...
@@ -673,7 +673,7 @@ MadDecoder::FileSizeToSongLength()
if
(
input_stream
.
KnownSize
())
{
offset_type
rest
=
RestIncludingThisFrame
();
const
SongTime
frame_duration
=
m
p3
_frame_duration
(
&
frame
);
const
SongTime
frame_duration
=
m
ad
_frame_duration
(
&
frame
);
const
SongTime
duration
=
SongTime
::
FromScale
<
uint64_t
>
(
rest
,
frame
.
header
.
bitrate
/
8
);
...
...
@@ -961,7 +961,7 @@ MadDecoder::Read()
}
static
void
m
p3
_decode
(
DecoderClient
&
client
,
InputStream
&
input_stream
)
m
ad
_decode
(
DecoderClient
&
client
,
InputStream
&
input_stream
)
{
MadDecoder
data
(
&
client
,
input_stream
);
...
...
@@ -1007,18 +1007,18 @@ mad_decoder_scan_stream(InputStream &is, TagHandler &handler) noexcept
return
true
;
}
static
const
char
*
const
m
p3
_suffixes
[]
=
{
"mp3"
,
"mp2"
,
nullptr
};
static
const
char
*
const
m
p3
_mime_types
[]
=
{
"audio/mpeg"
,
nullptr
};
static
const
char
*
const
m
ad
_suffixes
[]
=
{
"mp3"
,
"mp2"
,
nullptr
};
static
const
char
*
const
m
ad
_mime_types
[]
=
{
"audio/mpeg"
,
nullptr
};
const
struct
DecoderPlugin
mad_decoder_plugin
=
{
"mad"
,
m
p3
_plugin_init
,
m
ad
_plugin_init
,
nullptr
,
m
p3
_decode
,
m
ad
_decode
,
nullptr
,
nullptr
,
mad_decoder_scan_stream
,
nullptr
,
m
p3
_suffixes
,
m
p3
_mime_types
,
m
ad
_suffixes
,
m
ad
_mime_types
,
};
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