Skip to content

V
vlc-gpu
Commit 6b3c8540 authored by Sam Hocevar's avatar Sam Hocevar
Browse files
Options 

  * Beginning of the built-in modules support.

   A few words about the changes:

  - heavy Makefile butchery has taken place, each plugin now has its own
    Makefile. I know recursive make blablah harmful, but it was just so
    much easier to do this way.

  - Makefile.in has disappeared, we now generate Makefile.opts with
    the overall configuration options, and Makefile.modules which is
    specific to module compilation.

  - After ./configure has been run you may want to modify Makefile.opts
    to check which modules will be compiled built-in or as plugins.

  - Some modules cannot be compiled built-in right now because proper
    linkage doesn't work yet. We don't really care since they're the
    interface or video output modules. The most important stuff works
    (iDCT, motion, YUV, input).

  - It's perfectly valid to compile a module both as built-in and as a
    plugin. vlc will only load the built-in one, but I'll add an option
    to ignore built-in modules for testing purposes.

  - We *should* see a performance increase here. I didn't have much time
    to test it, but if anyone can confirm and perhaps give a rough
    estimate of how much we gain...
parent dc4cad8f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2650 additions and 1244 deletions
AUTHORS
View file @ 6b3c8540
......@@ -119,7 +119,7 @@ D: MPEG video decoder
N: Wade Majors
E: guru@startrek.com
D: BeOS testing and icon integration
D: BeOS testing, icon integration, debugging and fixes
N: Christophe Massiot
E: massiot@via.ecp.fr
......
ChangeLog
View file @ 6b3c8540
......@@ -4,7 +4,8 @@
HEAD
* Got rid of the sleep() hack in beos_specific.cpp
* Beginning of the built-in modules support.
* Got rid of the sleep() hack in beos_specific.cpp.
* Fixed a segfault when launched without argument under Darwin.
* Fix for Darwin program path handling.
......
Makefile 0 → 100644
View file @ 6b3c8540
This diff is collapsed.
Makefile.dep
View file @ 6b3c8540
......@@ -4,9 +4,27 @@
################################################################################
# This Makefile is dedicated to build of .d files. It should not be called
# directly by user, but only through main Makefile.
# See notes at the end of the main makefile for explanations.
################################################################################
###############################################################################
# Note on generic rules and dependancies
###############################################################################
# Note on dependancies: each .c file is associated with a .d file, which
# depends of it. The .o file associated with a .c file depends of the .d, of the
# .c itself, and of Makefile. The .d files are stored in a separate .dep/
# directory.
# The dep directory should be ignored by CVS.
# Note on inclusions: depending of the target, the dependancies files must
# or must not be included. The problem is that if we ask make to include a file,
# and this file does not exist, it is made before it can be included. In a
# general way, a .d file should be included if and only if the corresponding .o
# needs to be re-made.
# The object Makefile knows how to make a .o from a .c, and includes
# dependancies for the target, but only those required.
# All settings and options are passed through main Makefile
################################################################################
......
Makefile.in deleted 100644 → 0
View file @ dc4cad8f
This diff is collapsed.
Makefile.modules.in 0 → 100644
View file @ 6b3c8540
###############################################################################
# vlc (VideoLAN Client) plugins Makefile
# (c)1998 VideoLAN
###############################################################################
#
# C headers directories
#
CFLAGS += -I../../include -I../../extras
#
# C compiler flags: plugin compilation
#
PCFLAGS += -fPIC
#
# C compiler flags: plugin linking
#
ifneq (,$(findstring darwin,$(SYS)))
PLCFLAGS += -bundle -undefined suppress
else
ifeq ($(SYS),beos)
PLCFLAGS += -nostart plugins/_APP_
else
PLCFLAGS += -shared
endif
endif
#
# Libraries for special cases
#
LIB_GGI = @LIB_GGI@
LIB_GLIDE = @LIB_GLIDE@
LIB_SDL = @LIB_SDL@
Makefile.opts.in 0 → 100644
View file @ 6b3c8540
###############################################################################
# vlc (VideoLAN Client) options Makefile
# (c)1998 VideoLAN
###############################################################################
###############################################################################
# Configuration
###############################################################################
# Debugging mode on or off (set to 1 to activate)
DEBUG=@DEBUG@
STATS=@STATS@
OPTIMS=@OPTIMS@
GETOPT=@GETOPT@
PLUGINS:=@PLUGINS@
BUILTINS:=@BUILTINS@
SYS=@SYS@
ALIASES=@ALIASES@
INSTALL=@INSTALL@
ARCH=@ARCH@
exec_prefix=@exec_prefix@
prefix=@prefix@
bindir=@bindir@
datadir=@datadir@
libdir=@libdir@
CC=@CC@
SHELL=@SHELL@
###############################################################################
# Configuration pre-processing
###############################################################################
# PROGRAM_OPTIONS is an identification string of the compilation options
PROGRAM_OPTIONS = $(SYS) $(ARCH)
ifeq ($(DEBUG),1)
PROGRAM_OPTIONS += DEBUG
DEFINE += -DDEBUG
endif
ifeq ($(STATS),1)
PROGRAM_OPTIONS += DEBUG
DEFINE += -DSTATS
endif
# PROGRAM_BUILD is a complete identification of the build
# (we can't use fancy options with date since OSes like Solaris
# or FreeBSD have strange date implementations)
ifeq ($(SYS),beos)
# XXX: beos does not support hostname (how lame...)
PROGRAM_BUILD = `date` $(USER)
else
PROGRAM_BUILD = `date` $(USER)@`hostname`
endif
# PROGRAM_VERSION is the current vlc version
PROGRAM_VERSION=@VLC_VERSION@
# DEFINE will contain some of the constants definitions decided in Makefile,
# including SYS_xx. It will be passed to C compiler.
DEFINE += -DSYS_$(shell echo $(SYS) | sed 's/-.*//' | tr '[a-z].' '[A-Z]_')
# On Linux activate 64-bit off_t (by default under BSD)
ifneq (,$(findstring linux,$(SYS)))
DEFINE += -D_FILE_OFFSET_BITS=64 -D__USE_UNIX98
endif
###############################################################################
# Tuning and other variables - do not change anything except if you know
# exactly what you are doing
###############################################################################
#
# C headers directories
#
INCLUDE += @INCLUDE@
INCLUDE += -Iinclude -Iextras -I/usr/local/include
#
# Libraries
#
LIB = @LIB@ -L/usr/local/lib
ifeq ($(SYS),beos)
LIB += -lbe -lroot -lgame
else
LIB += -lm
endif
#
# C compiler flags: mainstream compilation
#
CFLAGS += $(DEFINE) $(INCLUDE)
CFLAGS += -Wall -Winline
CFLAGS += -D_REENTRANT
CFLAGS += -D_GNU_SOURCE
# flags needed for clean beos compilation
ifeq ($(SYS),beos)
CFLAGS += -Wno-multichar -Wno-ctor-dtor-privacy -Woverloaded-virtual
endif
ifneq (,$(findstring darwin,$(SYS)))
CFLAGS += -traditional-cpp
endif
# Optimizations : don't compile debug versions with them
ifeq ($(OPTIMS),1)
CFLAGS += -O3
CFLAGS += -ffast-math -funroll-loops
CFLAGS += -fomit-frame-pointer
# Optimizations for x86 familiy
ifneq (,$(findstring 86,$(ARCH)))
# Optional Pentium Pro optimizations
ifneq (,$(findstring ppro,$(ARCH)))
CFLAGS += -march=pentiumpro -mcpu=pentiumpro
else
CFLAGS += -march=pentium -mcpu=pentium
endif
endif
# Optimizations for PowerPC
ifneq (,$(findstring powerpc,$(ARCH)))
CFLAGS += -mmultiple -mhard-float -mstring
endif
# Optimizations for Sparc
ifneq (,$(findstring sparc,$(ARCH)))
CFLAGS += -mhard-float
endif
#end of optimisations
endif
# Optional MMX optimizations for x86
ifneq (,$(findstring mmx,$(ARCH)))
CFLAGS += -DHAVE_MMX
endif
#
# C compiler flags: dependancies
#
DCFLAGS += $(INCLUDE)
DCFLAGS += -MM
#
# C compiler flags: linking
#
LCFLAGS += @LCFLAGS@ $(LIB)
LCFLAGS += -Wall
#LCFLAGS += -s
ifeq ($(SYS),beos)
LCFLAGS += -Xlinker -soname=_APP_
else
ifneq (,$(findstring qnx,$(SYS)))
LCFLAGS += -Xlinker -export-dynamic
else
ifneq (,$(findstring darwin,$(SYS)))
LCFLAGS += -dyn
else
LCFLAGS += --export-dynamic
endif
endif
endif
#
# Debugging and profiling support (unless optimisations are active)
#
ifneq ($(OPTIMS),1)
CFLAGS += -g
endif
configure
View file @ 6b3c8540
This diff is collapsed.
configure.in
View file @ 6b3c8540
......@@ -39,7 +39,7 @@ AC_CHECK_FUNC(getopt_long,[AC_DEFINE(HAVE_GETOPT_LONG,1,long getopt support)],
[ # FreeBSD has a gnugetopt library for this:
AC_CHECK_LIB([gnugetopt],[getopt_long],
[AC_DEFINE(HAVE_GETOPT_LONG,1,getopt support) LIB=${LIB}" -lgnugetopt"],
[GETOPT="extras/GNUgetopt/getopt.o extras/GNUgetopt/getopt1.o"])])
[GETOPT=1])])
AC_SUBST(GETOPT)
AC_FUNC_MMAP
......@@ -101,7 +101,8 @@ AC_TYPE_SIZE_T
AC_HEADER_TIME
dnl default plugins
PLUGINS=${PLUGINS}"ps ts yuv idct idctclassic motion "
#PLUGINS=${PLUGINS}"ps ts yuv idct idctclassic motion "
BUILTINS=${BUILTINS}"ps ts yuv idct idctclassic motion "
if test x$host_os = xbeos; then
ACCEL_PLUGINS="yuvmmx idctmmx motionmmx "
else
......@@ -110,28 +111,39 @@ fi
dnl Checks for DVD ioctls
AC_CHECK_HEADERS(sys/ioctl.h,
[PLUGINS=${PLUGINS}"dvd "
[#PLUGINS=${PLUGINS}"dvd "
BUILTINS=${BUILTINS}"dvd "
AC_CHECK_HEADERS(linux/cdrom.h)
AC_EGREP_HEADER(dvd,linux/cdrom.h,[AC_DEFINE(LINUX_DVD,1,DVD support for linux)])])
ARCH=${host_cpu}
AC_ARG_ENABLE(dummy,
[ --disable-dummy dummy module (default enabled)])
if test x$enable_dummy != xno; then PLUGINS=${PLUGINS}"dummy "; fi
if test x$enable_dummy != xno; then
#PLUGINS=${PLUGINS}"dummy ";
BUILTINS=${BUILTINS}"dummy "; fi
AC_ARG_ENABLE(null,
[ --disable-null Null module (default enabled)])
if test x$enable_null != xno; then PLUGINS=${PLUGINS}"null "; fi
if test x$enable_null != xno; then
#PLUGINS=${PLUGINS}"null ";
BUILTINS=${BUILTINS}"null "; fi
AC_ARG_ENABLE(ppro,
[ --disable-ppro Disable PentiumPro optimizations (default enabled for x86)],
[ if test x$enableval = xyes; then ARCH=${ARCH}" ppro"; fi ],
[ if test x${host_cpu} = xi686; then ARCH=${ARCH}" ppro"; fi ])
AC_ARG_ENABLE(mmx,
[ --disable-mmx Disable MMX optimizations (default enabled for x86)],
[ if test x$enableval = xyes; then ARCH=${ARCH}" mmx"; PLUGINS=${PLUGINS}${ACCEL_PLUGINS}; fi ],
[ if test x${host_cpu} = xi686 -o x${host_cpu} = xi586 -o x${host_cpu} = xx86; then ARCH=${ARCH}" mmx"; PLUGINS=${PLUGINS}${ACCEL_PLUGINS}; fi ])
[ if test x$enableval = xyes; then ARCH=${ARCH}" mmx";
#PLUGINS=${PLUGINS}${ACCEL_PLUGINS};
BUILTINS=${BUILTINS}}${ACCEL_PLUGINS}; fi ],
[ if test x${host_cpu} = xi686 -o x${host_cpu} = xi586 -o x${host_cpu} = xx86; then ARCH=${ARCH}" mmx";
#PLUGINS=${PLUGINS}${ACCEL_PLUGINS};
BUILTINS=${BUILTINS}${ACCEL_PLUGINS}; fi ])
AC_ARG_ENABLE(altivec,
[ --enable-altivec Enable altivec optimizations (default disabled since it is broken)],
[ if test x$enableval = xyes; then ARCH=${ARCH}" altivec"; PLUGINS=${PLUGINS}"idctaltivec "; fi ])
[ if test x$enableval = xyes; then ARCH=${ARCH}" altivec";
#PLUGINS=${PLUGINS}"idctaltivec ";
BUILTINS=${BUILTINS}"idctaltivec "; fi ])
#[ if test -d /System/Library/Frameworks/vecLib.framework; then ARCH=${ARCH}" altivec"; PLUGINS=${PLUGINS}"idctaltivec "; fi ])
AC_ARG_ENABLE(css,
[ --disable-css Disable DVD CSS decryption (default enabled)],
......@@ -259,6 +271,7 @@ fi
AC_SUBST(SYS)
AC_SUBST(ARCH)
AC_SUBST(PLUGINS)
AC_SUBST(BUILTINS)
AC_SUBST(ALIASES)
AC_SUBST(INCLUDE)
AC_SUBST(DEBUG)
......@@ -273,7 +286,7 @@ AC_SUBST(LIB_SDL)
AC_SUBST(LIB_GLIDE)
AC_SUBST(LIB_GGI)
AC_OUTPUT([Makefile include/config.h])
AC_OUTPUT([Makefile.opts Makefile.modules include/config.h])
echo "
vlc configuration
......@@ -285,7 +298,10 @@ debug mode : ${DEBUG}
statistics : ${STATS}
optimizations : ${OPTIMS}
CSS decryption : ${CSS}
plugins : ${PLUGINS}
need builtin getopt : ${GETOPT}
plugin modules : ${PLUGINS}
built-in modules : ${BUILTINS}
vlc aliases : ${ALIASES}
"
You may now tune Makefile.opts at your convenience."
debian/rules
View file @ 6b3c8540
......@@ -49,6 +49,9 @@ install: build
DESTDIR=`pwd`/debian/vlc/ $(MAKE) install prefix=/usr
# remove the yuvmmx plugin, it doesn't like -fPIC
rm debian/vlc/usr/lib/videolan/vlc/yuvmmx.so
# make symlinks for packages
aliases="ggi gtk gnome esd sdl alsa qt" ; \
if [ $(DEB_BUILD_ARCH) = i386 ]; then aliases=$$aliases" glide" ; fi ; \
......
include/modules.h
View file @ 6b3c8540
......@@ -2,7 +2,7 @@
* modules.h : Module management functions.
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: modules.h,v 1.19 2001/03/21 13:42:33 sam Exp $
* $Id: modules.h,v 1.20 2001/04/15 04:19:57 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -234,8 +234,22 @@ typedef struct module_s
{
boolean_t b_builtin; /* Set to true if the module is built in */
module_handle_t handle; /* Unique handle to refer to the module */
char * psz_filename; /* Module filename */
union
{
struct
{
module_handle_t handle; /* Unique handle */
char * psz_filename; /* Module filename */
} plugin;
struct
{
int ( *pf_deactivate ) ( struct module_s * );
} builtin;
} is;
char * psz_name; /* Module _unique_ name */
char * psz_longname; /* Module descriptive name */
......
include/modules_builtin.h.in 0 → 100644
View file @ 6b3c8540
/*****************************************************************************
* modules_builtin.h: built-in modules list
*****************************************************************************
* Copyright (C) 2001 VideoLAN
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
#define ALLOCATE_BUILTIN( NAME ) \
AllocateBuiltinModule( p_bank, module_ ## NAME ## _InitModule, \
module_ ## NAME ## _ActivateModule, \
module_ ## NAME ## _DeactivateModule );
/* Add stuff here */
plugins/alsa/Makefile 0 → 100644
View file @ 6b3c8540
###############################################################################
# vlc (VideoLAN Client) ALSA module Makefile
# (c)2001 VideoLAN
###############################################################################
include ../../Makefile.modules
###############################################################################
# Objects and files
###############################################################################
PLUGIN_ALSA = alsa.o aout_alsa.o
BUILTIN_ALSA = $(PLUGIN_ALSA:%.o=%-BUILTIN.o)
STD_PLUGIN_OBJ = $(PLUGIN_ALSA)
STD_BUILTIN_OBJ = $(BUILTIN_ALSA)
ALL_OBJ = $(STD_PLUGIN_OBJ) $(STD_BUILTIN_OBJ)
objects := $(STD_PLUGIN_OBJ) $(STD_BUILTIN_OBJ)
cdependancies := $(objects:%.o=.dep/%.d)
export
#
# Virtual targets
#
all:
clean:
rm -f $(ALL_OBJ)
rm -f *.o *.moc *.bak *.so *.a *.builtin
rm -rf .dep
FORCE:
$(cdependancies): %.d: FORCE
@$(MAKE) -s --no-print-directory -f ../../Makefile.dep $@
$(ALL_OBJ): %.o: ../../Makefile.dep
$(STD_PLUGIN_OBJ): %.o: .dep/%.d
$(STD_PLUGIN_OBJ): %.o: %.c
$(CC) $(CFLAGS) $(PCFLAGS) -c -o $@ $<
$(STD_BUILTIN_OBJ): %-BUILTIN.o: .dep/%.d
$(STD_BUILTIN_OBJ): %-BUILTIN.o: %.c
$(CC) $(CFLAGS) -DBUILTIN -c -o $@ $<
#
# Real targets
#
../../lib/alsa.so: $(PLUGIN_ALSA)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) -lasound
../../lib/alsa.a: $(BUILTIN_ALSA)
ar r $@ $^
plugins/beos/Makefile 0 → 100644
View file @ 6b3c8540
###############################################################################
# vlc (VideoLAN Client) BeOS module Makefile
# (c)2001 VideoLAN
###############################################################################
include ../../Makefile.modules
###############################################################################
# Objects and files
###############################################################################
PLUGIN_BEOS = beos.o aout_beos.o vout_beos.o intf_beos.o DrawingTidbits.o TransportButton.o
BUILTIN_BEOS = $(PLUGIN_BEOS:%.o=%-BUILTIN.o)
NONSTD_CPP_PLUGIN_OBJ = $(PLUGIN_BEOS)
NONSTD_CPP_BUILTIN_OBJ = $(BUILTIN_BEOS)
ALL_OBJ = $(NONSTD_CPP_PLUGIN_OBJ) $(NONSTD_CPP_BUILTIN_OBJ)
cppobjects := $(NONSTD_CPP_PLUGIN_OBJ) $(NONSTD_CPP_BUILTIN_OBJ)
cppdependancies := $(cppobjects:%.o=.dep/%.dpp)
export
#
# Virtual targets
#
all:
clean:
rm -f $(ALL_OBJ)
rm -f *.o *.moc *.bak *.so *.a *.builtin
rm -rf .dep
FORCE:
$(cppdependancies): %.dpp: FORCE
@$(MAKE) -s --no-print-directory -f ../../Makefile.dep $@
$(ALL_OBJ): %.o: ../../Makefile.dep
$(PLUGIN_BEOS): %.o: .dep/%.dpp
$(PLUGIN_BEOS): %.o: %.cpp
$(CC) $(CFLAGS) $(PCFLAGS) -c -o $@ $<
$(BUILTIN_BEOS): %-BUILTIN.o: .dep/%.dpp
$(BUILTIN_BEOS): %-BUILTIN.o: %.cpp
$(CC) $(CFLAGS) -DBUILTIN -c -o $@ $<
#
# Real targets
#
../../lib/beos.so: $(PLUGIN_BEOS)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) -lbe -lgame -lroot -ltracker
../../lib/beos.a: $(BUILTIN_BEOS)
ar r $@ $^
plugins/beos/intf_beos.cpp
View file @ 6b3c8540
......@@ -2,7 +2,7 @@
* intf_beos.cpp: beos interface
*****************************************************************************
* Copyright (C) 1999, 2000, 2001 VideoLAN
* $Id: intf_beos.cpp,v 1.24 2001/04/12 11:10:16 tcastley Exp $
* $Id: intf_beos.cpp,v 1.25 2001/04/15 04:19:57 sam Exp $
*
* Authors: Jean-Marc Dressler <polux@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
......@@ -125,11 +125,11 @@ InterfaceWindow::InterfaceWindow( BRect frame, const char *name , intf_thread_t
menu_bar->AddItem( m = new BMenu("File") );
menu_bar->ResizeToPreferred();
m->AddItem( new BMenuItem("Open File...", new BMessage(OPEN_FILE), 'O'));
m->AddItem( new BMenuItem("Open File" B_UTF8_ELLIPSIS, new BMessage(OPEN_FILE), 'O'));
cd_menu = new CDMenu("Open Disc");
m->AddItem(cd_menu);
m->AddSeparatorItem();
m->AddItem( new BMenuItem("About...", new BMessage(B_ABOUT_REQUESTED), 'A'));
m->AddItem( new BMenuItem("About" B_UTF8_ELLIPSIS, new BMessage(B_ABOUT_REQUESTED), 'A'));
m->AddItem( new BMenuItem("Quit", new BMessage(B_QUIT_REQUESTED), 'Q'));
menu_bar->AddItem (am = new BMenu("Audio") );
......
plugins/darwin/Makefile 0 → 100644
View file @ 6b3c8540
###############################################################################
# vlc (VideoLAN Client) Darwin module makefile
# (c)2001 VideoLAN
###############################################################################
include ../../Makefile.modules
###############################################################################
# Objects and files
###############################################################################
PLUGIN_DARWIN = darwin.o
BUILTIN_DARWIN = $(PLUGIN_DARWIN:%.o=%-BUILTIN.o)
STD_PLUGIN_OBJ = $(PLUGIN_DARWIN)
STD_BUILTIN_OBJ = $(BUILTIN_DARWIN)
ALL_OBJ = $(STD_PLUGIN_OBJ) $(STD_BUILTIN_OBJ)
objects := $(STD_PLUGIN_OBJ) $(STD_BUILTIN_OBJ)
cdependancies := $(objects:%.o=.dep/%.d)
export
#
# Virtual targets
#
all:
clean:
rm -f $(ALL_OBJ)
rm -f *.o *.moc *.bak *.so *.a *.builtin
rm -rf .dep
FORCE:
$(cdependancies): %.d: FORCE
@$(MAKE) -s --no-print-directory -f ../../Makefile.dep $@
$(ALL_OBJ): %.o: ../../Makefile.dep
$(STD_PLUGIN_OBJ): %.o: .dep/%.d
$(STD_PLUGIN_OBJ): %.o: %.c
$(CC) $(CFLAGS) $(PCFLAGS) -c -o $@ $<
$(STD_BUILTIN_OBJ): %-BUILTIN.o: .dep/%.d
$(STD_BUILTIN_OBJ): %-BUILTIN.o: %.c
$(CC) $(CFLAGS) -DBUILTIN -c -o $@ $<
#
# Real targets
#
../../lib/darwin.so: $(PLUGIN_DARWIN)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) -framework CoreAudio
../../lib/darwin.a: $(BUILTIN_DARWIN)
ar r $@ $^
plugins/dsp/Makefile 0 → 100644
View file @ 6b3c8540
###############################################################################
# vlc (VideoLAN Client) OSS /dev/dsp module Makefile
# (c)2001 VideoLAN
###############################################################################
include ../../Makefile.modules
###############################################################################
# Objects and files
###############################################################################
PLUGIN_DSP = dsp.o aout_dsp.o
BUILTIN_DSP = $(PLUGIN_DSP:%.o=%-BUILTIN.o)
STD_PLUGIN_OBJ = $(PLUGIN_DSP)
STD_BUILTIN_OBJ = $(BUILTIN_DSP)
ALL_OBJ = $(STD_PLUGIN_OBJ) $(STD_BUILTIN_OBJ)
objects := $(STD_PLUGIN_OBJ) $(STD_BUILTIN_OBJ)
cdependancies := $(objects:%.o=.dep/%.d)
export
#
# Virtual targets
#
all:
clean:
rm -f $(ALL_OBJ)
rm -f *.o *.moc *.bak *.so *.a *.builtin
rm -rf .dep
FORCE:
$(cdependancies): %.d: FORCE
@$(MAKE) -s --no-print-directory -f ../../Makefile.dep $@
$(ALL_OBJ): %.o: ../../Makefile.dep
$(STD_PLUGIN_OBJ): %.o: .dep/%.d
$(STD_PLUGIN_OBJ): %.o: %.c
$(CC) $(CFLAGS) $(PCFLAGS) -c -o $@ $<
$(STD_BUILTIN_OBJ): %-BUILTIN.o: .dep/%.d
$(STD_BUILTIN_OBJ): %-BUILTIN.o: %.c
$(CC) $(CFLAGS) -DBUILTIN -c -o $@ $<
#
# Real targets
#
../../lib/dsp.so: $(PLUGIN_DSP)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
../../lib/dsp.a: $(BUILTIN_DSP)
ar r $@ $^
plugins/dummy/Makefile 0 → 100644
View file @ 6b3c8540
###############################################################################
# vlc (VideoLAN Client) dummy module makefile
# (c)2001 VideoLAN
###############################################################################
include ../../Makefile.modules
###############################################################################
# Objects and files
###############################################################################
PLUGIN_DUMMY = dummy.o aout_dummy.o vout_dummy.o intf_dummy.o
BUILTIN_DUMMY = $(PLUGIN_DUMMY:%.o=%-BUILTIN.o)
STD_PLUGIN_OBJ = $(PLUGIN_DUMMY)
STD_BUILTIN_OBJ = $(BUILTIN_DUMMY)
ALL_OBJ = $(STD_PLUGIN_OBJ) $(STD_BUILTIN_OBJ)
objects := $(STD_PLUGIN_OBJ) $(STD_BUILTIN_OBJ)
cdependancies := $(objects:%.o=.dep/%.d)
export
#
# Virtual targets
#
all:
clean:
rm -f $(ALL_OBJ)
rm -f *.o *.moc *.bak *.so *.a *.builtin
rm -rf .dep
FORCE:
$(cdependancies): %.d: FORCE
@$(MAKE) -s --no-print-directory -f ../../Makefile.dep $@
$(ALL_OBJ): %.o: ../../Makefile.dep
$(STD_PLUGIN_OBJ): %.o: .dep/%.d
$(STD_PLUGIN_OBJ): %.o: %.c
$(CC) $(CFLAGS) $(PCFLAGS) -c -o $@ $<
$(STD_BUILTIN_OBJ): %-BUILTIN.o: .dep/%.d
$(STD_BUILTIN_OBJ): %-BUILTIN.o: %.c
$(CC) $(CFLAGS) -DBUILTIN -c -o $@ $<
#
# Real targets
#
../../lib/dummy.so: $(PLUGIN_DUMMY)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
../../lib/dummy.a: $(BUILTIN_DUMMY)
ar r $@ $^
plugins/dvd/Makefile 0 → 100644
View file @ 6b3c8540
###############################################################################
# vlc (VideoLAN Client) dvd module Makefile
# (c)2001 VideoLAN
###############################################################################
include ../../Makefile.modules
###############################################################################
# Objects and files
###############################################################################
PLUGIN_DVD = dvd.o input_dvd.o dvd_netlist.o dvd_ioctl.o dvd_ifo.o dvd_udf.o dvd_css.o
BUILTIN_DVD = $(PLUGIN_DVD:%.o=%-BUILTIN.o)
ALL_OBJ = $(PLUGIN_DVD) $(BUILTIN_DVD)
objects := $(ALL_OBJ)
cdependancies := $(objects:%.o=.dep/%.d)
export
#
# Virtual targets
#
all:
clean:
rm -f $(ALL_OBJ)
rm -f *.o *.moc *.bak *.so *.a *.builtin
rm -rf .dep
FORCE:
$(cdependancies): %.d: FORCE
@$(MAKE) -s --no-print-directory -f ../../Makefile.dep $@
$(ALL_OBJ): %.o: ../../Makefile.dep
$(PLUGIN_DVD): %.o: .dep/%.d
$(PLUGIN_DVD): %.o: %.c
$(CC) $(CFLAGS) $(PCFLAGS) -c -o $@ $<
$(BUILTIN_DVD): %-BUILTIN.o: .dep/%.d
$(BUILTIN_DVD): %-BUILTIN.o: %.c
$(CC) $(CFLAGS) -DBUILTIN -c -o $@ $<
#
# Real targets
#
../../lib/dvd.so: $(PLUGIN_DVD)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
../../lib/dvd.a: $(BUILTIN_DVD)
ar r $@ $^
plugins/dvd/dvd.c
View file @ 6b3c8540
......@@ -2,7 +2,7 @@
* dvd.c : DVD input module for vlc
*****************************************************************************
* Copyright (C) 2000 VideoLAN
* $Id: dvd.c,v 1.6 2001/03/21 13:42:33 sam Exp $
* $Id: dvd.c,v 1.7 2001/04/15 04:19:57 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -27,9 +27,9 @@
#include "defs.h"
#ifdef HAVE_CSS
#define MODULE_NAME dvd-css
#else /* HAVE_CSS */
#define MODULE_NAME dvd
#else /* HAVE_CSS */
#define MODULE_NAME dvdnocss
#endif /* HAVE_CSS */
#include "modules_inner.h"
......
plugins/dvd/dvd_udf.c
View file @ 6b3c8540
......@@ -5,7 +5,7 @@
* contains the basic udf handling functions
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
* $Id: dvd_udf.c,v 1.4 2001/04/13 05:36:12 stef Exp $
* $Id: dvd_udf.c,v 1.5 2001/04/15 04:19:57 sam Exp $
*
* Author: Stphane Borel <stef@via.ecp.fr>
*
......@@ -28,14 +28,18 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
#define MODULE_NAME dvd
#include "modules_inner.h"
/*
* Preamble
*/
#include "defs.h"
#ifdef HAVE_CSS
#define MODULE_NAME dvd
#else /* HAVE_CSS */
#define MODULE_NAME dvdnocss
#endif /* HAVE_CSS */
#include "modules_inner.h"
#include <stdio.h>
#include <unistd.h>
#include <string.h>
......
plugins/dvd/input_dvd.c
View file @ 6b3c8540
......@@ -10,7 +10,7 @@
* -dvd_udf to find files
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
* $Id: input_dvd.c,v 1.45 2001/04/13 05:36:12 stef Exp $
* $Id: input_dvd.c,v 1.46 2001/04/15 04:19:57 sam Exp $
*
* Author: Stphane Borel <stef@via.ecp.fr>
*
......@@ -35,9 +35,9 @@
#include "defs.h"
#ifdef HAVE_CSS
#define MODULE_NAME dvd-css
#define MODULE_NAME dvd
#else /* HAVE_CSS */
#define MODULE_NAME dvd-nocss
#define MODULE_NAME dvdnocss
#endif /* HAVE_CSS */
#include "modules_inner.h"
......
plugins/esd/Makefile 0 → 100644
View file @ 6b3c8540
###############################################################################
# vlc (VideoLAN Client) esd module Makefile
# (c)2001 VideoLAN
###############################################################################
include ../../Makefile.modules
###############################################################################
# Objects and files
###############################################################################
PLUGIN_ESD = esd.o aout_esd.o
BUILTIN_ESD = $(PLUGIN_ESD:%.o=%-BUILTIN.o)
STD_PLUGIN_OBJ = $(PLUGIN_ESD)
STD_BUILTIN_OBJ = $(BUILTIN_ESD)
ALL_OBJ = $(STD_PLUGIN_OBJ) $(STD_BUILTIN_OBJ)
objects := $(STD_PLUGIN_OBJ) $(STD_BUILTIN_OBJ)
cdependancies := $(objects:%.o=.dep/%.d)
export
#
# Virtual targets
#
all:
clean:
rm -f $(ALL_OBJ)
rm -f *.o *.moc *.bak *.so *.a *.builtin
rm -rf .dep
FORCE:
$(cdependancies): %.d: FORCE
@$(MAKE) -s --no-print-directory -f ../../Makefile.dep $@
$(ALL_OBJ): %.o: ../../Makefile.dep
$(STD_PLUGIN_OBJ): %.o: .dep/%.d
$(STD_PLUGIN_OBJ): %.o: %.c
$(CC) $(CFLAGS) $(PCFLAGS) -c -o $@ $<
$(STD_BUILTIN_OBJ): %-BUILTIN.o: .dep/%.d
$(STD_BUILTIN_OBJ): %-BUILTIN.o: %.c
$(CC) $(CFLAGS) -DBUILTIN -c -o $@ $<
#
# Real targets
#
../../lib/esd.so: $(PLUGIN_ESD)
ifneq (,$(findstring bsd,$(SYS)))
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) -lesd
else
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) -laudiofile -lesd
endif
../../lib/esd.a: $(BUILTIN_ESD)
ar r $@ $^
plugins/fb/Makefile 0 → 100644
View file @ 6b3c8540
###############################################################################
# vlc (VideoLAN Client) fb module Makefile
# (c)2001 VideoLAN
###############################################################################
include ../../Makefile.modules
###############################################################################
# Objects and files
###############################################################################
PLUGIN_FB = fb.o vout_fb.o
BUILTIN_FB = $(PLUGIN_FB:%.o=%-BUILTIN.o)
STD_PLUGIN_OBJ = $(PLUGIN_FB)
STD_BUILTIN_OBJ = $(BUILTIN_FB)
ALL_OBJ = $(STD_PLUGIN_OBJ) $(STD_BUILTIN_OBJ)
objects := $(STD_PLUGIN_OBJ) $(STD_BUILTIN_OBJ)
cdependancies := $(objects:%.o=.dep/%.d)
export
#
# Virtual targets
#
all:
clean:
rm -f $(ALL_OBJ)
rm -f *.o *.moc *.bak *.so *.a *.builtin
rm -rf .dep
FORCE:
$(cdependancies): %.d: FORCE
@$(MAKE) -s --no-print-directory -f ../../Makefile.dep $@
$(ALL_OBJ): %.o: ../../Makefile.dep
$(STD_PLUGIN_OBJ): %.o: .dep/%.d
$(STD_PLUGIN_OBJ): %.o: %.c
$(CC) $(CFLAGS) $(PCFLAGS) -c -o $@ $<
$(STD_BUILTIN_OBJ): %-BUILTIN.o: .dep/%.d
$(STD_BUILTIN_OBJ): %-BUILTIN.o: %.c
$(CC) $(CFLAGS) -DBUILTIN -c -o $@ $<
#
# Real targets
#
../../lib/fb.so: $(PLUGIN_FB)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
../../lib/fb.a: $(BUILTIN_FB)
ar r $@ $^
plugins/ggi/Makefile 0 → 100644
View file @ 6b3c8540
###############################################################################
# vlc (VideoLAN Client) ggi module Makefile
# (c)2001 VideoLAN
###############################################################################
include ../../Makefile.modules
###############################################################################
# Objects and files
###############################################################################
PLUGIN_GGI = ggi.o vout_ggi.o
BUILTIN_GGI = $(PLUGIN_GGI:%.o=%-BUILTIN.o)
STD_PLUGIN_OBJ = $(PLUGIN_GGI)
STD_BUILTIN_OBJ = $(BUILTIN_GGI)
ALL_OBJ = $(STD_PLUGIN_OBJ) $(STD_BUILTIN_OBJ)
objects := $(STD_PLUGIN_OBJ) $(STD_BUILTIN_OBJ)
cdependancies := $(objects:%.o=.dep/%.d)
export
#
# Virtual targets
#
all:
clean:
rm -f $(ALL_OBJ)
rm -f *.o *.moc *.bak *.so *.a *.builtin
rm -rf .dep
FORCE:
$(cdependancies): %.d: FORCE
@$(MAKE) -s --no-print-directory -f ../../Makefile.dep $@
$(ALL_OBJ): %.o: ../../Makefile.dep
$(STD_PLUGIN_OBJ): %.o: .dep/%.d
$(STD_PLUGIN_OBJ): %.o: %.c
$(CC) $(CFLAGS) $(PCFLAGS) -c -o $@ $<
$(STD_BUILTIN_OBJ): %-BUILTIN.o: .dep/%.d
$(STD_BUILTIN_OBJ): %-BUILTIN.o: %.c
$(CC) $(CFLAGS) -DBUILTIN -c -o $@ $<
#
# Real targets
#
../../lib/ggi.so: $(PLUGIN_GGI)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_GGI)
../../lib/ggi.a: $(BUILTIN_GGI)
ar r $@ $^
plugins/glide/Makefile 0 → 100644
View file @ 6b3c8540
###############################################################################
# vlc (VideoLAN Client) glide module Makefile
# (c)2001 VideoLAN
###############################################################################
include ../../Makefile.modules
###############################################################################
# Objects and files
###############################################################################
PLUGIN_GLIDE = glide.o vout_glide.o
BUILTIN_GLIDE = $(PLUGIN_GLIDE:%.o=%-BUILTIN.o)
ALL_OBJ = $(PLUGIN_GLIDE) $(BUILTIN_GLIDE)
objects := $(PLUGIN_GLIDE) $(BUILTIN_GLIDE)
cdependancies := $(objects:%.o=.dep/%.d)
export
#
# Virtual targets
#
all:
clean:
rm -f $(ALL_OBJ)
rm -f *.o *.moc *.bak *.so *.a *.builtin
rm -rf .dep
FORCE:
$(cdependancies): %.d: FORCE
@$(MAKE) -s --no-print-directory -f ../../Makefile.dep $@
$(ALL_OBJ): %.o: ../../Makefile.dep
$(PLUGIN_GLIDE): %.o: .dep/%.d
$(PLUGIN_GLIDE): %.o: %.c
$(CC) $(CFLAGS) $(PCFLAGS) -I/usr/include/glide -c -o $@ $<
$(BUILTIN_GLIDE): %-BUILTIN.o: .dep/%.d
$(BUILTIN_GLIDE): %-BUILTIN.o: %.c
$(CC) $(CFLAGS) -DBUILTIN -I/usr/include/glide -c -o $@ $<
#
# Real targets
#
../../lib/glide.so: $(PLUGIN_GLIDE)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_GLIDE)
../../lib/glide.a: $(BUILTIN_GLIDE)
ar r $@ $^
plugins/gnome/Makefile 0 → 100644
View file @ 6b3c8540
###############################################################################
# vlc (VideoLAN Client) gnome module Makefile
# (c)2001 VideoLAN
###############################################################################
include ../../Makefile.modules
###############################################################################
# Objects and files
###############################################################################
PLUGIN_GNOME = gnome.o intf_gnome.o gnome_callbacks.o gnome_interface.o gnome_support.o
BUILTIN_GNOME = $(PLUGIN_GNOME:%.o=%-BUILTIN.o)
ALL_OBJ = $(PLUGIN_GNOME) $(BUILTIN_GNOME)
objects := $(PLUGIN_GNOME) $(BUILTIN_GNOME)
cdependancies := $(objects:%.o=.dep/%.d)
export
#
# Virtual targets
#
all:
clean:
rm -f $(ALL_OBJ)
rm -f *.o *.moc *.bak *.so *.a *.builtin
rm -rf .dep
FORCE:
$(cdependancies): %.d: FORCE
@$(MAKE) -s --no-print-directory -f ../../Makefile.dep $@
$(ALL_OBJ): %.o: ../../Makefile.dep
$(PLUGIN_GNOME): %.o: .dep/%.d
$(PLUGIN_GNOME): %.o: %.c
$(CC) $(CFLAGS) $(PCFLAGS) `gnome-config --cflags gtk gnomeui` -c -o $@ $<
$(BUILTIN_GNOME): %-BUILTIN.o: .dep/%.d
$(BUILTIN_GNOME): %-BUILTIN.o: %.c
$(CC) $(CFLAGS) -DBUILTIN `gnome-config --cflags gtk gnomeui` -c -o $@ $<
#
# Real targets
#
../../lib/gnome.so: $(PLUGIN_GNOME)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) `gnome-config --libs gnomeui | sed 's,-rdynamic,,'`
../../lib/gnome.a: $(BUILTIN_GNOME)
ar r $@ $^
plugins/gnome/gnome_interface.c
View file @ 6b3c8540
......@@ -89,7 +89,7 @@ static GnomeUIInfo menubar_settings_menu_uiinfo[] =
0, (GdkModifierType) 0, NULL
},
{
GNOME_APP_UI_ITEM, N_("_Subtitle"),
GNOME_APP_UI_ITEM, N_("_Subtitles"),
N_("Select subtitle unit"),
(gpointer) NULL, NULL, NULL,
GNOME_APP_PIXMAP_NONE, NULL,
......@@ -536,7 +536,6 @@ create_intf_window (void)
gtk_widget_show (button_title_prev);
gtk_box_pack_start (GTK_BOX (title_chapter_box), button_title_prev, FALSE, FALSE, 0);
gtk_tooltips_set_tip (tooltips, button_title_prev, _("Select previous title"), NULL);
gtk_button_set_relief (GTK_BUTTON (button_title_prev), GTK_RELIEF_NONE);
button_title_next = gnome_stock_button (GNOME_STOCK_BUTTON_NEXT);
gtk_widget_ref (button_title_next);
......@@ -544,7 +543,6 @@ create_intf_window (void)
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (button_title_next);
gtk_box_pack_start (GTK_BOX (title_chapter_box), button_title_next, FALSE, FALSE, 0);
gtk_button_set_relief (GTK_BUTTON (button_title_next), GTK_RELIEF_NONE);
dvd_chapter_box = gtk_hbox_new (FALSE, 10);
gtk_widget_ref (dvd_chapter_box);
......@@ -574,7 +572,6 @@ create_intf_window (void)
gtk_widget_show (button_chapter_prev);
gtk_box_pack_start (GTK_BOX (dvd_chapter_box), button_chapter_prev, FALSE, FALSE, 0);
gtk_tooltips_set_tip (tooltips, button_chapter_prev, _("Select previous chapter"), NULL);
gtk_button_set_relief (GTK_BUTTON (button_chapter_prev), GTK_RELIEF_NONE);
button_chapter_next = gnome_stock_button (GNOME_STOCK_BUTTON_NEXT);
gtk_widget_ref (button_chapter_next);
......@@ -583,7 +580,6 @@ create_intf_window (void)
gtk_widget_show (button_chapter_next);
gtk_box_pack_start (GTK_BOX (dvd_chapter_box), button_chapter_next, FALSE, FALSE, 0);
gtk_tooltips_set_tip (tooltips, button_chapter_next, _("Select next chapter"), NULL);
gtk_button_set_relief (GTK_BUTTON (button_chapter_next), GTK_RELIEF_NONE);
network_box = gtk_hbox_new (FALSE, 0);
gtk_widget_ref (network_box);
......@@ -801,7 +797,7 @@ static GnomeUIInfo intf_popup_uiinfo[] =
0, (GdkModifierType) 0, NULL
},
{
GNOME_APP_UI_ITEM, N_("_Subtitle"),
GNOME_APP_UI_ITEM, N_("_Subtitles"),
N_("Select subtitle channel"),
(gpointer) NULL, NULL, NULL,
GNOME_APP_PIXMAP_NONE, NULL,
......
plugins/gnome/intf_gnome.glade
View file @ 6b3c8540
......@@ -230,7 +230,7 @@
<name>menubar_subtitle</name>
<sensitive>False</sensitive>
<tooltip>Select subtitle unit</tooltip>
<label>_Subtitle</label>
<label>_Subtitles</label>
<right_justify>False</right_justify>
</widget>
......@@ -681,7 +681,7 @@
<last_modification_time>Tue, 03 Apr 2001 03:46:25 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_PREV</stock_button>
<relief>GTK_RELIEF_NONE</relief>
<relief>GTK_RELIEF_NORMAL</relief>
<child>
<padding>0</padding>
<expand>False</expand>
......@@ -699,7 +699,7 @@
<last_modification_time>Tue, 03 Apr 2001 03:47:01 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_NEXT</stock_button>
<relief>GTK_RELIEF_NONE</relief>
<relief>GTK_RELIEF_NORMAL</relief>
<child>
<padding>0</padding>
<expand>False</expand>
......@@ -764,7 +764,7 @@
<last_modification_time>Tue, 03 Apr 2001 00:53:47 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_PREV</stock_button>
<relief>GTK_RELIEF_NONE</relief>
<relief>GTK_RELIEF_NORMAL</relief>
<child>
<padding>0</padding>
<expand>False</expand>
......@@ -783,7 +783,7 @@
<last_modification_time>Tue, 03 Apr 2001 00:53:40 GMT</last_modification_time>
</signal>
<stock_button>GNOME_STOCK_BUTTON_NEXT</stock_button>
<relief>GTK_RELIEF_NONE</relief>
<relief>GTK_RELIEF_NORMAL</relief>
<child>
<padding>0</padding>
<expand>False</expand>
......@@ -1014,7 +1014,7 @@
<name>popup_subtitle</name>
<sensitive>False</sensitive>
<tooltip>Select subtitle channel</tooltip>
<label>_Subtitle</label>
<label>_Subtitles</label>
<right_justify>False</right_justify>
</widget>
......
plugins/gtk/Makefile 0 → 100644
View file @ 6b3c8540
###############################################################################
# vlc (VideoLAN Client) gtk module Makefile
# (c)2001 VideoLAN
###############################################################################
include ../../Makefile.modules
###############################################################################
# Objects and files
###############################################################################
PLUGIN_GTK = gtk.o intf_gtk.o gtk_callbacks.o gtk_interface.o gtk_support.o gtk_playlist.o
BUILTIN_GTK = $(PLUGIN_GTK:%.o=%-BUILTIN.o)
ALL_OBJ = $(PLUGIN_GTK) $(BUILTIN_GTK)
objects := $(PLUGIN_GTK) $(BUILTIN_GTK)
cdependancies := $(objects:%.o=.dep/%.d)
export
#
# Virtual targets
#
all:
clean:
rm -f $(ALL_OBJ)
rm -f *.o *.moc *.bak *.so *.a *.builtin
rm -rf .dep
FORCE:
$(cdependancies): %.d: FORCE
@$(MAKE) -s --no-print-directory -f ../../Makefile.dep $@
$(ALL_OBJ): %.o: ../../Makefile.dep
$(PLUGIN_GTK): %.o: .dep/%.d
$(PLUGIN_GTK): %.o: %.c
$(CC) $(CFLAGS) $(PCFLAGS) `gtk-config --cflags gtk` -c -o $@ $<
$(BUILTIN_GTK): %-BUILTIN.o: .dep/%.d
$(BUILTIN_GTK): %-BUILTIN.o: %.c
$(CC) $(CFLAGS) -DBUILTIN `gtk-config --cflags gtk` -c -o $@ $<
#
# Real targets
#
../../lib/gtk.so: $(PLUGIN_GTK)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) `gtk-config --libs gtk | sed 's,-rdynamic,,'`
../../lib/gtk.a: $(BUILTIN_GTK)
ar r $@ $^
plugins/gtk/gtk_interface.c
View file @ 6b3c8540
......@@ -309,7 +309,7 @@ create_intf_window (void)
menubar_subpictures = gtk_menu_item_new_with_label ("");
tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (menubar_subpictures)->child),
_("Sub _Pictures"));
_("_Subtitles"));
gtk_widget_add_accelerator (menubar_subpictures, "activate_item", menubar_settings_menu_accels,
tmp_key, 0, 0);
gtk_widget_ref (menubar_subpictures);
......@@ -770,7 +770,7 @@ create_intf_popup (void)
popup_subpictures = gtk_menu_item_new_with_label ("");
tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (popup_subpictures)->child),
_("_Subpictures"));
_("_Subtitles"));
gtk_widget_add_accelerator (popup_subpictures, "activate_item", intf_popup_accels,
tmp_key, 0, 0);
gtk_widget_ref (popup_subpictures);
......
plugins/gtk/intf_gtk.glade
View file @ 6b3c8540
......@@ -247,7 +247,7 @@
<name>menubar_subpictures</name>
<sensitive>False</sensitive>
<tooltip>Select sub-title</tooltip>
<label>Sub _Pictures</label>
<label>_Subtitles</label>
<right_justify>False</right_justify>
</widget>
......@@ -691,7 +691,7 @@
<class>GtkMenuItem</class>
<name>popup_subpictures</name>
<sensitive>False</sensitive>
<label>_Subpictures</label>
<label>_Subtitles</label>
<right_justify>False</right_justify>
</widget>
......
plugins/idct/Makefile 0 → 100644
View file @ 6b3c8540
###############################################################################
# vlc (VideoLAN Client) idct module makefile
# (c)2001 VideoLAN
###############################################################################
include ../../Makefile.modules
###############################################################################
# Objects and files
###############################################################################
PLUGIN_IDCT = idct.o
PLUGIN_IDCTCLASSIC = idctclassic.o
PLUGIN_IDCTMMX = idctmmx.o
PLUGIN_IDCTMMXEXT = idctmmxext.o
PLUGIN_IDCTALTIVEC = idctaltivec.o
PLUGIN_IDCTCOMMON = idct_common.o
BUILTIN_IDCT = $(PLUGIN_IDCT:%.o=%-BUILTIN-IDCT.o) \
$(PLUGIN_IDCTCOMMON:%.o=%-BUILTIN-IDCT.o)
BUILTIN_IDCTCLASSIC = $(PLUGIN_IDCTCLASSIC:%.o=%-BUILTIN-IDCTCLASSIC.o) \
$(PLUGIN_IDCTCOMMON:%.o=%-BUILTIN-IDCTCLASSIC.o)
BUILTIN_IDCTMMX = $(PLUGIN_IDCTMMX:%.o=%-BUILTIN-IDCTMMX.o) \
$(PLUGIN_IDCTCOMMON:%.o=%-BUILTIN-IDCTMMX.o)
BUILTIN_IDCTMMXEXT = $(PLUGIN_IDCTMMXEXT:%.o=%-BUILTIN-IDCTMMXEXT.o) \
$(PLUGIN_IDCTCOMMON:%.o=%-BUILTIN-IDCTMMXEXT.o)
BUILTIN_IDCTALTIVEC = $(PLUGIN_IDCTALTIVEC:%.o=%-BUILTIN-IDCTALTIVEC.o) \
$(PLUGIN_IDCTCOMMON:%.o=%-BUILTIN-IDCTALTIVEC.o)
STD_PLUGIN_OBJ = $(PLUGIN_IDCT) $(PLUGIN_IDCTCLASSIC) $(PLUGIN_IDCTMMX) $(PLUGIN_IDCTMMXEXT) $(PLUGIN_IDCTCOMMON)
ALL_OBJ = $(STD_PLUGIN_OBJ) $(PLUGIN_IDCTALTIVEC) $(BUILTIN_IDCT) $(BUILTIN_IDCTCLASSIC) $(BUILTIN_IDCTMMX) $(BUILTIN_IDCTMMXEXT) $(BUILTIN_IDCTALTIVEC)
objects := $(ALL_OBJ)
cdependancies := $(objects:%.o=.dep/%.d)
export
#
# Virtual targets
#
all:
clean:
rm -f $(ALL_OBJ)
rm -f *.o *.moc *.bak *.so *.a *.builtin
rm -rf .dep
FORCE:
$(cdependancies): %.d: FORCE
@$(MAKE) -s --no-print-directory -f ../../Makefile.dep $@
$(ALL_OBJ): %.o: ../../Makefile.dep
$(STD_PLUGIN_OBJ): %.o: .dep/%.d
$(STD_PLUGIN_OBJ): %.o: %.c
$(CC) $(CFLAGS) $(PCFLAGS) -c -o $@ $<
$(PLUGIN_IDCTALTIVEC): %.o: .dep/%.d
$(PLUGIN_IDCTALTIVEC): %.o: %.c
$(CC) $(CFLAGS) $(PCFLAGS) -faltivec -c -o $@ $<
$(BUILTIN_IDCT): %-BUILTIN-IDCT.o: .dep/%.d
$(BUILTIN_IDCT): %-BUILTIN-IDCT.o: %.c
$(CC) $(CFLAGS) -DBUILTIN -DMODULE_NAME=idct -c -o $@ $<
$(BUILTIN_IDCTCLASSIC): %-BUILTIN-IDCTCLASSIC.o: .dep/%.d
$(BUILTIN_IDCTCLASSIC): %-BUILTIN-IDCTCLASSIC.o: %.c
$(CC) $(CFLAGS) -DBUILTIN -DMODULE_NAME=idctclassic -c -o $@ $<
$(BUILTIN_IDCTMMX): %-BUILTIN-IDCTMMX.o: .dep/%.d
$(BUILTIN_IDCTMMX): %-BUILTIN-IDCTMMX.o: %.c
$(CC) $(CFLAGS) -DBUILTIN -DMODULE_NAME=idctmmx -c -o $@ $<
$(BUILTIN_IDCTMMXEXT): %-BUILTIN-IDCTMMXEXT.o: .dep/%.d
$(BUILTIN_IDCTMMXEXT): %-BUILTIN-IDCTMMXEXT.o: %.c
$(CC) $(CFLAGS) -DBUILTIN -DMODULE_NAME=idctmmxext -c -o $@ $<
$(BUILTIN_IDCTALTIVEC): %-BUILTIN-IDCTALTIVEC.o: .dep/%.d
$(BUILTIN_IDCTALTIVEC): %-BUILTIN-IDCTALTIVEC.o: %.c
$(CC) $(CFLAGS) -DBUILTIN -DMODULE_NAME=idctaltivec -c -o $@ $<
#
# Real targets
#
../../lib/idct.so: $(PLUGIN_IDCT) $(PLUGIN_IDCTCOMMON)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
../../lib/idct.a: $(BUILTIN_IDCT)
ar r $@ $^
../../lib/idctclassic.so: $(PLUGIN_IDCTCLASSIC) $(PLUGIN_IDCTCOMMON)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
../../lib/idctclassic.a: $(BUILTIN_IDCTCLASSIC)
ar r $@ $^
../../lib/idctmmx.so: $(PLUGIN_IDCTMMX) $(PLUGIN_IDCTCOMMON)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
../../lib/idctmmx.a: $(BUILTIN_IDCTMMX)
ar r $@ $^
../../lib/idctmmxext.so: $(PLUGIN_IDCTMMXEXT) $(PLUGIN_IDCTCOMMON)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
../../lib/idctmmxext.a: $(BUILTIN_IDCTMMXEXT)
ar r $@ $^
../../lib/idctaltivec.so: $(PLUGIN_IDCTALTIVEC) $(PLUGIN_IDCTCOMMON)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) -framework vecLib
../../lib/idctaltivec.a: $(BUILTIN_IDCTALTIVEC)
ar r $@ $^
plugins/idct/idct.c
View file @ 6b3c8540
......@@ -2,7 +2,7 @@
* idct.c : IDCT module
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: idct.c,v 1.7 2001/02/20 07:49:13 sam Exp $
* $Id: idct.c,v 1.8 2001/04/15 04:19:57 sam Exp $
*
* Authors: Gaël Hendryckx <jimmy@via.ecp.fr>
*
......@@ -128,9 +128,9 @@ MODULE_DEACTIVATE
static void idct_getfunctions( function_list_t * p_function_list )
{
p_function_list->pf_probe = idct_Probe;
p_function_list->functions.idct.pf_init = vdec_InitIDCT;
p_function_list->functions.idct.pf_sparse_idct = vdec_SparseIDCT;
p_function_list->functions.idct.pf_idct = vdec_IDCT;
p_function_list->functions.idct.pf_init = _M( vdec_InitIDCT );
p_function_list->functions.idct.pf_sparse_idct = _M( vdec_SparseIDCT );
p_function_list->functions.idct.pf_idct = _M( vdec_IDCT );
p_function_list->functions.idct.pf_norm_scan = vdec_NormScan;
}
......@@ -158,7 +158,7 @@ static void vdec_NormScan( u8 ppi_scan[2][64] )
/*****************************************************************************
* vdec_IDCT : IDCT function for normal matrices
*****************************************************************************/
void vdec_IDCT( vdec_thread_t * p_vdec, dctelem_t * p_block,
void _M( vdec_IDCT )( vdec_thread_t * p_vdec, dctelem_t * p_block,
int i_idontcare )
{
s32 tmp0, tmp1, tmp2, tmp3;
......
plugins/idct/idct.h
View file @ 6b3c8540
......@@ -2,7 +2,7 @@
* idct.h : macros for the inverse discrete cosine transform
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: idct.h,v 1.2 2001/01/17 18:17:30 massiot Exp $
* $Id: idct.h,v 1.3 2001/04/15 04:19:57 sam Exp $
*
* Authors: Gaël Hendryckx <jimmy@via.ecp.fr>
* Christophe Massiot <massiot@via.ecp.fr>
......@@ -143,9 +143,9 @@
/*****************************************************************************
* Protoypes
*****************************************************************************/
void vdec_SparseIDCT ( vdec_thread_t * p_vdec, dctelem_t * p_block,
int i_sparse_pos);
void vdec_InitIDCT ( vdec_thread_t * p_vdec );
void vdec_IDCT ( vdec_thread_t * p_vdec, dctelem_t * p_block,
int i_idontcare );
void _M( vdec_SparseIDCT ) ( vdec_thread_t * p_vdec, dctelem_t * p_block,
int i_sparse_pos);
void _M( vdec_InitIDCT ) ( vdec_thread_t * p_vdec );
void _M( vdec_IDCT ) ( vdec_thread_t * p_vdec, dctelem_t * p_block,
int i_idontcare );
plugins/idct/idct_common.c
View file @ 6b3c8540
......@@ -2,7 +2,7 @@
* idct_common.c : common IDCT functions
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: idct_common.c,v 1.4 2001/04/06 09:15:47 sam Exp $
* $Id: idct_common.c,v 1.5 2001/04/15 04:19:57 sam Exp $
*
* Authors: Gal Hendryckx <jimmy@via.ecp.fr>
*
......@@ -21,6 +21,13 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
/* MODULE_NAME defined in Makefile together with -DBUILTIN */
#ifdef BUILTIN
# include "modules_inner.h"
#else
# define _M( foo ) foo
#endif
/*****************************************************************************
* Preamble
*****************************************************************************/
......@@ -45,7 +52,7 @@
/*****************************************************************************
* vdec_InitIDCT : initialize datas for vdec_SparseIDCT
*****************************************************************************/
void vdec_InitIDCT (vdec_thread_t * p_vdec)
void _M( vdec_InitIDCT ) (vdec_thread_t * p_vdec)
{
int i;
......@@ -55,7 +62,7 @@ void vdec_InitIDCT (vdec_thread_t * p_vdec)
for( i=0 ; i < 64 ; i++ )
{
p_pre[i*64+i] = 1 << SPARSE_SCALE_FACTOR;
vdec_IDCT( p_vdec, &p_pre[i*64], 0) ;
_M( vdec_IDCT )( p_vdec, &p_pre[i*64], 0) ;
}
return;
}
......@@ -63,8 +70,8 @@ void vdec_InitIDCT (vdec_thread_t * p_vdec)
/*****************************************************************************
* vdec_SparseIDCT : IDCT function for sparse matrices
*****************************************************************************/
void vdec_SparseIDCT (vdec_thread_t * p_vdec, dctelem_t * p_block,
int i_sparse_pos)
void _M( vdec_SparseIDCT ) ( vdec_thread_t * p_vdec, dctelem_t * p_block,
int i_sparse_pos)
{
short int val;
int * dp;
......
plugins/idct/idctaltivec.c
View file @ 6b3c8540
......@@ -2,7 +2,7 @@
* idctaltivec.c : Altivec IDCT module
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: idctaltivec.c,v 1.3 2001/03/26 19:06:18 sam Exp $
* $Id: idctaltivec.c,v 1.4 2001/04/15 04:19:57 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -129,9 +129,9 @@ MODULE_DEACTIVATE
static void idct_getfunctions( function_list_t * p_function_list )
{
p_function_list->pf_probe = idct_Probe;
p_function_list->functions.idct.pf_init = vdec_InitIDCT;
p_function_list->functions.idct.pf_sparse_idct = vdec_SparseIDCT;
p_function_list->functions.idct.pf_idct = vdec_IDCT;
p_function_list->functions.idct.pf_init = _M( vdec_InitIDCT );
p_function_list->functions.idct.pf_sparse_idct = _M( vdec_SparseIDCT );
p_function_list->functions.idct.pf_idct = _M( vdec_IDCT );
p_function_list->functions.idct.pf_norm_scan = vdec_NormScan;
}
......@@ -168,7 +168,7 @@ static void vdec_NormScan( u8 ppi_scan[2][64] )
/*****************************************************************************
* vdec_IDCT :
*****************************************************************************/
void vdec_IDCT( vdec_thread_t * p_vdec, dctelem_t * p_block,
void _M( vdec_IDCT )( vdec_thread_t * p_vdec, dctelem_t * p_block,
int i_idontcare )
{
IDCT( p_block, p_block );
......
plugins/idct/idctclassic.c
View file @ 6b3c8540
......@@ -2,7 +2,7 @@
* idctclassic.c : Classic IDCT module
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: idctclassic.c,v 1.7 2001/02/20 07:49:13 sam Exp $
* $Id: idctclassic.c,v 1.8 2001/04/15 04:19:57 sam Exp $
*
* Authors: Gaël Hendryckx <jimmy@via.ecp.fr>
*
......@@ -128,9 +128,9 @@ MODULE_DEACTIVATE
static void idct_getfunctions( function_list_t * p_function_list )
{
p_function_list->pf_probe = idct_Probe;
p_function_list->functions.idct.pf_init = vdec_InitIDCT;
p_function_list->functions.idct.pf_sparse_idct = vdec_SparseIDCT;
p_function_list->functions.idct.pf_idct = vdec_IDCT;
p_function_list->functions.idct.pf_init = _M( vdec_InitIDCT );
p_function_list->functions.idct.pf_sparse_idct = _M( vdec_SparseIDCT );
p_function_list->functions.idct.pf_idct = _M( vdec_IDCT );
p_function_list->functions.idct.pf_norm_scan = vdec_NormScan;
}
......@@ -158,7 +158,7 @@ static void vdec_NormScan( u8 ppi_scan[2][64] )
/*****************************************************************************
* vdec_IDCT : IDCT function for normal matrices
*****************************************************************************/
void vdec_IDCT( vdec_thread_t * p_vdec, dctelem_t * p_block,
void _M( vdec_IDCT )( vdec_thread_t * p_vdec, dctelem_t * p_block,
int i_idontcare )
{
/* dct classique: pour tester la meilleure entre la classique et la */
......
plugins/idct/idctmmx.c
View file @ 6b3c8540
......@@ -2,7 +2,7 @@
* idctmmx.c : MMX IDCT module
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: idctmmx.c,v 1.8 2001/02/20 07:49:13 sam Exp $
* $Id: idctmmx.c,v 1.9 2001/04/15 04:19:57 sam Exp $
*
* Authors: Aaron Holtzman <aholtzma@ess.engr.uvic.ca>
* Michel Lespinasse <walken@zoy.org>
......@@ -134,9 +134,9 @@ MODULE_DEACTIVATE
static void idct_getfunctions( function_list_t * p_function_list )
{
p_function_list->pf_probe = idct_Probe;
p_function_list->functions.idct.pf_init = vdec_InitIDCT;
p_function_list->functions.idct.pf_sparse_idct = vdec_SparseIDCT;
p_function_list->functions.idct.pf_idct = vdec_IDCT;
p_function_list->functions.idct.pf_init = _M( vdec_InitIDCT );
p_function_list->functions.idct.pf_sparse_idct = _M( vdec_SparseIDCT );
p_function_list->functions.idct.pf_idct = _M( vdec_IDCT );
p_function_list->functions.idct.pf_norm_scan = vdec_NormScan;
}
......@@ -474,8 +474,8 @@ static s32 rounder3[] ATTR_ALIGN(8) =
static s32 rounder5[] ATTR_ALIGN(8) =
rounder (-0.441341716183); // C3*(-C5/C4+C5-C3)/2
void vdec_IDCT( vdec_thread_t * p_vdec, dctelem_t * p_block,
int i_idontcare )
void _M( vdec_IDCT )( vdec_thread_t * p_vdec, dctelem_t * p_block,
int i_idontcare )
{
static dctelem_t table04[] ATTR_ALIGN(16) =
table (22725, 21407, 19266, 16384, 12873, 8867, 4520);
......
plugins/idct/idctmmxext.c
View file @ 6b3c8540
......@@ -2,7 +2,7 @@
* idctmmxext.c : MMX EXT IDCT module
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: idctmmxext.c,v 1.5 2001/02/20 07:49:13 sam Exp $
* $Id: idctmmxext.c,v 1.6 2001/04/15 04:19:57 sam Exp $
*
* Authors: Aaron Holtzman <aholtzma@ess.engr.uvic.ca>
* Michel Lespinasse <walken@zoy.org>
......@@ -134,9 +134,9 @@ MODULE_DEACTIVATE
static void idct_getfunctions( function_list_t * p_function_list )
{
p_function_list->pf_probe = idct_Probe;
p_function_list->functions.idct.pf_init = vdec_InitIDCT;
p_function_list->functions.idct.pf_sparse_idct = vdec_SparseIDCT;
p_function_list->functions.idct.pf_idct = vdec_IDCT;
p_function_list->functions.idct.pf_init = _M( vdec_InitIDCT );
p_function_list->functions.idct.pf_sparse_idct = _M( vdec_SparseIDCT );
p_function_list->functions.idct.pf_idct = _M( vdec_IDCT );
p_function_list->functions.idct.pf_norm_scan = vdec_NormScan;
}
......@@ -457,8 +457,8 @@ static s32 rounder3[] ATTR_ALIGN(8) =
static s32 rounder5[] ATTR_ALIGN(8) =
rounder (-0.441341716183); // C3*(-C5/C4+C5-C3)/2
void vdec_IDCT( vdec_thread_t * p_vdec, dctelem_t * p_block,
int i_idontcare )
void _M( vdec_IDCT )( vdec_thread_t * p_vdec, dctelem_t * p_block,
int i_idontcare )
{
static dctelem_t table04[] ATTR_ALIGN(16) =
table (22725, 21407, 19266, 16384, 12873, 8867, 4520);
......
plugins/macosx/Makefile 0 → 100644
View file @ 6b3c8540
###############################################################################
# vlc (VideoLAN Client) macosx module makefile
# (c)2001 VideoLAN
###############################################################################
include ../../Makefile.modules
###############################################################################
# Objects and files
###############################################################################
PLUGIN_MACOSX = macosx.o intf_macosx.o aout_macosx.o vout_macosx.o
BUILTIN_MACOSX = $(PLUGIN_MACOSX:%.o=%-BUILTIN.o)
ALL_OBJ = $(PLUGIN_MACOSX) $(BUILTIN_MACOSX)
objects := $(PLUGIN_MACOSX) $(BUILTIN_MACOSX)
cdependancies := $(objects:%.o=.dep/%.d)
export
#
# Virtual targets
#
all:
clean:
rm -f $(ALL_OBJ)
rm -f *.o *.moc *.bak *.so *.a *.builtin
rm -rf .dep
FORCE:
$(cdependancies): %.d: FORCE
@$(MAKE) -s --no-print-directory -f ../../Makefile.dep $@
$(ALL_OBJ): %.o: ../../Makefile.dep
$(PLUGIN_MACOSX): %.o: .dep/%.d
$(PLUGIN_MACOSX): %.o: %.c
$(CC) $(CFLAGS) $(PCFLAGS) -fpascal-strings -c -o $@ $<
$(BUILTIN_MACOSX): %-BUILTIN.o: .dep/%.d
$(BUILTIN_MACOSX): %-BUILTIN.o: %.c
$(CC) $(CFLAGS) -DBUILTIN -fpascal-strings -c -o $@ $<
#
# Real targets
#
../../lib/macosx.so: $(PLUGIN_MACOSX)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) -framework CoreAudio -framework Carbon -framework AGL
../../lib/macosx.a: $(BUILTIN_MACOSX)
ar r $@ $^
plugins/mga/Makefile 0 → 100644
View file @ 6b3c8540
###############################################################################
# vlc (VideoLAN Client) mga module Makefile
# (c)2001 VideoLAN
###############################################################################
include ../../Makefile.modules
###############################################################################
# Objects and files
###############################################################################
PLUGIN_MGA = mga.o vout_mga.o
BUILTIN_MGA = $(PLUGIN_MGA:%.o=%-BUILTIN.o)
STD_PLUGIN_OBJ = $(PLUGIN_MGA)
STD_BUILTIN_OBJ = $(BUILTIN_MGA)
ALL_OBJ = $(STD_PLUGIN_OBJ) $(STD_BUILTIN_OBJ)
objects := $(STD_PLUGIN_OBJ) $(STD_BUILTIN_OBJ)
cdependancies := $(objects:%.o=.dep/%.d)
export
#
# Virtual targets
#
all:
clean:
rm -f $(ALL_OBJ)
rm -f *.o *.moc *.bak *.so *.a *.builtin
rm -rf .dep
FORCE:
$(cdependancies): %.d: FORCE
@$(MAKE) -s --no-print-directory -f ../../Makefile.dep $@
$(ALL_OBJ): %.o: ../../Makefile.dep
$(STD_PLUGIN_OBJ): %.o: .dep/%.d
$(STD_PLUGIN_OBJ): %.o: %.c
$(CC) $(CFLAGS) $(PCFLAGS) -c -o $@ $<
$(STD_BUILTIN_OBJ): %-BUILTIN.o: .dep/%.d
$(STD_BUILTIN_OBJ): %-BUILTIN.o: %.c
$(CC) $(CFLAGS) -DBUILTIN -c -o $@ $<
#
# Real targets
#
../../lib/mga.so: $(PLUGIN_MGA)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
../../lib/mga.a: $(BUILTIN_MGA)
ar r $@ $^
plugins/motion/Makefile 0 → 100644
View file @ 6b3c8540
###############################################################################
# vlc (VideoLAN Client) motion module makefile
# (c)2001 VideoLAN
###############################################################################
include ../../Makefile.modules
###############################################################################
# Objects and files
###############################################################################
PLUGIN_MOTION = motion.o vdec_motion_inner.o
PLUGIN_MOTIONMMX = motionmmx.o vdec_motion_inner_mmx.o
PLUGIN_MOTIONMMXEXT = motionmmxext.o vdec_motion_inner_mmxext.o
PLUGIN_MOTIONCOMMON = vdec_motion_common.o
BUILTIN_MOTION = $(PLUGIN_MOTION:%.o=%-BUILTIN-MOTION.o) \
$(PLUGIN_MOTIONCOMMON:%.o=%-BUILTIN-MOTION.o)
BUILTIN_MOTIONMMX = $(PLUGIN_MOTIONMMX:%.o=%-BUILTIN-MOTIONMMX.o) \
$(PLUGIN_MOTIONCOMMON:%.o=%-BUILTIN-MOTIONMMX.o)
BUILTIN_MOTIONMMXEXT = $(PLUGIN_MOTIONMMXEXT:%.o=%-BUILTIN-MOTIONMMXEXT.o) \
$(PLUGIN_MOTIONCOMMON:%.o=%-BUILTIN-MOTIONMMXEXT.o)
STD_PLUGIN_OBJ = $(PLUGIN_MOTION) $(PLUGIN_MOTIONMMX) $(PLUGIN_MOTIONMMXEXT) $(PLUGIN_MOTIONCOMMON)
ALL_OBJ = $(STD_PLUGIN_OBJ) $(BUILTIN_MOTION) $(BUILTIN_MOTIONMMX) $(BUILTIN_MOTIONMMXEXT)
objects := $(ALL_OBJ)
cdependancies := $(objects:%.o=.dep/%.d)
export
#
# Virtual targets
#
all:
clean:
rm -f $(ALL_OBJ)
rm -f *.o *.moc *.bak *.so *.a *.builtin
rm -rf .dep
FORCE:
$(cdependancies): %.d: FORCE
@$(MAKE) -s --no-print-directory -f ../../Makefile.dep $@
$(ALL_OBJ): %.o: ../../Makefile.dep
$(STD_PLUGIN_OBJ): %.o: .dep/%.d
$(STD_PLUGIN_OBJ): %.o: %.c
$(CC) $(CFLAGS) $(PCFLAGS) -c -o $@ $<
$(BUILTIN_MOTION): %-BUILTIN-MOTION.o: .dep/%.d
$(BUILTIN_MOTION): %-BUILTIN-MOTION.o: %.c
$(CC) $(CFLAGS) -DBUILTIN -DMODULE_NAME=motion -c -o $@ $<
$(BUILTIN_MOTIONMMX): %-BUILTIN-MOTIONMMX.o: .dep/%.d
$(BUILTIN_MOTIONMMX): %-BUILTIN-MOTIONMMX.o: %.c
$(CC) $(CFLAGS) -DBUILTIN -DMODULE_NAME=motionmmx -c -o $@ $<
$(BUILTIN_MOTIONMMXEXT): %-BUILTIN-MOTIONMMXEXT.o: .dep/%.d
$(BUILTIN_MOTIONMMXEXT): %-BUILTIN-MOTIONMMXEXT.o: %.c
$(CC) $(CFLAGS) -DBUILTIN -DMODULE_NAME=motionmmxext -c -o $@ $<
#
# Real targets
#
../../lib/motion.so: $(PLUGIN_MOTION) $(PLUGIN_MOTIONCOMMON)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
../../lib/motion.a: $(BUILTIN_MOTION)
ar r $@ $^
../../lib/motionclassic.so: $(PLUGIN_MOTIONCLASSIC) $(PLUGIN_MOTIONCOMMON)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
../../lib/motionclassic.a: $(BUILTIN_MOTIONCLASSIC)
ar r $@ $^
../../lib/motionmmx.so: $(PLUGIN_MOTIONMMX) $(PLUGIN_MOTIONCOMMON)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
../../lib/motionmmx.a: $(BUILTIN_MOTIONMMX)
ar r $@ $^
../../lib/motionmmxext.so: $(PLUGIN_MOTIONMMXEXT) $(PLUGIN_MOTIONCOMMON)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
../../lib/motionmmxext.a: $(BUILTIN_MOTIONMMXEXT)
ar r $@ $^
../../lib/motionaltivec.so: $(PLUGIN_MOTIONALTIVEC) $(PLUGIN_MOTIONCOMMON)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) -framework vecLib
../../lib/motionaltivec.a: $(BUILTIN_MOTIONALTIVEC)
ar r $@ $^
plugins/motion/motion.c
View file @ 6b3c8540
......@@ -2,7 +2,7 @@
* motion.c : C motion compensation module for vlc
*****************************************************************************
* Copyright (C) 2000 VideoLAN
* $Id: motion.c,v 1.3 2001/03/21 13:42:34 sam Exp $
* $Id: motion.c,v 1.4 2001/04/15 04:19:57 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -114,7 +114,7 @@ MODULE_DEACTIVATE
/*****************************************************************************
* motion_Probe: tests probe the CPU and return a score
*****************************************************************************/
int motion_Probe( probedata_t *p_data )
int _M( motion_Probe )( probedata_t *p_data )
{
if( TestMethod( MOTION_METHOD_VAR, "motion" ) )
{
......
plugins/motion/motionmmx.c
View file @ 6b3c8540
......@@ -2,7 +2,7 @@
* motionmmx.c : MMX motion compensation module for vlc
*****************************************************************************
* Copyright (C) 2000 VideoLAN
* $Id: motionmmx.c,v 1.3 2001/03/21 13:42:34 sam Exp $
* $Id: motionmmx.c,v 1.4 2001/04/15 04:19:57 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -114,7 +114,7 @@ MODULE_DEACTIVATE
/*****************************************************************************
* motion_Probe: tests probe the CPU and return a score
*****************************************************************************/
int motion_Probe( probedata_t *p_data )
int _M( motion_Probe )( probedata_t *p_data )
{
if( TestCPU( CPU_CAPABILITY_MMX ) )
{
......
plugins/motion/motionmmxext.c
View file @ 6b3c8540
......@@ -2,7 +2,7 @@
* motionmmxext.c : MMX EXT motion compensation module for vlc
*****************************************************************************
* Copyright (C) 2000 VideoLAN
* $Id: motionmmxext.c,v 1.3 2001/03/21 13:42:34 sam Exp $
* $Id: motionmmxext.c,v 1.4 2001/04/15 04:19:57 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -114,7 +114,7 @@ MODULE_DEACTIVATE
/*****************************************************************************
* motion_Probe: tests probe the CPU and return a score
*****************************************************************************/
int motion_Probe( probedata_t *p_data )
int _M( motion_Probe )( probedata_t *p_data )
{
if( TestCPU( CPU_CAPABILITY_MMXEXT ) )
{
......
plugins/motion/vdec_motion_common.c
View file @ 6b3c8540
......@@ -2,7 +2,7 @@
* vdec_motion_common.c : common motion compensation routines common
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: vdec_motion_common.c,v 1.5 2001/02/20 15:03:00 massiot Exp $
* $Id: vdec_motion_common.c,v 1.6 2001/04/15 04:19:57 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Jean-Marc Dressler <polux@via.ecp.fr>
......@@ -23,6 +23,13 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
/* MODULE_NAME defined in Makefile together with -DBUILTIN */
#ifdef BUILTIN
# include "modules_inner.h"
#else
# define _M( foo ) foo
#endif
/*****************************************************************************
* Preamble
*****************************************************************************/
......@@ -41,7 +48,7 @@
#include "vdec_motion.h"
#include "vpar_blocks.h"
extern int motion_Probe( probedata_t *p_data );
extern int _M( motion_Probe )( probedata_t *p_data );
static void vdec_MotionFieldField420 ( macroblock_t * p_mb );
static void vdec_MotionFieldField422 ( macroblock_t * p_mb );
......@@ -68,7 +75,7 @@ static void vdec_MotionFrameDMV444 ( macroblock_t * p_mb );
*****************************************************************************/
void motion_getfunctions( function_list_t * p_function_list )
{
p_function_list->pf_probe = motion_Probe;
p_function_list->pf_probe = _M( motion_Probe );
#define list p_function_list->functions.motion
#define motion_functions( yuv ) \
......
plugins/mpeg/Makefile 0 → 100644
View file @ 6b3c8540
###############################################################################
# vlc (VideoLAN Client) mpeg module Makefile
# (c)2001 VideoLAN
###############################################################################
include ../../Makefile.modules
###############################################################################
# Objects and files
###############################################################################
PLUGIN_PS = ps.o input_ps.o
PLUGIN_TS = ts.o input_ts.o
BUILTIN_PS = $(PLUGIN_PS:%.o=%-BUILTIN.o)
BUILTIN_TS = $(PLUGIN_TS:%.o=%-BUILTIN.o)
STD_PLUGIN_OBJ = $(PLUGIN_PS) $(PLUGIN_TS)
STD_BUILTIN_OBJ = $(BUILTIN_PS) $(BUILTIN_TS)
ALL_OBJ = $(STD_PLUGIN_OBJ) $(STD_BUILTIN_OBJ)
objects := $(ALL_OBJ)
cdependancies := $(objects:%.o=.dep/%.d)
export
#
# Virtual targets
#
all:
clean:
rm -f $(ALL_OBJ)
rm -f *.o *.moc *.bak *.so *.a *.builtin
rm -rf .dep
FORCE:
$(cdependancies): %.d: FORCE
@$(MAKE) -s --no-print-directory -f ../../Makefile.dep $@
$(ALL_OBJ): %.o: ../../Makefile.dep
$(STD_PLUGIN_OBJ): %.o: .dep/%.d
$(STD_PLUGIN_OBJ): %.o: %.c
$(CC) $(CFLAGS) $(PCFLAGS) -c -o $@ $<
$(STD_BUILTIN_OBJ): %-BUILTIN.o: .dep/%.d
$(STD_BUILTIN_OBJ): %-BUILTIN.o: %.c
$(CC) $(CFLAGS) -DBUILTIN -c -o $@ $<
#
# Real targets
#
../../lib/ps.so: $(PLUGIN_PS)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
../../lib/ps.a: $(BUILTIN_PS)
ar r $@ $^
../../lib/ts.so: $(PLUGIN_TS)
ifneq (,$(findstring darwin,$(SYS)))
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) -framework AGL -framework Carbon
else
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
endif
../../lib/ts.a: $(BUILTIN_TS)
ar r $@ $^
plugins/null/Makefile 0 → 100644
View file @ 6b3c8540
###############################################################################
# vlc (VideoLAN Client) null module makefile
# (c)2001 VideoLAN
###############################################################################
include ../../Makefile.modules
###############################################################################
# Objects and files
###############################################################################
PLUGIN_NULL = null.o
BUILTIN_NULL = $(PLUGIN_NULL:%.o=%-BUILTIN.o)
STD_PLUGIN_OBJ = $(PLUGIN_NULL)
STD_BUILTIN_OBJ = $(BUILTIN_NULL)
ALL_OBJ = $(STD_PLUGIN_OBJ) $(STD_BUILTIN_OBJ)
objects := $(STD_PLUGIN_OBJ) $(STD_BUILTIN_OBJ)
cdependancies := $(objects:%.o=.dep/%.d)
export
#
# Virtual targets
#
all:
clean:
rm -f $(ALL_OBJ)
rm -f *.o *.moc *.bak *.so *.a *.builtin
rm -rf .dep
FORCE:
$(cdependancies): %.d: FORCE
@$(MAKE) -s --no-print-directory -f ../../Makefile.dep $@
$(ALL_OBJ): %.o: ../../Makefile.dep
$(STD_PLUGIN_OBJ): %.o: .dep/%.d
$(STD_PLUGIN_OBJ): %.o: %.c
$(CC) $(CFLAGS) $(PCFLAGS) -c -o $@ $<
$(STD_BUILTIN_OBJ): %-BUILTIN.o: .dep/%.d
$(STD_BUILTIN_OBJ): %-BUILTIN.o: %.c
$(CC) $(CFLAGS) -DBUILTIN -c -o $@ $<
#
# Real targets
#
../../lib/null.so: $(PLUGIN_NULL)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
../../lib/null.a: $(BUILTIN_NULL)
ar r $@ $^
plugins/qt/Makefile 0 → 100644
View file @ 6b3c8540
###############################################################################
# vlc (VideoLAN Client) qt module Makefile
# (c)2001 VideoLAN
###############################################################################
include ../../Makefile.modules
###############################################################################
# Objects and files
###############################################################################
PLUGIN_QT = qt.o intf_qt.o
BUILTIN_QT = $(PLUGIN_QT:%.o=%-BUILTIN.o)
ALL_OBJ = $(PLUGIN_QT) $(BUILTIN_QT)
cppobjects := $(ALL_OBJ)
cppdependancies := $(cppobjects:%.o=.dep/%.dpp)
export
#
# Virtual targets
#
all:
clean:
rm -f $(ALL_OBJ)
rm -f *.o *.moc *.bak *.so *.a *.builtin
rm -rf .dep
FORCE:
$(cppdependancies): %.dpp: FORCE
@$(MAKE) -s --no-print-directory -f ../../Makefile.dep $@
$(ALL_OBJ): %.o: ../../Makefile.dep
$(PLUGIN_QT): %.o: .dep/%.dpp
$(PLUGIN_QT): %.o: %.moc
$(CC) $(CFLAGS) $(PCFLAGS) -I/usr/include/qt -I${QTDIR}/include -c -o $@ $(<:%.moc=%.cpp)
$(PLUGIN_QT:%.o=%.moc): %.moc: %.cpp
moc -i $< -o $@
$(BUILTIN_QT): %.o: .dep/%.dpp
$(BUILTIN_QT): %.o: %.moc
$(CC) $(CFLAGS) -DBUILTIN -I/usr/include/qt -I${QTDIR}/include -c -o $@ $(<:%.moc=%.cpp)
$(BUILTIN_QT:%.o=%.moc): %.moc: %.cpp
moc -i $< -o $@
#
# Real targets
#
../../lib/qt.so: $(PLUGIN_QT)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) -lqt -L${QTDIR}/lib
../../lib/qt.a: $(BUILTIN_QT)
ar r $@ $^
plugins/sdl/Makefile 0 → 100644
View file @ 6b3c8540
###############################################################################
# vlc (VideoLAN Client) sdl module Makefile
# (c)2001 VideoLAN
###############################################################################
include ../../Makefile.modules
###############################################################################
# Objects and files
###############################################################################
PLUGIN_SDL = sdl.o vout_sdl.o aout_sdl.o
BUILTIN_SDL = $(PLUGIN_SDL:%.o=%-BUILTIN.o)
ALL_OBJ = $(PLUGIN_SDL) $(BUILTIN_SDL)
objects := $(ALL_OBJ)
cdependancies := $(objects:%.o=.dep/%.d)
export
#
# Virtual targets
#
all:
clean:
rm -f $(ALL_OBJ)
rm -f *.o *.moc *.bak *.so *.a *.builtin
rm -rf .dep
FORCE:
$(cdependancies): %.d: FORCE
@$(MAKE) -s --no-print-directory -f ../../Makefile.dep $@
$(ALL_OBJ): %.o: ../../Makefile.dep
$(STD_PLUGIN_OBJ): %.o: .dep/%.d
$(STD_PLUGIN_OBJ): %.o: %.c
$(CC) $(CFLAGS) $(PCFLAGS) -c -o $@ $<
$(STD_BUILTIN_OBJ): %-BUILTIN.o: .dep/%.d
$(STD_BUILTIN_OBJ): %-BUILTIN.o: %.c
$(CC) $(CFLAGS) -DBUILTIN -c -o $@ $<
#
# Real targets
#
../../lib/sdl.so: $(PLUGIN_SDL)
ifneq (,$(findstring darwin,$(SYS)))
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_SDL) -framework Carbon -framework AGL
else
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_SDL)
endif
../../lib/sdl.a: $(BUILTIN_SDL)
ar r $@ $^
plugins/text/Makefile 0 → 100644
View file @ 6b3c8540
###############################################################################
# vlc (VideoLAN Client) text module Makefile
# (c)2001 VideoLAN
###############################################################################
include ../../Makefile.modules
###############################################################################
# Objects and files
###############################################################################
PLUGIN_NCURSES = ncurses.o vout_ncurses.o
BUILTIN_NCURSES = $(PLUGIN_NCURSES:%.o=%-BUILTIN.o)
ALL_OBJ = $(PLUGIN_NCURSES) $(BUILTIN_NCURSES)
objects := $(ALL_OBJ)
cdependancies := $(objects:%.o=.dep/%.d)
export
#
# Virtual targets
#
all:
clean:
rm -f $(ALL_OBJ)
rm -f *.o *.moc *.bak *.so *.a *.builtin
rm -rf .dep
FORCE:
$(cdependancies): %.d: FORCE
@$(MAKE) -s --no-print-directory -f ../../Makefile.dep $@
$(ALL_OBJ): %.o: ../../Makefile.dep
$(PLUGIN_NCURSES): %.o: .dep/%.d
$(PLUGIN_NCURSES): %.o: %.c
$(CC) $(CFLAGS) $(PCFLAGS) -c -o $@ $<
$(BUILTIN_NCURSES): %-BUILTIN.o: .dep/%.d
$(BUILTIN_NCURSES): %-BUILTIN.o: %.c
$(CC) $(CFLAGS) -DBUILTIN -c -o $@ $<
#
# Real targets
#
../../lib/ncurses.so: $(PLUGIN_NCURSES)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) -lncurses
../../lib/ncurses.a: $(BUILTIN_NCURSES)
ar r $@ $^
plugins/x11/Makefile 0 → 100644
View file @ 6b3c8540
###############################################################################
# vlc (VideoLAN Client) x11 module Makefile
# (c)2001 VideoLAN
###############################################################################
include ../../Makefile.modules
###############################################################################
# Objects and files
###############################################################################
PLUGIN_X11 = x11.o vout_x11.o
PLUGIN_XVIDEO = xvideo.o vout_xvideo.o
BUILTIN_X11 = $(PLUGIN_X11:%.o=%-BUILTIN.o)
BUILTIN_XVIDEO = $(PLUGIN_XVIDEO:%.o=%-BUILTIN.o)
STD_PLUGIN_OBJ = $(PLUGIN_X11) $(PLUGIN_XVIDEO)
STD_BUILTIN_OBJ = $(BUILTIN_X11) $(BUILTIN_XVIDEO)
ALL_OBJ = $(STD_PLUGIN_OBJ) $(STD_BUILTIN_OBJ)
objects := $(ALL_OBJ)
cdependancies := $(objects:%.o=.dep/%.d)
export
#
# Virtual targets
#
all:
clean:
rm -f $(ALL_OBJ)
rm -f *.o *.moc *.bak *.so *.a *.builtin
rm -rf .dep
FORCE:
$(cdependancies): %.d: FORCE
@$(MAKE) -s --no-print-directory -f ../../Makefile.dep $@
$(ALL_OBJ): %.o: ../../Makefile.dep
$(STD_PLUGIN_OBJ): %.o: .dep/%.d
$(STD_PLUGIN_OBJ): %.o: %.c
$(CC) $(CFLAGS) $(PCFLAGS) -c -o $@ $<
$(STD_BUILTIN_OBJ): %-BUILTIN.o: .dep/%.d
$(STD_BUILTIN_OBJ): %-BUILTIN.o: %.c
$(CC) $(CFLAGS) -DBUILTIN -c -o $@ $<
#
# Real targets
#
../../lib/x11.so: $(PLUGIN_X11)
ifeq ($(SYS),nto-qnx)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) -L/usr/X11R6/lib -lX11 -lXext -lsocket
else
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) -L/usr/X11R6/lib -lX11 -lXext
endif
../../lib/x11.a: $(BUILTIN_X11)
ar r $@ $^
../../lib/xvideo.so: $(PLUGIN_XVIDEO)
ifeq ($(SYS),nto-qnx)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) -L/usr/X11R6/lib -lX11 -lXext -lsocket
else
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) -L/usr/X11R6/lib -lX11 -lXext
endif
../../lib/xvideo.a: $(BUILTIN_XVIDEO)
ar r $@ $^
plugins/yuv/Makefile 0 → 100644
View file @ 6b3c8540
###############################################################################
# vlc (VideoLAN Client) yuv module makefile
# (c)2001 VideoLAN
###############################################################################
include ../../Makefile.modules
###############################################################################
# Objects and files
###############################################################################
PLUGIN_YUV = yuv.o video_yuv.o transforms_yuv.o
PLUGIN_YUVMMX = yuvmmx.o video_yuvmmx.o transforms_yuvmmx.o
BUILTIN_YUV = $(PLUGIN_YUV:%.o=%-BUILTIN.o)
BUILTIN_YUVMMX = $(PLUGIN_YUVMMX:%.o=%-BUILTIN.o)
STD_PLUGIN_OBJ = $(PLUGIN_YUV) $(PLUGIN_YUVMMX)
STD_BUILTIN_OBJ = $(BUILTIN_YUV) $(BUILTIN_YUVMMX)
ALL_OBJ = $(STD_PLUGIN_OBJ) $(STD_BUILTIN_OBJ)
objects := $(ALL_OBJ)
cdependancies := $(objects:%.o=.dep/%.d)
export
#
# Virtual targets
#
all:
clean:
rm -f $(ALL_OBJ)
rm -f *.o *.moc *.bak *.so *.a *.builtin
rm -rf .dep
FORCE:
$(cdependancies): %.d: FORCE
@$(MAKE) -s --no-print-directory -f ../../Makefile.dep $@
$(ALL_OBJ): %.o: ../../Makefile.dep
$(STD_PLUGIN_OBJ): %.o: .dep/%.d
$(STD_PLUGIN_OBJ): %.o: %.c
$(CC) $(CFLAGS) $(PCFLAGS) -c -o $@ $<
$(STD_BUILTIN_OBJ): %-BUILTIN.o: .dep/%.d
$(STD_BUILTIN_OBJ): %-BUILTIN.o: %.c
$(CC) $(CFLAGS) -DBUILTIN -c -o $@ $<
#
# Real targets
#
../../lib/yuv.so: $(PLUGIN_YUV)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
../../lib/yuv.a: $(BUILTIN_YUV)
ar r $@ $^
../../lib/yuvmmx.so: $(PLUGIN_YUVMMX)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
../../lib/yuvmmx.a: $(BUILTIN_YUVMMX)
ar r $@ $^
plugins/yuv/transforms_yuv.c
View file @ 6b3c8540
This diff is collapsed.
plugins/yuv/transforms_yuvmmx.c
View file @ 6b3c8540
This diff is collapsed.
plugins/yuv/video_common.h
View file @ 6b3c8540
......@@ -5,7 +5,7 @@
* case by optimized functions.
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: video_common.h,v 1.3 2001/03/21 13:42:34 sam Exp $
* $Id: video_common.h,v 1.4 2001/04/15 04:19:58 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
*
......@@ -68,44 +68,43 @@ int i_matrix_coefficients
* Extern prototypes
*****************************************************************************/
void SetOffset( int i_width, int i_height, int i_pic_width, int i_pic_height,
boolean_t *pb_h_scaling, int *pi_v_scaling,
int *p_offset, boolean_t b_double );
void ConvertY4Gray8 ( YUV_ARGS_8BPP );
void ConvertYUV420RGB8 ( YUV_ARGS_8BPP );
void ConvertYUV422RGB8 ( YUV_ARGS_8BPP );
void ConvertYUV444RGB8 ( YUV_ARGS_8BPP );
void ConvertY4Gray16 ( YUV_ARGS_16BPP );
void ConvertYUV420RGB16 ( YUV_ARGS_16BPP );
void ConvertYUV422RGB16 ( YUV_ARGS_16BPP );
void ConvertYUV444RGB16 ( YUV_ARGS_16BPP );
void ConvertY4Gray24 ( YUV_ARGS_24BPP );
void ConvertYUV420RGB24 ( YUV_ARGS_24BPP );
void ConvertYUV422RGB24 ( YUV_ARGS_24BPP );
void ConvertYUV444RGB24 ( YUV_ARGS_24BPP );
void ConvertY4Gray32 ( YUV_ARGS_32BPP );
void ConvertYUV420RGB32 ( YUV_ARGS_32BPP );
void ConvertYUV422RGB32 ( YUV_ARGS_32BPP );
void ConvertYUV444RGB32 ( YUV_ARGS_32BPP );
void ConvertYUV420YCbr8 ( YUV_ARGS_8BPP );
void ConvertYUV422YCbr8 ( YUV_ARGS_8BPP );
void ConvertYUV444YCbr8 ( YUV_ARGS_8BPP );
void ConvertYUV420YCbr16 ( YUV_ARGS_16BPP );
void ConvertYUV422YCbr16 ( YUV_ARGS_16BPP );
void ConvertYUV444YCbr16 ( YUV_ARGS_16BPP );
void ConvertYUV420YCbr24 ( YUV_ARGS_24BPP );
void ConvertYUV422YCbr24 ( YUV_ARGS_24BPP );
void ConvertYUV444YCbr24 ( YUV_ARGS_24BPP );
void ConvertYUV420YCbr32 ( YUV_ARGS_32BPP );
void ConvertYUV422YCbr32 ( YUV_ARGS_32BPP );
void ConvertYUV444YCbr32 ( YUV_ARGS_32BPP );
void _M( SetOffset )( int i_width, int i_height, int i_pic_width,
int i_pic_height, boolean_t *pb_h_scaling,
int *pi_v_scaling, int *p_offset, boolean_t b_double );
void _M( ConvertY4Gray8 ) ( YUV_ARGS_8BPP );
void _M( ConvertYUV420RGB8 ) ( YUV_ARGS_8BPP );
void _M( ConvertYUV422RGB8 ) ( YUV_ARGS_8BPP );
void _M( ConvertYUV444RGB8 ) ( YUV_ARGS_8BPP );
void _M( ConvertY4Gray16 ) ( YUV_ARGS_16BPP );
void _M( ConvertYUV420RGB16 ) ( YUV_ARGS_16BPP );
void _M( ConvertYUV422RGB16 ) ( YUV_ARGS_16BPP );
void _M( ConvertYUV444RGB16 ) ( YUV_ARGS_16BPP );
void _M( ConvertY4Gray24 ) ( YUV_ARGS_24BPP );
void _M( ConvertYUV420RGB24 ) ( YUV_ARGS_24BPP );
void _M( ConvertYUV422RGB24 ) ( YUV_ARGS_24BPP );
void _M( ConvertYUV444RGB24 ) ( YUV_ARGS_24BPP );
void _M( ConvertY4Gray32 ) ( YUV_ARGS_32BPP );
void _M( ConvertYUV420RGB32 ) ( YUV_ARGS_32BPP );
void _M( ConvertYUV422RGB32 ) ( YUV_ARGS_32BPP );
void _M( ConvertYUV444RGB32 ) ( YUV_ARGS_32BPP );
void _M( ConvertYUV420YCbr8 ) ( YUV_ARGS_8BPP );
void _M( ConvertYUV422YCbr8 ) ( YUV_ARGS_8BPP );
void _M( ConvertYUV444YCbr8 ) ( YUV_ARGS_8BPP );
void _M( ConvertYUV420YCbr16 ) ( YUV_ARGS_16BPP );
void _M( ConvertYUV422YCbr16 ) ( YUV_ARGS_16BPP );
void _M( ConvertYUV444YCbr16 ) ( YUV_ARGS_16BPP );
void _M( ConvertYUV420YCbr24 ) ( YUV_ARGS_24BPP );
void _M( ConvertYUV422YCbr24 ) ( YUV_ARGS_24BPP );
void _M( ConvertYUV444YCbr24 ) ( YUV_ARGS_24BPP );
void _M( ConvertYUV420YCbr32 ) ( YUV_ARGS_32BPP );
void _M( ConvertYUV422YCbr32 ) ( YUV_ARGS_32BPP );
void _M( ConvertYUV444YCbr32 ) ( YUV_ARGS_32BPP );
plugins/yuv/video_yuv.c
View file @ 6b3c8540
......@@ -5,7 +5,7 @@
* case by optimized functions.
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: video_yuv.c,v 1.12 2001/03/21 13:42:34 sam Exp $
* $Id: video_yuv.c,v 1.13 2001/04/15 04:19:58 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
*
......@@ -441,56 +441,60 @@ static void SetYUV( vout_thread_t *p_vout )
{
switch( p_vout->i_bytes_per_pixel)
{
#define _X( foo ) (vout_yuv_convert_t *) _M( foo )
case 1:
p_vout->yuv.pf_yuv420 = (vout_yuv_convert_t *) ConvertYUV420YCbr8;
p_vout->yuv.pf_yuv422 = (vout_yuv_convert_t *) ConvertYUV422YCbr8;
p_vout->yuv.pf_yuv444 = (vout_yuv_convert_t *) ConvertYUV444YCbr8;
p_vout->yuv.pf_yuv420 = _X( ConvertYUV420YCbr8 );
p_vout->yuv.pf_yuv422 = _X( ConvertYUV422YCbr8 );
p_vout->yuv.pf_yuv444 = _X( ConvertYUV444YCbr8 );
break;
case 2:
p_vout->yuv.pf_yuv420 = (vout_yuv_convert_t *) ConvertYUV420YCbr16;
p_vout->yuv.pf_yuv422 = (vout_yuv_convert_t *) ConvertYUV422YCbr16;
p_vout->yuv.pf_yuv444 = (vout_yuv_convert_t *) ConvertYUV444YCbr16;
p_vout->yuv.pf_yuv420 = _X( ConvertYUV420YCbr16 );
p_vout->yuv.pf_yuv422 = _X( ConvertYUV422YCbr16 );
p_vout->yuv.pf_yuv444 = _X( ConvertYUV444YCbr16 );
break;
case 3:
p_vout->yuv.pf_yuv420 = (vout_yuv_convert_t *) ConvertYUV420YCbr24;
p_vout->yuv.pf_yuv422 = (vout_yuv_convert_t *) ConvertYUV422YCbr24;
p_vout->yuv.pf_yuv444 = (vout_yuv_convert_t *) ConvertYUV444YCbr24;
p_vout->yuv.pf_yuv420 = _X( ConvertYUV420YCbr24 );
p_vout->yuv.pf_yuv422 = _X( ConvertYUV422YCbr24 );
p_vout->yuv.pf_yuv444 = _X( ConvertYUV444YCbr24 );
break;
case 4:
p_vout->yuv.pf_yuv420 = (vout_yuv_convert_t *) ConvertYUV420YCbr32;
p_vout->yuv.pf_yuv422 = (vout_yuv_convert_t *) ConvertYUV422YCbr32;
p_vout->yuv.pf_yuv444 = (vout_yuv_convert_t *) ConvertYUV444YCbr32;
p_vout->yuv.pf_yuv420 = _X( ConvertYUV420YCbr32 );
p_vout->yuv.pf_yuv422 = _X( ConvertYUV422YCbr32 );
p_vout->yuv.pf_yuv444 = _X( ConvertYUV444YCbr32 );
break;
}
#undef _X
}
else if( p_vout->b_grayscale )
{
/* Grayscale */
switch( p_vout->i_bytes_per_pixel )
{
#define _X( foo ) (vout_yuv_convert_t *) _M( foo )
case 1:
p_vout->yuv.pf_yuv420 = (vout_yuv_convert_t *) ConvertY4Gray8;
p_vout->yuv.pf_yuv422 = (vout_yuv_convert_t *) ConvertY4Gray8;
p_vout->yuv.pf_yuv444 = (vout_yuv_convert_t *) ConvertY4Gray8;
p_vout->yuv.pf_yuv420 = _X( ConvertY4Gray8 );
p_vout->yuv.pf_yuv422 = _X( ConvertY4Gray8 );
p_vout->yuv.pf_yuv444 = _X( ConvertY4Gray8 );
break;
case 2:
p_vout->yuv.pf_yuv420 = (vout_yuv_convert_t *) ConvertY4Gray16;
p_vout->yuv.pf_yuv422 = (vout_yuv_convert_t *) ConvertY4Gray16;
p_vout->yuv.pf_yuv444 = (vout_yuv_convert_t *) ConvertY4Gray16;
p_vout->yuv.pf_yuv420 = _X( ConvertY4Gray16 );
p_vout->yuv.pf_yuv422 = _X( ConvertY4Gray16 );
p_vout->yuv.pf_yuv444 = _X( ConvertY4Gray16 );
break;
case 3:
p_vout->yuv.pf_yuv420 = (vout_yuv_convert_t *) ConvertY4Gray24;
p_vout->yuv.pf_yuv422 = (vout_yuv_convert_t *) ConvertY4Gray24;
p_vout->yuv.pf_yuv444 = (vout_yuv_convert_t *) ConvertY4Gray24;
p_vout->yuv.pf_yuv420 = _X( ConvertY4Gray24 );
p_vout->yuv.pf_yuv422 = _X( ConvertY4Gray24 );
p_vout->yuv.pf_yuv444 = _X( ConvertY4Gray24 );
break;
case 4:
p_vout->yuv.pf_yuv420 = (vout_yuv_convert_t *) ConvertY4Gray32;
p_vout->yuv.pf_yuv422 = (vout_yuv_convert_t *) ConvertY4Gray32;
p_vout->yuv.pf_yuv444 = (vout_yuv_convert_t *) ConvertY4Gray32;
p_vout->yuv.pf_yuv420 = _X( ConvertY4Gray32 );
p_vout->yuv.pf_yuv422 = _X( ConvertY4Gray32 );
p_vout->yuv.pf_yuv444 = _X( ConvertY4Gray32 );
break;
#undef _X
}
}
else
......@@ -498,26 +502,28 @@ static void SetYUV( vout_thread_t *p_vout )
/* Color */
switch( p_vout->i_bytes_per_pixel )
{
#define _X( foo ) (vout_yuv_convert_t *) _M( foo )
case 1:
p_vout->yuv.pf_yuv420 = (vout_yuv_convert_t *) ConvertYUV420RGB8;
p_vout->yuv.pf_yuv422 = (vout_yuv_convert_t *) ConvertYUV422RGB8;
p_vout->yuv.pf_yuv444 = (vout_yuv_convert_t *) ConvertYUV444RGB8;
p_vout->yuv.pf_yuv420 = _X( ConvertYUV420RGB8 );
p_vout->yuv.pf_yuv422 = _X( ConvertYUV422RGB8 );
p_vout->yuv.pf_yuv444 = _X( ConvertYUV444RGB8 );
break;
case 2:
p_vout->yuv.pf_yuv420 = (vout_yuv_convert_t *) ConvertYUV420RGB16;
p_vout->yuv.pf_yuv422 = (vout_yuv_convert_t *) ConvertYUV422RGB16;
p_vout->yuv.pf_yuv444 = (vout_yuv_convert_t *) ConvertYUV444RGB16;
p_vout->yuv.pf_yuv420 = _X( ConvertYUV420RGB16 );
p_vout->yuv.pf_yuv422 = _X( ConvertYUV422RGB16 );
p_vout->yuv.pf_yuv444 = _X( ConvertYUV444RGB16 );
break;
case 3:
p_vout->yuv.pf_yuv420 = (vout_yuv_convert_t *) ConvertYUV420RGB24;
p_vout->yuv.pf_yuv422 = (vout_yuv_convert_t *) ConvertYUV422RGB24;
p_vout->yuv.pf_yuv444 = (vout_yuv_convert_t *) ConvertYUV444RGB24;
p_vout->yuv.pf_yuv420 = _X( ConvertYUV420RGB24 );
p_vout->yuv.pf_yuv422 = _X( ConvertYUV422RGB24 );
p_vout->yuv.pf_yuv444 = _X( ConvertYUV444RGB24 );
break;
case 4:
p_vout->yuv.pf_yuv420 = (vout_yuv_convert_t *) ConvertYUV420RGB32;
p_vout->yuv.pf_yuv422 = (vout_yuv_convert_t *) ConvertYUV422RGB32;
p_vout->yuv.pf_yuv444 = (vout_yuv_convert_t *) ConvertYUV444RGB32;
p_vout->yuv.pf_yuv420 = _X( ConvertYUV420RGB32 );
p_vout->yuv.pf_yuv422 = _X( ConvertYUV422RGB32 );
p_vout->yuv.pf_yuv444 = _X( ConvertYUV444RGB32 );
break;
#undef _X
}
}
......@@ -530,9 +536,9 @@ static void SetYUV( vout_thread_t *p_vout )
* It will also set horizontal and vertical scaling indicators. If b_double
* is set, the p_offset structure has interleaved Y and U/V offsets.
*****************************************************************************/
void SetOffset( int i_width, int i_height, int i_pic_width, int i_pic_height,
boolean_t *pb_h_scaling, int *pi_v_scaling,
int *p_offset, boolean_t b_double )
void _M( SetOffset )( int i_width, int i_height, int i_pic_width,
int i_pic_height, boolean_t *pb_h_scaling,
int *pi_v_scaling, int *p_offset, boolean_t b_double )
{
int i_x; /* x position in destination */
int i_scale_count; /* modulo counter */
......
plugins/yuv/video_yuvmmx.c
View file @ 6b3c8540
......@@ -3,7 +3,7 @@
* Provides functions to perform the YUV conversion.
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: video_yuvmmx.c,v 1.7 2001/03/21 13:42:34 sam Exp $
* $Id: video_yuvmmx.c,v 1.8 2001/04/15 04:19:58 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -329,29 +329,31 @@ static void SetYUV( vout_thread_t *p_vout )
{
switch( p_vout->i_bytes_per_pixel)
{
#define _X( foo ) (vout_yuv_convert_t *) _M( foo )
case 1:
p_vout->yuv.pf_yuv420 = (vout_yuv_convert_t *) ConvertYUV420YCbr8;
p_vout->yuv.pf_yuv422 = (vout_yuv_convert_t *) ConvertYUV422YCbr8;
p_vout->yuv.pf_yuv444 = (vout_yuv_convert_t *) ConvertYUV444YCbr8;
p_vout->yuv.pf_yuv420 = _X( ConvertYUV420YCbr8 );
p_vout->yuv.pf_yuv422 = _X( ConvertYUV422YCbr8 );
p_vout->yuv.pf_yuv444 = _X( ConvertYUV444YCbr8 );
break;
case 2:
p_vout->yuv.pf_yuv420 = (vout_yuv_convert_t *) ConvertYUV420YCbr16;
p_vout->yuv.pf_yuv422 = (vout_yuv_convert_t *) ConvertYUV422YCbr16;
p_vout->yuv.pf_yuv444 = (vout_yuv_convert_t *) ConvertYUV444YCbr16;
p_vout->yuv.pf_yuv420 = _X( ConvertYUV420YCbr16 );
p_vout->yuv.pf_yuv422 = _X( ConvertYUV422YCbr16 );
p_vout->yuv.pf_yuv444 = _X( ConvertYUV444YCbr16 );
break;
case 3:
p_vout->yuv.pf_yuv420 = (vout_yuv_convert_t *) ConvertYUV420YCbr24;
p_vout->yuv.pf_yuv422 = (vout_yuv_convert_t *) ConvertYUV422YCbr24;
p_vout->yuv.pf_yuv444 = (vout_yuv_convert_t *) ConvertYUV444YCbr24;
p_vout->yuv.pf_yuv420 = _X( ConvertYUV420YCbr24 );
p_vout->yuv.pf_yuv422 = _X( ConvertYUV422YCbr24 );
p_vout->yuv.pf_yuv444 = _X( ConvertYUV444YCbr24 );
break;
case 4:
p_vout->yuv.pf_yuv420 = (vout_yuv_convert_t *) ConvertYUV420YCbr32;
p_vout->yuv.pf_yuv422 = (vout_yuv_convert_t *) ConvertYUV422YCbr32;
p_vout->yuv.pf_yuv444 = (vout_yuv_convert_t *) ConvertYUV444YCbr32;
p_vout->yuv.pf_yuv420 = _X( ConvertYUV420YCbr32 );
p_vout->yuv.pf_yuv422 = _X( ConvertYUV422YCbr32 );
p_vout->yuv.pf_yuv444 = _X( ConvertYUV444YCbr32 );
break;
#undef _X
}
}
else if( p_vout->b_grayscale )
......@@ -359,26 +361,28 @@ static void SetYUV( vout_thread_t *p_vout )
/* Grayscale */
switch( p_vout->i_bytes_per_pixel )
{
#define _X( foo ) (vout_yuv_convert_t *) _M( foo )
case 1:
p_vout->yuv.pf_yuv420 = (vout_yuv_convert_t *) ConvertY4Gray8;
p_vout->yuv.pf_yuv422 = (vout_yuv_convert_t *) ConvertY4Gray8;
p_vout->yuv.pf_yuv444 = (vout_yuv_convert_t *) ConvertY4Gray8;
p_vout->yuv.pf_yuv420 = _X( ConvertY4Gray8 );
p_vout->yuv.pf_yuv422 = _X( ConvertY4Gray8 );
p_vout->yuv.pf_yuv444 = _X( ConvertY4Gray8 );
break;
case 2:
p_vout->yuv.pf_yuv420 = (vout_yuv_convert_t *) ConvertY4Gray16;
p_vout->yuv.pf_yuv422 = (vout_yuv_convert_t *) ConvertY4Gray16;
p_vout->yuv.pf_yuv444 = (vout_yuv_convert_t *) ConvertY4Gray16;
p_vout->yuv.pf_yuv420 = _X( ConvertY4Gray16 );
p_vout->yuv.pf_yuv422 = _X( ConvertY4Gray16 );
p_vout->yuv.pf_yuv444 = _X( ConvertY4Gray16 );
break;
case 3:
p_vout->yuv.pf_yuv420 = (vout_yuv_convert_t *) ConvertYUV420RGB24;
p_vout->yuv.pf_yuv422 = (vout_yuv_convert_t *) ConvertY4Gray24;
p_vout->yuv.pf_yuv444 = (vout_yuv_convert_t *) ConvertY4Gray24;
p_vout->yuv.pf_yuv420 = _X( ConvertYUV420RGB24 );
p_vout->yuv.pf_yuv422 = _X( ConvertY4Gray24 );
p_vout->yuv.pf_yuv444 = _X( ConvertY4Gray24 );
break;
case 4:
p_vout->yuv.pf_yuv420 = (vout_yuv_convert_t *) ConvertYUV420RGB32;
p_vout->yuv.pf_yuv422 = (vout_yuv_convert_t *) ConvertY4Gray32;
p_vout->yuv.pf_yuv444 = (vout_yuv_convert_t *) ConvertY4Gray32;
p_vout->yuv.pf_yuv420 = _X( ConvertYUV420RGB32 );
p_vout->yuv.pf_yuv422 = _X( ConvertY4Gray32 );
p_vout->yuv.pf_yuv444 = _X( ConvertY4Gray32 );
break;
#undef _X
}
}
else
......@@ -386,26 +390,28 @@ static void SetYUV( vout_thread_t *p_vout )
/* Color */
switch( p_vout->i_bytes_per_pixel )
{
#define _X( foo ) (vout_yuv_convert_t *) _M( foo )
case 1:
p_vout->yuv.pf_yuv420 = (vout_yuv_convert_t *) ConvertYUV420RGB8;
p_vout->yuv.pf_yuv422 = (vout_yuv_convert_t *) ConvertYUV422RGB8;
p_vout->yuv.pf_yuv444 = (vout_yuv_convert_t *) ConvertYUV444RGB8;
p_vout->yuv.pf_yuv420 = _X( ConvertYUV420RGB8 );
p_vout->yuv.pf_yuv422 = _X( ConvertYUV422RGB8 );
p_vout->yuv.pf_yuv444 = _X( ConvertYUV444RGB8 );
break;
case 2:
p_vout->yuv.pf_yuv420 = (vout_yuv_convert_t *) ConvertYUV420RGB16;
p_vout->yuv.pf_yuv422 = (vout_yuv_convert_t *) ConvertYUV422RGB16;
p_vout->yuv.pf_yuv444 = (vout_yuv_convert_t *) ConvertYUV444RGB16;
p_vout->yuv.pf_yuv420 = _X( ConvertYUV420RGB16 );
p_vout->yuv.pf_yuv422 = _X( ConvertYUV422RGB16 );
p_vout->yuv.pf_yuv444 = _X( ConvertYUV444RGB16 );
break;
case 3:
p_vout->yuv.pf_yuv420 = (vout_yuv_convert_t *) ConvertYUV420RGB24;
p_vout->yuv.pf_yuv422 = (vout_yuv_convert_t *) ConvertYUV422RGB24;
p_vout->yuv.pf_yuv444 = (vout_yuv_convert_t *) ConvertYUV444RGB24;
p_vout->yuv.pf_yuv420 = _X( ConvertYUV420RGB24 );
p_vout->yuv.pf_yuv422 = _X( ConvertYUV422RGB24 );
p_vout->yuv.pf_yuv444 = _X( ConvertYUV444RGB24 );
break;
case 4:
p_vout->yuv.pf_yuv420 = (vout_yuv_convert_t *) ConvertYUV420RGB32;
p_vout->yuv.pf_yuv422 = (vout_yuv_convert_t *) ConvertYUV422RGB32;
p_vout->yuv.pf_yuv444 = (vout_yuv_convert_t *) ConvertYUV444RGB32;
p_vout->yuv.pf_yuv420 = _X( ConvertYUV420RGB32 );
p_vout->yuv.pf_yuv422 = _X( ConvertYUV422RGB32 );
p_vout->yuv.pf_yuv444 = _X( ConvertYUV444RGB32 );
break;
#undef _X
}
}
}
......@@ -417,9 +423,9 @@ static void SetYUV( vout_thread_t *p_vout )
* It will also set horizontal and vertical scaling indicators. If b_double
* is set, the p_offset structure has interleaved Y and U/V offsets.
*****************************************************************************/
void SetOffset( int i_width, int i_height, int i_pic_width, int i_pic_height,
boolean_t *pb_h_scaling, int *pi_v_scaling,
int *p_offset, boolean_t b_double )
void _M( SetOffset )( int i_width, int i_height, int i_pic_width,
int i_pic_height, boolean_t *pb_h_scaling,
int *pi_v_scaling, int *p_offset, boolean_t b_double )
{
int i_x; /* x position in destination */
int i_scale_count; /* modulo counter */
......
src/input/input.c
View file @ 6b3c8540
......@@ -4,7 +4,7 @@
* decoders.
*****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN
* $Id: input.c,v 1.97 2001/04/12 02:40:09 stef Exp $
* $Id: input.c,v 1.98 2001/04/15 04:19:58 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -273,7 +273,7 @@ static void RunThread( input_thread_t *p_input )
{
/* End of file - we do not set b_die because only the
* interface is allowed to do so. */
intf_WarnMsg( 1, "End of file reached" );
intf_WarnMsg( 1, "input: EOF reached" );
p_input->b_eof = 1;
}
else
......@@ -292,7 +292,7 @@ static void RunThread( input_thread_t *p_input )
DestroyThread( p_input );
intf_DbgMsg("Thread end");
intf_DbgMsg("input: Thread end");
}
/*****************************************************************************
......@@ -519,6 +519,7 @@ void input_FileOpen( input_thread_t * p_input )
*****************************************************************************/
void input_FileClose( input_thread_t * p_input )
{
intf_Msg( "input: closing %s", p_input->p_source );
close( p_input->i_handle );
return;
......
src/misc/modules.c
View file @ 6b3c8540
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment