Skip to content

Commit

Permalink
drop unused *OGGFlac* classes
Browse files Browse the repository at this point in the history
  • Loading branch information
whatdoineed2do/Ray committed Jun 24, 2023
1 parent 9808e6c commit 63834a7
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 93 deletions.
1 change: 0 additions & 1 deletion src/File.cc
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ static std::list<const char*> ffmpeg_supported_fmts;
namespace AudioTag
{
const char* FileMP3::sffx[] = { ".mp3", NULL };
const char* FileOGGFlac::sffx[] = { ".ogg", NULL };
const char* FileFlac::sffx[] = { ".flac", NULL };
/* drop .aac - this is a raw stream with no container and thus no meta
*/
Expand Down
20 changes: 0 additions & 20 deletions src/File.h
Original file line number Diff line number Diff line change
Expand Up @@ -91,26 +91,6 @@ class FileMP3 : public File
};


class FileOGGFlac : public File
{
public:
static const char* sffx[];

FileOGGFlac(const char* f_, MetaOut& mo_, const std::string& hash_)
: _f(f_),
_m(*this, mo_),
File(_m, hash_, f_, _f)
{ }

~FileOGGFlac() = default;

private:
TagLib::Ogg::FLAC::File _f;
MetaOGGFlac _m;
};



class FileFlac : public File
{
public:
Expand Down
39 changes: 0 additions & 39 deletions src/Meta.cc
Original file line number Diff line number Diff line change
Expand Up @@ -790,45 +790,6 @@ void MetaMP3::_tag(TagLib::ID3v2::Tag* tag_, const Input& flds_, TagLib::Stri
}
}

MetaOGGFlac::MetaOGGFlac(FileOGGFlac& f_, MetaOut& mo_)
: Meta(f_.taglibfile(), (TagLib::Tag**)&_tag, mo_),
_f(f_),
_tf((TagLib::Ogg::FLAC::File&)_f.taglibfile()),
_tag(NULL)
{
_tag = _tf.tag(); // always non null, even if disk may not have value
}

Meta::Tags MetaOGGFlac::tags() const
{
Meta::Tags tag;
if ( ((TagLib::Ogg::FLAC::File&)_f.taglibfile()).hasXiphComment() && !_tag->isEmpty()) {
tag.push_back(Meta::Tags::value_type("Ogg/Xipth", _tag));
}
return tag;
}

void MetaOGGFlac::remove(const MetaTOI& toi_)
{
}

int MetaOGGFlac::rating() const
{
return Meta::rating();
}

void MetaOGGFlac::rating(uint8_t r_)
{
}

void MetaOGGFlac::properties(TagLib::Tag& t_, const TagLib::PropertyMap& m_) const
{
TagLib::Ogg::XiphComment* t = dynamic_cast<TagLib::Ogg::XiphComment*>(&t_);
if (t) _properties(*t, m_);
else _properties(t_, m_);
}



// flac ////////////////////////////////////////////////////////////////////////
const char* MetaFlac::TAG_RATING = "RATING";
Expand Down
33 changes: 0 additions & 33 deletions src/Meta.h
Original file line number Diff line number Diff line change
Expand Up @@ -449,39 +449,6 @@ class MetaMP3 : public _MetaMulti
};



class MetaOGGFlac : public Meta
{
public:
MetaOGGFlac(FileOGGFlac&, MetaOut&);

~MetaOGGFlac() = default;
MetaOGGFlac(const MetaOGGFlac&) = delete;
void operator=(const MetaOGGFlac&) = delete;

const bool empty() const;
//{ return _f.hasXiphComment(); }

Meta::Tags tags() const;
void remove(const MetaTOI&);

int rating() const;
void rating(uint8_t);

TagLib::PropertyMap properties() const override
{ return _tag->properties(); }

void properties(TagLib::Tag&, const TagLib::PropertyMap&) const;

private:
FileOGGFlac& _f;
TagLib::Ogg::FLAC::File& _tf;

TagLib::Ogg::XiphComment* _tag;

// this can have id3v2/v1 but ignoring
};

class MetaFlac : public Meta
{
public:
Expand Down

0 comments on commit 63834a7

Please sign in to comment.