claunia/flac
1
0
Fork 0
mirror of https://github.com/claunia/flac.git synced 2025-12-16 18:54:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

big fix to allow codec and metadata interface to handle unknown metadata block types correctly

Browse Source
This commit is contained in:
Josh Coalson
2003-01-10 05:43:51 +00:00
parent 5267ae56c6
commit cbaab8625c
1 changed files with 34 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/libFLAC++/metadata.cpp
View File

@@ -52,7 +52,7 @@ namespace FLAC {
ret = new CueSheet(object, /*copy=*/false); ret = new CueSheet(object, /*copy=*/false);
break; break;
default: default:
FLAC__ASSERT(0); ret = new Unknown(object, /*copy=*/false);
break; break;
} }
return ret; return ret;
@@ -70,6 +70,7 @@ namespace FLAC {
const SeekTable *seektable = dynamic_cast<const SeekTable *>(object); const SeekTable *seektable = dynamic_cast<const SeekTable *>(object);
const VorbisComment *vorbiscomment = dynamic_cast<const VorbisComment *>(object); const VorbisComment *vorbiscomment = dynamic_cast<const VorbisComment *>(object);
const CueSheet *cuesheet = dynamic_cast<const CueSheet *>(object); const CueSheet *cuesheet = dynamic_cast<const CueSheet *>(object);
const Unknown *unknown = dynamic_cast<const Unknown *>(object);
if(0 != streaminfo) if(0 != streaminfo)
return new StreamInfo(*streaminfo); return new StreamInfo(*streaminfo);
@@ -83,6 +84,8 @@ namespace FLAC {
return new VorbisComment(*vorbiscomment); return new VorbisComment(*vorbiscomment);
else if(0 != cuesheet) else if(0 != cuesheet)
return new CueSheet(*cuesheet); return new CueSheet(*cuesheet);
else if(0 != unknown)
return new Unknown(*unknown);
else { else {
FLAC__ASSERT(0); FLAC__ASSERT(0);
return 0; return 0;
@@ -925,6 +928,36 @@ namespace FLAC {
} }
//
// Unknown
//
Unknown::Unknown():
Prototype(FLAC__metadata_object_new(FLAC__METADATA_TYPE_APPLICATION), /*copy=*/false)
{ }
Unknown::~Unknown()
{ }
const FLAC__byte *Unknown::get_data() const
{
FLAC__ASSERT(is_valid());
return object_->data.application.data;
}
bool Unknown::set_data(const FLAC__byte *data, unsigned length)
{
FLAC__ASSERT(is_valid());
return (bool)::FLAC__metadata_object_application_set_data(object_, (FLAC__byte*)data, length, true);
}
bool Unknown::set_data(FLAC__byte *data, unsigned length, bool copy)
{
FLAC__ASSERT(is_valid());
return (bool)::FLAC__metadata_object_application_set_data(object_, data, length, copy);
}
// ============================================================ // ============================================================
// //
// Level 0 // Level 0