claunia/flac
1
0
Fork 0
mirror of https://github.com/claunia/flac.git synced 2025-12-16 18:54:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

minor reordering of decoder state enum to match FLAC layers

Browse Source
This commit is contained in:
Josh Coalson
2004-03-17 22:08:15 +00:00
parent e436297d64
commit f45b2a85a7
6 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/OggFLAC/file_decoder.h
View File

@@ -91,9 +91,6 @@ typedef enum {
* check OggFLAC__file_decoder_get_seekable_stream_decoder_state(). * 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, OggFLAC__FILE_DECODER_MEMORY_ALLOCATION_ERROR,
/**< Memory allocation failed. */ /**< Memory allocation failed. */
@@ -103,6 +100,9 @@ typedef enum {
* OggFLAC__file_decoder_finish() was not called. * 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 OggFLAC__FILE_DECODER_UNINITIALIZED
/**< The decoder is in the uninitialized state. */ /**< The decoder is in the uninitialized state. */

6
include/OggFLAC/seekable_stream_decoder.h
View File

@@ -91,9 +91,6 @@ typedef enum {
OggFLAC__SEEKABLE_STREAM_DECODER_READ_ERROR, OggFLAC__SEEKABLE_STREAM_DECODER_READ_ERROR,
/**< The read callback returned an 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, OggFLAC__SEEKABLE_STREAM_DECODER_MEMORY_ALLOCATION_ERROR,
/**< Memory allocation failed. */ /**< Memory allocation failed. */
@@ -103,6 +100,9 @@ typedef enum {
* OggFLAC__seekable_stream_decoder_finish() was not called. * 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 OggFLAC__SEEKABLE_STREAM_DECODER_UNINITIALIZED
/**< The decoder is in the uninitialized state. */ /**< The decoder is in the uninitialized state. */

6
include/OggFLAC/stream_decoder.h
View File

@@ -103,9 +103,6 @@ typedef enum {
* check OggFLAC__stream_decoder_get_FLAC_stream_decoder_state(). * 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, OggFLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR,
/**< Memory allocation failed. */ /**< Memory allocation failed. */
@@ -115,6 +112,9 @@ typedef enum {
* OggFLAC__stream_decoder_finish() was not called. * 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 OggFLAC__STREAM_DECODER_UNINITIALIZED
/**< The decoder is in the uninitialized state. */ /**< The decoder is in the uninitialized state. */

2
src/libOggFLAC/file_decoder.c
View File

@@ -89,9 +89,9 @@ OggFLAC_API const char * const OggFLAC__FileDecoderStateString[] = {
"OggFLAC__FILE_DECODER_ERROR_OPENING_FILE", "OggFLAC__FILE_DECODER_ERROR_OPENING_FILE",
"OggFLAC__FILE_DECODER_SEEK_ERROR", "OggFLAC__FILE_DECODER_SEEK_ERROR",
"OggFLAC__FILE_DECODER_SEEKABLE_STREAM_DECODER_ERROR", "OggFLAC__FILE_DECODER_SEEKABLE_STREAM_DECODER_ERROR",
"OggFLAC__FILE_DECODER_INVALID_CALLBACK",
"OggFLAC__FILE_DECODER_MEMORY_ALLOCATION_ERROR", "OggFLAC__FILE_DECODER_MEMORY_ALLOCATION_ERROR",
"OggFLAC__FILE_DECODER_ALREADY_INITIALIZED", "OggFLAC__FILE_DECODER_ALREADY_INITIALIZED",
"OggFLAC__FILE_DECODER_INVALID_CALLBACK",
"OggFLAC__FILE_DECODER_UNINITIALIZED" "OggFLAC__FILE_DECODER_UNINITIALIZED"
}; };

2
src/libOggFLAC/seekable_stream_decoder.c
View File

@@ -82,9 +82,9 @@ OggFLAC_API const char * const OggFLAC__SeekableStreamDecoderStateString[] = {
"OggFLAC__SEEKABLE_STREAM_DECODER_OGG_ERROR", "OggFLAC__SEEKABLE_STREAM_DECODER_OGG_ERROR",
"OggFLAC__SEEKABLE_STREAM_DECODER_FLAC_SEEKABLE_STREAM_DECODER_ERROR", "OggFLAC__SEEKABLE_STREAM_DECODER_FLAC_SEEKABLE_STREAM_DECODER_ERROR",
"OggFLAC__SEEKABLE_STREAM_DECODER_READ_ERROR", "OggFLAC__SEEKABLE_STREAM_DECODER_READ_ERROR",
"OggFLAC__SEEKABLE_STREAM_DECODER_INVALID_CALLBACK",
"OggFLAC__SEEKABLE_STREAM_DECODER_MEMORY_ALLOCATION_ERROR", "OggFLAC__SEEKABLE_STREAM_DECODER_MEMORY_ALLOCATION_ERROR",
"OggFLAC__SEEKABLE_STREAM_DECODER_ALREADY_INITIALIZED", "OggFLAC__SEEKABLE_STREAM_DECODER_ALREADY_INITIALIZED",
"OggFLAC__SEEKABLE_STREAM_DECODER_INVALID_CALLBACK",
"OggFLAC__SEEKABLE_STREAM_DECODER_UNINITIALIZED" "OggFLAC__SEEKABLE_STREAM_DECODER_UNINITIALIZED"
}; };

2
src/libOggFLAC/stream_decoder.c
View File

@@ -74,9 +74,9 @@ OggFLAC_API const char * const OggFLAC__StreamDecoderStateString[] = {
"OggFLAC__STREAM_DECODER_OGG_ERROR", "OggFLAC__STREAM_DECODER_OGG_ERROR",
"OggFLAC__STREAM_DECODER_READ_ERROR", "OggFLAC__STREAM_DECODER_READ_ERROR",
"OggFLAC__STREAM_DECODER_FLAC_STREAM_DECODER_ERROR", "OggFLAC__STREAM_DECODER_FLAC_STREAM_DECODER_ERROR",
"OggFLAC__STREAM_DECODER_INVALID_CALLBACK",
"OggFLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR", "OggFLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR",
"OggFLAC__STREAM_DECODER_ALREADY_INITIALIZED", "OggFLAC__STREAM_DECODER_ALREADY_INITIALIZED",
"OggFLAC__STREAM_DECODER_INVALID_CALLBACK",
"OggFLAC__STREAM_DECODER_UNINITIALIZED" "OggFLAC__STREAM_DECODER_UNINITIALIZED"
}; };