minor cosmetics
authorJosh Coalson <jcoalson@users.sourceforce.net>
Wed, 25 Sep 2002 06:06:55 +0000 (06:06 +0000)
committerJosh Coalson <jcoalson@users.sourceforce.net>
Wed, 25 Sep 2002 06:06:55 +0000 (06:06 +0000)
src/libFLAC/stream_encoder_framing.c
src/test_libFLAC++/decoders.cc
src/test_libFLAC++/metadata_manip.cc
src/test_libOggFLAC++/decoders.cc

index 95a701d..d7bd363 100644 (file)
@@ -107,7 +107,7 @@ FLAC__bool FLAC__add_metadata_block(const FLAC__StreamMetadata *metadata, FLAC__
                case FLAC__METADATA_TYPE_VORBIS_COMMENT:
                        if(!FLAC__bitbuffer_write_raw_uint32_little_endian(bb, vendor_string_length))
                                return false;
-                       if(!FLAC__bitbuffer_write_byte_block(bb, FLAC__VENDOR_STRING, vendor_string_length))
+                       if(!FLAC__bitbuffer_write_byte_block(bb, (const FLAC__byte*)FLAC__VENDOR_STRING, vendor_string_length))
                                return false;
                        if(!FLAC__bitbuffer_write_raw_uint32_little_endian(bb, metadata->data.vorbis_comment.num_comments))
                                return false;
index 48876be..c19cc25 100644 (file)
@@ -104,7 +104,7 @@ static void init_metadata_blocks_()
        application2_.data.application.data = 0;
 
        {
-               const unsigned vendor_string_length = (unsigned)strlen((const char *)FLAC__VENDOR_STRING);
+               const unsigned vendor_string_length = (unsigned)strlen(FLAC__VENDOR_STRING);
                vorbiscomment_.is_last = true;
                vorbiscomment_.type = FLAC__METADATA_TYPE_VORBIS_COMMENT;
                vorbiscomment_.length = (4 + vendor_string_length) + 4 + (4 + 5) + (4 + 0);
index 47fb1b9..167f1b3 100644 (file)
@@ -286,7 +286,7 @@ static bool generate_file_()
        memset(streaminfo.data.stream_info.md5sum, 0, 16);
 
        {
-               const unsigned vendor_string_length = (unsigned)strlen((const char*)FLAC__VENDOR_STRING);
+               const unsigned vendor_string_length = (unsigned)strlen(FLAC__VENDOR_STRING);
                vorbiscomment.is_last = false;
                vorbiscomment.type = FLAC__METADATA_TYPE_VORBIS_COMMENT;
                vorbiscomment.length = (4 + vendor_string_length) + 4;
index ea7a46b..da11bfd 100644 (file)
@@ -104,7 +104,7 @@ static void init_metadata_blocks_()
        application2_.data.application.data = 0;
 
        {
-               const unsigned vendor_string_length = (unsigned)strlen((const char *)FLAC__VENDOR_STRING);
+               const unsigned vendor_string_length = (unsigned)strlen(FLAC__VENDOR_STRING);
                vorbiscomment_.is_last = true;
                vorbiscomment_.type = FLAC__METADATA_TYPE_VORBIS_COMMENT;
                vorbiscomment_.length = (4 + vendor_string_length) + 4 + (4 + 5) + (4 + 0);