update to match new default vorbis comment size (now with vendor string)

diff --git a/src/test_libFLAC++/metadata_object.cpp b/src/test_libFLAC++/metadata_object.cpp
index e3b15b3..21a332e 100644 (file)
--- a/src/test_libFLAC++/metadata_object.cpp
+++ b/src/test_libFLAC++/metadata_object.cpp
@@ -786,7 +786,7 @@ bool test_metadata_object_vorbiscomment()
        FLAC::Metadata::VorbisComment block;
        if(!block.is_valid())
                return die_("!block.is_valid()");
-       expected_length = (FLAC__STREAM_METADATA_VORBIS_COMMENT_ENTRY_LENGTH_LEN + FLAC__STREAM_METADATA_VORBIS_COMMENT_NUM_COMMENTS_LEN) / 8;
+       expected_length = (FLAC__STREAM_METADATA_VORBIS_COMMENT_ENTRY_LENGTH_LEN/8 + strlen(::FLAC__VENDOR_STRING) + FLAC__STREAM_METADATA_VORBIS_COMMENT_NUM_COMMENTS_LEN/8);
        if(block.get_length() != expected_length) {
                printf("FAILED, bad length, expected %u, got %u\n", expected_length, block.get_length());
                return false;

diff --git a/src/test_libFLAC/metadata_object.c b/src/test_libFLAC/metadata_object.c
index 34b77c1..215f7b3 100644 (file)
--- a/src/test_libFLAC/metadata_object.c
+++ b/src/test_libFLAC/metadata_object.c
@@ -608,7 +608,7 @@ FLAC__bool test_metadata_object()
                printf("FAILED, returned NULL\n");
                return false;
        }
-       expected_length = (FLAC__STREAM_METADATA_VORBIS_COMMENT_ENTRY_LENGTH_LEN + FLAC__STREAM_METADATA_VORBIS_COMMENT_NUM_COMMENTS_LEN) / 8;
+       expected_length = (FLAC__STREAM_METADATA_VORBIS_COMMENT_ENTRY_LENGTH_LEN/8 + strlen(FLAC__VENDOR_STRING) + FLAC__STREAM_METADATA_VORBIS_COMMENT_NUM_COMMENTS_LEN/8);
        if(block->length != expected_length) {
                printf("FAILED, bad length, expected %u, got %u\n", expected_length, block->length);
                return false;