[vlc-devel] commit: Moved aout_input_t to aout_internal.h. (Laurent Aimar )

[git version control]

vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Tue Aug 25 23:16:05 2009 +0200| [3b4d57e9e465a20b5795e20806478d1e9ea7ae35] | committer: Laurent Aimar 

Moved aout_input_t to aout_internal.h.

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

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

diff --git a/include/vlc_aout.h b/include/vlc_aout.h
index 23bab0e..f3eec56 100644
--- a/include/vlc_aout.h
+++ b/include/vlc_aout.h
@@ -227,58 +227,6 @@ struct aout_filter_t
 #define AOUT_RESAMPLING_NONE     0
 #define AOUT_RESAMPLING_UP       1
 #define AOUT_RESAMPLING_DOWN     2
-/** an input stream for the audio output */
-struct aout_input_t
-{
-    /* When this lock is taken, the pipeline cannot be changed by a
-     * third-party. */
-    vlc_mutex_t             lock;
-
-    audio_sample_format_t   input;
-    aout_alloc_t            input_alloc;
-
-    /* pre-filters */
-    aout_filter_t *         pp_filters[AOUT_MAX_FILTERS];
-    int                     i_nb_filters;
-
-    aout_filter_t *         p_playback_rate_filter;
-
-    /* resamplers */
-    aout_filter_t *         pp_resamplers[AOUT_MAX_FILTERS];
-    int                     i_nb_resamplers;
-    int                     i_resampling_type;
-    mtime_t                 i_resamp_start_date;
-    int                     i_resamp_start_drift;
-
-    /* Mixer information */
-    audio_replay_gain_t     replay_gain;
-
-    /* If b_restart == 1, the input pipeline will be re-created. */
-    bool              b_restart;
-
-    /* If b_error == 1, there is no input pipeline. */
-    bool              b_error;
-
-    /* Did we just change the output format? (expect buffer inconsistencies) */
-    bool              b_changed;
-
-    /* last rate from input */
-    int               i_last_input_rate;
-
-    /* */
-    int               i_buffer_lost;
-
-    /* */
-    bool              b_paused;
-    mtime_t           i_pause_date;
-
-    /* */
-    bool                b_recycle_vout;
-    aout_request_vout_t request_vout;
-
-    /* */
-    aout_mixer_input_t mixer;
- };
 
 /** 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 ca2576e..d18929a 100644
--- a/src/audio_output/aout_internal.h
+++ b/src/audio_output/aout_internal.h
@@ -87,6 +87,59 @@ struct aout_filter_owner_sys_t
     aout_input_t    *p_input;
 };
 
+/** an input stream for the audio output */
+struct aout_input_t
+{
+    /* When this lock is taken, the pipeline cannot be changed by a
+     * third-party. */
+    vlc_mutex_t             lock;
+
+    audio_sample_format_t   input;
+    aout_alloc_t            input_alloc;
+
+    /* pre-filters */
+    aout_filter_t *         pp_filters[AOUT_MAX_FILTERS];
+    int                     i_nb_filters;
+
+    aout_filter_t *         p_playback_rate_filter;
+
+    /* resamplers */
+    aout_filter_t *         pp_resamplers[AOUT_MAX_FILTERS];
+    int                     i_nb_resamplers;
+    int                     i_resampling_type;
+    mtime_t                 i_resamp_start_date;
+    int                     i_resamp_start_drift;
+
+    /* Mixer information */
+    audio_replay_gain_t     replay_gain;
+
+    /* If b_restart == 1, the input pipeline will be re-created. */
+    bool              b_restart;
+
+    /* If b_error == 1, there is no input pipeline. */
+    bool              b_error;
+
+    /* Did we just change the output format? (expect buffer inconsistencies) */
+    bool              b_changed;
+
+    /* last rate from input */
+    int               i_last_input_rate;
+
+    /* */
+    int               i_buffer_lost;
+
+    /* */
+    bool              b_paused;
+    mtime_t           i_pause_date;
+
+    /* */
+    bool                b_recycle_vout;
+    aout_request_vout_t request_vout;
+
+    /* */
+    aout_mixer_input_t mixer;
+ };
+
 /****************************************************************************
  * Prototypes
  *****************************************************************************/