[vlc-commits] aout: move some internal defines to src/

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Jul 25 17:40:14 2011 +0300| [335bbdfe57a8eaca40afcd1a595e8ba3c118d1af] | committer: Rémi Denis-Courmont

aout: move some internal defines to src/

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=335bbdfe57a8eaca40afcd1a595e8ba3c118d1af
---

 include/vlc_aout.h               |    7 -------
 src/audio_output/aout_internal.h |    9 +++++++++
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/include/vlc_aout.h b/include/vlc_aout.h
index bb64328..27178e5 100644
--- a/include/vlc_aout.h
+++ b/include/vlc_aout.h
@@ -153,9 +153,6 @@ typedef int32_t vlc_fixed_t;
 /* Number of samples in an A/52 frame. */
 #define A52_FRAME_NB 1536
 
-/* Max input rate factor (1/4 -> 4) */
-#define AOUT_MAX_INPUT_RATE (4)
-
 /** audio output buffer FIFO */
 struct aout_fifo_t
 {
@@ -167,10 +164,6 @@ struct aout_fifo_t
 /* FIXME to remove once aout.h is cleaned a bit more */
 #include <vlc_block.h>
 
-#define AOUT_RESAMPLING_NONE     0
-#define AOUT_RESAMPLING_UP       1
-#define AOUT_RESAMPLING_DOWN     2
-
 /** an output stream for the audio output */
 typedef struct aout_output_t
 {
diff --git a/src/audio_output/aout_internal.h b/src/audio_output/aout_internal.h
index da8a438..442c780 100644
--- a/src/audio_output/aout_internal.h
+++ b/src/audio_output/aout_internal.h
@@ -24,6 +24,15 @@
 #ifndef LIBVLC_AOUT_INTERNAL_H
 # define LIBVLC_AOUT_INTERNAL_H 1
 
+/* Max input rate factor (1/4 -> 4) */
+# define AOUT_MAX_INPUT_RATE (4)
+
+enum {
+    AOUT_RESAMPLING_NONE=0,
+    AOUT_RESAMPLING_UP,
+    AOUT_RESAMPLING_DOWN
+};
+
 # include <vlc_aout_mixer.h>
 
 typedef struct