diff options
| author | Michael Roitzsch <mroi@users.sourceforge.net> | 2003-05-20 13:50:55 +0000 |
|---|---|---|
| committer | Michael Roitzsch <mroi@users.sourceforge.net> | 2003-05-20 13:50:55 +0000 |
| commit | 8ce6f74d499f0248946261972cb22552482eb7de (patch) | |
| tree | 22f757e2e990be8d3fa92f9230335116a181215b /src/demuxers/demux.h | |
| parent | 1f93c3866ac62e671b02ba83978282924086042e (diff) | |
| download | xine-lib-8ce6f74d499f0248946261972cb22552482eb7de.tar.gz xine-lib-8ce6f74d499f0248946261972cb22552482eb7de.tar.bz2 | |
public header cleanup:
* regulate mutual inclusion based on XINE_COMPILE
* src/xine-engine/spu_decoder.h was unused
-> make it the spu decoder API header and remove src/libspudec/spu_decoder_api.h
* mark some xine_stream_t members as unused for next cleanup
CVS patchset: 4883
CVS date: 2003/05/20 13:50:55
Diffstat (limited to 'src/demuxers/demux.h')
| -rw-r--r-- | src/demuxers/demux.h | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/demuxers/demux.h b/src/demuxers/demux.h index 1a979ac43..52dd0568f 100644 --- a/src/demuxers/demux.h +++ b/src/demuxers/demux.h @@ -17,19 +17,22 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: demux.h,v 1.30 2003/04/26 20:15:52 guenter Exp $ + * $Id: demux.h,v 1.31 2003/05/20 13:50:56 mroi Exp $ */ #ifndef HAVE_DEMUX_H #define HAVE_DEMUX_H -#include "buffer.h" -#include "video_out.h" -#include "xine_internal.h" -#if defined(XINE_COMPILE) -#include "input/input_plugin.h" +#ifdef XINE_COMPILE +# include "input/input_plugin.h" +# include "buffer.h" +# include "video_out.h" +# include "xine_internal.h" #else -#include "input_plugin.h" +# include <xine/input_plugin.h> +# include <xine/buffer.h> +# include <xine/video_out.h> +# include <xine/xine_internal.h> #endif #define DEMUXER_PLUGIN_IFACE_VERSION 21 |