[vlc-commits] Remove recursion into modules/access/dshow/

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Sep  9 11:37:06 2012 +0300| [0f085d69bbc11ab31cc511201c929a3dae51e8f5] | committer: Rémi Denis-Courmont

Remove recursion into modules/access/dshow/

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

 configure.ac                    |   20 --------------------
 modules/access/Modules.am       |   27 +++++++++++++++++++--------
 modules/access/dshow/Modules.am |    1 -
 3 files changed, 19 insertions(+), 29 deletions(-)

diff --git a/configure.ac b/configure.ac
index 56b5800..1f15dd6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1707,25 +1707,6 @@ then
 fi
 
 dnl
-dnl  Windows DirectShow access module
-dnl
-AC_ARG_ENABLE(dshow,
-  [AS_HELP_STRING([--disable-dshow],
-    [support DirectShow (default auto)])])
-if test "${enable_dshow}" != "no"
-then
-  if test "${SYS}" = "mingw32"
-  then
-    AC_LANG_PUSH(C++)
-      AC_CHECK_HEADERS(dshow.h,
-      [ VLC_ADD_PLUGIN([dshow])
-        VLC_ADD_CXXFLAGS([dshow],[])
-        VLC_ADD_LIBS([dshow],[-lole32 -loleaut32 -luuid -lstrmiids -lksuser])])
-    AC_LANG_POP(C++)
-  fi
-fi
-
-dnl
 dnl  Blu-ray Disc Support with libbluray
 dnl
 PKG_ENABLE_MODULES_VLC([BLURAY], [libbluray], [libbluray >= 0.2.1], (libbluray for Blu-ray disc support ) )
@@ -4150,7 +4131,6 @@ AC_CONFIG_FILES([
   bin/Makefile
   test/Makefile
   modules/access/Makefile
-  modules/access/dshow/Makefile
   modules/access/mms/Makefile
   modules/access/rtp/Makefile
   modules/access/rtsp/Makefile
diff --git a/modules/access/Modules.am b/modules/access/Modules.am
index 125ef70..1a8b8b1 100644
--- a/modules/access/Modules.am
+++ b/modules/access/Modules.am
@@ -1,11 +1,4 @@
-BASE_SUBDIRS = mms rtp rtsp screen vcd vcdx zip
-EXTRA_SUBDIRS = dshow
-SUBDIRS = $(BASE_SUBDIRS)
-DIST_SUBDIRS = $(BASE_SUBDIRS) $(EXTRA_SUBDIRS)
-
-if HAVE_WIN32
-SUBDIRS += dshow
-endif
+SUBDIRS = mms rtsp rtp screen vcd vcdx zip
 
 libfilesystem_plugin_la_SOURCES = \
 	fs.h \
@@ -95,6 +88,9 @@ libvlc_LTLIBRARIES += \
 	libaccess_vdr_plugin.la \
 	$(NULL)
 
+
+### Audio capture ###
+
 libaccess_oss_plugin_la_SOURCES = oss.c
 libaccess_oss_plugin_la_CFLAGS = $(AM_CFLAGS)
 libaccess_oss_plugin_la_LIBADD = $(AM_LIBADD) $(OSS_LIBS)
@@ -119,10 +115,14 @@ if HAVE_PULSE
 libvlc_LTLIBRARIES += libpulsesrc_plugin.la
 endif
 
+
+### Video capture ###
+
 libaccess_shm_plugin_la_SOURCES = shm.c
 libaccess_shm_plugin_la_CFLAGS = $(AM_CFLAGS)
 libaccess_shm_plugin_la_LIBADD = $(AM_LIBADD)
 libvlc_LTLIBRARIES += $(LTLIBaccess_shm)
+EXTRA_LTLIBRARIES += libaccess_shm_plugin.la
 
 libv4l2_plugin_la_SOURCES = \
 	v4l2/videodev2.h \
@@ -140,6 +140,17 @@ if HAVE_V4L2
 libvlc_LTLIBRARIES += libv4l2_plugin.la
 endif
 
+libdshow_plugin_la_SOURCES = dshow/vlc_dshow.h dshow/dshow.cpp dshow/access.h \
+	dshow/filter.cpp dshow/filter.h dshow/crossbar.cpp
+libdshow_plugin_la_CFLAGS = $(AM_CFLAGS)
+libdshow_plugin_la_LIBADD = $(AM_LIBADD) -lole32 -loleaut32 -luuid -lstrmiids -lksuser
+if HAVE_WIN32
+libvlc_LTLIBRARIES += libdshow_plugin.la
+endif
+
+
+### Screen grab ###
+
 libxcb_screen_plugin_la_SOURCES = screen/xcb.c
 libxcb_screen_plugin_la_CFLAGS = $(AM_CFLAGS) \
 	$(XCB_CFLAGS) $(XCB_COMPOSITE_CFLAGS)
diff --git a/modules/access/dshow/Modules.am b/modules/access/dshow/Modules.am
deleted file mode 100644
index e6612de..0000000
--- a/modules/access/dshow/Modules.am
+++ /dev/null
@@ -1 +0,0 @@
-SOURCES_dshow = vlc_dshow.h dshow.cpp access.h filter.cpp filter.h crossbar.cpp