[vlc-commits] Move spu source and filter plugins to dedicated directory

Rémi Denis-Courmont git at videolan.org
Fri Nov 25 22:07:12 CET 2016 

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Fri Nov 25 23:00:04 2016 +0200| [446f59d8d434ac12ddc7b4d0409038e0a5ca895a] | committer: Rémi Denis-Courmont

Move spu source and filter plugins to dedicated directory

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=446f59d8d434ac12ddc7b4d0409038e0a5ca895a
---

 modules/Makefile.am                                |  1 +
 modules/spu/Makefile.am                            | 38 ++++++++++++++++++++++
 modules/{video_filter => spu}/audiobargraph_v.c    |  0
 .../dynamicoverlay/dynamicoverlay.c                |  0
 .../dynamicoverlay/dynamicoverlay.h                |  0
 .../dynamicoverlay/dynamicoverlay_buffer.c         |  0
 .../dynamicoverlay/dynamicoverlay_commands.c       |  0
 .../dynamicoverlay/dynamicoverlay_list.c           |  0
 .../dynamicoverlay/dynamicoverlay_queue.c          |  0
 modules/{video_filter => spu}/logo.c               |  0
 modules/{video_filter => spu}/marq.c               |  0
 modules/{video_filter => spu}/mosaic.c             |  0
 modules/{video_filter => spu}/mosaic.h             |  0
 modules/{video_filter => spu}/remoteosd.c          |  0
 modules/{video_filter => spu}/remoteosd_rfbproto.h |  0
 modules/{video_filter => spu}/rss.c                |  0
 modules/{video_filter => spu}/subsdelay.c          |  0
 modules/stream_out/mosaic_bridge.c                 |  2 +-
 modules/video_filter/Makefile.am                   | 37 ---------------------
 po/POTFILES.in                                     | 23 +++++--------
 20 files changed, 48 insertions(+), 53 deletions(-)

diff --git a/modules/Makefile.am b/modules/Makefile.am
index a4a9977..a291e33 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -40,6 +40,7 @@ include misc/Makefile.am
 include notify/Makefile.am
 include packetizer/Makefile.am
 include services_discovery/Makefile.am
+include spu/Makefile.am
 include stream_filter/Makefile.am
 include text_renderer/Makefile.am
 include video_chroma/Makefile.am
diff --git a/modules/spu/Makefile.am b/modules/spu/Makefile.am
new file mode 100644
index 0000000..7e520c0
--- /dev/null
+++ b/modules/spu/Makefile.am
@@ -0,0 +1,38 @@
+spudir = $(pluginsdir)/spu
+
+# sub filters
+libsubsdelay_plugin_la_SOURCES = spu/subsdelay.c
+spu_LTLIBRARIES = libsubsdelay_plugin.la
+
+# sub sources
+libaudiobargraph_v_plugin_la_SOURCES = spu/audiobargraph_v.c
+libaudiobargraph_v_plugin_la_LIBADD = $(LIBM)
+liblogo_plugin_la_SOURCES = spu/logo.c
+libmarq_plugin_la_SOURCES = spu/marq.c
+libmosaic_plugin_la_SOURCES = spu/mosaic.c spu/mosaic.h
+libmosaic_plugin_la_LIBADD = $(LIBM)
+librss_plugin_la_SOURCES = spu/rss.c
+
+spu_LTLIBRARIES += \
+	libaudiobargraph_v_plugin.la \
+	liblogo_plugin.la \
+	libmarq_plugin.la \
+	libmosaic_plugin.la \
+	librss_plugin.la
+
+libdynamicoverlay_plugin_la_SOURCES = \
+	spu/dynamicoverlay/dynamicoverlay_buffer.c \
+	spu/dynamicoverlay/dynamicoverlay_queue.c \
+	spu/dynamicoverlay/dynamicoverlay_list.c \
+	spu/dynamicoverlay/dynamicoverlay_commands.c \
+	spu/dynamicoverlay/dynamicoverlay.c spu/dynamicoverlay/dynamicoverlay.h
+if !HAVE_WIN32
+spu_LTLIBRARIES += libdynamicoverlay_plugin.la
+endif
+
+libremoteosd_plugin_la_SOURCES = spu/remoteosd.c spu/remoteosd_rfbproto.h
+libremoteosd_plugin_la_CFLAGS = $(AM_CFLAGS) $(GCRYPT_CFLAGS)
+libremoteosd_plugin_la_LIBADD = $(GCRYPT_LIBS) $(SOCKET_LIBS) $(LIBPTHREAD)
+if HAVE_GCRYPT
+spu_LTLIBRARIES += libremoteosd_plugin.la
+endif
diff --git a/modules/video_filter/audiobargraph_v.c b/modules/spu/audiobargraph_v.c
similarity index 100%
rename from modules/video_filter/audiobargraph_v.c
rename to modules/spu/audiobargraph_v.c
diff --git a/modules/video_filter/dynamicoverlay/dynamicoverlay.c b/modules/spu/dynamicoverlay/dynamicoverlay.c
similarity index 100%
rename from modules/video_filter/dynamicoverlay/dynamicoverlay.c
rename to modules/spu/dynamicoverlay/dynamicoverlay.c
diff --git a/modules/video_filter/dynamicoverlay/dynamicoverlay.h b/modules/spu/dynamicoverlay/dynamicoverlay.h
similarity index 100%
rename from modules/video_filter/dynamicoverlay/dynamicoverlay.h
rename to modules/spu/dynamicoverlay/dynamicoverlay.h
diff --git a/modules/video_filter/dynamicoverlay/dynamicoverlay_buffer.c b/modules/spu/dynamicoverlay/dynamicoverlay_buffer.c
similarity index 100%
rename from modules/video_filter/dynamicoverlay/dynamicoverlay_buffer.c
rename to modules/spu/dynamicoverlay/dynamicoverlay_buffer.c
diff --git a/modules/video_filter/dynamicoverlay/dynamicoverlay_commands.c b/modules/spu/dynamicoverlay/dynamicoverlay_commands.c
similarity index 100%
rename from modules/video_filter/dynamicoverlay/dynamicoverlay_commands.c
rename to modules/spu/dynamicoverlay/dynamicoverlay_commands.c
diff --git a/modules/video_filter/dynamicoverlay/dynamicoverlay_list.c b/modules/spu/dynamicoverlay/dynamicoverlay_list.c
similarity index 100%
rename from modules/video_filter/dynamicoverlay/dynamicoverlay_list.c
rename to modules/spu/dynamicoverlay/dynamicoverlay_list.c
diff --git a/modules/video_filter/dynamicoverlay/dynamicoverlay_queue.c b/modules/spu/dynamicoverlay/dynamicoverlay_queue.c
similarity index 100%
rename from modules/video_filter/dynamicoverlay/dynamicoverlay_queue.c
rename to modules/spu/dynamicoverlay/dynamicoverlay_queue.c
diff --git a/modules/video_filter/logo.c b/modules/spu/logo.c
similarity index 100%
rename from modules/video_filter/logo.c
rename to modules/spu/logo.c
diff --git a/modules/video_filter/marq.c b/modules/spu/marq.c
similarity index 100%
rename from modules/video_filter/marq.c
rename to modules/spu/marq.c
diff --git a/modules/video_filter/mosaic.c b/modules/spu/mosaic.c
similarity index 100%
rename from modules/video_filter/mosaic.c
rename to modules/spu/mosaic.c
diff --git a/modules/video_filter/mosaic.h b/modules/spu/mosaic.h
similarity index 100%
rename from modules/video_filter/mosaic.h
rename to modules/spu/mosaic.h
diff --git a/modules/video_filter/remoteosd.c b/modules/spu/remoteosd.c
similarity index 100%
rename from modules/video_filter/remoteosd.c
rename to modules/spu/remoteosd.c
diff --git a/modules/video_filter/remoteosd_rfbproto.h b/modules/spu/remoteosd_rfbproto.h
similarity index 100%
rename from modules/video_filter/remoteosd_rfbproto.h
rename to modules/spu/remoteosd_rfbproto.h
diff --git a/modules/video_filter/rss.c b/modules/spu/rss.c
similarity index 100%
rename from modules/video_filter/rss.c
rename to modules/spu/rss.c
diff --git a/modules/video_filter/subsdelay.c b/modules/spu/subsdelay.c
similarity index 100%
rename from modules/video_filter/subsdelay.c
rename to modules/spu/subsdelay.c
diff --git a/modules/stream_out/mosaic_bridge.c b/modules/stream_out/mosaic_bridge.c
index 4ab9a00..1c313f0 100644
--- a/modules/stream_out/mosaic_bridge.c
+++ b/modules/stream_out/mosaic_bridge.c
@@ -41,7 +41,7 @@
 #include <vlc_filter.h>
 #include <vlc_modules.h>
 
-#include "../video_filter/mosaic.h"
+#include "../spu/mosaic.h"
 
 /*****************************************************************************
  * Local structures
diff --git a/modules/video_filter/Makefile.am b/modules/video_filter/Makefile.am
index 5d5fdaf..8fcc93c 100644
--- a/modules/video_filter/Makefile.am
+++ b/modules/video_filter/Makefile.am
@@ -130,16 +130,6 @@ libdeinterlace_plugin_la_CFLAGS += -DCAN_COMPILE_ARM64
 endif
 video_filter_LTLIBRARIES += libdeinterlace_plugin.la
 
-libdynamicoverlay_plugin_la_SOURCES = \
-	video_filter/dynamicoverlay/dynamicoverlay_buffer.c \
-	video_filter/dynamicoverlay/dynamicoverlay_queue.c \
-	video_filter/dynamicoverlay/dynamicoverlay_list.c \
-	video_filter/dynamicoverlay/dynamicoverlay_commands.c \
-	video_filter/dynamicoverlay/dynamicoverlay.c video_filter/dynamicoverlay/dynamicoverlay.h
-if !HAVE_WIN32
-video_filter_LTLIBRARIES += libdynamicoverlay_plugin.la
-endif
-
 libopencv_wrapper_plugin_la_SOURCES = video_filter/opencv_wrapper.c
 libopencv_wrapper_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(OPENCV_CFLAGS)
 libopencv_wrapper_plugin_la_LIBADD = $(OPENCV_LIBS)
@@ -154,33 +144,6 @@ libpostproc_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(video_filterdir)'
 video_filter_LTLIBRARIES += $(LTLIBpostproc)
 EXTRA_LTLIBRARIES += libpostproc_plugin.la
 
-# sub filters
-libsubsdelay_plugin_la_SOURCES = video_filter/subsdelay.c
-video_filter_LTLIBRARIES += libsubsdelay_plugin.la
-
-# sub sources
-libaudiobargraph_v_plugin_la_SOURCES = video_filter/audiobargraph_v.c
-libaudiobargraph_v_plugin_la_LIBADD = $(LIBM)
-liblogo_plugin_la_SOURCES = video_filter/logo.c
-libmarq_plugin_la_SOURCES = video_filter/marq.c
-libmosaic_plugin_la_SOURCES = video_filter/mosaic.c video_filter/mosaic.h
-libmosaic_plugin_la_LIBADD = $(LIBM)
-librss_plugin_la_SOURCES = video_filter/rss.c
-
-video_filter_LTLIBRARIES += \
-	libaudiobargraph_v_plugin.la \
-	liblogo_plugin.la \
-	libmarq_plugin.la \
-	libmosaic_plugin.la \
-	librss_plugin.la
-
-libremoteosd_plugin_la_SOURCES = video_filter/remoteosd.c video_filter/remoteosd_rfbproto.h
-libremoteosd_plugin_la_CFLAGS = $(AM_CFLAGS) $(GCRYPT_CFLAGS)
-libremoteosd_plugin_la_LIBADD = $(GCRYPT_LIBS) $(SOCKET_LIBS) $(LIBPTHREAD)
-if HAVE_GCRYPT
-video_filter_LTLIBRARIES += libremoteosd_plugin.la
-endif
-
 # misc
 libblend_plugin_la_SOURCES = video_filter/blend.cpp
 video_filter_LTLIBRARIES += libblend_plugin.la
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 2c42699..73262d0 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1026,6 +1026,14 @@ modules/services_discovery/udev.c
 modules/services_discovery/upnp.cpp
 modules/services_discovery/windrive.c
 modules/services_discovery/xcb_apps.c
+modules/spu/audiobargraph_v.c
+modules/spu/dynamicoverlay/dynamicoverlay.c
+modules/spu/logo.c
+modules/spu/marq.c
+modules/spu/mosaic.c
+modules/spu/remoteosd.c
+modules/spu/rss.c
+modules/spu/subsdelay.c
 modules/stream_filter/adf.c
 modules/stream_filter/aribcam.c
 modules/stream_filter/cache_block.c
@@ -1088,7 +1096,6 @@ modules/video_filter/adjust.c
 modules/video_filter/alphamask.c
 modules/video_filter/anaglyph.c
 modules/video_filter/antiflicker.c
-modules/video_filter/audiobargraph_v.c
 modules/video_filter/ball.c
 modules/video_filter/blendbench.c
 modules/video_filter/blend.cpp
@@ -1099,12 +1106,6 @@ modules/video_filter/croppadd.c
 modules/video_filter/deinterlace/algo_phosphor.h
 modules/video_filter/deinterlace/deinterlace.c
 modules/video_filter/deinterlace/deinterlace.h
-modules/video_filter/dynamicoverlay/dynamicoverlay_buffer.c
-modules/video_filter/dynamicoverlay/dynamicoverlay.c
-modules/video_filter/dynamicoverlay/dynamicoverlay_commands.c
-modules/video_filter/dynamicoverlay/dynamicoverlay.h
-modules/video_filter/dynamicoverlay/dynamicoverlay_list.c
-modules/video_filter/dynamicoverlay/dynamicoverlay_queue.c
 modules/video_filter/edgedetection.c
 modules/video_filter/erase.c
 modules/video_filter/extract.c
@@ -1118,12 +1119,8 @@ modules/video_filter/gradient.c
 modules/video_filter/grain.c
 modules/video_filter/hqdn3d.c
 modules/video_filter/invert.c
-modules/video_filter/logo.c
 modules/video_filter/magnify.c
-modules/video_filter/marq.c
 modules/video_filter/mirror.c
-modules/video_filter/mosaic.c
-modules/video_filter/mosaic.h
 modules/video_filter/motionblur.c
 modules/video_filter/motiondetect.c
 modules/video_filter/oldmovie.c
@@ -1133,16 +1130,12 @@ modules/video_filter/posterize.c
 modules/video_filter/postproc.c
 modules/video_filter/psychedelic.c
 modules/video_filter/puzzle.c
-modules/video_filter/remoteosd.c
-modules/video_filter/remoteosd_rfbproto.h
 modules/video_filter/ripple.c
 modules/video_filter/rotate.c
-modules/video_filter/rss.c
 modules/video_filter/scale.c
 modules/video_filter/scene.c
 modules/video_filter/sepia.c
 modules/video_filter/sharpen.c
-modules/video_filter/subsdelay.c
 modules/video_filter/transform.c
 modules/video_filter/vhs.c
 modules/video_filter/wave.c

More information about the vlc-commits mailing list