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/xine-engine/osd.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/xine-engine/osd.h')
| -rw-r--r-- | src/xine-engine/osd.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/xine-engine/osd.h b/src/xine-engine/osd.h index ce5ef93b8..21e0bf0e8 100644 --- a/src/xine-engine/osd.h +++ b/src/xine-engine/osd.h @@ -18,15 +18,19 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * * OSD stuff (text and graphic primitives) - * $Id: osd.h,v 1.15 2003/04/06 15:50:57 holstsn Exp $ + * $Id: osd.h,v 1.16 2003/05/20 13:50:56 mroi Exp $ */ #ifndef HAVE_OSD_H #define HAVE_OSD_H -#include "video_overlay.h" -#ifdef __OSD_C__ -#include "video_out/alphablend.h" +#ifdef XINE_COMPILE +# include "video_overlay.h" +# ifdef __OSD_C__ +# include "video_out/alphablend.h" +# endif +#else +# include <xine/video_overlay.h> #endif typedef struct osd_object_s osd_object_t; |