Commit 13700a22 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Do not #include <vlc_aout_mixer.h> from <vlc_aout.h>

parent 7eb6a150
......@@ -150,7 +150,6 @@ struct aout_fifo_t
};
/* FIXME to remove once aout.h is cleaned a bit more */
#include <vlc_aout_mixer.h>
#include <vlc_block.h>
/** audio output filter */
......@@ -205,6 +204,8 @@ typedef struct aout_output_t
bool b_error;
} aout_output_t;
struct aout_mixer_t;
/** audio output thread descriptor */
struct aout_instance_t
{
......@@ -235,7 +236,7 @@ struct aout_instance_t
audio_sample_format_t mixer_format;
aout_alloc_t mixer_allocation;
float mixer_multiplier;
aout_mixer_t *p_mixer;
struct aout_mixer_t *p_mixer;
/* Output plug-in */
aout_output_t output;
......
......@@ -33,6 +33,7 @@
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_aout.h>
#include <vlc_aout_mixer.h>
/*****************************************************************************
* Local prototypes
......
......@@ -34,6 +34,7 @@
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_aout.h>
#include <vlc_aout_mixer.h>
/*****************************************************************************
* Local prototypes
......
......@@ -33,6 +33,7 @@
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_aout.h>
#include <vlc_aout_mixer.h>
/*****************************************************************************
* Local prototypes
......
......@@ -24,6 +24,8 @@
#ifndef LIBVLC_AOUT_INTERNAL_H
# define LIBVLC_AOUT_INTERNAL_H 1
# include <vlc_aout_mixer.h>
aout_buffer_t *aout_BufferAlloc(aout_alloc_t *allocation, mtime_t microseconds,
aout_buffer_t *old_buffer);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment