summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitmodules3
-rw-r--r--Makefile.am7
-rw-r--r--configure.ac29
-rw-r--r--src/Makefile.am6
m---------zita-resampler0
5 files changed, 13 insertions, 32 deletions
diff --git a/.gitmodules b/.gitmodules
index 756043e..4a7fcd2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -17,3 +17,6 @@
[submodule "pugixml"]
path = pugixml
url = http://git.drumgizmo.org/pugixml.git
+[submodule "zita-resampler"]
+ path = zita-resampler
+ url = git://git.drumgizmo.org/zita-resampler.git
diff --git a/Makefile.am b/Makefile.am
index cce80d3..7014a8a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,4 +20,9 @@ EXTRA_DIST = \
\
pugixml/src/pugixml.hpp \
pugixml/src/pugiconfig.hpp \
- pugixml/src/pugixml.cpp
+ pugixml/src/pugixml.cpp \
+\
+ zita-resampler/libs/resampler.cc \
+ zita-resampler/libs/resampler-table.cc \
+ zita-resampler/libs/zita-resampler/resampler-table.h \
+ zita-resampler/libs/zita-resampler/resampler.h
diff --git a/configure.ac b/configure.ac
index 19adae5..ed8cc65 100644
--- a/configure.ac
+++ b/configure.ac
@@ -572,35 +572,6 @@ dnl Check for sndfile
dnl ======================
PKG_CHECK_MODULES(SNDFILE, sndfile >= 1.0.20)
-
-dnl ======================
-dnl Check for the zitaresampler library
-dnl ======================
-AC_LANG_PUSH([C++])
-tmp_CXXFLAGS="$CXXFLAGS"
-tmp_CPPFLAGS="$CPPFLAGS"
-tmp_CFLAGS="$CFLAGS"
-tmp_LDFLAGS="$LDFLAGS"
-tmp_LIBS="$LIBS"
-CXXFLAGS=""
-CPPFLAGS="$ZITA_CPPFLAGS"
-CFLAGS=""
-LDFLAGS="$ZITA_LDFLAGS"
-LIBS="-lzita-resampler -lpthread"
-AC_LINK_IFELSE(
- [AC_LANG_PROGRAM([#include <zita-resampler/resampler.h>],
- [Resampler r] ) ], , AC_MSG_ERROR([*** zita-resampler library not found!]))
-ZITA_CPPFLAGS="$CXXFLAGS $CPPFLAGS $CFLAGS"
-ZITA_LIBS="$LDFLAGS $LIBS"
-CXXFLAGS="$tmp_CXXFLAGS"
-CPPFLAGS="$tmp_CPPFLAGS"
-CFLAGS="$tmp_CFLAGS"
-LDFLAGS="$tmp_LDFLAGS"
-LIBS="$tmp_LIBS"
-AC_SUBST(ZITA_CPPFLAGS)
-AC_SUBST(ZITA_LIBS)
-AC_LANG_POP([C++])
-
dnl ======================
dnl Check for the rt library
dnl ======================
diff --git a/src/Makefile.am b/src/Makefile.am
index 93ef5ed..3d4874c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,14 +3,16 @@ noinst_LTLIBRARIES = libdg.la
libdg_la_CPPFLAGS = \
-I$(top_srcdir)/hugin -I$(top_srcdir)/pugixml/src \
$(SSEFLAGS) \
- $(ZITA_CPPFLAGS) $(SNDFILE_CFLAGS) $(PTHREAD_CFLAGS)
+ -I$(top_srcdir)/libs $(SNDFILE_CFLAGS) $(PTHREAD_CFLAGS)
libdg_la_LIBADD = \
- $(ZITA_LIBS) $(SNDFILE_LIBS) $(PTHREAD_LIBS)
+ $(SNDFILE_LIBS) $(PTHREAD_LIBS)
# If you add a file here, remember to add it to plugin/Makefile.mingw32.in
nodist_libdg_la_SOURCES = \
$(top_srcdir)/pugixml/src/pugixml.cpp \
+ $(top_srcdir)/zita-resampler/libs/resampler.cc \
+ $(top_srcdir)/zita-resampler/libs/resampler-table.cc \
audiocachefile.cc \
audiocache.cc \
audiocacheeventhandler.cc \
diff --git a/zita-resampler b/zita-resampler
new file mode 160000
+Subproject 76288efeead86fd5799d9771e50bf3222aaa8e7