directsound: Fix DLL name to match plugin name

https://bugzilla.gnome.org/show_bug.cgi?id=785168

diff --git a/Makefile.am b/Makefile.am
index b072fe6..26ea127 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -65,6 +65,7 @@ CRUFT_FILES = \
        $(top_builddir)/gst/videofilter/.libs/*videoflip.{so,dll,DLL,dylib} \
        $(top_builddir)/gst/videofilter/.libs/*videobalance.{so,dll,DLL,dylib} \
        $(top_builddir)/gst/videofilter/.libs/*gamma.{so,dll,DLL,dylib} \
+       $(top_builddir)/sys/directsound/.libs/libgstdirectsoundsink.{dll,DLL} \
        $(top_builddir)/sys/oss4/.libs/libgstoss4audio.so
 
 CRUFT_DIRS = \

diff --git a/sys/directsound/Makefile.am b/sys/directsound/Makefile.am
index 23bfe8e..49c3ae5 100644 (file)
--- a/sys/directsound/Makefile.am
+++ b/sys/directsound/Makefile.am
@@ -1,17 +1,17 @@
-plugin_LTLIBRARIES = libgstdirectsoundsink.la\r
-\r
-libgstdirectsoundsink_la_SOURCES =  gstdirectsoundsink.c gstdirectsoundplugin.c\r
-libgstdirectsoundsink_la_CFLAGS = \
+plugin_LTLIBRARIES = libgstdirectsound.la
+
+libgstdirectsound_la_SOURCES =  gstdirectsound.c gstdirectsoundplugin.c
+libgstdirectsound_la_CFLAGS = \
        $(GST_PLUGINS_BASE_CFLAGS) \
        $(GST_BASE_CFLAGS) \
        $(GST_CFLAGS) \
        $(DIRECTSOUND_CFLAGS)
-libgstdirectsoundsink_la_LIBADD = \
+libgstdirectsound_la_LIBADD = \
        $(GST_PLUGINS_BASE_LIBS) \
        -lgstaudio-$(GST_API_VERSION) \
        $(GST_BASE_LIBS) \
        $(GST_LIBS) \
        $(DIRECTSOUND_LIBS)
-libgstdirectsoundsink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DIRECTSOUND_LDFLAGS)\r
-\r
+libgstdirectsound_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DIRECTSOUND_LDFLAGS)
+
 noinst_HEADERS = gstdirectsoundsink.h

diff --git a/sys/directsound/meson.build b/sys/directsound/meson.build
index e330c95..eed3ffd 100644 (file)
--- a/sys/directsound/meson.build
+++ b/sys/directsound/meson.build
@@ -6,7 +6,7 @@ directsoundsink_sources = [
 if host_machine.system() == 'windows' and cc.has_header('dsound.h')
   directsoundsink_dep = [cc.find_library('dsound'), cc.find_library('winmm'), cc.find_library('ole32')]
 
-  gstdirectsoundsink = library('gstdirectsoundsink',
+  gstdirectsoundsink = library('gstdirectsound',
     directsoundsink_sources,
     c_args : gst_plugins_good_args,
     include_directories : [configinc],