Update libchdr (replace libflac with dr_flac)

[pcsx_rearmed.git] / deps / libchdr / include / libchdr / flac.h

diff --git a/deps/libchdr/flac.h b/deps/libchdr/include/libchdr/flac.h
similarity index 88%
rename from deps/libchdr/flac.h
rename to deps/libchdr/include/libchdr/flac.h
index 6cf011f..bff255b 100644 (file)
--- a/deps/libchdr/flac.h
+++ b/deps/libchdr/include/libchdr/flac.h
@@ -14,7 +14,6 @@
 #define __FLAC_H__
 
 #include <stdint.h>
-#include <FLAC/all.h>
 
 /***************************************************************************
  *  TYPE DEFINITIONS
@@ -24,14 +23,14 @@
 typedef struct _flac_decoder flac_decoder;
 struct _flac_decoder {
                /* output state */
-       FLAC__StreamDecoder*    decoder;                                /* actual encoder */
+       void *                  decoder;                                /* actual encoder */
        uint32_t                sample_rate;                    /* decoded sample rate */
        uint8_t                 channels;                               /* decoded number of channels */
        uint8_t                 bits_per_sample;                /* decoded bits per sample */
        uint32_t                compressed_offset;              /* current offset in compressed data */
-       const FLAC__byte *      compressed_start;               /* start of compressed data */
+       const uint8_t *         compressed_start;               /* start of compressed data */
        uint32_t                compressed_length;              /* length of compressed data */
-       const FLAC__byte *      compressed2_start;              /* start of compressed data */
+       const uint8_t *         compressed2_start;              /* start of compressed data */
        uint32_t                compressed2_length;             /* length of compressed data */
        int16_t *               uncompressed_start[8];  /* pointer to start of uncompressed data (up to 8 streams) */
        uint32_t                uncompressed_offset;    /* current position in uncompressed data */
@@ -42,7 +41,7 @@ struct _flac_decoder {
 
 /* ======================> flac_decoder */
 
-void           flac_decoder_init(flac_decoder* decoder);
+int            flac_decoder_init(flac_decoder* decoder);
 void           flac_decoder_free(flac_decoder* decoder);
 int            flac_decoder_reset(flac_decoder* decoder, uint32_t sample_rate, uint8_t num_channels, uint32_t block_size, const void *buffer, uint32_t length);
 int            flac_decoder_decode_interleaved(flac_decoder* decoder, int16_t *samples, uint32_t num_samples, int swap_endian);