* Collection of useful common types and macros definitions
*****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: common.h,v 1.52 2001/12/03 16:18:37 sam Exp $
+ * $Id: common.h,v 1.53 2001/12/07 18:33:07 sam Exp $
*
* Authors: Samuel Hocevar <sam@via.ecp.fr>
* Vincent Seguin <seguin@via.ecp.fr>
*****************************************************************************/
/*****************************************************************************
- * required headers:
- * config.h
+ * Required headers
*****************************************************************************/
+#include "config.h"
+#include "int_types.h"
+
/*****************************************************************************
* Basic types definitions
*****************************************************************************/
-#include "int_types.h"
-
typedef u8 byte_t;
/* Boolean type */
#define I64C(x) x##LL
-/* Pointer to the fast memcpy plugin function */
-extern void* ( * pf_fast_memcpy ) ( void *, const void *, size_t );
-
/* The win32 specific stuff was getting really big so it has been moved */
#if defined( WIN32 )
# include "common_win32.h"
void ( * intf_PlaylistJumpto ) ( struct playlist_s *, int );
void ( * intf_UrlDecode ) ( char * );
- void* ( * pf_fast_memcpy ) ( void *, const void *, size_t );
-
void ( * msleep ) ( mtime_t );
mtime_t ( * mdate ) ( void );
#ifdef PLUGIN
extern module_symbols_t* p_symbols;
#endif
+
+/*****************************************************************************
+ * Global headers
+ *****************************************************************************/
+
+#include "main.h"
+
*
*/
+#ifdef HAVE_CONFIG_H
+#else
+#define HAVE_CONFIG_H
+
/*****************************************************************************
* Program information
*****************************************************************************/
#define PLAYLIST_LOOP_VAR "vlc_playlist_loop"
#define PLAYLIST_LOOP_DEFAULT 0
+#endif
* input_ext-dec.h: structures exported to the VideoLAN decoders
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
- * $Id: input_ext-dec.h,v 1.40 2001/12/03 16:18:37 sam Exp $
+ * $Id: input_ext-dec.h,v 1.41 2001/12/07 18:33:07 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Michel Kaempf <maxx@via.ecp.fr>
if( (i_available = p_bit_stream->p_end - p_bit_stream->p_byte)
>= i_buf_len )
{
- pf_fast_memcpy( p_buffer, p_bit_stream->p_byte, i_buf_len );
+ p_main->fast_memcpy( p_buffer, p_bit_stream->p_byte, i_buf_len );
p_bit_stream->p_byte += i_buf_len;
}
else
{
do
{
- pf_fast_memcpy( p_buffer, p_bit_stream->p_byte, i_available );
+ p_main->fast_memcpy( p_buffer, p_bit_stream->p_byte, i_available );
p_bit_stream->p_byte = p_bit_stream->p_end;
p_buffer += i_available;
i_buf_len -= i_available;
if( i_buf_len )
{
- pf_fast_memcpy( p_buffer, p_bit_stream->p_byte, i_buf_len );
+ p_main->fast_memcpy( p_buffer, p_bit_stream->p_byte, i_buf_len );
p_bit_stream->p_byte += i_buf_len;
}
}
* Declaration and extern access to global program object.
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
- * $Id: main.h,v 1.24 2001/12/06 10:53:42 massiot Exp $
+ * $Id: main.h,v 1.25 2001/12/07 18:33:07 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
*
boolean_t b_ac3;
int i_desync; /* relative desync of the audio ouput */
- /* memcpy plugin used */
+ /* Fast memcpy plugin used */
struct module_s * p_memcpy_module;
+ void * ( * fast_memcpy ) ( void *, const void *, size_t );
/* Unique threads */
p_intf_thread_t p_intf; /* main interface thread */
* modules.h : Module management functions.
*****************************************************************************
* Copyright (C) 2001 VideoLAN
- * $Id: modules.h,v 1.34 2001/12/07 16:47:47 jobi Exp $
+ * $Id: modules.h,v 1.35 2001/12/07 18:33:07 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
/* memcpy plugins */
struct
{
- void* ( * pf_fast_memcpy ) ( void *, const void *, size_t );
+ void* ( * fast_memcpy ) ( void *, const void *, size_t );
} memcpy;
} functions;
(p_symbols)->intf_PlaylistDestroy = intf_PlaylistDestroy; \
(p_symbols)->intf_PlaylistJumpto = intf_PlaylistJumpto; \
(p_symbols)->intf_UrlDecode = intf_UrlDecode; \
- (p_symbols)->pf_fast_memcpy = pf_fast_memcpy; \
(p_symbols)->msleep = msleep; \
(p_symbols)->mdate = mdate; \
(p_symbols)->network_ChannelCreate = network_ChannelCreate; \
# define intf_PlaylistJumpto(a,b) p_symbols->intf_PlaylistJumpto(a,b)
# define intf_UrlDecode(a) p_symbols->intf_UrlDecode(a)
-# define pf_fast_memcpy p_symbols->pf_fast_memcpy
-
# define msleep(a) p_symbols->msleep(a)
# define mdate() p_symbols->mdate()
* aout_alsa.c : Alsa functions library
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
- * $Id: aout_alsa.c,v 1.21 2001/12/03 16:18:37 sam Exp $
+ * $Id: aout_alsa.c,v 1.22 2001/12/07 18:33:07 sam Exp $
*
* Authors: Henri Fallon <henri@videolan.org> - Original Author
* Jeffrey Baker <jwbaker@acm.org> - Port to ALSA 1.0 API
#include <alsa/asoundlib.h>
-#include "config.h"
#include "common.h" /* boolean_t, byte_t */
#include "intf_msg.h" /* intf_DbgMsg(), intf_ErrMsg() */
#include "threads.h"
#include "audio_output.h" /* aout_thread_t */
-#include "main.h"
-
#include "modules.h"
#include "modules_export.h"
#include <artsc.h>
-#include "config.h"
#include "common.h" /* boolean_t, byte_t */
#include "intf_msg.h"
#include "threads.h"
#include "audio_output.h" /* aout_thread_t */
-#include "main.h"
-
#include "modules.h"
#include "modules_export.h"
* InterfaceWindow.cpp: beos interface
*****************************************************************************
* Copyright (C) 1999, 2000, 2001 VideoLAN
- * $Id: InterfaceWindow.cpp,v 1.9 2001/12/06 10:29:40 tcastley Exp $
+ * $Id: InterfaceWindow.cpp,v 1.10 2001/12/07 18:33:07 sam Exp $
*
* Authors: Jean-Marc Dressler <polux@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
/* VLC headers */
extern "C"
{
-#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
#include "mtime.h"
-#include "main.h"
#include "tests.h"
#include "stream_control.h"
#include "input_ext-intf.h"
* MediaControlView.cpp: beos interface
*****************************************************************************
* Copyright (C) 1999, 2000, 2001 VideoLAN
- * $Id: MediaControlView.cpp,v 1.5 2001/11/30 09:49:04 tcastley Exp $
+ * $Id: MediaControlView.cpp,v 1.6 2001/12/07 18:33:07 sam Exp $
*
* Authors: Tony Castley <tony@castley.net>
*
/* VLC headers */
extern "C"
{
-#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
#include "mtime.h"
-#include "main.h"
#include "tests.h"
#include "stream_control.h"
#include "input_ext-intf.h"
* PlayListWindow.cpp: beos interface
*****************************************************************************
* Copyright (C) 1999, 2000, 2001 VideoLAN
- * $Id: PlayListWindow.cpp,v 1.3 2001/11/30 09:49:04 tcastley Exp $
+ * $Id: PlayListWindow.cpp,v 1.4 2001/12/07 18:33:07 sam Exp $
*
* Authors: Jean-Marc Dressler <polux@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
/* VLC headers */
extern "C"
{
-#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
#include "mtime.h"
-#include "main.h"
#include "tests.h"
#include "stream_control.h"
#include "input_ext-intf.h"
* aout_beos.cpp: BeOS audio output
*****************************************************************************
* Copyright (C) 1999, 2000, 2001 VideoLAN
- * $Id: aout_beos.cpp,v 1.16 2001/11/28 15:08:05 massiot Exp $
+ * $Id: aout_beos.cpp,v 1.17 2001/12/07 18:33:07 sam Exp $
*
* Authors: Jean-Marc Dressler <polux@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
extern "C"
{
-#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
#include "audio_output.h"
-#include "main.h"
-
#include "modules.h"
#include "modules_export.h"
}
* intf_beos.cpp: beos interface
*****************************************************************************
* Copyright (C) 1999, 2000, 2001 VideoLAN
- * $Id: intf_beos.cpp,v 1.33 2001/11/28 15:08:05 massiot Exp $
+ * $Id: intf_beos.cpp,v 1.34 2001/12/07 18:33:07 sam Exp $
*
* Authors: Jean-Marc Dressler <polux@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
extern "C"
{
-#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
#include "stream_control.h"
#include "interface.h"
#include "input_ext-intf.h"
-#include "main.h"
#include "modules.h"
#include "modules_export.h"
}
* vout_beos.cpp: beos video output display method
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
- * $Id: vout_beos.cpp,v 1.34 2001/12/06 10:29:40 tcastley Exp $
+ * $Id: vout_beos.cpp,v 1.35 2001/12/07 18:33:07 sam Exp $
*
* Authors: Jean-Marc Dressler <polux@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
extern "C"
{
-#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
#include "interface.h"
-#include "main.h"
-
#include "modules.h"
#include "modules_export.h"
}
* aout_directx.c: Windows DirectX audio output method
*****************************************************************************
* Copyright (C) 2001 VideoLAN
- * $Id: aout_directx.c,v 1.12 2001/11/28 15:08:05 massiot Exp $
+ * $Id: aout_directx.c,v 1.13 2001/12/07 18:33:07 sam Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
#include <stdio.h> /* "intf_msg.h" */
#include <stdlib.h> /* calloc(), malloc(), free() */
-#include "config.h"
#include "common.h" /* boolean_t, byte_t */
#include "intf_msg.h" /* intf_DbgMsg(), intf_ErrMsg() */
#include "threads.h"
#include "audio_output.h" /* aout_thread_t */
-#include "main.h"
-
#include "modules.h"
#include "modules_export.h"
* vout_directx.c: Windows DirectX video output display method
*****************************************************************************
* Copyright (C) 2001 VideoLAN
- * $Id: vout_directx.c,v 1.14 2001/11/28 15:08:05 massiot Exp $
+ * $Id: vout_directx.c,v 1.15 2001/12/07 18:33:07 sam Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
# include <directx.h>
#endif
-#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
#include "video_output.h"
#include "interface.h"
-#include "main.h"
#include "modules.h"
#include "modules_export.h"
* vout_events.c: Windows DirectX video output events handler
*****************************************************************************
* Copyright (C) 2001 VideoLAN
- * $Id: vout_events.c,v 1.5 2001/11/28 15:08:05 massiot Exp $
+ * $Id: vout_events.c,v 1.6 2001/12/07 18:33:07 sam Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
#include <stdlib.h> /* free() */
#include <string.h> /* strerror() */
-#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
#endif
#include "interface.h"
-#include "main.h"
#include "modules.h"
#include "modules_export.h"
* aout_dsp.c : dsp functions library
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
- * $Id: aout_dsp.c,v 1.16 2001/11/28 15:08:05 massiot Exp $
+ * $Id: aout_dsp.c,v 1.17 2001/12/07 18:33:07 sam Exp $
*
* Authors: Michel Kaempf <maxx@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
SNDCTL_DSP_STEREO, SNDCTL_DSP_SPEED, SNDCTL_DSP_GETOSPACE */
#endif
-#include "config.h"
#include "common.h" /* boolean_t, byte_t */
#include "intf_msg.h" /* intf_DbgMsg(), intf_ErrMsg() */
#include "threads.h"
#include "audio_output.h" /* aout_thread_t */
-#include "main.h"
-
#include "modules.h"
#include "modules_export.h"
* aout_dummy.c : dummy audio output plugin
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
- * $Id: aout_dummy.c,v 1.15 2001/11/28 15:08:05 massiot Exp $
+ * $Id: aout_dummy.c,v 1.16 2001/12/07 18:33:07 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
#include <string.h>
-#include "config.h"
#include "common.h" /* boolean_t, byte_t */
#include "intf_msg.h"
#include "threads.h"
#include "audio_output.h" /* aout_thread_t */
-#include "main.h"
-
#include "modules.h"
#include "modules_export.h"
* input_dummy.c: dummy input plugin, to manage "vlc:***" special options
*****************************************************************************
* Copyright (C) 2001 VideoLAN
- * $Id: input_dummy.c,v 1.8 2001/11/28 15:08:05 massiot Exp $
+ * $Id: input_dummy.c,v 1.9 2001/12/07 18:33:07 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
# include <strings.h>
#endif
-#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
#include "interface.h"
#include "intf_playlist.h"
-#include "main.h"
-
#include "modules.h"
#include "modules_export.h"
* intf_dummy.c: dummy interface plugin
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
- * $Id: intf_dummy.c,v 1.11 2001/11/28 15:08:05 massiot Exp $
+ * $Id: intf_dummy.c,v 1.12 2001/12/07 18:33:07 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
#include <stdlib.h> /* malloc(), free() */
#include <string.h>
-#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
#include "interface.h"
#include "modules.h"
-
-#include "main.h"
#include "modules_export.h"
/*****************************************************************************
* found in .ifo.
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
- * $Id: dvd_summary.c,v 1.10 2001/11/28 15:08:05 massiot Exp $
+ * $Id: dvd_summary.c,v 1.11 2001/12/07 18:33:07 sam Exp $
*
* Author: Stéphane Borel <stef@via.ecp.fr>
*
# include <videolan/dvdcss.h>
#endif
-#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
#include "iso_lang.h"
#include "tests.h"
-#include "main.h"
-
#include "input_dvd.h"
#include "dvd_ifo.h"
* -dvd_udf to find files
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
- * $Id: input_dvd.c,v 1.104 2001/12/07 16:47:47 jobi Exp $
+ * $Id: input_dvd.c,v 1.105 2001/12/07 18:33:07 sam Exp $
*
* Author: Stéphane Borel <stef@via.ecp.fr>
*
# include <videolan/dvdcss.h>
#endif
-#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
# include "input_iovec.h"
#endif
-#include "main.h"
-
#include "modules.h"
#include "modules_export.h"
* It depends on: libdvdread for ifo files and block reading.
*****************************************************************************
* Copyright (C) 2001 VideoLAN
- * $Id: input_dvdread.c,v 1.2 2001/11/28 15:08:05 massiot Exp $
+ * $Id: input_dvdread.c,v 1.3 2001/12/07 18:33:07 sam Exp $
*
* Author: Stéphane Borel <stef@via.ecp.fr>
*
#endif
-#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
# include "input_iovec.h"
#endif
-#include "main.h"
-
#include "stream_control.h"
#include "input_ext-intf.h"
#include "input_ext-dec.h"
* aout_esd.c : Esound functions library
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
- * $Id: aout_esd.c,v 1.15 2001/11/28 15:08:05 massiot Exp $
+ * $Id: aout_esd.c,v 1.16 2001/12/07 18:33:07 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
#include <esd.h>
-#include "config.h"
#include "common.h" /* boolean_t, byte_t */
#include "intf_msg.h" /* intf_DbgMsg(), intf_ErrMsg() */
#include "threads.h"
#include "audio_output.h" /* aout_thread_t */
-#include "main.h"
-
#include "modules.h"
#include "modules_export.h"
* vout_fb.c: framebuffer video output display method
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
- * $Id: vout_fb.c,v 1.14 2001/11/28 15:08:05 massiot Exp $
+ * $Id: vout_fb.c,v 1.15 2001/12/07 18:33:07 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
#include <linux/vt.h> /* VT_* */
#include <linux/kd.h> /* KD* */
-#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
#include "video.h"
#include "video_output.h"
-#include "main.h"
-
#include "modules_export.h"
/*****************************************************************************
* vout_ggi.c: GGI video output display method
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
- * $Id: vout_ggi.c,v 1.12 2001/11/28 15:08:05 massiot Exp $
+ * $Id: vout_ggi.c,v 1.13 2001/12/07 18:33:07 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
#include <ggi/ggi.h>
-#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
#include "intf_msg.h"
#include "interface.h"
-#include "main.h"
-
#include "modules_export.h"
/*****************************************************************************
* vout_glide.c: 3dfx video output display method for 3dfx cards
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
- * $Id: vout_glide.c,v 1.8 2001/11/28 15:08:05 massiot Exp $
+ * $Id: vout_glide.c,v 1.9 2001/12/07 18:33:07 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
#include <glide.h>
#include <linutil.h> /* Glide kbhit() and getch() */
-#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
#include "interface.h"
-#include "main.h"
-
#include "modules.h"
#include "modules_export.h"
* gtk_callbacks.c : Callbacks for the Gtk+ plugin.
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
- * $Id: gtk_callbacks.c,v 1.27 2001/11/28 15:08:05 massiot Exp $
+ * $Id: gtk_callbacks.c,v 1.28 2001/12/07 18:33:07 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Stéphane Borel <stef@via.ecp.fr>
#include <string.h>
-#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
#include "gtk_support.h"
#include "intf_gtk.h"
-#include "main.h"
#include "netutils.h"
#include "modules_export.h"
* gtk_control.c : functions to handle stream control buttons.
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
- * $Id: gtk_control.c,v 1.6 2001/11/28 15:08:05 massiot Exp $
+ * $Id: gtk_control.c,v 1.7 2001/12/07 18:33:07 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Stéphane Borel <stef@via.ecp.fr>
#include <string.h>
-#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
#include "gtk_playlist.h"
#include "intf_gtk.h"
-#include "main.h"
-
#include "modules_export.h"
/****************************************************************************
* gtk_display.c: Gtk+ tools for main interface
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
- * $Id: gtk_display.c,v 1.8 2001/11/28 15:08:05 massiot Exp $
+ * $Id: gtk_display.c,v 1.9 2001/12/07 18:33:07 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Stéphane Borel <stef@via.ecp.fr>
#undef gtk
#undef gnome
-#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
#include "gtk_display.h"
#include "intf_gtk.h"
-#include "main.h"
-
#include "modules_export.h"
/*****************************************************************************
* gtk_menu.c : functions to handle menu items.
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
- * $Id: gtk_menu.c,v 1.15 2001/11/28 15:08:05 massiot Exp $
+ * $Id: gtk_menu.c,v 1.16 2001/12/07 18:33:07 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Stéphane Borel <stef@via.ecp.fr>
#include <string.h>
-#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
#include "gtk_playlist.h"
#include "intf_gtk.h"
-#include "main.h"
-
#include "modules_export.h"
/*
* gtk_modules.c : functions to build modules configuration boxes.
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
- * $Id: gtk_modules.c,v 1.5 2001/11/28 15:08:05 massiot Exp $
+ * $Id: gtk_modules.c,v 1.6 2001/12/07 18:33:07 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Stéphane Borel <stef@via.ecp.fr>
#include <string.h>
-#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
#include "gtk_playlist.h"
#include "intf_gtk.h"
-#include "main.h"
-
gboolean GtkModulesShow( GtkWidget *widget,
GdkEventButton *event,
gpointer user_data )
* gtk_open.c : functions to handle file/disc/network open widgets.
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
- * $Id: gtk_open.c,v 1.10 2001/12/03 16:18:37 sam Exp $
+ * $Id: gtk_open.c,v 1.11 2001/12/07 18:33:07 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Stéphane Borel <stef@via.ecp.fr>
#include <string.h>
-#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
#include "gtk_playlist.h"
#include "intf_gtk.h"
-#include "main.h"
#include "netutils.h"
#include "modules_export.h"
* gtk_playlist.c : Interface for the playlist dialog
*****************************************************************************
* Copyright (C) 2001 VideoLAN
- * $Id: gtk_playlist.c,v 1.21 2001/11/28 15:08:05 massiot Exp $
+ * $Id: gtk_playlist.c,v 1.22 2001/12/07 18:33:07 sam Exp $
*
* Authors: Pierre Baillet <oct@zoy.org>
* Stéphane Borel <stef@via.ecp.fr>
#undef gtk
#undef gnome
-#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
#include "gtk_playlist.h"
#include "intf_gtk.h"
-#include "main.h"
-
#include "modules_export.h"
/****************************************************************************
* gtk_control.c : functions to handle stream control buttons.
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
- * $Id: gtk_preferences.c,v 1.7 2001/11/28 15:08:05 massiot Exp $
+ * $Id: gtk_preferences.c,v 1.8 2001/12/07 18:33:07 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Stéphane Borel <stef@via.ecp.fr>
#include <string.h>
-#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
#include "gtk_playlist.h"
#include "intf_gtk.h"
-#include "main.h"
-
#include "modules_export.h"
/****************************************************************************
* intf_gnome.c: Gnome interface
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
- * $Id: intf_gnome.c,v 1.6 2001/11/28 15:08:05 massiot Exp $
+ * $Id: intf_gnome.c,v 1.7 2001/12/07 18:33:07 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Stéphane Borel <stef@via.ecp.fr>
#include <gnome.h>
-#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
#include "gtk_display.h"
#include "intf_gtk.h"
-#include "main.h"
-
#include "modules.h"
#include "modules_export.h"
* intf_gtk.c: Gtk+ interface
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
- * $Id: intf_gtk.c,v 1.28 2001/11/28 15:08:05 massiot Exp $
+ * $Id: intf_gtk.c,v 1.29 2001/12/07 18:33:07 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Stéphane Borel <stef@via.ecp.fr>
#include <gtk/gtk.h>
-#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
#include "gtk_display.h"
#include "intf_gtk.h"
-#include "main.h"
-
#include "modules.h"
#include "modules_export.h"
#include <string.h>
#include <stdio.h>
-#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
#include "intf_playlist.h"
#include "interface.h"
-#include "main.h"
-
#include "modules.h"
#include "modules_export.h"
}
* aout_darwin.c : Darwin audio output plugin
*****************************************************************************
* Copyright (C) 2001 VideoLAN
- * $Id: aout_macosx.c,v 1.7 2001/11/29 10:20:56 massiot Exp $
+ * $Id: aout_macosx.c,v 1.8 2001/12/07 18:33:07 sam Exp $
*
* Authors: Colin Delacroix <colin@zoy.org>
*
#include <string.h>
-#include "config.h"
#include "common.h" /* boolean_t, byte_t */
#include "intf_msg.h" /* intf_DbgMsg(), intf_ErrMsg() */
#include "threads.h"
#include "audio_output.h" /* aout_thread_t */
-#include "main.h"
-
#include "modules.h"
#include <Carbon/Carbon.h>
* intf_vlc_wrapper.c : MacOS X plugin for vlc
*****************************************************************************
* Copyright (C) 2001 VideoLAN
- * $Id: intf_vlc_wrapper.c,v 1.4 2001/11/29 10:20:56 massiot Exp $
+ * $Id: intf_vlc_wrapper.c,v 1.5 2001/12/07 18:33:07 sam Exp $
*
* Authors: Florian G. Pflug <fgp@phlo.org>
*
#include <sys/param.h> /* for MAXPATHLEN */
#include <string.h>
-#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
#include "interface.h"
#include "intf_playlist.h"
-#include "main.h"
-
#include "modules.h"
#include "modules_export.h"
#include <stdlib.h> /* free() */
#include <string.h> /* strerror() */
-#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
#include "video_output.h"
#include "modules.h"
-#include "main.h"
#include "macosx.h"
* memcpy.c : classic memcpy module
*****************************************************************************
* Copyright (C) 2001 VideoLAN
- * $Id: memcpy.c,v 1.1 2001/12/03 16:18:37 sam Exp $
+ * $Id: memcpy.c,v 1.2 2001/12/07 18:33:07 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
#include <stdlib.h>
#include <string.h>
-#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
{
p_function_list->pf_probe = memcpy_Probe;
#define F p_function_list->functions.memcpy
- F.pf_fast_memcpy = memcpy;
+ F.fast_memcpy = memcpy;
#undef F
}
* memcpy3dn.c : 3D Now! memcpy module
*****************************************************************************
* Copyright (C) 2001 VideoLAN
- * $Id: memcpy3dn.c,v 1.1 2001/12/03 16:18:37 sam Exp $
+ * $Id: memcpy3dn.c,v 1.2 2001/12/07 18:33:07 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
#include <stdlib.h>
#include <string.h>
-#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
{
p_function_list->pf_probe = memcpy_Probe;
#define F p_function_list->functions.memcpy
- F.pf_fast_memcpy = _M( fast_memcpy );
+ F.fast_memcpy = _M( fast_memcpy );
#undef F
}
* memcpymmx.c : MMX memcpy module
*****************************************************************************
* Copyright (C) 2001 VideoLAN
- * $Id: memcpymmx.c,v 1.1 2001/12/03 16:18:37 sam Exp $
+ * $Id: memcpymmx.c,v 1.2 2001/12/07 18:33:07 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
#include <stdlib.h>
#include <string.h>
-#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
{
p_function_list->pf_probe = memcpy_Probe;
#define F p_function_list->functions.memcpy
- F.pf_fast_memcpy = _M( fast_memcpy );
+ F.fast_memcpy = _M( fast_memcpy );
#undef F
}
* memcpymmxext.c : MMX EXT memcpy module
*****************************************************************************
* Copyright (C) 2001 VideoLAN
- * $Id: memcpymmxext.c,v 1.1 2001/12/03 16:18:37 sam Exp $
+ * $Id: memcpymmxext.c,v 1.2 2001/12/07 18:33:07 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
#include <stdlib.h>
#include <string.h>
-#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
{
p_function_list->pf_probe = memcpy_Probe;
#define F p_function_list->functions.memcpy
- F.pf_fast_memcpy = _M( fast_memcpy );
+ F.fast_memcpy = _M( fast_memcpy );
#undef F
}
* input_es.c: Elementary Stream demux and packet management
*****************************************************************************
* Copyright (C) 2001 VideoLAN
- * $Id: input_es.c,v 1.15 2001/12/07 16:47:47 jobi Exp $
+ * $Id: input_es.c,v 1.16 2001/12/07 18:33:07 sam Exp $
*
* Author: Christophe Massiot <massiot@via.ecp.fr>
*
# include <sys/uio.h> /* struct iovec */
#endif
-#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
# include "input_iovec.h"
#endif
-#include "main.h"
-
#include "modules.h"
#include "modules_export.h"
* input_ps.c: PS demux and packet management
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
- * $Id: input_ps.c,v 1.43 2001/12/07 16:47:47 jobi Exp $
+ * $Id: input_ps.c,v 1.44 2001/12/07 18:33:07 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Cyril Deguet <asmax@via.ecp.fr>
#include <fcntl.h>
-#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
#include "mtime.h"
#include "tests.h"
-#include "main.h"
-
#include "modules.h"
#include "modules_export.h"
* input_ts.c: TS demux and netlist management
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
- * $Id: input_ts.c,v 1.41 2001/12/07 16:47:47 jobi Exp $
+ * $Id: input_ts.c,v 1.42 2001/12/07 18:33:07 sam Exp $
*
* Authors: Henri Fallon <henri@videolan.org>
*
# include <sys/uio.h> /* struct iovec */
#endif
-#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
input.pf_end = TSEnd;
input.pf_init_bit_stream = InitBitstream;
input.pf_set_area = NULL;
- input.pf_set_area = input_SetProgram;
+ input.pf_set_program = input_SetProgram;
input.pf_read = TSRead;
input.pf_demux = input_DemuxTS;
input.pf_new_packet = input_NetlistNewPacket;
* input_ts.h: structures of the input not exported to other modules
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
- * $Id: input_ts.h,v 1.11 2001/12/03 16:18:37 sam Exp $
+ * $Id: input_ts.h,v 1.12 2001/12/07 18:33:07 sam Exp $
*
* Authors: Henri Fallon <henri@via.ecp.fr>
* Boris Dorès <babal@via.ecp.fr>
i_bytes = p_sys->i_length - p_sys->i_offset;
}
- pf_fast_memcpy( p_base, p_sys->p_buffer + p_sys->i_offset, i_bytes );
+ fast_memcpy( p_base, p_sys->p_buffer + p_sys->i_offset, i_bytes );
p_sys->i_offset += i_bytes;
return i_bytes;
* video_parser.c : video parser thread
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
- * $Id: video_parser.c,v 1.5 2001/12/03 16:18:37 sam Exp $
+ * $Id: video_parser.c,v 1.6 2001/12/07 18:33:08 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Samuel Hocevar <sam@via.ecp.fr>
# include <sys/times.h>
#endif
-#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
#include "mtime.h"
#include "modules.h"
-#include "main.h"
-
#include "video.h"
#include "video_output.h"
* vpar_synchro.c : frame dropping routines
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
- * $Id: vpar_synchro.c,v 1.2 2001/11/28 15:08:05 massiot Exp $
+ * $Id: vpar_synchro.c,v 1.3 2001/12/07 18:33:08 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Samuel Hocevar <sam@via.ecp.fr>
#include <string.h> /* memcpy(), memset() */
-#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
#include "mtime.h"
-#include "main.h"
-
#include "video.h"
#include "video_output.h"
#include <sys/asoundlib.h>
-#include "config.h"
#include "common.h" /* boolean_t, byte_t */
#include "intf_msg.h" /* intf_DbgMsg(), intf_ErrMsg() */
#include "threads.h"
#include "audio_output.h" /* aout_thread_t */
-#include "main.h"
-
#include "modules.h"
#include "modules_export.h"
#include <photon/PtLabel.h>
#include <photon/PdDirect.h>
-#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
#include "video_output.h"
#include "interface.h"
-#include "main.h"
#include "modules.h"
#include "modules_export.h"
* intf_qt.cpp: Qt interface
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
- * $Id: intf_qt.cpp,v 1.8 2001/11/28 15:08:05 massiot Exp $
+ * $Id: intf_qt.cpp,v 1.9 2001/12/07 18:33:08 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
#include <string.h> /* strerror() */
#include <stdio.h>
-#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
#include "intf_playlist.h"
#include "interface.h"
-#include "main.h"
-
#include "modules.h"
#include "modules_export.h"
* aout_sdl.c : audio sdl functions library
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
- * $Id: aout_sdl.c,v 1.19 2001/11/28 15:08:05 massiot Exp $
+ * $Id: aout_sdl.c,v 1.20 2001/12/07 18:33:08 sam Exp $
*
* Authors: Michel Kaempf <maxx@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
#include SDL_INCLUDE_FILE
-#include "config.h"
#include "common.h" /* boolean_t, byte_t */
#include "intf_msg.h" /* intf_DbgMsg(), intf_ErrMsg() */
#include "threads.h"
#include "audio_output.h" /* aout_thread_t */
-#include "main.h"
-
#include "modules.h"
#include "modules_export.h"
* vout_sdl.c: SDL video output display method
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
- * $Id: vout_sdl.c,v 1.66 2001/12/03 16:18:37 sam Exp $
+ * $Id: vout_sdl.c,v 1.67 2001/12/07 18:33:08 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Pierre Baillet <oct@zoy.org>
#include SDL_INCLUDE_FILE
-#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
#include "interface.h"
/* FIXME: get rid of this */
#include "keystrokes.h"
-#include "main.h"
#include "netutils.h"
#include "modules.h"
SDL_LockYUVOverlay( p_vout->p_sys->p_overlay );
/* copy the data into video buffers */
/* Y first */
- pf_fast_memcpy( p_vout->p_sys->p_overlay->pixels[0],
- p_vout->p_rendered_pic->p_y,
- p_vout->p_sys->p_overlay->h *
- p_vout->p_sys->p_overlay->pitches[0] );
+ p_main->fast_memcpy( p_vout->p_sys->p_overlay->pixels[0],
+ p_vout->p_rendered_pic->p_y,
+ p_vout->p_sys->p_overlay->h *
+ p_vout->p_sys->p_overlay->pitches[0] );
/* then V */
- pf_fast_memcpy( p_vout->p_sys->p_overlay->pixels[1],
- p_vout->p_rendered_pic->p_v,
- p_vout->p_sys->p_overlay->h *
- p_vout->p_sys->p_overlay->pitches[1] / 2 );
+ p_main->fast_memcpy( p_vout->p_sys->p_overlay->pixels[1],
+ p_vout->p_rendered_pic->p_v,
+ p_vout->p_sys->p_overlay->h *
+ p_vout->p_sys->p_overlay->pitches[1] / 2 );
/* and U */
- pf_fast_memcpy( p_vout->p_sys->p_overlay->pixels[2],
- p_vout->p_rendered_pic->p_u,
- p_vout->p_sys->p_overlay->h *
- p_vout->p_sys->p_overlay->pitches[2] / 2 );
+ p_main->fast_memcpy( p_vout->p_sys->p_overlay->pixels[2],
+ p_vout->p_rendered_pic->p_u,
+ p_vout->p_sys->p_overlay->h *
+ p_vout->p_sys->p_overlay->pitches[2] / 2 );
OutputCoords( p_vout->p_rendered_pic, 1,
p_vout->p_sys->i_width,
* intf_ncurses.c: ncurses interface
*****************************************************************************
* Copyright (C) 2001 VideoLAN
- * $Id: intf_ncurses.c,v 1.6 2001/11/28 15:08:06 massiot Exp $
+ * $Id: intf_ncurses.c,v 1.7 2001/12/07 18:33:08 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
#include <curses.h>
-#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
#include "interface.h"
#include "modules.h"
-#include "main.h"
-
#include "modules_export.h"
/*****************************************************************************
# include <sys/uio.h> /* struct iovec */
#endif
-
-#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
# include "input_iovec.h"
#endif
-#include "main.h"
-
#include "stream_control.h"
#include "input_ext-intf.h"
#include "input_ext-dec.h"
if( U32_AT(p_buffer) != 0x1B9 )
{
- pf_fast_memcpy( p_data->p_buffer, p_buffer + i_index,
- 6 + i_packet_size );
+ p_main->fast_memcpy( p_data->p_buffer, p_buffer + i_index,
+ 6 + i_packet_size );
i_index += ( 6 + i_packet_size );
}
#include <sys/ioctl.h>
-#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
# include "input_iovec.h"
#endif
-#include "main.h"
-
#include "stream_control.h"
#include "input_ext-intf.h"
#include "input_ext-dec.h"
* vout_x11.c: X11 video output display method
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
- * $Id: vout_x11.c,v 1.32 2001/11/28 15:08:06 massiot Exp $
+ * $Id: vout_x11.c,v 1.33 2001/12/07 18:33:08 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
#include <X11/keysym.h>
#include <X11/extensions/XShm.h>
-#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
#include "netutils.h" /* network_ChannelJoin */
-#include "main.h"
-
#include "modules.h"
#include "modules_export.h"
* vout_xvideo.c: Xvideo video output display method
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
- * $Id: vout_xvideo.c,v 1.35 2001/12/06 10:53:42 massiot Exp $
+ * $Id: vout_xvideo.c,v 1.36 2001/12/07 18:33:08 sam Exp $
*
* Authors: Shane Harper <shanegh@optusnet.com.au>
* Vincent Seguin <seguin@via.ecp.fr>
#include <X11/extensions/Xvlib.h>
#include <X11/extensions/dpms.h>
-#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
#include "netutils.h" /* network_ChannelJoin */
-#include "main.h"
-
#include "stream_control.h" /* needed by input_ext-intf.h... */
#include "input_ext-intf.h"
break;
case YUV_420_PICTURE:
- pf_fast_memcpy( p_vout->p_sys->p_xvimage->data,
- p_vout->p_rendered_pic->p_y, i_size );
- pf_fast_memcpy( p_vout->p_sys->p_xvimage->data + ( i_size ),
- p_vout->p_rendered_pic->p_v, i_size / 4 );
- pf_fast_memcpy( p_vout->p_sys->p_xvimage->data + ( i_size ) + ( i_size / 4 ),
- p_vout->p_rendered_pic->p_u, i_size / 4 );
+ p_main->fast_memcpy( p_vout->p_sys->p_xvimage->data,
+ p_vout->p_rendered_pic->p_y, i_size );
+ p_main->fast_memcpy( p_vout->p_sys->p_xvimage->data + ( i_size ),
+ p_vout->p_rendered_pic->p_v, i_size / 4 );
+ p_main->fast_memcpy( p_vout->p_sys->p_xvimage->data
+ + ( i_size ) + ( i_size / 4 ),
+ p_vout->p_rendered_pic->p_u, i_size / 4 );
break;
}
* aout_ext-dec.c : exported fifo management functions
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
- * $Id: aout_ext-dec.c,v 1.6 2001/11/28 15:08:06 massiot Exp $
+ * $Id: aout_ext-dec.c,v 1.7 2001/12/07 18:33:08 sam Exp $
*
* Authors: Michel Kaempf <maxx@via.ecp.fr>
*
#include <stdlib.h> /* calloc(), malloc(), free() */
#include <string.h>
-#include "config.h"
#include "common.h"
#include "intf_msg.h" /* intf_DbgMsg(), intf_ErrMsg() */
#include "threads.h"
#include "audio_output.h"
#include "aout_common.h"
-#include "main.h"
-
/*****************************************************************************
* aout_CreateFifo
*****************************************************************************/
#include <stdlib.h> /* calloc(), malloc(), free() */
#include <string.h>
-#include "config.h"
#include "common.h"
#include "intf_msg.h" /* intf_DbgMsg(), intf_ErrMsg() */
#include "threads.h"
#include "audio_output.h"
#include "aout_common.h"
-#include "main.h"
-
/*****************************************************************************
* Local prototypes
*****************************************************************************/
* aout_u8.c: 8 bit unsigned audio output functions
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
- * $Id: aout_u8.c,v 1.8 2001/12/06 10:53:42 massiot Exp $
+ * $Id: aout_u8.c,v 1.9 2001/12/07 18:33:08 sam Exp $
*
* Authors: Michel Kaempf <maxx@via.ecp.fr>
*
#include <stdlib.h> /* calloc(), malloc(), free() */
#include <string.h>
-#include "config.h"
#include "common.h"
#include "intf_msg.h" /* intf_DbgMsg(), intf_ErrMsg() */
#include "threads.h"
#include "audio_output.h"
#include "aout_common.h"
-#include "main.h"
-
/*****************************************************************************
* Local prototypes
*****************************************************************************/
* audio_output.c : audio output thread
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
- * $Id: audio_output.c,v 1.67 2001/12/06 10:53:42 massiot Exp $
+ * $Id: audio_output.c,v 1.68 2001/12/07 18:33:08 sam Exp $
*
* Authors: Michel Kaempf <maxx@via.ecp.fr>
*
#include <stdlib.h> /* calloc(), malloc(), free() */
#include <string.h>
-#include "config.h"
#include "common.h"
#include "intf_msg.h" /* intf_DbgMsg(), intf_ErrMsg() */
#include "threads.h"
#include "audio_output.h"
#include "aout_common.h"
-#include "main.h"
-
/*****************************************************************************
* Local prototypes
*****************************************************************************/
* decoders.
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
- * $Id: input.c,v 1.162 2001/12/07 16:47:47 jobi Exp $
+ * $Id: input.c,v 1.163 2001/12/07 18:33:08 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
# include <sys/times.h>
#endif
-#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
#include "interface.h"
-#include "main.h"
-
/*****************************************************************************
* Local prototypes
*****************************************************************************/
* input_clock.c: Clock/System date convertions, stream management
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
- * $Id: input_clock.c,v 1.26 2001/12/06 10:53:42 massiot Exp $
+ * $Id: input_clock.c,v 1.27 2001/12/07 18:33:08 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
#include <string.h> /* memcpy(), memset() */
#include <sys/types.h> /* off_t */
-#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
#include "input_ext-dec.h"
#include "input_ext-plugins.h"
-#include "main.h"
-
/*
* DISCUSSION : SYNCHRONIZATION METHOD
*
* input_programs.c: es_descriptor_t, pgrm_descriptor_t management
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
- * $Id: input_programs.c,v 1.68 2001/12/07 16:47:47 jobi Exp $
+ * $Id: input_programs.c,v 1.69 2001/12/07 18:33:08 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
#include <string.h> /* memcpy(), memset() */
#include <sys/types.h> /* off_t */
-#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
#include "input_ext-dec.h"
#include "input_ext-plugins.h"
-#include "main.h" /* --noaudio --novideo */
-
/*
* NOTICE : all of these functions expect you to have taken the lock on
* p_input->stream.lock
* mpeg_system.c: TS, PS and PES management
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
- * $Id: mpeg_system.c,v 1.68 2001/12/05 03:31:04 jobi Exp $
+ * $Id: mpeg_system.c,v 1.69 2001/12/07 18:33:08 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Michel Lespinasse <walken@via.ecp.fr>
#include <string.h> /* memcpy(), memset() */
#include <sys/types.h> /* off_t */
-#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
#include "input_ext-dec.h"
#include "input_ext-plugins.h"
-#include "main.h" /* AC3/MPEG channel, SPU channel, b_stat */
-
/*****************************************************************************
* Local prototypes
*****************************************************************************/
* interface, such as command line.
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
- * $Id: interface.c,v 1.81 2001/11/28 15:08:06 massiot Exp $
+ * $Id: interface.c,v 1.82 2001/12/07 18:33:08 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
*
#include <string.h> /* strerror() */
#include <sys/types.h> /* off_t */
-#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
#include "video.h"
#include "video_output.h"
-#include "main.h"
-
/*****************************************************************************
* Local prototypes
*****************************************************************************/
* intf_channels.c: channel handling functions
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
- * $Id: intf_channels.c,v 1.4 2001/11/28 15:08:06 massiot Exp $
+ * $Id: intf_channels.c,v 1.5 2001/12/07 18:33:08 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
*
#include <stdio.h> /* FILE */
#include <string.h> /* strerror() */
-#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
#include "intf_channels.h"
#include "interface.h"
-#include "main.h"
-
/*****************************************************************************
* Local prototypes
*****************************************************************************/
* interface, such as message output. See config.h for output configuration.
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
- * $Id: intf_msg.c,v 1.39 2001/11/28 15:08:06 massiot Exp $
+ * $Id: intf_msg.c,v 1.40 2001/12/07 18:33:08 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
*
#include <unistd.h> /* close(), write() */
#endif
-#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
#include "interface.h"
-#include "main.h"
-
/*****************************************************************************
* intf_msg_item_t
*****************************************************************************
* intf_playlist.c : Playlist management functions
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
- * $Id: intf_playlist.c,v 1.10 2001/11/28 15:08:06 massiot Exp $
+ * $Id: intf_playlist.c,v 1.11 2001/12/07 18:33:08 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
#include <string.h> /* strerror() */
#include <errno.h> /* ENOMEM */
-#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
#include "intf_playlist.h"
-#include "main.h"
-
/*****************************************************************************
* Local prototypes
*****************************************************************************/
* and spawn threads.
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
- * $Id: main.c,v 1.131 2001/12/06 10:53:42 massiot Exp $
+ * $Id: main.c,v 1.132 2001/12/07 18:33:08 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
#include <fcntl.h> /* open(), O_WRONLY */
#include <sys/stat.h> /* S_IREAD */
-#include "config.h"
#include "common.h"
#include "debug.h"
#include "intf_msg.h"
#include "netutils.h" /* network_ChannelJoin */
-#include "main.h"
-
/*****************************************************************************
* Command line options constants. If something is changed here, be sure that
* GetConfiguration and Usage are also changed.
module_bank_t *p_module_bank;
aout_bank_t *p_aout_bank;
vout_bank_t *p_vout_bank;
-void* ( *pf_fast_memcpy ) ( void *, const void *, size_t );
/*****************************************************************************
* Local prototypes
{
intf_ErrMsg( "intf error: no suitable memcpy module, "
"using libc default" );
- pf_fast_memcpy = memcpy;
+ p_main->fast_memcpy = memcpy;
}
else
{
#define f p_main->p_memcpy_module->p_functions->memcpy.functions.memcpy
- pf_fast_memcpy = f.pf_fast_memcpy;
+ p_main->fast_memcpy = f.fast_memcpy;
#undef f
}
* modules.c : Built-in and plugin modules management functions
*****************************************************************************
* Copyright (C) 2001 VideoLAN
- * $Id: modules.c,v 1.43 2001/11/28 15:08:06 massiot Exp $
+ * $Id: modules.c,v 1.44 2001/12/07 18:33:08 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Ethan C. Baldridge <BaldridgeE@cadmus.com>
*****************************************************************************/
#include "defs.h"
-#include "config.h"
-
/* Some faulty libcs have a broken struct dirent when _FILE_OFFSET_BITS
* is set to 64. Don't try to be cleverer. */
#ifdef _FILE_OFFSET_BITS
#include "modules_builtin.h"
#include "modules_export.h"
-#include "main.h"
-
/*****************************************************************************
* Local prototypes
*****************************************************************************/
* netutils.c: various network functions
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
- * $Id: netutils.c,v 1.52 2001/11/28 15:08:06 massiot Exp $
+ * $Id: netutils.c,v 1.53 2001/12/07 18:33:08 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Benoit Steiner <benny@via.ecp.fr>
#include <sys/sockio.h>
#endif
-#include "config.h"
#include "common.h"
#include "mtime.h"
#include "intf_msg.h"
#include "threads.h"
-#include "main.h"
#include "intf_playlist.h"
* Functions are prototyped in tests.h.
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
- * $Id: tests.c,v 1.8 2001/11/28 15:08:06 massiot Exp $
+ * $Id: tests.c,v 1.9 2001/12/07 18:33:08 sam Exp $
*
* Authors: Samuel Hocevar <sam@via.ecp.fr>
*
#include <string.h> /* memcpy(), memset() */
-#include "config.h"
#include "common.h"
-
#include "intf_msg.h"
#include "tests.h"
-#include "main.h"
-
/*****************************************************************************
* TestProgram: tests if the given string equals the program name
*****************************************************************************/
* thread, and destroy a previously oppened video output thread.
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
- * $Id: video_output.c,v 1.144 2001/11/28 15:08:06 massiot Exp $
+ * $Id: video_output.c,v 1.145 2001/12/07 18:33:08 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
*
# include <sys/times.h>
#endif
-#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
#include "video_spu.h"
#include "video_yuv.h"
-#include "main.h"
-
/*****************************************************************************
* Local prototypes
*****************************************************************************/