oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

decoder/ffpmeg: rename functions to CamelCase

This commit is contained in:
Max Kellermann 2014-12-10 13:05:28 +01:00
parent bcd97f5887
commit 0c1e428c7d
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/decoder/plugins/FfmpegDecoderPlugin.cxx
View File

@ -634,11 +634,11 @@ ffmpeg_scan_stream(InputStream &is,
tag_handler_invoke_duration(handler, handler_ctx, duration);
}
ffmpeg_scan_dictionary(f->metadata, handler, handler_ctx);
FfmpegScanDictionary(f->metadata, handler, handler_ctx);
int idx = ffmpeg_find_audio_stream(f);
if (idx >= 0)
ffmpeg_scan_dictionary(f->streams[idx]->metadata,
handler, handler_ctx);
FfmpegScanDictionary(f->streams[idx]->metadata,
handler, handler_ctx);
avformat_close_input(&f);
return true;

24
src/decoder/plugins/FfmpegMetaData.cxx
View File

@ -36,9 +36,9 @@ static constexpr struct tag_table ffmpeg_tags[] = {
};
static void
ffmpeg_copy_metadata(TagType type,
AVDictionary *m, const char *name,
const struct tag_handler *handler, void *handler_ctx)
FfmpegScanTag(TagType type,
AVDictionary *m, const char *name,
const struct tag_handler *handler, void *handler_ctx)
{
AVDictionaryEntry *mt = nullptr;
@ -48,8 +48,8 @@ ffmpeg_copy_metadata(TagType type,
}
static void
ffmpeg_scan_pairs(AVDictionary *dict,
const struct tag_handler *handler, void *handler_ctx)
FfmpegScanPairs(AVDictionary *dict,
const struct tag_handler *handler, void *handler_ctx)
{
AVDictionaryEntry *i = nullptr;
@ -59,20 +59,20 @@ ffmpeg_scan_pairs(AVDictionary *dict,
}
void
ffmpeg_scan_dictionary(AVDictionary *dict,
const struct tag_handler *handler, void *handler_ctx)
FfmpegScanDictionary(AVDictionary *dict,
const struct tag_handler *handler, void *handler_ctx)
{
if (handler->tag != nullptr) {
for (unsigned i = 0; i < TAG_NUM_OF_ITEM_TYPES; ++i)
ffmpeg_copy_metadata(TagType(i), dict, tag_item_names[i],
handler, handler_ctx);
FfmpegScanTag(TagType(i), dict, tag_item_names[i],
handler, handler_ctx);
for (const struct tag_table *i = ffmpeg_tags;
i->name != nullptr; ++i)
ffmpeg_copy_metadata(i->type, dict, i->name,
handler, handler_ctx);
FfmpegScanTag(i->type, dict, i->name,
handler, handler_ctx);
}
if (handler->pair != nullptr)
ffmpeg_scan_pairs(dict, handler, handler_ctx);
FfmpegScanPairs(dict, handler, handler_ctx);
}

4
src/decoder/plugins/FfmpegMetaData.hxx
View File

@ -32,7 +32,7 @@ extern "C" {
struct tag_handler;
void
ffmpeg_scan_dictionary(AVDictionary *dict,
const tag_handler *handler, void *handler_ctx);
FfmpegScanDictionary(AVDictionary *dict,
const tag_handler *handler, void *handler_ctx);
#endif