Changeset 07743d45ea60d9674cf30205303230ecd1f58220

Timestamp:

22/06/04 23:22:13 (4 years ago)

Author:

Gildas Bazin <gbazin@videolan.org>

git-committer:

Gildas Bazin <gbazin@videolan.org> 1087939333 +0000

git-parent:

[21261c74fafd51d7eb36948061eae7e6fffc6c8d]

git-author:

Gildas Bazin <gbazin@videolan.org> 1087939333 +0000

Message:

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

Files:

• configure.ac (modified) (4 diffs)
• modules/codec/cmml/intf.c (modified) (1 diff)
• modules/codec/theora.c (modified) (1 diff)
• modules/control/netsync.c (modified) (1 diff)
• modules/demux/Modules.am (modified) (1 diff)
• modules/demux/m3u.c (modified) (19 diffs)
• modules/demux/mpeg/Modules.am (modified) (1 diff)
• modules/demux/playlist/m3u.c (modified) (1 diff)
• modules/demux/playlist/old.c (modified) (2 diffs)
• modules/demux/playlist/pls.c (modified) (2 diffs)
• modules/demux/ps.c (modified) (2 diffs)

configure.ac

@@ -894 +894 @@
-dnl
-AX_ADD_PLUGINS([dummy rc telnet logger gestures memcpy hotkeys netsync])
-s2 p
+
-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])
@@ -903 +903 @@
-AX_ADD_PLUGINS([aout_file])
-AX_ADD_PLUGINS([i420_rgb i420_yuy2 i422_yuy2 i420_ymga])
-id3 
+
-AX_ADD_PLUGINS([rawvideo])
-AX_ADD_PLUGINS([wav araw demuxsub adpcm a52sys dtssys au])
@@ -1838 +1838 @@
-
-dnl
-
-
-
-
-
-
+ (FIXME!!! doesn't work with new input)
+
+dnl 
+dnl 
+dnl 
+dnl 
-
-dnl
@@ -3513 +3513 @@
-dnl
-AC_ARG_ENABLE(slp,
-en
-!= "no
+dis
+= "yes
-then
-  AC_ARG_WITH(slp,

modules/codec/cmml/intf.c

@@ -34 +34 @@
-#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"

modules/codec/theora.c

@@ -27 +27 @@
-#include <vlc/vlc.h>
-#include <vlc/decoder.h>
+#include <vlc/input.h>
-#include <vlc/sout.h>
-

modules/control/netsync.c

@@ -335 +335 @@
-    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

@@ -12 +12 @@
-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
-2
+
-SOURCES_dvdnav = dvdnav.c
-SOURCES_mod = mod.c

modules/demux/m3u.c

@@ -55 +55 @@
-static int  Activate  ( vlc_object_t * );
-static void Deactivate( vlc_object_t * );
-
+
+
-
-/*****************************************************************************
@@ -62 +63 @@
-vlc_module_begin();
-    set_description( _("Playlist metademux") );
-
+2
-    set_callbacks( Activate, Deactivate );
-    add_shortcut( "m3u" );
@@ -76 +77 @@
-static int Activate( vlc_object_t * p_this )
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-    /* Check for m3u/asx file extension or if the demux has been forced */
-input->psz_name
+demux->psz_path
-
-    if( ( psz_ext && !strcasecmp( psz_ext, ".m3u") ) ||
-
-
+
+
+
-    {
-        i_type = TYPE_M3U;
-    }
-    else if( ( psz_ext && !strcasecmp( psz_ext, ".asx") ) ||
-input->psz_demux && !strcmp(p_input
+demux->psz_demux && !strcmp(p_demux
-    {
-        i_type = TYPE_ASX;
-    }
-    else if( ( psz_ext && !strcasecmp( psz_ext, ".html") ) ||
-input->psz_demux && !strcmp(p_input
+demux->psz_demux && !strcmp(p_demux
-    {
-        i_type = TYPE_HTML;
-    }
-    else if( ( psz_ext && !strcasecmp( psz_ext, ".pls") ) ||
-input->psz_demux && !strcmp(p_input
+demux->psz_demux && !strcmp(p_demux
-    {
-        i_type = TYPE_PLS;
-    }
-    else if( ( psz_ext && !strcasecmp( psz_ext, ".b4s") ) ||
-input->psz_demux && !strcmp(p_input
+demux->psz_demux && !strcmp(p_demux
-    {
-        i_type = TYPE_B4S;
@@ -128 +123 @@
-    if( i_type != TYPE_M3U )
-    {
-byte
-input_Peek( p_input
+uint8
+stream_Peek( p_demux->s
-        i_size -= sizeof("[playlist]") - 1;
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-            {
-                p_peek++;
-                i_size--;
-            }
- 
+
-            {
-                ;
-            }
- 
+
-            {
-                i_type2 = TYPE_PLS;
-            }
- 
+
-            {
-                i_type2 = TYPE_HTML;
-            }
- 
+
-            {
-                i_type2 = TYPE_ASX;
-            }
-#if 0
- 
+
-            {
-                i_type2 = TYPE_B4S;
@@ -165 +162 @@
-        }
-    }
- 
+
-    {
-        return VLC_EGENERIC;
-    }
- 
+
-    {
-        i_type = TYPE_M3U;
@@ -179 +176 @@
-
-    /* Allocate p_m3u */
-input->p_demux_data
-input->p_demux_data
+demux->p_sys
+demux->p_sys
-
-    return VLC_SUCCESS;
@@ -190 +187 @@
-static void Deactivate( vlc_object_t *p_this )
-{
-
-
-
+
+
-}
-
@@ -239 +235 @@
- *    psz_line is \0 terminated
- *****************************************************************************/
-input_thread_t *p_input
+demux_t *p_demux
-                      vlc_bool_t *pb_next )
-{
-  *p_m3u = p_input->p_demux_data
-  
+*p_m3u = p_demux->p_sys
+
-
-    psz_bol = psz_line;
@@ -385 +381 @@
-        char *psz_eol;
-
-input
+demux
-        /* We are dealing with a B4S file from Winamp 3 */
-
@@ -446 +442 @@
-    else
-    {
-input
+demux
-        return 0;
-    }
@@ -498 +494 @@
-    {
-        /* assume the path is relative to the path of the m3u file. */
-input->psz_name
+demux->psz_path
-
-#ifndef WIN32
@@ -538 +534 @@
-}
-
-
-
-
+
+
-                          int *pi_options, char ***pppsz_options,
-                          int *pi_position )
@@ -547 +542 @@
-    vlc_bool_t    b_next;
-
-input
+demux
-    {
-        case 1:
@@ -598 +593 @@
- * Returns -1 in case of error, 0 in case of EOF, 1 otherwise
- *****************************************************************************/
- ( input_thread_t *p_input
+( demux_t *p_demux
-{
-
-
-
+
+
-    char          psz_line[MAX_LINE];
-
+ = 0
-    int           i_size, i_bufpos, i_linepos = 0;
-    playlist_t    *p_playlist;
@@ -616 +610 @@
-    int           i_position;
-
-input
+demux
-                                                 FIND_ANYWHERE );
-    if( !p_playlist )
-    {
-input
+demux
-        return -1;
-    }
@@ -634 +628 @@
-        eol_tok = '\n';
-
-input_SplitBuffer( p_input, &p_data, MAX_LINE ) ) > 0
-
- p_buf = p_data->p_payload_start;
+stream_Read( p_demux->s, p_buf, MAX_LINE ) )
+
+
-
-        while( i_size )
@@ -673 +667 @@
-            i_linepos = 0;
-
-input
+demux
-                         &i_options, &ppsz_options, &i_position );
-        }
-
-input_DeletePacket( p_input->p_method_data, p_data
+free( p_buf
-    }
-
@@ -684 +678 @@
-        psz_line[i_linepos] = '\0';
-
-input
+demux
-                     &i_options, &ppsz_options, &i_position );
-
@@ -708 +702 @@
-    return 0;
-}
+
+static int Control( demux_t *p_demux, int i_query, va_list args )
+{
+    return VLC_EGENERIC;
+}

modules/demux/mpeg/Modules.am

@@ -1 +1 @@
-SOURCES_mpeg_system = system.c system.h
-SOURCES_m4v = m4v.c
-
+_old
-SOURCES_ts_old = ts.c
-SOURCES_ts_old_dvbpsi = ts.c

modules/demux/playlist/m3u.c

@@ -29 +29 @@
-
-#include <vlc/vlc.h>
+#include <vlc/input.h>
-#include <vlc/intf.h>
-

modules/demux/playlist/old.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2004 VideoLAN
-: old.c,v 1.2 2004/01/25 20:05:29 hartman Exp 
+
- *
- * Authors: Cl�nt Stenac <zorglub@videolan.org>
@@ -28 +28 @@
-
-#include <vlc/vlc.h>
+#include <vlc/input.h>
-#include <vlc/intf.h>
-

modules/demux/playlist/pls.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2004 VideoLAN
-: pls.c,v 1.2 2004/01/25 20:05:29 hartman Exp 
+
- *
- * Authors: Cl�nt Stenac <zorglub@videolan.org>
@@ -29 +29 @@
-
-#include <vlc/vlc.h>
+#include <vlc/input.h>
-#include <vlc/intf.h>
-

modules/demux/ps.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2004 VideoLAN
-: ps.c,v 1.2 2004/01/25 20:05:28 hartman Exp 
+
- *
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -47 +47 @@
-    set_capability( "demux2", 0 );
-    set_callbacks( Open, Close );
-2
+
-vlc_module_end();
-