minor reordering of decoder state enum to match FLAC layers

diff --git a/include/OggFLAC/file_decoder.h b/include/OggFLAC/file_decoder.h
index f0019b4..19167dd 100644 (file)
--- a/include/OggFLAC/file_decoder.h
+++ b/include/OggFLAC/file_decoder.h
@@ -91,9 +91,6 @@ typedef enum {
         * check OggFLAC__file_decoder_get_seekable_stream_decoder_state().
         */
 
-       OggFLAC__FILE_DECODER_INVALID_CALLBACK,
-       /**< The decoder was initialized before setting all the required callbacks. */
-
        OggFLAC__FILE_DECODER_MEMORY_ALLOCATION_ERROR,
        /**< Memory allocation failed. */
 
@@ -103,6 +100,9 @@ typedef enum {
         * OggFLAC__file_decoder_finish() was not called.
         */
 
+       OggFLAC__FILE_DECODER_INVALID_CALLBACK,
+       /**< The decoder was initialized before setting all the required callbacks. */
+
        OggFLAC__FILE_DECODER_UNINITIALIZED
        /**< The decoder is in the uninitialized state. */
 

diff --git a/include/OggFLAC/seekable_stream_decoder.h b/include/OggFLAC/seekable_stream_decoder.h
index cb11351..496e11f 100644 (file)
--- a/include/OggFLAC/seekable_stream_decoder.h
+++ b/include/OggFLAC/seekable_stream_decoder.h
@@ -91,9 +91,6 @@ typedef enum {
        OggFLAC__SEEKABLE_STREAM_DECODER_READ_ERROR,
        /**< The read callback returned an error. */
 
-       OggFLAC__SEEKABLE_STREAM_DECODER_INVALID_CALLBACK,
-       /**< The decoder was initialized before setting all the required callbacks. */
-
        OggFLAC__SEEKABLE_STREAM_DECODER_MEMORY_ALLOCATION_ERROR,
        /**< Memory allocation failed. */
 
@@ -103,6 +100,9 @@ typedef enum {
         * OggFLAC__seekable_stream_decoder_finish() was not called.
         */
 
+       OggFLAC__SEEKABLE_STREAM_DECODER_INVALID_CALLBACK,
+       /**< The decoder was initialized before setting all the required callbacks. */
+
        OggFLAC__SEEKABLE_STREAM_DECODER_UNINITIALIZED
        /**< The decoder is in the uninitialized state. */
 

diff --git a/include/OggFLAC/stream_decoder.h b/include/OggFLAC/stream_decoder.h
index ab5b03f..983f94c 100644 (file)
--- a/include/OggFLAC/stream_decoder.h
+++ b/include/OggFLAC/stream_decoder.h
@@ -103,9 +103,6 @@ typedef enum {
         * check OggFLAC__stream_decoder_get_FLAC_stream_decoder_state().
         */
 
-       OggFLAC__STREAM_DECODER_INVALID_CALLBACK,
-       /**< The decoder was initialized before setting all the required callbacks. */
-
        OggFLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR,
        /**< Memory allocation failed. */
 
@@ -115,6 +112,9 @@ typedef enum {
         * OggFLAC__stream_decoder_finish() was not called.
         */
 
+       OggFLAC__STREAM_DECODER_INVALID_CALLBACK,
+       /**< The decoder was initialized before setting all the required callbacks. */
+
        OggFLAC__STREAM_DECODER_UNINITIALIZED
        /**< The decoder is in the uninitialized state. */
 

diff --git a/src/libOggFLAC/file_decoder.c b/src/libOggFLAC/file_decoder.c
index 990ba8d..393ac2d 100644 (file)
--- a/src/libOggFLAC/file_decoder.c
+++ b/src/libOggFLAC/file_decoder.c
@@ -89,9 +89,9 @@ OggFLAC_API const char * const OggFLAC__FileDecoderStateString[] = {
        "OggFLAC__FILE_DECODER_ERROR_OPENING_FILE",
        "OggFLAC__FILE_DECODER_SEEK_ERROR",
        "OggFLAC__FILE_DECODER_SEEKABLE_STREAM_DECODER_ERROR",
-       "OggFLAC__FILE_DECODER_INVALID_CALLBACK",
        "OggFLAC__FILE_DECODER_MEMORY_ALLOCATION_ERROR",
        "OggFLAC__FILE_DECODER_ALREADY_INITIALIZED",
+       "OggFLAC__FILE_DECODER_INVALID_CALLBACK",
        "OggFLAC__FILE_DECODER_UNINITIALIZED"
 };
 

diff --git a/src/libOggFLAC/seekable_stream_decoder.c b/src/libOggFLAC/seekable_stream_decoder.c
index bc7773f..f7f777c 100644 (file)
--- a/src/libOggFLAC/seekable_stream_decoder.c
+++ b/src/libOggFLAC/seekable_stream_decoder.c
@@ -82,9 +82,9 @@ OggFLAC_API const char * const OggFLAC__SeekableStreamDecoderStateString[] = {
        "OggFLAC__SEEKABLE_STREAM_DECODER_OGG_ERROR",
        "OggFLAC__SEEKABLE_STREAM_DECODER_FLAC_SEEKABLE_STREAM_DECODER_ERROR",
        "OggFLAC__SEEKABLE_STREAM_DECODER_READ_ERROR",
-       "OggFLAC__SEEKABLE_STREAM_DECODER_INVALID_CALLBACK",
        "OggFLAC__SEEKABLE_STREAM_DECODER_MEMORY_ALLOCATION_ERROR",
        "OggFLAC__SEEKABLE_STREAM_DECODER_ALREADY_INITIALIZED",
+       "OggFLAC__SEEKABLE_STREAM_DECODER_INVALID_CALLBACK",
        "OggFLAC__SEEKABLE_STREAM_DECODER_UNINITIALIZED"
 };
 

diff --git a/src/libOggFLAC/stream_decoder.c b/src/libOggFLAC/stream_decoder.c
index be242d3..73f56ef 100644 (file)
--- a/src/libOggFLAC/stream_decoder.c
+++ b/src/libOggFLAC/stream_decoder.c
@@ -74,9 +74,9 @@ OggFLAC_API const char * const OggFLAC__StreamDecoderStateString[] = {
        "OggFLAC__STREAM_DECODER_OGG_ERROR",
        "OggFLAC__STREAM_DECODER_READ_ERROR",
        "OggFLAC__STREAM_DECODER_FLAC_STREAM_DECODER_ERROR",
-       "OggFLAC__STREAM_DECODER_INVALID_CALLBACK",
        "OggFLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR",
        "OggFLAC__STREAM_DECODER_ALREADY_INITIALIZED",
+       "OggFLAC__STREAM_DECODER_INVALID_CALLBACK",
        "OggFLAC__STREAM_DECODER_UNINITIALIZED"
 };