Commit 62e3bc5e authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Move splitters to a subdirectory of their own

parent bf7d363f
......@@ -655,7 +655,7 @@ AC_CHECK_FUNC(getopt_long,, [
AC_SUBST(GNUGETOPT_LIBS)
AC_CHECK_LIB(m,cos,[
VLC_ADD_LIBS([adjust wave ripple psychedelic gradient a52tofloat32 dtstofloat32 x264 goom panoramix rotate noise grain scene kate lua chorus_flanger freetype avcodec access_avio swscale postproc i420_rgb faad twolame equalizer spatializer param_eq samplerate freetype mpc dmo quicktime qt4 compressor headphone_channel_mixer normvol audiobargraph_a audiobargraph_v speex opus mono colorthres extract ball access_imem hotkeys mosaic gaussianblur x26410b hqdn3d anaglyph oldrc ncurses],[-lm])
VLC_ADD_LIBS([adjust wave ripple psychedelic gradient a52tofloat32 dtstofloat32 x264 goom rotate noise grain scene kate lua chorus_flanger freetype avcodec access_avio swscale postproc i420_rgb faad twolame equalizer spatializer param_eq samplerate freetype mpc dmo quicktime qt4 compressor headphone_channel_mixer normvol audiobargraph_a audiobargraph_v speex opus mono colorthres extract ball access_imem hotkeys mosaic gaussianblur x26410b hqdn3d anaglyph oldrc ncurses],[-lm])
LIBM="-lm"
], [
LIBM=""
......@@ -2991,6 +2991,7 @@ AC_ARG_ENABLE(glx,
])
have_xcb="no"
have_xcb_randr="no"
AS_IF([test "${enable_xcb}" != "no"], [
dnl libxcb
PKG_CHECK_MODULES(XCB, [xcb >= 1.6])
......@@ -3005,11 +3006,7 @@ AS_IF([test "${enable_xcb}" != "no"], [
])
PKG_CHECK_MODULES(XCB_RANDR, [xcb-randr >= 1.3], [
VLC_ADD_PLUGIN([panoramix])
VLC_ADD_LIBS([panoramix],[${XCB_RANDR_LIBS} ${XCB_LIBS}])
VLC_ADD_CFLAGS([panoramix],[${XCB_RANDR_CFLAGS} ${XCB_CFLAGS}])
], [
AC_MSG_WARN([${XCB_RANDR_PKG_ERRORS}. Panoramix filter will not be supported.])
have_xcb_randr="yes"
])
PKG_CHECK_MODULES(XPROTO, [xproto], [
......@@ -3036,6 +3033,7 @@ AS_IF([test "${enable_xcb}" != "no"], [
])
])
AM_CONDITIONAL([HAVE_XCB], [test "${have_xcb}" = "yes"])
AM_CONDITIONAL([HAVE_XCB_RANDR], [test "${have_xcb_randr}" = "yes"])
dnl
......@@ -3253,11 +3251,6 @@ dnl
dnl Windows DirectX module
dnl
if test "${SYS}" = "mingw32"
then
VLC_ADD_PLUGIN([panoramix])
fi
AC_ARG_ENABLE(directx,
[AS_HELP_STRING([--enable-directx],
[Microsoft DirectX support (default enabled on Windows)])],, [
......@@ -4208,6 +4201,7 @@ AC_CONFIG_FILES([
modules/video_chroma/Makefile
modules/video_filter/Makefile
modules/video_output/Makefile
modules/video_splitter/Makefile
modules/visualization/Makefile
modules/mmx/Makefile
modules/sse2/Makefile
......
......@@ -18,6 +18,7 @@ BASE_SUBDIRS = \
video_chroma \
video_filter \
video_output \
video_splitter \
visualization
EXTRA_SUBDIRS = \
access_output \
......
......@@ -3,8 +3,6 @@ SOURCES_transform = transform.c
SOURCES_invert = invert.c
SOURCES_mirror = mirror.c
SOURCES_adjust = adjust.c adjust_sat_hue.c adjust_sat_hue.h
SOURCES_wall = wall.c
SOURCES_clone = clone.c
SOURCES_motionblur = motionblur.c
SOURCES_logo = logo.c
SOURCES_audiobargraph_v = audiobargraph_v.c
......@@ -70,7 +68,6 @@ SOURCES_posterize = posterize.c
SOURCES_psychedelic = psychedelic.c
SOURCES_gradient = gradient.c
SOURCES_ball = ball.c
SOURCES_panoramix = panoramix.c
SOURCES_opencv_wrapper = opencv_wrapper.c
SOURCES_opencv_example = opencv_example.cpp filter_event_info.h
......@@ -138,7 +135,6 @@ libvlc_LTLIBRARIES += \
libblendbench_plugin.la \
libbluescreen_plugin.la \
libcanvas_plugin.la \
libclone_plugin.la \
libcolorthres_plugin.la \
libcroppadd_plugin.la \
liberase_plugin.la \
......@@ -165,7 +161,6 @@ libvlc_LTLIBRARIES += \
libsharpen_plugin.la \
libsubsdelay_plugin.la \
libtransform_plugin.la \
libwall_plugin.la \
libwave_plugin.la \
libgradfun_plugin.la \
libyuvp_plugin.la \
......
basedir = video_splitter
include $(top_srcdir)/modules/common.am
libvlc_LTLIBRARIES = \
libclone_plugin.la \
libwall_plugin.la
libclone_plugin_la_SOURCES = clone.c
libclone_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
libwall_plugin_la_SOURCES = wall.c
libwall_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
libpanoramix_plugin_la_SOURCES = panoramix.c
libpanoramix_plugin_la_CFLAGS = $(AM_CFLAGS)
libpanoramix_plugin_la_LIBADD = $(AM_LIBADD) $(LIBM)
if HAVE_WIN32
libvlc_LTLIBRARIES += libpanoramix_plugin.la
else
if HAVE_XCB_RANDR
libpanoramix_plugin_la_CFLAGS += $(XCB_RANDR_CFLAGS)
libpanoramix_plugin_la_LIBADD += $(XCB_RANDR_LIBS)
libvlc_LTLIBRARIES += libpanoramix_plugin.la
endif
endif
......@@ -1080,7 +1080,6 @@ modules/video_filter/blendbench.c
modules/video_filter/blend.cpp
modules/video_filter/bluescreen.c
modules/video_filter/canvas.c
modules/video_filter/clone.c
modules/video_filter/colorthres.c
modules/video_filter/croppadd.c
modules/video_filter/deinterlace/algo_phosphor.h
......@@ -1112,7 +1111,6 @@ modules/video_filter/motionblur.c
modules/video_filter/motiondetect.c
modules/video_filter/opencv_example.cpp
modules/video_filter/opencv_wrapper.c
modules/video_filter/panoramix.c
modules/video_filter/posterize.c
modules/video_filter/postproc.c
modules/video_filter/psychedelic.c
......@@ -1128,7 +1126,6 @@ modules/video_filter/sepia.c
modules/video_filter/sharpen.c
modules/video_filter/subsdelay.c
modules/video_filter/transform.c
modules/video_filter/wall.c
modules/video_filter/wave.c
modules/video_filter/yuvp.c
modules/video_output/aa.c
......@@ -1158,6 +1155,9 @@ modules/video_output/xcb/window.c
modules/video_output/xcb/x11.c
modules/video_output/xcb/xvideo.c
modules/video_output/yuv.c
modules/video_splitter/clone.c
modules/video_splitter/panoramix.c
modules/video_splitter/wall.c
modules/visualization/goom.c
modules/visualization/projectm.cpp
modules/visualization/visual/effects.c
......
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