Get rid of xine.h inclusion. Fix xine.h.tmpl.in, inttypes.h was

unincluded. Fix xine.m4 to reflect the new xine.h location.

CVS patchset: 6
CVS date: 2001/04/19 09:46:57

20 files changed, 43 insertions, 35 deletions

diff --git a/include/video_out.h b/include/video_out.h
index 03503fd69..3d46a3826 100644
--- a/include/video_out.h
+++ b/include/video_out.h
@@ -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.h,v 1.2 2001/04/18 23:48:29 guenter Exp $
+ * $Id: video_out.h,v 1.3 2001/04/19 09:46:57 f1rmb Exp $
  *
  *
  * xine version of video_out.h 
@@ -25,7 +25,6 @@
  */
 
 #ifndef HAVE_VIDEO_OUT_H
-
 #define HAVE_VIDEO_OUT_H
 
 #ifdef HAVE_CONFIG_H
diff --git a/include/xine.h.tmpl.in b/include/xine.h.tmpl.in
index 4a03e5cff..7e029f6ad 100644
--- a/include/xine.h.tmpl.in
+++ b/include/xine.h.tmpl.in
@@ -17,13 +17,15 @@
  * 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.h.tmpl.in,v 1.2 2001/04/18 23:48:29 guenter Exp $
+ * $Id: xine.h.tmpl.in,v 1.3 2001/04/19 09:46:57 f1rmb Exp $
  *
  */
 
 #ifndef HAVE_XINE_H
 #define HAVE_XINE_H
 
+#include <inttypes.h>
+
 #define XINE_MAJOR_VERSION @XINE_MAJOR@
 #define XINE_MINOR_VERSION @XINE_MINOR@
 #define XINE_SUB_VERSION   @XINE_SUB@
diff --git a/m4/xine.m4 b/m4/xine.m4
index 3f30959ea..3194429d8 100644
--- a/m4/xine.m4
+++ b/m4/xine.m4
@@ -83,7 +83,7 @@ dnl
       AC_LANG_C()
       rm -f conf.xinetest
       AC_TRY_RUN([
-#include <xine/xine.h>
+#include <xine.h>
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/src/demuxers/demux.h b/src/demuxers/demux.h
index 6fda091fe..a7e6f8292 100644
--- a/src/demuxers/demux.h
+++ b/src/demuxers/demux.h
@@ -17,14 +17,14 @@
  * 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.1 2001/04/18 22:33:54 f1rmb Exp $
+ * $Id: demux.h,v 1.2 2001/04/19 09:46:57 f1rmb Exp $
  */
 
 #ifndef HAVE_DEMUX_H
 #define HAVE_DEMUX_H
 
 #include "buffer.h"
-#include "xine.h"
+#include "xine_internal.h"
 #if defined(XINE_COMPILE)
 #include "input/input_plugin.h"
 #else
diff --git a/src/demuxers/demux_avi.c b/src/demuxers/demux_avi.c
index badcadc7d..cfa4307e0 100644
--- a/src/demuxers/demux_avi.c
+++ b/src/demuxers/demux_avi.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: demux_avi.c,v 1.1 2001/04/18 22:33:55 f1rmb Exp $
+ * $Id: demux_avi.c,v 1.2 2001/04/19 09:46:57 f1rmb Exp $
  *
  * demultiplexer for avi streams
  *
@@ -37,7 +37,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "xine.h"
+#include "xine_internal.h"
 #include "monitor.h"
 #include "demux.h"
 #include "utils.h"
diff --git a/src/demuxers/demux_elem.c b/src/demuxers/demux_elem.c
index 855c22e17..7c5257732 100644
--- a/src/demuxers/demux_elem.c
+++ b/src/demuxers/demux_elem.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: demux_elem.c,v 1.1 2001/04/18 22:33:58 f1rmb Exp $
+ * $Id: demux_elem.c,v 1.2 2001/04/19 09:46:57 f1rmb Exp $
  *
  * demultiplexer for elementary mpeg streams
  * 
@@ -33,7 +33,7 @@
 #include <pthread.h>
 #include <string.h>
 
-#include "xine.h"
+#include "xine_internal.h"
 #include "monitor.h"
 #include "demux.h"
 
diff --git a/src/demuxers/demux_mpeg.c b/src/demuxers/demux_mpeg.c
index 9fcb37df4..b373b4f93 100644
--- a/src/demuxers/demux_mpeg.c
+++ b/src/demuxers/demux_mpeg.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: demux_mpeg.c,v 1.1 2001/04/18 22:33:58 f1rmb Exp $
+ * $Id: demux_mpeg.c,v 1.2 2001/04/19 09:46:57 f1rmb Exp $
  *
  * demultiplexer for mpeg 1/2 program streams
  * reads streams of variable blocksizes
@@ -37,7 +37,7 @@
 #include <string.h>
 
 #include "monitor.h"
-#include "xine.h"
+#include "xine_internal.h"
 #include "demux.h"
 #include "utils.h"
 
diff --git a/src/demuxers/demux_mpeg_block.c b/src/demuxers/demux_mpeg_block.c
index 531bf44aa..d3bf96519 100644
--- a/src/demuxers/demux_mpeg_block.c
+++ b/src/demuxers/demux_mpeg_block.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: demux_mpeg_block.c,v 1.1 2001/04/18 22:33:58 f1rmb Exp $
+ * $Id: demux_mpeg_block.c,v 1.2 2001/04/19 09:46:57 f1rmb Exp $
  *
  * demultiplexer for mpeg 1/2 program streams
  *
@@ -33,7 +33,7 @@
 #include <pthread.h>
 #include <string.h>
 
-#include "xine.h"
+#include "xine_internal.h"
 #include "monitor.h"
 #include "demux.h"
 #include "utils.h"
diff --git a/src/demuxers/demux_mpgaudio.c b/src/demuxers/demux_mpgaudio.c
index 8eea5bddf..322612e56 100644
--- a/src/demuxers/demux_mpgaudio.c
+++ b/src/demuxers/demux_mpgaudio.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: demux_mpgaudio.c,v 1.1 2001/04/18 22:33:58 f1rmb Exp $
+ * $Id: demux_mpgaudio.c,v 1.2 2001/04/19 09:46:57 f1rmb Exp $
  *
  * demultiplexer for mpeg audio (i.e. mp3) streams
  *
@@ -34,7 +34,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "xine.h"
+#include "xine_internal.h"
 #include "monitor.h"
 #include "demux.h"
 
diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c
index b3f105bbd..cf1ac339e 100644
--- a/src/input/input_dvd.c
+++ b/src/input/input_dvd.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: input_dvd.c,v 1.1 2001/04/18 22:34:04 f1rmb Exp $
+ * $Id: input_dvd.c,v 1.2 2001/04/19 09:46:57 f1rmb Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -41,7 +41,7 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "xine.h"
+#include "xine_internal.h"
 #include "monitor.h"
 #include "input_plugin.h"
 #include "dvd_udf.h"
diff --git a/src/input/input_file.c b/src/input/input_file.c
index d2591d2bd..28741e437 100644
--- a/src/input/input_file.c
+++ b/src/input/input_file.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: input_file.c,v 1.1 2001/04/18 22:34:04 f1rmb Exp $
+ * $Id: input_file.c,v 1.2 2001/04/19 09:46:57 f1rmb Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -30,7 +30,7 @@
 #include <fcntl.h>
 #include <string.h>
 
-#include "xine.h"
+#include "xine_internal.h"
 #include "monitor.h"
 #include "input_plugin.h"
 
diff --git a/src/input/input_net.c b/src/input/input_net.c
index 67684320e..d450f9716 100644
--- a/src/input/input_net.c
+++ b/src/input/input_net.c
@@ -36,7 +36,7 @@
 #include <errno.h>
 #include <sys/time.h>
 
-#include "xine.h"
+#include "xine_internal.h"
 #include "monitor.h"
 #include "input_plugin.h"
 
diff --git a/src/input/input_vcd.c b/src/input/input_vcd.c
index 42ccade80..1a4229eb4 100644
--- a/src/input/input_vcd.c
+++ b/src/input/input_vcd.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: input_vcd.c,v 1.1 2001/04/18 22:34:05 f1rmb Exp $
+ * $Id: input_vcd.c,v 1.2 2001/04/19 09:46:57 f1rmb Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -41,7 +41,7 @@
 #error "you need to add cdrom / VCD support for your platform to input_vcd"
 #endif
 
-#include "xine.h"
+#include "xine_internal.h"
 #include "monitor.h"
 #include "input_plugin.h"
 
diff --git a/src/libmpeg2/idct.c b/src/libmpeg2/idct.c
index 21d33dc8c..937feb8e8 100644
--- a/src/libmpeg2/idct.c
+++ b/src/libmpeg2/idct.c
@@ -44,7 +44,7 @@
 
 #include "mpeg2_internal.h"
 #include "xine_internal.h"
-#include "xine.h"
+#include "xine_internal.h"
 #include "cpu_accel.h"
 
 #define W1 2841 /* 2048*sqrt (2)*cos (1*pi/16) */
diff --git a/src/libspudec/spudec.c b/src/libspudec/spudec.c
index b8c661df5..45d9f9dff 100644
--- a/src/libspudec/spudec.c
+++ b/src/libspudec/spudec.c
@@ -23,7 +23,7 @@
 
 #include "spudec.h"
 
-#include "xine.h"
+#include "xine_internal.h"
 #include "utils.h"
 #include "metronom.h"
 
diff --git a/src/xine-engine/load_plugins.c b/src/xine-engine/load_plugins.c
index 4984566db..ebd94bec2 100644
--- a/src/xine-engine/load_plugins.c
+++ b/src/xine-engine/load_plugins.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: load_plugins.c,v 1.1 2001/04/18 22:36:09 f1rmb Exp $
+ * $Id: load_plugins.c,v 1.2 2001/04/19 09:46:57 f1rmb Exp $
  *
  *
  * Load input/demux/audio_out/video_out plugins
@@ -34,7 +34,6 @@
 #include <dirent.h>
 #include <dlfcn.h>
 
-#include "xine.h"
 #include "xine_internal.h"
 #include "demuxers/demux.h"
 #include "input/input_plugin.h"
diff --git a/src/xine-engine/metronom.c b/src/xine-engine/metronom.c
index e71f2b8b6..014df6cc4 100644
--- a/src/xine-engine/metronom.c
+++ b/src/xine-engine/metronom.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: metronom.c,v 1.1 2001/04/18 22:36:04 f1rmb Exp $
+ * $Id: metronom.c,v 1.2 2001/04/19 09:46:57 f1rmb Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -31,7 +31,6 @@
 #include <math.h>
 
 #include "monitor.h"
-#include "xine.h"
 #include "xine_internal.h"
 #include "metronom.h"
 #include "utils.h"
diff --git a/src/xine-engine/video_decoder.c b/src/xine-engine/video_decoder.c
index a3f5532ce..d7d69f846 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.1 2001/04/18 22:36:04 f1rmb Exp $
+ * $Id: video_decoder.c,v 1.2 2001/04/19 09:46:57 f1rmb Exp $
  *
  */
 
@@ -25,7 +25,6 @@
 #include "config.h"
 #endif
 
-#include "xine.h"
 #include "xine_internal.h"
 #include "video_out/video_out.h"
 #include "video_decoder.h"
diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c
index 9093e50ec..daad7cbf4 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.1 2001/04/18 22:36:05 f1rmb Exp $
+ * $Id: xine.c,v 1.2 2001/04/19 09:46:57 f1rmb Exp $
  *
  * top-level xine functions
  *
@@ -37,7 +37,6 @@
 #include <machine/endian.h>
 #endif
 
-#include "xine.h"
 #include "xine_internal.h"
 #include "audio_out.h"
 #include "video_out.h"
diff --git a/src/xine-engine/xine_internal.h b/src/xine-engine/xine_internal.h
index c097158af..d05736330 100644
--- a/src/xine-engine/xine_internal.h
+++ b/src/xine-engine/xine_internal.h
@@ -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_internal.h,v 1.1 2001/04/18 22:36:09 f1rmb Exp $
+ * $Id: xine_internal.h,v 1.2 2001/04/19 09:46:57 f1rmb Exp $
  *
  */
 
@@ -25,7 +25,6 @@
 #define HAVE_XINE_INTERNAL_H
 
 #include <inttypes.h>
-#include "xine.h"
 #include "input/input_plugin.h"
 #include "demuxers/demux.h"
 #include "video_out.h"
@@ -35,6 +34,18 @@
 #define INPUT_PLUGIN_MAX   50
 #define DEMUXER_PLUGIN_MAX 50
 
+/* nStatus : current xine status */
+typedef void (*gui_status_callback_func_t)(int nStatus);
+
+/*
+ * player status constants:
+ */
+
+#define XINE_STOP      0 
+#define XINE_PLAY      1 
+#define XINE_PAUSE     2 
+#define XINE_QUIT      3
+
 typedef struct xine_s {
   
   /* private : */