src/flac/encode.c : Use flac_snprintf instead of sprintf.

[platform/upstream/flac.git] / src / libFLAC++ / metadata.cpp

diff --git a/src/libFLAC++/metadata.cpp b/src/libFLAC++/metadata.cpp
index 5c11dfd..1d60a0e 100644 (file)
--- a/src/libFLAC++/metadata.cpp
+++ b/src/libFLAC++/metadata.cpp
@@ -361,6 +361,12 @@ namespace FLAC {
                Prototype(FLAC__metadata_object_new(FLAC__METADATA_TYPE_PADDING), /*copy=*/false)
                { }
 
+               Padding::Padding(unsigned length):
+               Prototype(FLAC__metadata_object_new(FLAC__METADATA_TYPE_PADDING), /*copy=*/false)
+               {
+                       set_length(length);
+               }
+
                Padding::~Padding()
                { }
 
@@ -431,11 +437,11 @@ namespace FLAC {
                        return object_->data.seek_table.num_points;
                }
 
-               ::FLAC__StreamMetadata_SeekPoint SeekTable::get_point(unsigned index) const
+               ::FLAC__StreamMetadata_SeekPoint SeekTable::get_point(unsigned indx) const
                {
                        FLAC__ASSERT(is_valid());
-                       FLAC__ASSERT(index < object_->data.seek_table.num_points);
-                       return object_->data.seek_table.points[index];
+                       FLAC__ASSERT(indx < object_->data.seek_table.num_points);
+                       return object_->data.seek_table.points[indx];
                }
 
                bool SeekTable::resize_points(unsigned new_num_points)
@@ -444,25 +450,25 @@ namespace FLAC {
                        return (bool)::FLAC__metadata_object_seektable_resize_points(object_, new_num_points);
                }
 
-               void SeekTable::set_point(unsigned index, const ::FLAC__StreamMetadata_SeekPoint &point)
+               void SeekTable::set_point(unsigned indx, const ::FLAC__StreamMetadata_SeekPoint &point)
                {
                        FLAC__ASSERT(is_valid());
-                       FLAC__ASSERT(index < object_->data.seek_table.num_points);
-                       ::FLAC__metadata_object_seektable_set_point(object_, index, point);
+                       FLAC__ASSERT(indx < object_->data.seek_table.num_points);
+                       ::FLAC__metadata_object_seektable_set_point(object_, indx, point);
                }
 
-               bool SeekTable::insert_point(unsigned index, const ::FLAC__StreamMetadata_SeekPoint &point)
+               bool SeekTable::insert_point(unsigned indx, const ::FLAC__StreamMetadata_SeekPoint &point)
                {
                        FLAC__ASSERT(is_valid());
-                       FLAC__ASSERT(index <= object_->data.seek_table.num_points);
-                       return (bool)::FLAC__metadata_object_seektable_insert_point(object_, index, point);
+                       FLAC__ASSERT(indx <= object_->data.seek_table.num_points);
+                       return (bool)::FLAC__metadata_object_seektable_insert_point(object_, indx, point);
                }
 
-               bool SeekTable::delete_point(unsigned index)
+               bool SeekTable::delete_point(unsigned indx)
                {
                        FLAC__ASSERT(is_valid());
-                       FLAC__ASSERT(index < object_->data.seek_table.num_points);
-                       return (bool)::FLAC__metadata_object_seektable_delete_point(object_, index);
+                       FLAC__ASSERT(indx < object_->data.seek_table.num_points);
+                       return (bool)::FLAC__metadata_object_seektable_delete_point(object_, indx);
                }
 
                bool SeekTable::is_legal() const
@@ -834,18 +840,18 @@ namespace FLAC {
                        return object_->data.vorbis_comment.vendor_string.entry;
                }
 
-               VorbisComment::Entry VorbisComment::get_comment(unsigned index) const
+               VorbisComment::Entry VorbisComment::get_comment(unsigned indx) const
                {
                        FLAC__ASSERT(is_valid());
-                       FLAC__ASSERT(index < object_->data.vorbis_comment.num_comments);
-                       return Entry((const char *)object_->data.vorbis_comment.comments[index].entry, object_->data.vorbis_comment.comments[index].length);
+                       FLAC__ASSERT(indx < object_->data.vorbis_comment.num_comments);
+                       return Entry((const char *)object_->data.vorbis_comment.comments[indx].entry, object_->data.vorbis_comment.comments[indx].length);
                }
 
                bool VorbisComment::set_vendor_string(const FLAC__byte *string)
                {
                        FLAC__ASSERT(is_valid());
                        // vendor_string is a special kind of entry
-                       const ::FLAC__StreamMetadata_VorbisComment_Entry vendor_string = { strlen((const char *)string), (FLAC__byte*)string }; // we can cheat on const-ness because we make a copy below:
+                       const ::FLAC__StreamMetadata_VorbisComment_Entry vendor_string = { static_cast<FLAC__uint32>(strlen((const char *)string)), (FLAC__byte*)string }; // we can cheat on const-ness because we make a copy below:
                        return (bool)::FLAC__metadata_object_vorbiscomment_set_vendor_string(object_, vendor_string, /*copy=*/true);
                }
 
@@ -855,18 +861,18 @@ namespace FLAC {
                        return (bool)::FLAC__metadata_object_vorbiscomment_resize_comments(object_, new_num_comments);
                }
 
-               bool VorbisComment::set_comment(unsigned index, const VorbisComment::Entry &entry)
+               bool VorbisComment::set_comment(unsigned indx, const VorbisComment::Entry &entry)
                {
                        FLAC__ASSERT(is_valid());
-                       FLAC__ASSERT(index < object_->data.vorbis_comment.num_comments);
-                       return (bool)::FLAC__metadata_object_vorbiscomment_set_comment(object_, index, entry.get_entry(), /*copy=*/true);
+                       FLAC__ASSERT(indx < object_->data.vorbis_comment.num_comments);
+                       return (bool)::FLAC__metadata_object_vorbiscomment_set_comment(object_, indx, entry.get_entry(), /*copy=*/true);
                }
 
-               bool VorbisComment::insert_comment(unsigned index, const VorbisComment::Entry &entry)
+               bool VorbisComment::insert_comment(unsigned indx, const VorbisComment::Entry &entry)
                {
                        FLAC__ASSERT(is_valid());
-                       FLAC__ASSERT(index <= object_->data.vorbis_comment.num_comments);
-                       return (bool)::FLAC__metadata_object_vorbiscomment_insert_comment(object_, index, entry.get_entry(), /*copy=*/true);
+                       FLAC__ASSERT(indx <= object_->data.vorbis_comment.num_comments);
+                       return (bool)::FLAC__metadata_object_vorbiscomment_insert_comment(object_, indx, entry.get_entry(), /*copy=*/true);
                }
 
                bool VorbisComment::append_comment(const VorbisComment::Entry &entry)
@@ -881,11 +887,11 @@ namespace FLAC {
                        return (bool)::FLAC__metadata_object_vorbiscomment_replace_comment(object_, entry.get_entry(), all, /*copy=*/true);
                }
 
-               bool VorbisComment::delete_comment(unsigned index)
+               bool VorbisComment::delete_comment(unsigned indx)
                {
                        FLAC__ASSERT(is_valid());
-                       FLAC__ASSERT(index < object_->data.vorbis_comment.num_comments);
-                       return (bool)::FLAC__metadata_object_vorbiscomment_delete_comment(object_, index);
+                       FLAC__ASSERT(indx < object_->data.vorbis_comment.num_comments);
+                       return (bool)::FLAC__metadata_object_vorbiscomment_delete_comment(object_, indx);
                }
 
                int VorbisComment::find_entry_from(unsigned offset, const char *field_name)
@@ -964,11 +970,11 @@ namespace FLAC {
                        object_->type = value;
                }
 
-               void CueSheet::Track::set_index(unsigned i, const ::FLAC__StreamMetadata_CueSheet_Index &index)
+               void CueSheet::Track::set_index(unsigned i, const ::FLAC__StreamMetadata_CueSheet_Index &indx)
                {
                        FLAC__ASSERT(is_valid());
                        FLAC__ASSERT(i < object_->num_indices);
-                       object_->indices[i] = index;
+                       object_->indices[i] = indx;
                }
 
 
@@ -1034,20 +1040,35 @@ namespace FLAC {
                        object_->data.cue_sheet.is_cd = value;
                }
 
-               void CueSheet::set_index(unsigned track_num, unsigned index_num, const ::FLAC__StreamMetadata_CueSheet_Index &index)
+               void CueSheet::set_index(unsigned track_num, unsigned index_num, const ::FLAC__StreamMetadata_CueSheet_Index &indx)
                {
                        FLAC__ASSERT(is_valid());
                        FLAC__ASSERT(track_num < object_->data.cue_sheet.num_tracks);
                        FLAC__ASSERT(index_num < object_->data.cue_sheet.tracks[track_num].num_indices);
-                       object_->data.cue_sheet.tracks[track_num].indices[index_num] = index;
+                       object_->data.cue_sheet.tracks[track_num].indices[index_num] = indx;
+               }
+
+               bool CueSheet::resize_indices(unsigned track_num, unsigned new_num_indices)
+               {
+                       FLAC__ASSERT(is_valid());
+                       FLAC__ASSERT(track_num < object_->data.cue_sheet.num_tracks);
+                       return (bool)::FLAC__metadata_object_cuesheet_track_resize_indices(object_, track_num, new_num_indices);
                }
 
-               bool CueSheet::insert_index(unsigned track_num, unsigned index_num, const ::FLAC__StreamMetadata_CueSheet_Index &index)
+               bool CueSheet::insert_index(unsigned track_num, unsigned index_num, const ::FLAC__StreamMetadata_CueSheet_Index &indx)
                {
                        FLAC__ASSERT(is_valid());
                        FLAC__ASSERT(track_num < object_->data.cue_sheet.num_tracks);
                        FLAC__ASSERT(index_num <= object_->data.cue_sheet.tracks[track_num].num_indices);
-                       return (bool)::FLAC__metadata_object_cuesheet_track_insert_index(object_, track_num, index_num, index);
+                       return (bool)::FLAC__metadata_object_cuesheet_track_insert_index(object_, track_num, index_num, indx);
+               }
+
+               bool CueSheet::insert_blank_index(unsigned track_num, unsigned index_num)
+               {
+                       FLAC__ASSERT(is_valid());
+                       FLAC__ASSERT(track_num < object_->data.cue_sheet.num_tracks);
+                       FLAC__ASSERT(index_num <= object_->data.cue_sheet.tracks[track_num].num_indices);
+                       return (bool)::FLAC__metadata_object_cuesheet_track_insert_blank_index(object_, track_num, index_num);
                }
 
                bool CueSheet::delete_index(unsigned track_num, unsigned index_num)
@@ -1058,6 +1079,12 @@ namespace FLAC {
                        return (bool)::FLAC__metadata_object_cuesheet_track_delete_index(object_, track_num, index_num);
                }
 
+               bool CueSheet::resize_tracks(unsigned new_num_tracks)
+               {
+                       FLAC__ASSERT(is_valid());
+                       return (bool)::FLAC__metadata_object_cuesheet_resize_tracks(object_, new_num_tracks);
+               }
+
                bool CueSheet::set_track(unsigned i, const CueSheet::Track &track)
                {
                        FLAC__ASSERT(is_valid());
@@ -1074,6 +1101,13 @@ namespace FLAC {
                        return (bool)::FLAC__metadata_object_cuesheet_insert_track(object_, i, const_cast< ::FLAC__StreamMetadata_CueSheet_Track*>(track.get_track()), /*copy=*/true);
                }
 
+               bool CueSheet::insert_blank_track(unsigned i)
+               {
+                       FLAC__ASSERT(is_valid());
+                       FLAC__ASSERT(i <= object_->data.cue_sheet.num_tracks);
+                       return (bool)::FLAC__metadata_object_cuesheet_insert_blank_track(object_, i);
+               }
+
                bool CueSheet::delete_track(unsigned i)
                {
                        FLAC__ASSERT(is_valid());
@@ -1210,6 +1244,12 @@ namespace FLAC {
                        return (bool)::FLAC__metadata_object_picture_set_data(object_, const_cast<FLAC__byte*>(data), data_length, /*copy=*/true);
                }
 
+               bool Picture::is_legal(const char **violation)
+               {
+                       FLAC__ASSERT(is_valid());
+                       return (bool)::FLAC__metadata_object_picture_is_legal(object_, violation);
+               }
+
 
                //
                // Unknown