From 01290c888ec621cb00f2e1aae986085554198820 Mon Sep 17 00:00:00 2001
From: Michael Roitzsch <mroi@users.sourceforge.net>
Date: Sun, 16 Nov 2003 15:41:15 +0000
Subject: actually not every engine file uses internals, so we do not need to
 define XINE_ENGINE_INTERNAL for every file

CVS patchset: 5753
CVS date: 2003/11/16 15:41:15
---
 src/xine-engine/Makefile.am      | 3 +--
 src/xine-engine/audio_decoder.c  | 4 +++-
 src/xine-engine/audio_out.c      | 3 ++-
 src/xine-engine/demux.c          | 5 ++++-
 src/xine-engine/events.c         | 4 +++-
 src/xine-engine/info_helper.c    | 3 +++
 src/xine-engine/io_helper.c      | 3 +++
 src/xine-engine/video_decoder.c  | 4 +++-
 src/xine-engine/video_out.c      | 3 ++-
 src/xine-engine/xine.c           | 8 +++++---
 src/xine-engine/xine_interface.c | 4 +++-
 11 files changed, 32 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am
index d5e462477..b1b76cf6e 100644
--- a/src/xine-engine/Makefile.am
+++ b/src/xine-engine/Makefile.am
@@ -1,7 +1,6 @@
 include $(top_srcdir)/misc/Makefile.common
 
-AM_CFLAGS = $(THREAD_CFLAGS) $(X_CFLAGS) $(FT2_CFLAGS) \
-	-DXINE_ENGINE_INTERNAL
+AM_CFLAGS = $(THREAD_CFLAGS) $(X_CFLAGS) $(FT2_CFLAGS)
 
 LIBTOOL = $(SHELL) $(top_builddir)/libtool
 lib_LTLIBRARIES = libxine.la
diff --git a/src/xine-engine/audio_decoder.c b/src/xine-engine/audio_decoder.c
index b91072523..d90829636 100644
--- a/src/xine-engine/audio_decoder.c
+++ b/src/xine-engine/audio_decoder.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: audio_decoder.c,v 1.109 2003/11/11 18:45:00 f1rmb Exp $
+ * $Id: audio_decoder.c,v 1.110 2003/11/16 15:41:15 mroi Exp $
  *
  *
  * functions that implement audio decoding
@@ -33,6 +33,8 @@
 #include <sched.h>
 #include <unistd.h>
 
+#define XINE_ENGINE_INTERNAL
+
 #include "xine_internal.h"
 #include "xineutils.h"
 
diff --git a/src/xine-engine/audio_out.c b/src/xine-engine/audio_out.c
index 7f38e6ece..21d243ccb 100644
--- a/src/xine-engine/audio_out.c
+++ b/src/xine-engine/audio_out.c
@@ -17,7 +17,7 @@
  * along with self program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: audio_out.c,v 1.150 2003/11/11 18:45:00 f1rmb Exp $
+ * $Id: audio_out.c,v 1.151 2003/11/16 15:41:15 mroi Exp $
  *
  * 22-8-2001 James imported some useful AC3 sections from the previous alsa driver.
  *   (c) 2001 Andy Lo A Foe <andy@alsaplayer.org>
@@ -78,6 +78,7 @@
 #include <math.h>
 
 #define XINE_ENABLE_EXPERIMENTAL_FEATURES
+#define XINE_ENGINE_INTERNAL
 
 /********** logging **********/
 #define LOG_MODULE "audio_out"
diff --git a/src/xine-engine/demux.c b/src/xine-engine/demux.c
index 239298c9f..6a4039e16 100644
--- a/src/xine-engine/demux.c
+++ b/src/xine-engine/demux.c
@@ -20,7 +20,7 @@
  * Demuxer helper functions
  * hide some xine engine details from demuxers and reduce code duplication
  *
- * $Id: demux.c,v 1.39 2003/11/15 14:54:31 miguelfreitas Exp $ 
+ * $Id: demux.c,v 1.40 2003/11/16 15:41:15 mroi Exp $ 
  */
 
 
@@ -32,6 +32,9 @@
 #include <sys/types.h>
 #include <unistd.h>
 #include <errno.h>
+
+#define XINE_ENGINE_INTERNAL
+
 #include "xine_internal.h"
 #include "demuxers/demux.h"
 #include "buffer.h"
diff --git a/src/xine-engine/events.c b/src/xine-engine/events.c
index 113a1548f..2f8ed16b8 100644
--- a/src/xine-engine/events.c
+++ b/src/xine-engine/events.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: events.c,v 1.19 2003/04/02 12:28:09 hadess Exp $
+ * $Id: events.c,v 1.20 2003/11/16 15:41:15 mroi Exp $
  *
  * Event handling functions
  *
@@ -27,6 +27,8 @@
 #include "config.h"
 #endif
 
+#define XINE_ENGINE_INTERNAL
+
 #include "xine_internal.h"
 
 xine_event_t *xine_event_get  (xine_event_queue_t *queue) {
diff --git a/src/xine-engine/info_helper.c b/src/xine-engine/info_helper.c
index 36d083dc4..fe234916e 100644
--- a/src/xine-engine/info_helper.c
+++ b/src/xine-engine/info_helper.c
@@ -28,6 +28,9 @@
 #endif
 
 #include <string.h>
+
+#define XINE_ENGINE_INTERNAL
+
 #include "info_helper.h"
 
 /* Remove trailing separator chars (\n,\r,\t, space,...)
diff --git a/src/xine-engine/io_helper.c b/src/xine-engine/io_helper.c
index 406a3ad4b..45ab04748 100644
--- a/src/xine-engine/io_helper.c
+++ b/src/xine-engine/io_helper.c
@@ -35,6 +35,9 @@
 #include <errno.h>
 #include <string.h>
 #include <assert.h>
+
+#define XINE_ENGINE_INTERNAL
+
 #include "io_helper.h"
 
 /* private constants */
diff --git a/src/xine-engine/video_decoder.c b/src/xine-engine/video_decoder.c
index e21d301e6..662179b59 100644
--- a/src/xine-engine/video_decoder.c
+++ b/src/xine-engine/video_decoder.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: video_decoder.c,v 1.137 2003/11/11 18:45:01 f1rmb Exp $
+ * $Id: video_decoder.c,v 1.138 2003/11/16 15:41:15 mroi Exp $
  *
  */
 
@@ -29,6 +29,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#define XINE_ENGINE_INTERNAL
+
 #include "xine_internal.h"
 #include "xineutils.h"
 #include <sched.h>
diff --git a/src/xine-engine/video_out.c b/src/xine-engine/video_out.c
index ea4f30c84..b7d7626f6 100644
--- a/src/xine-engine/video_out.c
+++ b/src/xine-engine/video_out.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: video_out.c,v 1.177 2003/11/11 18:45:01 f1rmb Exp $
+ * $Id: video_out.c,v 1.178 2003/11/16 15:41:15 mroi Exp $
  *
  * frame allocation / queuing / scheduling / output functions
  */
@@ -37,6 +37,7 @@
 #include <assert.h>
 
 #define XINE_ENABLE_EXPERIMENTAL_FEATURES
+#define XINE_ENGINE_INTERNAL
 
 #include "xine_internal.h"
 #include "video_out.h"
diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c
index 0679e4ae2..d10004c77 100644
--- a/src/xine-engine/xine.c
+++ b/src/xine-engine/xine.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: xine.c,v 1.265 2003/11/15 20:43:11 mroi Exp $
+ * $Id: xine.c,v 1.266 2003/11/16 15:41:15 mroi Exp $
  */
 
 /*
@@ -49,9 +49,11 @@
 /********** logging **********/
 #define LOG_MODULE "xine"
 #define LOG_VERBOSE
-
 /* #define LOG */
-#define XINE_ENABLE_EXPERIMENTAL_FEATURES 1
+
+#define XINE_ENABLE_EXPERIMENTAL_FEATURES
+#define XINE_ENGINE_INTERNAL
+
 #include "xine_internal.h"
 #include "plugin_catalog.h"
 #include "audio_out.h"
diff --git a/src/xine-engine/xine_interface.c b/src/xine-engine/xine_interface.c
index 3c179b386..304c7baec 100644
--- a/src/xine-engine/xine_interface.c
+++ b/src/xine-engine/xine_interface.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: xine_interface.c,v 1.65 2003/11/15 20:43:11 mroi Exp $
+ * $Id: xine_interface.c,v 1.66 2003/11/16 15:41:15 mroi Exp $
  *
  * convenience/abstraction layer, functions to implement
  * libxine's public interface
@@ -41,6 +41,8 @@
 #include <machine/endian.h>
 #endif
 
+#define XINE_ENGINE_INTERNAL
+
 #include "xine_internal.h"
 #include "audio_out.h"
 #include "video_out.h"
-- 
cgit v1.2.3