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 f8431d17c965164650434430794f2b8f1def8e17..b823e9d4865783d6c001742d2d904f169f899592 100644 (file)
--- a/modules/video_filter/Modules.am
+++ b/modules/video_filter/Modules.am
@@ -10,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,15 +26,11 @@ libdeinterlace_plugin_la_SOURCES = \
        deinterlace/algo_ivtc.c deinterlace/algo_ivtc.h
 # inline ASM doesn't build with -O0
 libdeinterlace_plugin_la_CFLAGS = $(AM_CFLAGS) -O2
-libdeinterlace_plugin_la_LIBADD = $(AM_LIBADD)
 if HAVE_NEON
 libdeinterlace_plugin_la_SOURCES += deinterlace/merge_arm.S
 libdeinterlace_plugin_la_CFLAGS += -DCAN_COMPILE_ARM
 endif
-if HAVE_WIN32
-libdeinterlace_plugin_la_DEPENDENCIES = libdeinterlace_plugin.rc.o
-endif
-libvlc_LTLIBRARIES += libdeinterlace_plugin.la
+video_filter_LTLIBRARIES += libdeinterlace_plugin.la
 
 libdynamicoverlay_plugin_la_SOURCES = \
        dynamicoverlay/dynamicoverlay_buffer.c \
@@ -41,20 +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)
-if HAVE_WIN32
-libremoteosd_plugin_la_DEPENDENCIES = libremoteosd_plugin.rc.o
-endif
+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 = \
@@ -63,12 +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)
-if HAVE_WIN32
-libpuzzle_plugin_la_DEPENDENCIES = libpuzzle_plugin.rc.o
-endif
-libvlc_LTLIBRARIES += libpuzzle_plugin.la
+libpuzzle_plugin_la_LIBADD = $(LIBM)
+video_filter_LTLIBRARIES += libpuzzle_plugin.la
 
 SOURCES_magnify = magnify.c
 SOURCES_wave = wave.c
@@ -80,17 +68,13 @@ SOURCES_ball = ball.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
@@ -138,7 +122,7 @@ 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 \
@@ -165,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 \
@@ -181,5 +164,6 @@ libvlc_LTLIBRARIES += \
        libanaglyph_plugin.la \
        liboldmovie_plugin.la \
        libvhs_plugin.la \
+       libfps_plugin.la \
        libfreeze_plugin.la