Commit df61d33b authored by Jean-Paul Saman's avatar Jean-Paul Saman
Browse files

Merge branch 'master' of git@git.videolan.org:vlc

parents cb23a823 03119836
......@@ -8,7 +8,7 @@
# - src (libvlc) is nedeed by modules, mozilla and bindings
# - libs/* are needed by modules
SUBDIRS = po libs/loader libs/srtp src modules \
projects/mozilla bindings projects/activex share doc
projects/mozilla bindings projects/activex share doc test
DIST_SUBDIRS = $(SUBDIRS) m4 extras/package/ipkg
EXTRA_DIST = \
......
......@@ -162,6 +162,7 @@ Matthieu Lochegnies <prof at tocard dot org> - MPEG audio emphasis fix
Max Rudberg <max_08 at mac.com> - Mac OS X controller art (v0.7.0)
Meelad Zakaria <meelad at farsiweb dot info> - Persian localisation
Michael Mondragon <mammon at lokmail.net> - ncurses compilation fix
Michael Ploujnikov <ploujj at gmail dot com> - Spelling fix
Michał Trzebiatowski <hippie_1968 at hotmail dot com> - Polish translation
Mickael Hoerdt <hoerdt at clarinet.u-strasbg.fr> - IPv6 SSM multicast patch
Miguel Angel Cabrera <macabrera at solaiemes.com> - RTMP access patch
......
......@@ -51,7 +51,6 @@ public class LoggerIterator implements Iterator<LoggerMessage>
/**
* {@inheritDoc}
*/
@Override
public boolean hasNext()
{
libvlc_exception_t exception = new libvlc_exception_t();
......@@ -61,7 +60,6 @@ public class LoggerIterator implements Iterator<LoggerMessage>
/**
* {@inheritDoc}
*/
@Override
public LoggerMessage next()
{
libvlc_exception_t exception = new libvlc_exception_t();
......@@ -75,7 +73,6 @@ public class LoggerIterator implements Iterator<LoggerMessage>
* {@inheritDoc}
* Does not remove the element.
*/
@Override
public void remove()
{
//
......
......@@ -31,7 +31,7 @@
<distributionManagement>
<site>
<id>jvlc</id>
<url>http://jvlc.ihack.it/maven-site</url>
<url>http://jvlc.ihack.it/maven-site/</url>
<name>JVLC Maven Site</name>
</site>
</distributionManagement>
......
......@@ -1200,7 +1200,7 @@ dnl
VLC_ADD_PLUGINS([dummy logger memcpy])
VLC_ADD_PLUGINS([mpgv mpga m4v m4a h264 vc1 demux_cdg cdg ps pva avi asf mp4 rawdv rawvid nsv real aiff mjpeg demuxdump flacsys tta])
VLC_ADD_PLUGINS([cvdsub svcdsub spudec subsdec subsusf t140 dvbsub cc mpeg_audio lpcm a52 dts cinepak flac])
VLC_ADD_PLUGINS([deinterlace invert adjust transform wave ripple psychedelic gradient motionblur rv32 rotate noise grain extract sharpen seamcarving croppadd dynamicoverlay blendbench])
VLC_ADD_PLUGINS([deinterlace invert adjust transform wave ripple psychedelic gradient motionblur rv32 rotate noise grain extract sharpen seamcarving croppadd blendbench])
VLC_ADD_PLUGINS([converter_fixed mono])
VLC_ADD_PLUGINS([trivial_resampler ugly_resampler])
VLC_ADD_PLUGINS([trivial_channel_mixer trivial_mixer])
......@@ -1240,6 +1240,7 @@ dnl Some plugins aren't useful on some platforms
dnl
if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then
VLC_ADD_PLUGINS([screensaver motion])
VLC_ADD_PLUGINS([dynamicoverlay])
elif test "${SYS}" != "mingwce"; then
VLC_ADD_PLUGINS([ntservice access_smb dmo msn])
VLC_ADD_LIBS([dmo],[-lole32 -luuid])
......@@ -6226,6 +6227,7 @@ AC_CONFIG_FILES([
po/Makefile.in
share/Makefile
src/Makefile
test/Makefile
])
AC_CONFIG_FILES([
......
......@@ -850,3 +850,10 @@ VLC development is NOT about being a sed god.
<Meuuh> ha, NOW you can go into the fortunes
-- #videolan
%
< dionoea> tu veux transcoder une fille?
< funman> j aimerais bien la streamer direct chez moi
< dionoea> kewl :)
< dionoea> avec la texture et tout ?
< funman> ouais surtout les 2 macro blocks pectoraux
-- #vd
%
......@@ -33,6 +33,7 @@ add_subdirectory(libs/loader)
add_subdirectory(src)
add_subdirectory(modules)
add_subdirectory(po)
add_subdirectory(test)
# Enable uninstall
configure_file(
......
......@@ -270,19 +270,16 @@ set_target_properties(libvlc libvlc-control vlc PROPERTIES COMPILE_FLAGS
##########################################################
# Tests
add_executable(test_testapi control/testapi.c)
add_executable(test_i18n_atof test/i18n_atof.c)
add_executable(test_url test/url.c)
add_executable(test_utf8 test/utf8.c)
add_executable(test_dictionary test/dictionary.c)
target_link_libraries(test_testapi libvlc-control)
target_link_libraries(test_i18n_atof libvlc)
target_link_libraries(test_url libvlc)
target_link_libraries(test_utf8 libvlc)
target_link_libraries(test_dictionary libvlc)
add_test(test_control ${CMAKE_CURRENT_BINARY_DIR}/test_testapi)
add_test(test_i18n_atof ${CMAKE_CURRENT_BINARY_DIR}/test_i18n_atof)
add_test(test_url ${CMAKE_CURRENT_BINARY_DIR}/test_url)
add_test(test_utf8 ${CMAKE_CURRENT_BINARY_DIR}/test_utf8)
......
add_executable(test_libvlc_core libvlc/core.c)
add_executable(test_libvlc_events libvlc/events.c)
add_executable(test_libvlc_media_player libvlc/media_player.c
samples/test.sample)
add_executable(test_libvlc_media_list libvlc/media_list.c)
add_executable(test_libvlc_media_list_player libvlc/media_list_player.c
samples/test.sample)
target_link_libraries(test_libvlc_core libvlc-control)
target_link_libraries(test_libvlc_events libvlc-control)
target_link_libraries(test_libvlc_media_player libvlc-control)
target_link_libraries(test_libvlc_media_list libvlc-control)
target_link_libraries(test_libvlc_media_list_player libvlc-control)
set(SAMPLES_SERVER http://streams.videolan.org/streams-videolan/reference)
add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/samples/test.sample
COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/samples
COMMAND curl -L ${SAMPLES_SERVER}/avi/Hero-Div3.avi > ${CMAKE_CURRENT_BINARY_DIR}/samples/test.sample
)
add_test(test_libvlc_core
${CMAKE_CURRENT_BINARY_DIR}/test_libvlc_core)
add_test(test_libvlc_events
${CMAKE_CURRENT_BINARY_DIR}/test_libvlc_events)
add_test(test_libvlc_media_player
${CMAKE_CURRENT_BINARY_DIR}/test_libvlc_media_player)
add_test(test_libvlc_media_list
${CMAKE_CURRENT_BINARY_DIR}/test_libvlc_media_list)
add_test(test_libvlc_media_list_player
${CMAKE_CURRENT_BINARY_DIR}/test_libvlc_media_list_player)
......@@ -21,9 +21,9 @@ ln -sf ../$cmake_dir/CMakeLists/src_CMakeLists.txt src/CMakeLists.txt
echo "Removing old modules/gui/qt4/CMakeLists.txt"
rm -f modules/gui/qt4/CMakeLists.txt
echo "Installing libs/loaders/CMakeLists.txt"
rm -f libs/loaders/CMakeLists.txt
ln -s ../$cmake_dir/CMakeLists/libs_loaders_CMakeLists.txt libs/loaders/CMakeLists.txt
echo "Installing libs/loader/CMakeLists.txt"
rm -f libs/loader/CMakeLists.txt
ln -s ../../$cmake_dir/CMakeLists/libs_loaders_CMakeLists.txt libs/loader/CMakeLists.txt
echo "Installing modules/CMakeLists.txt"
rm -f modules/CMakeLists.txt
......@@ -33,7 +33,11 @@ echo "Installing po/CMakeLists.txt"
rm -f po/CMakeLists.txt
ln -s ../$cmake_dir/CMakeLists/po_CMakeLists.txt po/CMakeLists.txt
echo "Installing include/config.h.cmake"
echo "installing test/CMakeLists.txt"
rm -f test/CMakeLists.txt
ln -sf ../$cmake_dir/CMakeLists/test_CMakeLists.txt test/CMakeLists.txt
echo "installing include/config.h.cmake"
rm -f include/config.h.cmake
ln -sf ../$cmake_dir/config.h.cmake include/config.h.cmake
......
......@@ -14,7 +14,7 @@ info
src/*
# But not our files
!Makefile
!src/Distributions
!src/Distributions/*
!src/Patches
!src/package.mak
!src/packages.mak
!src/Makefile
......@@ -289,3 +289,14 @@ if git help >/dev/null 2>&1; then
else
echo "You do not have a Git client in your PATH." >&2
fi
if test -z "$CONTRIBS_RELEASE"; then
set +x
echo
echo "***********************************************************"
echo "* If you are building contribs for a release build of VLC *"
echo "* Please run CONTRIBS_RELEASE=sexy ./bootstrap *"
echo "***********************************************************"
else
echo "EXTRA_CFLAGS += -DNDEBUG" >> config.mak
fi
......@@ -4,15 +4,15 @@ download-all: autoconf automake libtool cmake gettext pkgconfig freetype2 \
speex libshout faad2 faac lame twolame libebml libmatroska ffmpeg libdca \
libdvdcss libdvdnav libdvbpsi live libcaca libmodplug xml asa jpeg tiff \
SDL zlib libpng libgpg-error libgcrypt opencdk gnutls libopendaap libcddb \
libcdio vcdimager SDL_image glib gecko-sdk mpcdec dirac expat taglib nasm \
x264 goom lua zvbi fontconfig ncurses all
libcdio vcdimager SDL_image glib gecko-sdk mpcdec dirac expat taglib \
x264 yasm goom lua zvbi fontconfig ncurses all
all: .autoconf .automake .libtool .cmake .intl .pkgcfg .freetype \
.fribidi .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
.flac .speex .shout .faad .faac .lame .twolame .ebml .matroska .ffmpeg \
.dvdcss .dvdnav .dvdread .dvbpsi .live .caca .mod .asa \
.png .gpg-error .gcrypt .opencdk .gnutls .opendaap .cddb .cdio .vcdimager \
.SDL_image .glib .gecko .mpcdec .dirac_encoder .dirac_decoder \
.dca .tag .nasm .x264 .goom2k4 .lua .zvbi .fontconfig .ncurses .aclocal
.dca .tag .x264 .goom2k4 .lua .zvbi .fontconfig .ncurses .aclocal
# .expat .clinkcc don't work with SDK yet
# .glib .IDL .gecko are required to build the mozilla plugin
# .mozilla-macosx will build an entire mozilla. it can be used if we need to create a new .gecko package
......
......@@ -148,9 +148,10 @@ FFMPEGCONF += --disable-mmx
endif
ifdef HAVE_DARWIN_OS
X264CONF += --enable-pic
ifdef HAVE_DARWIN_OS_ON_INTEL
FFMPEG_CFLAGS += -DHAVE_LRINTF
else
X264CONF += --enable-pic
endif
endif
......@@ -1374,8 +1375,13 @@ ifdef HAVE_WIN32
(cd $<; $(HOSTCC) ./configure $(X264CONF) --prefix="$(PREFIX)" && make && make install)
endif
else
.x264: x264
ifdef HAVE_DARWIN_OS_ON_INTEL
.x264: x264 .yasm
(cd $<; $(HOSTCC) ./configure $(X264CONF) --prefix="$(PREFIX)" && make && make install)
else
.x264: x264
(cd $<; $(HOSTCC) ./configure $(X264CONF) --prefix="$(PREFIX)" && make && make install)
endif
endif
touch $@
......@@ -2229,27 +2235,22 @@ CLEAN_PKG += clinkcc
DISTCLEAN_PKG += clinkcc$(CLINKCC_VERSION).tar.gz
# ***************************************************************************
# NASM assembler
# YASM assembler
# ***************************************************************************
nasm-$(NASM_VERSION).tar.bz2:
$(WGET) $(NASM_URL)
nasm: nasm-$(NASM_VERSION).tar.bz2
$(EXTRACT_BZ2)
yasm-$(YASM_VERSION).tar.gz:
$(WGET) $(YASM_URL)
#nasm:
# echo $(NASM_CVSROOT) A > ./nasm.cvs
# CVS_PASSFILE=./nasm.cvs cvs -z3 -d $(NASM_CVSROOT) co nasm
# (cd $@ && autoconf && autoheader)
yasm: yasm-$(YASM_VERSION).tar.gz
$(EXTRACT_GZ)
.nasm: nasm
.yasm: yasm
(cd $< && $(HOSTCC) ./configure --prefix=$(PREFIX) && make && make install)
touch $@
CLEAN_FILE += .nasm
CLEAN_PKG += nasm nasm.cvs
DISTCLEAN_PKG += nasm-$(NASM_VERSION).tar.bz2
CLEAN_FILE += .yasm
CLEAN_PKG += yasm
DISTCLEAN_PKG += yasm-$(YASM_VERSION).tar.bz2
# ***************************************************************************
# Copy aclocal files
......@@ -2291,12 +2292,15 @@ taglib-$(TAGLIB_VERSION).tar.gz:
taglib: taglib-$(TAGLIB_VERSION).tar.gz
$(EXTRACT_GZ)
ifdef HAVE_WIN32
patch -p0 < Patches/taglib.patch
endif
ifdef HAVE_CYGWIN
patch -p0 <Patches/taglib-cygwin.patch
patch -p0 < Patches/taglib-cygwin.patch
endif
.tag: taglib
(cd $<; $(HOSTCC) CXXFLAGS="-DMAKE_TAGLIB_LIB" ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
$(INSTALL_NAME)
touch $@
......
......@@ -10,3 +10,15 @@
modplug.cpp
libmodplugincludedir = $(includedir)/libmodplug
diff -ru libmodplug/src/sndfile.cpp libmodplug-new/src/sndfile.cpp
--- libmodplug/src/sndfile.cpp 2006-11-02 04:31:26.000000000 +0000
+++ libmodplug-new/src/sndfile.cpp 2008-04-12 20:56:39.000000000 +0100
@@ -143,8 +143,5 @@
#ifndef MODPLUG_BASIC_SUPPORT
/* Sequencer File Format Support */
- && (!ReadABC(lpStream, dwMemLength))
- && (!ReadMID(lpStream, dwMemLength))
- && (!ReadPAT(lpStream, dwMemLength))
&& (!ReadSTM(lpStream, dwMemLength))
&& (!ReadMed(lpStream, dwMemLength))
&& (!ReadMTM(lpStream, dwMemLength))
diff -ru taglib-1.5/taglib/taglib_export.h taglib/taglib/taglib_export.h
--- taglib-1.5/taglib/taglib_export.h 2008-02-04 15:14:46.000000000 +0000
+++ taglib/taglib/taglib_export.h 2008-04-13 18:25:29.000000000 +0100
@@ -28,9 +28,9 @@
#if defined(_WIN32) || defined(_WIN64)
#ifdef MAKE_TAGLIB_LIB
-#define TAGLIB_EXPORT __declspec(dllexport)
+#define TAGLIB_EXPORT
#else
-#define TAGLIB_EXPORT __declspec(dllimport)
+#define TAGLIB_EXPORT
#endif
#else
#define TAGLIB_EXPORT
......@@ -199,9 +199,6 @@ UPNP_VERSION=1.2.1
UPNP_URL=$(SF)/upnp/libupnp-$(UPNP_VERSION).tar.gz
EXPAT_VERSION=2.0.0
EXPAT_URL=$(SF)/expat/expat-$(EXPAT_VERSION).tar.gz
NASM_CVSROOT=:pserver:anonymous@cvs.sourceforge.net:/cvsroot/nasm
NASM_VERSION=2.02
NASM_URL=$(SF)/nasm/nasm-$(NASM_VERSION).tar.bz2
PTHREADS_VERSION=2-8-0
PTHREADS_URL=ftp://sources.redhat.com/pub/pthreads-win32/pthreads-w32-$(PTHREADS_VERSION)-release.tar.gz
UNICOWS_VERSION=1.1.1
......@@ -219,3 +216,5 @@ PCRE_VERSION=7.6
PCRE_URL=ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-$(PCRE_VERSION).tar.bz2
FLUID_VERSION=1.0.8
FLUID_URL=http://download.savannah.gnu.org/releases/fluid/fluidsynth-$(FLUID_VERSION).tar.gz
YASM_VERSION=0.6.2
YASM_URL=http://www.tortall.net/projects/yasm/releases/yasm-$(YASM_VERSION).tar.gz
......@@ -49,7 +49,7 @@ struct libvlc_int_t
vlc_object_t *p_interaction; ///< interface interaction object
vlc_object_t *p_vlm; ///< vlm if created from libvlc-common.
vlm_t *p_vlm; ///< vlm if created from libvlc-common.
/// (this is clearly private and
// shouldn't be used)
......@@ -64,13 +64,13 @@ struct libvlc_int_t
/* Messages */
msg_bank_t msg_bank; ///< The message bank
int i_verbose; ///< info messages
vlc_bool_t b_color; ///< color messages?
bool b_color; ///< color messages?
module_t * p_memcpy_module; ///< Fast memcpy plugin used
void* ( *pf_memcpy ) ( void *, const void *, size_t ); ///< fast memcpy
void* ( *pf_memset ) ( void *, int, size_t ); ///< fast memset
vlc_bool_t b_stats; ///< Should we collect stats ?
bool b_stats; ///< Should we collect stats ?
vlc_mutex_t timer_lock; ///< Lock to protect timers
int i_timers; ///< Number of timers
counter_t **pp_timers; ///< Array of all timers
......
......@@ -45,7 +45,6 @@ extern "C" {
/*****************************************************************************
* Our custom types
*****************************************************************************/
typedef bool vlc_bool_t; /* (shouldn't be exposed) */
typedef struct vlc_list_t vlc_list_t; /* (shouldn't be exposed) */
typedef struct vlc_object_t vlc_object_t; /* (shouldn't be exposed) */
......@@ -61,7 +60,7 @@ typedef signed long long vlc_int64_t;
typedef union
{
int i_int;
vlc_bool_t b_bool;
bool b_bool;
float f_float;
char * psz_string;
void * p_address;
......@@ -109,12 +108,6 @@ struct vlc_list_t
#define VLC_EEXITSUCCESS -999 /* Program exited successfully */
#define VLC_EGENERIC -666 /* Generic error */
/*****************************************************************************
* Booleans (shouldn't be exposed)
*****************************************************************************/
#define VLC_FALSE false
#define VLC_TRUE true
/**
* \defgroup var_type Variable types (shouldn't be exposed)
* These are the different types a vlc variable can have.
......
......@@ -252,32 +252,6 @@ VLC_DEPRECATED_API libvlc_media_player_t * libvlc_playlist_get_media_player(
#define VLC_EEXITSUCCESS -999 /* Program exited successfully */
#define VLC_EGENERIC -666 /* Generic error */
/*****************************************************************************
* Booleans
*****************************************************************************/
#define VLC_FALSE false
#define VLC_TRUE true
/**
* \defgroup var_type Variable types
* These are the different types a vlc variable can have.
* @{
*/
#define VLC_VAR_VOID 0x0010
#define VLC_VAR_BOOL 0x0020
#define VLC_VAR_INTEGER 0x0030
#define VLC_VAR_HOTKEY 0x0031
#define VLC_VAR_STRING 0x0040
#define VLC_VAR_MODULE 0x0041
#define VLC_VAR_FILE 0x0042
#define VLC_VAR_DIRECTORY 0x0043
#define VLC_VAR_VARIABLE 0x0044
#define VLC_VAR_FLOAT 0x0050
#define VLC_VAR_TIME 0x0060
#define VLC_VAR_ADDRESS 0x0070
#define VLC_VAR_MUTEX 0x0080
#define VLC_VAR_LIST 0x0090
/**@}*/
#if !defined( __LIBVLC__ )
......@@ -381,12 +355,12 @@ VLC_DEPRECATED_API int VLC_Init( int, int, const char *[] );
* \param b_play start playing when the interface is done loading
* \return VLC_SUCCESS on success
*/
VLC_DEPRECATED_API int VLC_AddIntf( int, char const *, vlc_bool_t, vlc_bool_t );
VLC_DEPRECATED_API int VLC_AddIntf( int, char const *, bool, bool );
/**
* Ask vlc to die
*
* This function sets p_libvlc->b_die to VLC_TRUE, but does not do any other
* This function sets p_libvlc->b_die to true, but does not do any other
* task. It is your duty to call VLC_CleanUp and VLC_Destroy afterwards.
*
* \param i_object a vlc object id
......@@ -517,12 +491,12 @@ VLC_DEPRECATED_API int VLC_Stop( int );
* Tell if VLC is playing
*
* If an item is currently playing, it returns
* VLC_TRUE, else VLC_FALSE
* true, else false
*
* \param i_object a vlc object id
* \return VLC_TRUE or VLC_FALSE
* \return true or false
*/
VLC_DEPRECATED_API vlc_bool_t VLC_IsPlaying( int );
VLC_DEPRECATED_API bool VLC_IsPlaying( int );
/**
* Get the current position in a input
......@@ -573,7 +547,7 @@ VLC_DEPRECATED_API int VLC_TimeGet( int );
* \param b_relative seek relative from current position
* \return VLC_SUCCESS on success
*/
VLC_DEPRECATED_API int VLC_TimeSet( int, int, vlc_bool_t );
VLC_DEPRECATED_API int VLC_TimeSet( int, int, bool );
/**
* Get the total length of a input
......
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