ALL: a bunch of compilation fixes + disabled plugins that don't compile anymore.

configure.ac

@@ -893,7 +893,7 @@ dnl
 dnl  default modules
 dnl
 AX_ADD_PLUGINS([dummy rc telnet logger gestures memcpy hotkeys netsync])
-AX_ADD_PLUGINS([mpgv mpga m4v h264 ps ps2 pva avi asf aac mp4 rawdv nsv real aiff mjpeg])
+AX_ADD_PLUGINS([mpgv mpga m4v h264 ps pva avi asf aac mp4 rawdv nsv real aiff mjpeg])
 AX_ADD_PLUGINS([cvdsub svcdsub spudec dvbsub mpeg_audio lpcm a52 dts cinepak])
 AX_ADD_PLUGINS([deinterlace invert adjust wall transform distort clone crop motionblur])
 AX_ADD_PLUGINS([float32tos16 float32tos8 float32tou16 float32tou8 a52tospdif dtstospdif fixed32tofloat32 fixed32tos16 s16tofixed32 s16tofloat32 s16tofloat32swab s8tofloat32 u8tofixed32 u8tofloat32])
@@ -902,7 +902,7 @@ AX_ADD_PLUGINS([trivial_channel_mixer headphone_channel_mixer])
 AX_ADD_PLUGINS([trivial_mixer spdif_mixer float32_mixer])
 AX_ADD_PLUGINS([aout_file])
 AX_ADD_PLUGINS([i420_rgb i420_yuy2 i422_yuy2 i420_ymga])
-AX_ADD_PLUGINS([id3 m3u playlist export sgimb])
+AX_ADD_PLUGINS([m3u playlist export sgimb])
 AX_ADD_PLUGINS([rawvideo])
 AX_ADD_PLUGINS([wav araw demuxsub adpcm a52sys dtssys au])
 AX_ADD_PLUGINS([access_file access_udp access_tcp access_http ipv4 access_mms])
@@ -1837,12 +1837,12 @@ then
 fi
 
 dnl
-dnl   libid3tag support
+dnl   libid3tag support (FIXME!!! doesn't work with new input)
 dnl
-AC_CHECK_HEADERS(id3tag.h, [
-  AC_CHECK_HEADERS(zlib.h, [
-    AX_ADD_LDFLAGS([id3tag],[-lid3tag -lz])
-    AX_ADD_PLUGINS([id3tag])]) ])
+dnl AC_CHECK_HEADERS(id3tag.h, [
+dnl   AC_CHECK_HEADERS(zlib.h, [
+dnl     AX_ADD_LDFLAGS([id3tag],[-lid3tag -lz])
+dnl     AX_ADD_PLUGINS([id3tag])]) ])
 
 dnl
 dnl  ffmpeg decoder/demuxer plugin
@@ -3512,8 +3512,8 @@ dnl
 dnl  SLP access plugin
 dnl
 AC_ARG_ENABLE(slp,
-  [  --enable-slp            SLP service discovery support (default enabled)])
-if test "${enable_slp}" != "no"
+  [  --enable-slp            SLP service discovery support (default disabled)])
+if test "${enable_slp}" = "yes"
 then
   AC_ARG_WITH(slp,
   [    --with-slp=PATH       libslp headers and libraries])

modules/codec/cmml/intf.c

@@ -33,15 +33,12 @@
 
 #include <vlc/vlc.h>
 #include <vlc/decoder.h>
+#include <vlc/input.h>
 #include <vlc/intf.h>
 #include <vlc/vout.h>
 
 #include <osd.h>
 
-#include "stream_control.h"
-#include "input_ext-intf.h"
-#include "input_ext-dec.h"
-
 #include "vlc_keys.h"
 
 #include "browser_open.h"

modules/codec/theora.c

@@ -26,6 +26,7 @@
  *****************************************************************************/
 #include <vlc/vlc.h>
 #include <vlc/decoder.h>
+#include <vlc/input.h>
 #include <vlc/sout.h>
 
 #include <ogg/ogg.h>

modules/control/netsync.c

@@ -334,8 +334,12 @@ static mtime_t GetClockRef( intf_thread_t *p_intf, mtime_t i_pts )
 
     if( !p_input ) return 0;
 
+#if 0
     p_pgrm = p_input->stream.p_selected_program;
     if( p_pgrm ) return input_ClockGetTS( p_input, p_pgrm, i_pts );
+#else
+#warning "This code is currently broken. FIXME!!!"
+#endif
 
     return 0;
 }

modules/demux/Modules.am

@@ -11,11 +11,10 @@ SOURCES_wav = wav.c
 SOURCES_aac = aac.c
 SOURCES_mkv = mkv.cpp
 SOURCES_livedotcom = livedotcom.cpp
-SOURCES_demux2 = demux2.c
 SOURCES_nsv = nsv.c
 SOURCES_real = real.c
 SOURCES_ts = ts.c ../mux/mpeg/csa.c
-SOURCES_ps2 = ps.c ps.h
+SOURCES_ps = ps.c ps.h
 SOURCES_dvdnav = dvdnav.c
 SOURCES_mod = mod.c
 SOURCES_pva = pva.c

modules/demux/mpeg/Modules.am

 SOURCES_mpeg_system = system.c system.h
 SOURCES_m4v = m4v.c
-SOURCES_ps = ps.c
+SOURCES_ps_old = ps.c
 SOURCES_ts_old = ts.c
 SOURCES_ts_old_dvbpsi = ts.c
 SOURCES_mpga = mpga.c

modules/demux/playlist/m3u.c

@@ -28,6 +28,7 @@
 #include <stdlib.h>                                      /* malloc(), free() */
 
 #include <vlc/vlc.h>
+#include <vlc/input.h>
 #include <vlc/intf.h>
 
 #include <errno.h>                                                 /* ENOMEM */

modules/demux/playlist/old.c

@@ -2,7 +2,7 @@
  * old.c : Old playlist format import
  *****************************************************************************
  * Copyright (C) 2004 VideoLAN
- * $Id: old.c,v 1.2 2004/01/25 20:05:29 hartman Exp $
+ * $Id$
  *
  * Authors: Clment Stenac <zorglub@videolan.org>
  *
@@ -27,6 +27,7 @@
 #include <stdlib.h>                                      /* malloc(), free() */
 
 #include <vlc/vlc.h>
+#include <vlc/input.h>
 #include <vlc/intf.h>
 
 #include <errno.h>                                                 /* ENOMEM */

modules/demux/playlist/pls.c

@@ -2,7 +2,7 @@
  * pls.c : PLS playlist format import
  *****************************************************************************
  * Copyright (C) 2004 VideoLAN
- * $Id: pls.c,v 1.2 2004/01/25 20:05:29 hartman Exp $
+ * $Id$
  *
  * Authors: Clment Stenac <zorglub@videolan.org>
  * Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
@@ -28,6 +28,7 @@
 #include <stdlib.h>                                      /* malloc(), free() */
 
 #include <vlc/vlc.h>
+#include <vlc/input.h>
 #include <vlc/intf.h>
 
 #include <errno.h>                                                 /* ENOMEM */

modules/demux/ps.c

@@ -2,7 +2,7 @@
  * ps.c
  *****************************************************************************
  * Copyright (C) 2004 VideoLAN
- * $Id: ps.c,v 1.2 2004/01/25 20:05:28 hartman Exp $
+ * $Id$
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -46,7 +46,7 @@ vlc_module_begin();
     set_description( _("PS demuxer") );
     set_capability( "demux2", 0 );
     set_callbacks( Open, Close );
-    add_shortcut( "ps2" );
+    add_shortcut( "ps" );
 vlc_module_end();
 
 /*****************************************************************************