Skip to content

Commit

Permalink
fileref: Adapt formatting to TagLib code style
Browse files Browse the repository at this point in the history
  • Loading branch information
ufleisch committed Feb 27, 2022
1 parent a7eb773 commit e255e74
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 9 deletions.
7 changes: 4 additions & 3 deletions taglib/fileref.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,10 @@ namespace
{
for(ResolverList::ConstIterator it = fileTypeResolvers.begin();
it != fileTypeResolvers.end(); ++it) {
if (const FileRef::StreamTypeResolver* streamResolver =
dynamic_cast<const FileRef::StreamTypeResolver*>(*it)) {
if(File *file = streamResolver->createFileFromStream(stream, readAudioProperties, audioPropertiesStyle))
if(const FileRef::StreamTypeResolver *streamResolver =
dynamic_cast<const FileRef::StreamTypeResolver*>(*it)) {
if(File *file = streamResolver->createFileFromStream(
stream, readAudioProperties, audioPropertiesStyle))
return file;
}
}
Expand Down
12 changes: 6 additions & 6 deletions taglib/fileref.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};

/*!
Expand Down
2 changes: 2 additions & 0 deletions tests/test_fileref.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,15 @@ namespace
return new Ogg::Vorbis::File(fileName);
}
};

class DummyStreamResolver : public FileRef::StreamTypeResolver
{
public:
virtual File *createFile(FileName, bool, AudioProperties::ReadStyle) const
{
return 0;
}

virtual File *createFileFromStream(IOStream *s, bool, AudioProperties::ReadStyle) const
{
return new MP4::File(s);
Expand Down

0 comments on commit e255e74

Please sign in to comment.