Merge various clang-inspired fixes

[disorder] / lib / resample.h

diff --git a/lib/resample.h b/lib/resample.h
index e8bfb10b2e84c11f21f32778e50b3fea88efe333..e99aaeb3455de23d77fef9a981f61bcf0157120a 100644 (file)
--- a/lib/resample.h
+++ b/lib/resample.h
@@ -27,8 +27,7 @@
 #include <samplerate.h>
 #endif
 
 #include <samplerate.h>
 #endif
 

-#define ENDIAN_BIG 1
-#define ENDIAN_LITTLE 2
+#include "byte-order.h"

 
 struct resampler {
   int input_bits, input_channels, input_rate, input_signed, input_endian;
 
 struct resampler {
   int input_bits, input_channels, input_rate, input_signed, input_endian;


@@ -47,12 +46,14 @@ void resample_init(struct resampler *rs,
                    int output_bits, int output_channels, 
                    int output_rate, int output_signed,
                    int output_endian);
                    int output_bits, int output_channels, 
                    int output_rate, int output_signed,
                    int output_endian);

-size_t resample_convert(struct resampler *rs,
+size_t resample_convert(const struct resampler *rs,

                         const uint8_t *bytes,
                         size_t nbytes,
                         int eof,
                         void (*converted)(uint8_t *bytes,
                         const uint8_t *bytes,
                         size_t nbytes,
                         int eof,
                         void (*converted)(uint8_t *bytes,

-                                          size_t nbytes));
+                                          size_t nbytes,
+                                          void *cd),
+                        void *cd);

 void resample_close(struct resampler *rs);
 
 #endif /* RESAMPLE_H */
 void resample_close(struct resampler *rs);
 
 #endif /* RESAMPLE_H */