playlist: use playlist_TogglePause() directly, fix minor races

[vlc] / modules / video_filter / Modules.am

diff --git a/modules/video_filter/Modules.am b/modules/video_filter/Modules.am
index 183009a253dbe934ffab0c558fd8418c24f0f6b4..b823e9d4865783d6c001742d2d904f169f899592 100644 (file)
--- a/modules/video_filter/Modules.am
+++ b/modules/video_filter/Modules.am
@@ -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
@@ -12,6 +10,7 @@ SOURCES_blend = blend.cpp
 SOURCES_scale = scale.c
 SOURCES_marq = marq.c
 SOURCES_rss = rss.c
+SOURCES_fps = fps.c
 SOURCES_motiondetect = motiondetect.c
 
 libdeinterlace_plugin_la_SOURCES = \
@@ -25,13 +24,13 @@ libdeinterlace_plugin_la_SOURCES = \
        deinterlace/yadif.h deinterlace/yadif_template.h \
        deinterlace/algo_phosphor.c deinterlace/algo_phosphor.h \
        deinterlace/algo_ivtc.c deinterlace/algo_ivtc.h
-libdeinterlace_plugin_la_CFLAGS = $(AM_CFLAGS)
-libdeinterlace_plugin_la_LIBADD = $(AM_LIBADD)
+# inline ASM doesn't build with -O0
+libdeinterlace_plugin_la_CFLAGS = $(AM_CFLAGS) -O2
 if HAVE_NEON
 libdeinterlace_plugin_la_SOURCES += deinterlace/merge_arm.S
 libdeinterlace_plugin_la_CFLAGS += -DCAN_COMPILE_ARM
 endif
-libvlc_LTLIBRARIES += libdeinterlace_plugin.la
+video_filter_LTLIBRARIES += libdeinterlace_plugin.la
 
 libdynamicoverlay_plugin_la_SOURCES = \
        dynamicoverlay/dynamicoverlay_buffer.c \
@@ -39,17 +38,15 @@ libdynamicoverlay_plugin_la_SOURCES = \
        dynamicoverlay/dynamicoverlay_list.c \
        dynamicoverlay/dynamicoverlay_commands.c \
        dynamicoverlay/dynamicoverlay.c dynamicoverlay/dynamicoverlay.h
-libdynamicoverlay_plugin_la_CFLAGS = $(AM_CFLAGS)
-libdynamicoverlay_plugin_la_LIBADD = $(AM_LIBADD)
 if !HAVE_WIN32
-libvlc_LTLIBRARIES += libdynamicoverlay_plugin.la
+video_filter_LTLIBRARIES += libdynamicoverlay_plugin.la
 endif
 
 libremoteosd_plugin_la_SOURCES = remoteosd.c remoteosd_rfbproto.h
 libremoteosd_plugin_la_CFLAGS = $(AM_CFLAGS) $(GCRYPT_CFLAGS)
-libremoteosd_plugin_la_LIBADD = $(AM_LIBADD) $(GCRYPT_LIBS) $(LIBS_remoteosd)
+libremoteosd_plugin_la_LIBADD = $(GCRYPT_LIBS) $(LIBS_remoteosd) $(LIBPTHREAD)
 if HAVE_GCRYPT
-libvlc_LTLIBRARIES += libremoteosd_plugin.la
+video_filter_LTLIBRARIES += libremoteosd_plugin.la
 endif
 
 libpuzzle_plugin_la_SOURCES = \
@@ -58,9 +55,8 @@ libpuzzle_plugin_la_SOURCES = \
        puzzle_lib.c puzzle_lib.h \
        puzzle_mgt.c puzzle_mgt.h \
        puzzle_pce.c puzzle_pce.h
-libpuzzle_plugin_la_CFLAGS = $(AM_CFLAGS)
-libpuzzle_plugin_la_LIBADD = $(AM_LIBADD)
-libvlc_LTLIBRARIES += libpuzzle_plugin.la
+libpuzzle_plugin_la_LIBADD = $(LIBM)
+video_filter_LTLIBRARIES += libpuzzle_plugin.la
 
 SOURCES_magnify = magnify.c
 SOURCES_wave = wave.c
@@ -69,21 +65,16 @@ 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
 
+librotate_plugin_la_SOURCES = rotate.c
+librotate_plugin_la_LIBADD = ../control/libvlc_motion.la $(LIBM)
+librotate_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(video_filterdir)'
 if HAVE_DARWIN
-motion_extra = ../control/unimotion.c ../control/unimotion.h
-else
-motion_extra = $(NULL)
+librotate_plugin_la_LDFLAGS += -Wl,-framework,IOKit,-framework,CoreFoundation
 endif
-SOURCES_rotate = \
-       rotate.c \
-       ../control/motionlib.c \
-       ../control/motionlib.h \
-       $(motion_extra) \
-       $(NULL)
+video_filter_LTLIBRARIES += librotate_plugin.la
 
 SOURCES_colorthres = colorthres.c
 SOURCES_extract = extract.c
@@ -96,9 +87,7 @@ SOURCES_grain = grain.c
 SOURCES_croppadd = croppadd.c
 SOURCES_canvas = canvas.c
 SOURCES_blendbench = blendbench.c
-SOURCES_chain = chain.c
 SOURCES_postproc = postproc.c
-SOURCES_swscale = swscale.c ../codec/avcodec/chroma.c
 SOURCES_scene = scene.c
 SOURCES_sepia = sepia.c
 SOURCES_yuvp = yuvp.c
@@ -128,9 +117,12 @@ SOURCES_gradfun = gradfun.c gradfun.h
 SOURCES_subsdelay = subsdelay.c
 SOURCES_hqdn3d = hqdn3d.c hqdn3d.h
 SOURCES_anaglyph = anaglyph.c
+SOURCES_oldmovie = oldmovie.c
+SOURCES_vhs = vhs.c
+SOURCES_freeze = freeze.c
 noinst_HEADERS = filter_picture.h
 
-libvlc_LTLIBRARIES += \
+video_filter_LTLIBRARIES += \
        libadjust_plugin.la \
        libalphamask_plugin.la \
        libaudiobargraph_v_plugin.la \
@@ -139,8 +131,6 @@ libvlc_LTLIBRARIES += \
        libblendbench_plugin.la \
        libbluescreen_plugin.la \
        libcanvas_plugin.la \
-       libchain_plugin.la \
-       libclone_plugin.la \
        libcolorthres_plugin.la \
        libcroppadd_plugin.la \
        liberase_plugin.la \
@@ -159,7 +149,6 @@ libvlc_LTLIBRARIES += \
        libposterize_plugin.la \
        libpsychedelic_plugin.la \
        libripple_plugin.la \
-       librotate_plugin.la \
        librss_plugin.la \
        libscale_plugin.la \
        libscene_plugin.la \
@@ -167,10 +156,14 @@ libvlc_LTLIBRARIES += \
        libsharpen_plugin.la \
        libsubsdelay_plugin.la \
        libtransform_plugin.la \
-       libwall_plugin.la \
        libwave_plugin.la \
        libgradfun_plugin.la \
        libyuvp_plugin.la \
        libantiflicker_plugin.la \
        libhqdn3d_plugin.la \
-       libanaglyph_plugin.la
+       libanaglyph_plugin.la \
+       liboldmovie_plugin.la \
+       libvhs_plugin.la \
+       libfps_plugin.la \
+       libfreeze_plugin.la
+