add missing decoder finish calls
authorJosh Coalson <jcoalson@users.sourceforce.net>
Thu, 27 Jan 2005 04:00:36 +0000 (04:00 +0000)
committerJosh Coalson <jcoalson@users.sourceforce.net>
Thu, 27 Jan 2005 04:00:36 +0000 (04:00 +0000)
src/test_seeking/main.c

index 52fa338..3e01b58 100644 (file)
@@ -278,7 +278,7 @@ static FLAC__bool seek_barrage_native_flac(const char *filename, off_t filesize,
                        else
                                printf("seek past end failed as expected... ");
 
                        else
                                printf("seek past end failed as expected... ");
 
-                       /* hack to work around a deficiency in the seek API's bahavior */
+                       /* hack to work around a deficiency in the seek API's behavior */
                        /* seeking past EOF sets the file decoder state to non-OK and there's no ..._flush() or ..._reset() call to reset it */
                        if(!FLAC__file_decoder_finish(decoder))
                                return die_f_("FLAC__file_decoder_finish() FAILED", decoder);
                        /* seeking past EOF sets the file decoder state to non-OK and there's no ..._flush() or ..._reset() call to reset it */
                        if(!FLAC__file_decoder_finish(decoder))
                                return die_f_("FLAC__file_decoder_finish() FAILED", decoder);
@@ -320,6 +320,11 @@ static FLAC__bool seek_barrage_native_flac(const char *filename, off_t filesize,
                fflush(stdout);
        }
 
                fflush(stdout);
        }
 
+       if(FLAC__file_decoder_get_state(decoder) != FLAC__FILE_DECODER_UNINITIALIZED) {
+               if(!FLAC__file_decoder_finish(decoder))
+                       return die_f_("FLAC__file_decoder_finish() FAILED", decoder);
+       }
+
        printf("\nPASSED!\n");
 
        return true;
        printf("\nPASSED!\n");
 
        return true;
@@ -414,7 +419,7 @@ static FLAC__bool seek_barrage_ogg_flac(const char *filename, off_t filesize, un
                                printf("seek failed, assuming it was past EOF... ");
                        else
                                printf("seek past end failed as expected... ");
                                printf("seek failed, assuming it was past EOF... ");
                        else
                                printf("seek past end failed as expected... ");
-                       /* hack to work around a deficiency in the seek API's bahavior */
+                       /* hack to work around a deficiency in the seek API's behavior */
                        /* seeking past EOF sets the file decoder state to non-OK and there's no ..._flush() or ..._reset() call to reset it */
                        if(!OggFLAC__file_decoder_finish(decoder))
                                return die_of_("OggFLAC__file_decoder_finish() FAILED", decoder);
                        /* seeking past EOF sets the file decoder state to non-OK and there's no ..._flush() or ..._reset() call to reset it */
                        if(!OggFLAC__file_decoder_finish(decoder))
                                return die_of_("OggFLAC__file_decoder_finish() FAILED", decoder);
@@ -456,6 +461,11 @@ static FLAC__bool seek_barrage_ogg_flac(const char *filename, off_t filesize, un
                fflush(stdout);
        }
 
                fflush(stdout);
        }
 
+       if(OggFLAC__file_decoder_get_state(decoder) != OggFLAC__FILE_DECODER_UNINITIALIZED) {
+               if(!OggFLAC__file_decoder_finish(decoder))
+                       return die_of_("OggFLAC__file_decoder_finish() FAILED", decoder);
+       }
+
        printf("\nPASSED!\n");
 
        return true;
        printf("\nPASSED!\n");
 
        return true;