videolan/vlc
1
Fork 0
mirror of https://code.videolan.org/videolan/vlc synced 2024-09-04 09:11:33 +02:00
Code Releases Activity

* Fixed a total breakage of decoder plugins introduced by fast_memcpy.

Browse Source 
* Got rid of #include "main.h", included it in common.h instead ; got
    rid of #include "config.h" in most files as well.
This commit is contained in:
Sam Hocevar 2001-12-07 18:33:08 +00:00
parent 7917d2ef3f
commit 1b8d106c72
79 changed files with 120 additions and 312 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
include/common.h
View File

@ -3,7 +3,7 @@
* 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>
@ -24,16 +24,16 @@
*****************************************************************************/
/*****************************************************************************
* 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 */
@ -237,9 +237,6 @@ struct decoder_fifo_s;
#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"
@ -284,8 +281,6 @@ typedef struct module_symbols_s
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 );
@ -401,3 +396,10 @@ typedef struct module_symbols_s
#ifdef PLUGIN
extern module_symbols_t* p_symbols;
#endif
/*****************************************************************************
* Global headers
*****************************************************************************/
#include "main.h"

5
include/config.h.in
View File

@ -36,6 +36,10 @@
*
*/
#ifdef HAVE_CONFIG_H
#else
#define HAVE_CONFIG_H
/*****************************************************************************
* Program information
*****************************************************************************/
@ -514,3 +518,4 @@
#define PLAYLIST_LOOP_VAR "vlc_playlist_loop"
#define PLAYLIST_LOOP_DEFAULT 0
#endif

8
include/input_ext-dec.h
View File

@ -2,7 +2,7 @@
* 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>
@ -479,14 +479,14 @@ static __inline__ void GetChunk( bit_stream_t * p_bit_stream,
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;
@ -497,7 +497,7 @@ static __inline__ void GetChunk( bit_stream_t * p_bit_stream,
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;
}
}

5
include/main.h
View File

@ -3,7 +3,7 @@
* 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>
*
@ -51,8 +51,9 @@ typedef struct main_s
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 */

4
include/modules.h
View File

@ -2,7 +2,7 @@
* 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>
*
@ -228,7 +228,7 @@ typedef struct function_list_s
/* memcpy plugins */
struct
{
void* ( * pf_fast_memcpy ) ( void *, const void *, size_t );
void* ( * fast_memcpy ) ( void *, const void *, size_t );
} memcpy;
} functions;

3
include/modules_export.h
View File

@ -45,7 +45,6 @@
(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; \
@ -150,8 +149,6 @@
# 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()

5
plugins/alsa/aout_alsa.c
View File

@ -2,7 +2,7 @@
* 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
@ -38,7 +38,6 @@
#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"
@ -47,8 +46,6 @@
#include "audio_output.h" /* aout_thread_t */
#include "main.h"
#include "modules.h"
#include "modules_export.h"

3
plugins/arts/aout_arts.c
View File

@ -38,7 +38,6 @@
#include <artsc.h>
#include "config.h"
#include "common.h" /* boolean_t, byte_t */
#include "intf_msg.h"
#include "threads.h"
@ -47,8 +46,6 @@
#include "audio_output.h" /* aout_thread_t */
#include "main.h"
#include "modules.h"
#include "modules_export.h"

4
plugins/beos/InterfaceWindow.cpp
View File

@ -2,7 +2,7 @@
* 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>
@ -40,12 +40,10 @@
/* 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"

4
plugins/beos/MediaControlView.cpp
View File

@ -2,7 +2,7 @@
* 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>
*
@ -31,12 +31,10 @@
/* 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"

4
plugins/beos/PlayListWindow.cpp
View File

@ -2,7 +2,7 @@
* 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>
@ -33,12 +33,10 @@
/* 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"

5
plugins/beos/aout_beos.cpp
View File

@ -2,7 +2,7 @@
* 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>
@ -44,7 +44,6 @@
extern "C"
{
#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
@ -52,8 +51,6 @@ extern "C"
#include "audio_output.h"
#include "main.h"
#include "modules.h"
#include "modules_export.h"
}

4
plugins/beos/intf_beos.cpp
View File

@ -2,7 +2,7 @@
* 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>
@ -39,7 +39,6 @@
extern "C"
{
#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
@ -48,7 +47,6 @@ extern "C"
#include "stream_control.h"
#include "interface.h"
#include "input_ext-intf.h"
#include "main.h"
#include "modules.h"
#include "modules_export.h"
}

5
plugins/beos/vout_beos.cpp
View File

@ -2,7 +2,7 @@
* 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>
@ -43,7 +43,6 @@
extern "C"
{
#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
@ -55,8 +54,6 @@ extern "C"
#include "interface.h"
#include "main.h"
#include "modules.h"
#include "modules_export.h"
}

5
plugins/directx/aout_directx.c
View File

@ -2,7 +2,7 @@
* 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>
*
@ -37,7 +37,6 @@
#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"
@ -52,8 +51,6 @@
#include "audio_output.h" /* aout_thread_t */
#include "main.h"
#include "modules.h"
#include "modules_export.h"

4
plugins/directx/vout_directx.c
View File

@ -2,7 +2,7 @@
* 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>
*
@ -63,7 +63,6 @@
# include <directx.h>
#endif
#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
@ -75,7 +74,6 @@
#include "video_output.h"
#include "interface.h"
#include "main.h"
#include "modules.h"
#include "modules_export.h"

4
plugins/directx/vout_events.c
View File

@ -2,7 +2,7 @@
* 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>
*
@ -32,7 +32,6 @@
#include <stdlib.h> /* free() */
#include <string.h> /* strerror() */
#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
@ -53,7 +52,6 @@
#endif
#include "interface.h"
#include "main.h"
#include "modules.h"
#include "modules_export.h"

5
plugins/dsp/aout_dsp.c
View File

@ -2,7 +2,7 @@
* 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>
@ -54,7 +54,6 @@
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"
@ -63,8 +62,6 @@
#include "audio_output.h" /* aout_thread_t */
#include "main.h"
#include "modules.h"
#include "modules_export.h"

5
plugins/dummy/aout_dummy.c
View File

@ -2,7 +2,7 @@
* 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>
*
@ -31,7 +31,6 @@
#include <string.h>
#include "config.h"
#include "common.h" /* boolean_t, byte_t */
#include "intf_msg.h"
#include "threads.h"
@ -40,8 +39,6 @@
#include "audio_output.h" /* aout_thread_t */
#include "main.h"
#include "modules.h"
#include "modules_export.h"

5
plugins/dummy/input_dummy.c
View File

@ -2,7 +2,7 @@
* 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>
*
@ -38,7 +38,6 @@
# include <strings.h>
#endif
#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
@ -48,8 +47,6 @@
#include "interface.h"
#include "intf_playlist.h"
#include "main.h"
#include "modules.h"
#include "modules_export.h"

5
plugins/dummy/intf_dummy.c
View File

@ -2,7 +2,7 @@
* 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>
*
@ -32,7 +32,6 @@
#include <stdlib.h> /* malloc(), free() */
#include <string.h>
#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
@ -43,8 +42,6 @@
#include "interface.h"
#include "modules.h"
#include "main.h"
#include "modules_export.h"
/*****************************************************************************

5
plugins/dvd/dvd_summary.c
View File

@ -3,7 +3,7 @@
* 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>
*
@ -56,7 +56,6 @@
# include <videolan/dvdcss.h>
#endif
#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
@ -64,8 +63,6 @@
#include "iso_lang.h"
#include "tests.h"
#include "main.h"
#include "input_dvd.h"
#include "dvd_ifo.h"

5
plugins/dvd/input_dvd.c
View File

@ -10,7 +10,7 @@
* -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>
*
@ -66,7 +66,6 @@
# include <videolan/dvdcss.h>
#endif
#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
@ -78,8 +77,6 @@
# include "input_iovec.h"
#endif
#include "main.h"
#include "modules.h"
#include "modules_export.h"

5
plugins/dvdread/input_dvdread.c
View File

@ -6,7 +6,7 @@
* 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>
*
@ -60,7 +60,6 @@
#endif
#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
@ -72,8 +71,6 @@
# include "input_iovec.h"
#endif
#include "main.h"
#include "stream_control.h"
#include "input_ext-intf.h"
#include "input_ext-dec.h"

5
plugins/esd/aout_esd.c
View File

@ -2,7 +2,7 @@
* 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>
*
@ -44,7 +44,6 @@
#include <esd.h>
#include "config.h"
#include "common.h" /* boolean_t, byte_t */
#include "intf_msg.h" /* intf_DbgMsg(), intf_ErrMsg() */
#include "threads.h"
@ -53,8 +52,6 @@
#include "audio_output.h" /* aout_thread_t */
#include "main.h"
#include "modules.h"
#include "modules_export.h"

5
plugins/fb/vout_fb.c
View File

@ -2,7 +2,7 @@
* 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>
*
@ -44,7 +44,6 @@
#include <linux/vt.h> /* VT_* */
#include <linux/kd.h> /* KD* */
#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
@ -55,8 +54,6 @@
#include "video.h"
#include "video_output.h"
#include "main.h"
#include "modules_export.h"
/*****************************************************************************

5
plugins/ggi/vout_ggi.c
View File

@ -2,7 +2,7 @@
* 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>
@ -36,7 +36,6 @@
#include <ggi/ggi.h>
#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
@ -50,8 +49,6 @@
#include "intf_msg.h"
#include "interface.h"
#include "main.h"
#include "modules_export.h"
/*****************************************************************************

5
plugins/glide/vout_glide.c
View File

@ -2,7 +2,7 @@
* 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>
*
@ -39,7 +39,6 @@
#include <glide.h>
#include <linutil.h> /* Glide kbhit() and getch() */
#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
@ -51,8 +50,6 @@
#include "interface.h"
#include "main.h"
#include "modules.h"
#include "modules_export.h"

4
plugins/gtk/gtk_callbacks.c
View File

@ -2,7 +2,7 @@
* 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>
@ -33,7 +33,6 @@
#include <string.h>
#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
@ -53,7 +52,6 @@
#include "gtk_support.h"
#include "intf_gtk.h"
#include "main.h"
#include "netutils.h"
#include "modules_export.h"

5
plugins/gtk/gtk_control.c
View File

@ -2,7 +2,7 @@
* 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>
@ -41,7 +41,6 @@
#include <string.h>
#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
@ -59,8 +58,6 @@
#include "gtk_playlist.h"
#include "intf_gtk.h"
#include "main.h"
#include "modules_export.h"
/****************************************************************************

5
plugins/gtk/gtk_display.c
View File

@ -2,7 +2,7 @@
* 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>
@ -42,7 +42,6 @@
#undef gtk
#undef gnome
#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
@ -66,8 +65,6 @@
#include "gtk_display.h"
#include "intf_gtk.h"
#include "main.h"
#include "modules_export.h"
/*****************************************************************************

5
plugins/gtk/gtk_menu.c
View File

@ -2,7 +2,7 @@
* 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>
@ -41,7 +41,6 @@
#include <string.h>
#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
@ -63,8 +62,6 @@
#include "gtk_playlist.h"
#include "intf_gtk.h"
#include "main.h"
#include "modules_export.h"
/*

5
plugins/gtk/gtk_modules.c
View File

@ -2,7 +2,7 @@
* 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>
@ -41,7 +41,6 @@
#include <string.h>
#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
@ -59,8 +58,6 @@
#include "gtk_playlist.h"
#include "intf_gtk.h"
#include "main.h"
gboolean GtkModulesShow( GtkWidget *widget,
GdkEventButton *event,
gpointer user_data )

4
plugins/gtk/gtk_open.c
View File

@ -2,7 +2,7 @@
* 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>
@ -41,7 +41,6 @@
#include <string.h>
#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
@ -59,7 +58,6 @@
#include "gtk_playlist.h"
#include "intf_gtk.h"
#include "main.h"
#include "netutils.h"
#include "modules_export.h"

5
plugins/gtk/gtk_playlist.c
View File

@ -2,7 +2,7 @@
* 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>
@ -49,7 +49,6 @@
#undef gtk
#undef gnome
#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
@ -67,8 +66,6 @@
#include "gtk_playlist.h"
#include "intf_gtk.h"
#include "main.h"
#include "modules_export.h"
/****************************************************************************

5
plugins/gtk/gtk_preferences.c
View File

@ -2,7 +2,7 @@
* 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>
@ -41,7 +41,6 @@
#include <string.h>
#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
@ -59,8 +58,6 @@
#include "gtk_playlist.h"
#include "intf_gtk.h"
#include "main.h"
#include "modules_export.h"
/****************************************************************************

5
plugins/gtk/intf_gnome.c
View File

@ -2,7 +2,7 @@
* 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>
@ -37,7 +37,6 @@
#include <gnome.h>
#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
@ -59,8 +58,6 @@
#include "gtk_display.h"
#include "intf_gtk.h"
#include "main.h"
#include "modules.h"
#include "modules_export.h"

5
plugins/gtk/intf_gtk.c
View File

@ -2,7 +2,7 @@
* 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>
@ -37,7 +37,6 @@
#include <gtk/gtk.h>
#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
@ -60,8 +59,6 @@
#include "gtk_display.h"
#include "intf_gtk.h"
#include "main.h"
#include "modules.h"
#include "modules_export.h"

3
plugins/kde/intf_plugin.h
View File

@ -19,7 +19,6 @@ extern "C"
#include <string.h>
#include <stdio.h>
#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
@ -32,8 +31,6 @@ extern "C"
#include "intf_playlist.h"
#include "interface.h"
#include "main.h"
#include "modules.h"
#include "modules_export.h"
}

5
plugins/macosx/aout_macosx.c
View File

@ -2,7 +2,7 @@
* 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>
*
@ -44,7 +44,6 @@
#include <string.h>
#include "config.h"
#include "common.h" /* boolean_t, byte_t */
#include "intf_msg.h" /* intf_DbgMsg(), intf_ErrMsg() */
#include "threads.h"
@ -53,8 +52,6 @@
#include "audio_output.h" /* aout_thread_t */
#include "main.h"
#include "modules.h"
#include <Carbon/Carbon.h>

5
plugins/macosx/intf_vlc_wrapper.c
View File

@ -2,7 +2,7 @@
* 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>
*
@ -27,7 +27,6 @@
#include <sys/param.h> /* for MAXPATHLEN */
#include <string.h>
#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
@ -37,8 +36,6 @@
#include "interface.h"
#include "intf_playlist.h"
#include "main.h"
#include "modules.h"
#include "modules_export.h"

2
plugins/macosx/vout_macosx.c
View File

@ -33,7 +33,6 @@
#include <stdlib.h> /* free() */
#include <string.h> /* strerror() */
#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
@ -46,7 +45,6 @@
#include "video_output.h"
#include "modules.h"
#include "main.h"
#include "macosx.h"

5
plugins/memcpy/memcpy.c
View File

@ -2,7 +2,7 @@
* 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>
*
@ -32,7 +32,6 @@
#include <stdlib.h>
#include <string.h>
#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
@ -79,7 +78,7 @@ static void memcpy_getfunctions( function_list_t * p_function_list )
{
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
}

5
plugins/memcpy/memcpy3dn.c
View File

@ -2,7 +2,7 @@
* 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>
*
@ -32,7 +32,6 @@
#include <stdlib.h>
#include <string.h>
#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
@ -87,7 +86,7 @@ static void memcpy_getfunctions( function_list_t * p_function_list )
{
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
}

5
plugins/memcpy/memcpymmx.c
View File

@ -2,7 +2,7 @@
* 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>
*
@ -32,7 +32,6 @@
#include <stdlib.h>
#include <string.h>
#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
@ -87,7 +86,7 @@ static void memcpy_getfunctions( function_list_t * p_function_list )
{
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
}

5
plugins/memcpy/memcpymmxext.c
View File

@ -2,7 +2,7 @@
* 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>
*
@ -32,7 +32,6 @@
#include <stdlib.h>
#include <string.h>
#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
@ -87,7 +86,7 @@ static void memcpy_getfunctions( function_list_t * p_function_list )
{
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
}

5
plugins/mpeg/input_es.c
View File

@ -2,7 +2,7 @@
* 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>
*
@ -48,7 +48,6 @@
# include <sys/uio.h> /* struct iovec */
#endif
#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
@ -59,8 +58,6 @@
# include "input_iovec.h"
#endif
#include "main.h"
#include "modules.h"
#include "modules_export.h"

5
plugins/mpeg/input_ps.c
View File

@ -2,7 +2,7 @@
* 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>
@ -50,15 +50,12 @@
#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"

5
plugins/mpeg/input_ts.c
View File

@ -2,7 +2,7 @@
* 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>
*
@ -62,7 +62,6 @@
# include <sys/uio.h> /* struct iovec */
#endif
#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
@ -106,7 +105,7 @@ void _M( input_getfunctions )( function_list_t * p_function_list )
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;

4
plugins/mpeg/input_ts.h
View File

@ -2,7 +2,7 @@
* 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>
@ -71,7 +71,7 @@ static __inline__ int read_network( int i_fd, char * p_base,
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;

5
plugins/mpeg_vdec/video_parser.c
View File

@ -2,7 +2,7 @@
* 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>
@ -43,15 +43,12 @@
# 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"

5
plugins/mpeg_vdec/vpar_synchro.c
View File

@ -2,7 +2,7 @@
* 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>
@ -98,14 +98,11 @@
#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"

3
plugins/qnx/aout_qnx.c
View File

@ -37,7 +37,6 @@
#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"
@ -46,8 +45,6 @@
#include "audio_output.h" /* aout_thread_t */
#include "main.h"
#include "modules.h"
#include "modules_export.h"

2
plugins/qnx/vout_qnx.c
View File

@ -37,7 +37,6 @@
#include <photon/PtLabel.h>
#include <photon/PdDirect.h>
#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
@ -48,7 +47,6 @@
#include "video_output.h"
#include "interface.h"
#include "main.h"
#include "modules.h"
#include "modules_export.h"

5
plugins/qt/intf_qt.cpp
View File

@ -2,7 +2,7 @@
* 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>
*
@ -37,7 +37,6 @@ extern "C"
#include <string.h> /* strerror() */
#include <stdio.h>
#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
@ -50,8 +49,6 @@ extern "C"
#include "intf_playlist.h"
#include "interface.h"
#include "main.h"
#include "modules.h"
#include "modules_export.h"

5
plugins/sdl/aout_sdl.c
View File

@ -2,7 +2,7 @@
* 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>
@ -40,7 +40,6 @@
#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"
@ -49,8 +48,6 @@
#include "audio_output.h" /* aout_thread_t */
#include "main.h"
#include "modules.h"
#include "modules_export.h"

28
plugins/sdl/vout_sdl.c
View File

@ -2,7 +2,7 @@
* 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>
@ -42,7 +42,6 @@
#include SDL_INCLUDE_FILE
#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
@ -55,7 +54,6 @@
#include "interface.h"
/* FIXME: get rid of this */
#include "keystrokes.h"
#include "main.h"
#include "netutils.h"
#include "modules.h"
@ -594,20 +592,20 @@ static void vout_Display( vout_thread_t *p_vout )
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,

5
plugins/text/intf_ncurses.c
View File

@ -2,7 +2,7 @@
* 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>
*
@ -36,7 +36,6 @@
#include <curses.h>
#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
@ -49,8 +48,6 @@
#include "interface.h"
#include "modules.h"
#include "main.h"
#include "modules_export.h"
/*****************************************************************************

8
plugins/vcd/input_vcd.c
View File

@ -50,8 +50,6 @@
# include <sys/uio.h> /* struct iovec */
#endif
#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
@ -62,8 +60,6 @@
# include "input_iovec.h"
#endif
#include "main.h"
#include "stream_control.h"
#include "input_ext-intf.h"
#include "input_ext-dec.h"
@ -598,8 +594,8 @@ static int VCDRead( input_thread_t * p_input,
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 );
}

3
plugins/vcd/linux_cdrom_tools.c
View File

@ -51,7 +51,6 @@
#include <sys/ioctl.h>
#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
@ -62,8 +61,6 @@
# include "input_iovec.h"
#endif
#include "main.h"
#include "stream_control.h"
#include "input_ext-intf.h"
#include "input_ext-dec.h"

5
plugins/x11/vout_x11.c
View File

@ -2,7 +2,7 @@
* 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>
@ -52,7 +52,6 @@
#include <X11/keysym.h>
#include <X11/extensions/XShm.h>
#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
@ -66,8 +65,6 @@
#include "netutils.h" /* network_ChannelJoin */
#include "main.h"
#include "modules.h"
#include "modules_export.h"

18
plugins/x11/vout_xvideo.c
View File

@ -2,7 +2,7 @@
* 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>
@ -56,7 +56,6 @@
#include <X11/extensions/Xvlib.h>
#include <X11/extensions/dpms.h>
#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
@ -70,8 +69,6 @@
#include "netutils.h" /* network_ChannelJoin */
#include "main.h"
#include "stream_control.h" /* needed by input_ext-intf.h... */
#include "input_ext-intf.h"
@ -680,12 +677,13 @@ static void vout_Display( vout_thread_t *p_vout )
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;
}

5
src/audio_output/aout_ext-dec.c
View File

@ -2,7 +2,7 @@
* 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>
*
@ -30,7 +30,6 @@
#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"
@ -39,8 +38,6 @@
#include "audio_output.h"
#include "aout_common.h"
#include "main.h"
/*****************************************************************************
* aout_CreateFifo
*****************************************************************************/

3
src/audio_output/aout_s16.c
View File

@ -29,7 +29,6 @@
#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"
@ -38,8 +37,6 @@
#include "audio_output.h"
#include "aout_common.h"
#include "main.h"
/*****************************************************************************
* Local prototypes
*****************************************************************************/

5
src/audio_output/aout_u8.c
View File

@ -2,7 +2,7 @@
* 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>
*
@ -30,7 +30,6 @@
#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"
@ -39,8 +38,6 @@
#include "audio_output.h"
#include "aout_common.h"
#include "main.h"
/*****************************************************************************
* Local prototypes
*****************************************************************************/

5
src/audio_output/audio_output.c
View File

@ -2,7 +2,7 @@
* 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>
*
@ -38,7 +38,6 @@
#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"
@ -48,8 +47,6 @@
#include "audio_output.h"
#include "aout_common.h"
#include "main.h"
/*****************************************************************************
* Local prototypes
*****************************************************************************/

5
src/input/input.c
View File

@ -4,7 +4,7 @@
* 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>
*
@ -62,7 +62,6 @@
# include <sys/times.h>
#endif
#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
@ -80,8 +79,6 @@
#include "interface.h"
#include "main.h"
/*****************************************************************************
* Local prototypes
*****************************************************************************/

5
src/input/input_clock.c
View File

@ -2,7 +2,7 @@
* 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>
*
@ -29,7 +29,6 @@
#include <string.h> /* memcpy(), memset() */
#include <sys/types.h> /* off_t */
#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
@ -40,8 +39,6 @@
#include "input_ext-dec.h"
#include "input_ext-plugins.h"
#include "main.h"
/*
* DISCUSSION : SYNCHRONIZATION METHOD
*

5
src/input/input_programs.c
View File

@ -2,7 +2,7 @@
* 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>
*
@ -30,7 +30,6 @@
#include <string.h> /* memcpy(), memset() */
#include <sys/types.h> /* off_t */
#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
@ -42,8 +41,6 @@
#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

5
src/input/mpeg_system.c
View File

@ -2,7 +2,7 @@
* 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>
@ -34,7 +34,6 @@
#include <string.h> /* memcpy(), memset() */
#include <sys/types.h> /* off_t */
#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
@ -45,8 +44,6 @@
#include "input_ext-dec.h"
#include "input_ext-plugins.h"
#include "main.h" /* AC3/MPEG channel, SPU channel, b_stat */
/*****************************************************************************
* Local prototypes
*****************************************************************************/

5
src/interface/interface.c
View File

@ -4,7 +4,7 @@
* 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>
*
@ -34,7 +34,6 @@
#include <string.h> /* strerror() */
#include <sys/types.h> /* off_t */
#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
@ -54,8 +53,6 @@
#include "video.h"
#include "video_output.h"
#include "main.h"
/*****************************************************************************
* Local prototypes
*****************************************************************************/

5
src/interface/intf_channels.c
View File

@ -2,7 +2,7 @@
* 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>
*
@ -31,7 +31,6 @@
#include <stdio.h> /* FILE */
#include <string.h> /* strerror() */
#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
@ -40,8 +39,6 @@
#include "intf_channels.h"
#include "interface.h"
#include "main.h"
/*****************************************************************************
* Local prototypes
*****************************************************************************/

5
src/interface/intf_msg.c
View File

@ -4,7 +4,7 @@
* 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>
*
@ -39,7 +39,6 @@
#include <unistd.h> /* close(), write() */
#endif
#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
@ -47,8 +46,6 @@
#include "interface.h"
#include "main.h"
/*****************************************************************************
* intf_msg_item_t
*****************************************************************************

5
src/interface/intf_playlist.c
View File

@ -2,7 +2,7 @@
* 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>
*
@ -27,15 +27,12 @@
#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
*****************************************************************************/

10
src/interface/main.c
View File

@ -4,7 +4,7 @@
* 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>
@ -64,7 +64,6 @@
#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"
@ -98,8 +97,6 @@
#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.
@ -241,7 +238,6 @@ main_t *p_main;
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
@ -394,12 +390,12 @@ int main( int i_argc, char *ppsz_argv[], char *ppsz_env[] )
{
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
}

6
src/misc/modules.c
View File

@ -2,7 +2,7 @@
* 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>
@ -23,8 +23,6 @@
*****************************************************************************/
#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
@ -88,8 +86,6 @@
#include "modules_builtin.h"
#include "modules_export.h"
#include "main.h"
/*****************************************************************************
* Local prototypes
*****************************************************************************/

4
src/misc/netutils.c
View File

@ -2,7 +2,7 @@
* 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>
@ -77,12 +77,10 @@
#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"

6
src/misc/tests.c
View File

@ -3,7 +3,7 @@
* 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>
*
@ -29,14 +29,10 @@
#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
*****************************************************************************/

5
src/video_output/video_output.c
View File

@ -5,7 +5,7 @@
* 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>
*
@ -38,7 +38,6 @@
# include <sys/times.h>
#endif
#include "config.h"
#include "common.h"
#include "intf_msg.h"
#include "threads.h"
@ -51,8 +50,6 @@
#include "video_spu.h"
#include "video_yuv.h"
#include "main.h"
/*****************************************************************************
* Local prototypes
*****************************************************************************/