From e255e749e837329c21e191ce4ab5b625ec7cfe8e Mon Sep 17 00:00:00 2001 From: Urs Fleisch Date: Sun, 27 Feb 2022 07:03:36 +0100 Subject: [PATCH] fileref: Adapt formatting to TagLib code style --- taglib/fileref.cpp | 7 ++++--- taglib/fileref.h | 12 ++++++------ tests/test_fileref.cpp | 2 ++ 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/taglib/fileref.cpp b/taglib/fileref.cpp index 4e15ad3e..b71d6571 100644 --- a/taglib/fileref.cpp +++ b/taglib/fileref.cpp @@ -89,9 +89,10 @@ namespace { for(ResolverList::ConstIterator it = fileTypeResolvers.begin(); it != fileTypeResolvers.end(); ++it) { - if (const FileRef::StreamTypeResolver* streamResolver = - dynamic_cast(*it)) { - if(File *file = streamResolver->createFileFromStream(stream, readAudioProperties, audioPropertiesStyle)) + if(const FileRef::StreamTypeResolver *streamResolver = + dynamic_cast(*it)) { + if(File *file = streamResolver->createFileFromStream( + stream, readAudioProperties, audioPropertiesStyle)) return file; } } diff --git a/taglib/fileref.h b/taglib/fileref.h index 37f44a0e..75d14926 100644 --- a/taglib/fileref.h +++ b/taglib/fileref.h @@ -110,12 +110,12 @@ namespace TagLib { class TAGLIB_EXPORT StreamTypeResolver : public FileTypeResolver { - TAGLIB_IGNORE_MISSING_DESTRUCTOR - public: - virtual File *createFileFromStream(IOStream* stream, - bool readAudioProperties = true, - AudioProperties::ReadStyle - audioPropertiesStyle = AudioProperties::Average) const = 0; + TAGLIB_IGNORE_MISSING_DESTRUCTOR + public: + virtual File *createFileFromStream(IOStream *stream, + bool readAudioProperties = true, + AudioProperties::ReadStyle + audioPropertiesStyle = AudioProperties::Average) const = 0; }; /*! diff --git a/tests/test_fileref.cpp b/tests/test_fileref.cpp index f8e79afa..b2631827 100644 --- a/tests/test_fileref.cpp +++ b/tests/test_fileref.cpp @@ -60,6 +60,7 @@ namespace return new Ogg::Vorbis::File(fileName); } }; + class DummyStreamResolver : public FileRef::StreamTypeResolver { public: @@ -67,6 +68,7 @@ namespace { return 0; } + virtual File *createFileFromStream(IOStream *s, bool, AudioProperties::ReadStyle) const { return new MP4::File(s);