Move libmythsamplerate to external/libsamplerate.

mythtv/configure

@@ -6479,5 +6479,9 @@ fi
 echo "Configuring libmythbluray..."
 (cd external/libmythbluray ; \
        ${qmakeconf} -o Makefile)
+echo "Configuring libsamplerate..."
+(cd external/libsamplerate ; \
+       ${qmakeconf} -o Makefile)
+
 
 test -n "$WARNINGS" && printf "\n$WARNINGS" || exit 0

mythtv/docs/doxygen-architecture-document.cpp

@@ -102,7 +102,7 @@ There are also a few simple \ref testing "testing shortcuts".
       and some old UI widgets are implemented by libmyth.
 
       This library depends on libav*, libmythbase, libmythui, libmythupnp,
-      libmythsamplerate, libmythsoundtouch and libmythfreesurround.
+      libsamplerate, libmythsoundtouch and libmythfreesurround.
 
       Any changes to this library's ABI may trigger a MythTV binary version
       change because the plugins depend on it.
@@ -144,7 +144,7 @@ There are also a few simple \ref testing "testing shortcuts".
 
       This library does not depend on any of our libraries.
 
-  <dt>libmythsamplerate      <dd>Audio resampling library.
+  <dt>libsamplerate      <dd>Audio resampling library.
       <a href="http://www.mega-nerd.com/SRC/api.html">Documented Externally</a>.
       We use this to support different output sample rates than the sample
       rate used in the audio streams we play.
@@ -190,9 +190,9 @@ There are also a few simple \ref testing "testing shortcuts".
       This library does not depend on any of our libraries.
 
 </dl>
-Two libraries libmythmpeg2 and libmythsamplerate appear redundant, but
+Two libraries libmythmpeg2 and libsamplerate appear redundant, but
 libmpeg2 decodes MPEG-2 more quickly than ffmpeg on some systems, and
-libmythsamplerate resamples audio with better quality when we only need
+libsamplerate resamples audio with better quality when we only need
 to match the hardware sample rate to the A/V streams audio sample rate.
 
 \section db Database Schema

mythtv/external/Makefile

@@ -1,6 +1,6 @@
 include ../config.mak
 
-SUBDIRS = FFmpeg zeromq nzmqt qjson libmythbluray
+SUBDIRS = FFmpeg zeromq nzmqt qjson libmythbluray libsamplerate
 
 ifdef CONFIG_HDHOMERUN
     SUBDIRS += libhdhomerun
@@ -55,3 +55,6 @@ libhdhomerun-all libhdhomerun-clean libhdhomerun-distclean libhdhomerun-install
 libmythbluray-all libmythbluray-clean libmythbluray-distclean libmythbluray-install libmythbluray-uninstall:
 	${MAKE} -C libmythbluray ${@:libmythbluray-%=%}
 
+libsamplerate-all libsamplerate-clean libsamplerate-distclean libsamplerate-install libsamplerate-uninstall:
+	${MAKE} -C libsamplerate ${@:libsamplerate-%=%}
+

mythtv/external/libsamplerate/libsamplerate.pro

@@ -0,0 +1,41 @@
+include ( ../../settings.pro )
+
+TEMPLATE = lib
+TARGET = mythsamplerate-$$LIBVERSION
+CONFIG += thread staticlib warn_off
+CONFIG -= qt
+
+INCLUDEPATH += ../ ../../ 
+
+DEFINES += HAVE_AV_CONFIG_H
+
+QMAKE_CLEAN += $(TARGET) $(TARGETA) $(TARGETD) $(TARGET0) $(TARGET1) $(TARGET2)
+
+# Input
+HEADERS += samplerate.h
+
+SOURCES += samplerate.c src_linear.c src_sinc.c src_zoh.c
+
+inc.path = $${PREFIX}/include/mythtv/
+inc.files = samplerate.h
+
+INSTALLS += inc
+
+mingw {
+    dll : contains( TEMPLATE, lib ) {
+
+        # Qt under Linux/UnixMac OS X builds libBlah.a and libBlah.so,
+        # but is using the Windows defaults  libBlah.a and    Blah.dll.
+        #
+        # So that our dependency targets work between SUBDIRS, override:
+        #
+        TARGET = lib$${TARGET}
+
+
+        # Windows doesn't have a nice variable like LD_LIBRARY_PATH,
+        # which means make install would be broken without extra steps.
+        # As a workaround, we store dlls with exes. Also improves debugging!
+        #
+        target.path = $${PREFIX}/bin
+    }
+}

mythtv/libs/libmythsamplerate/samplerate.c → mythtv/external/libsamplerate/samplerate.c

@@ -26,8 +26,6 @@
 #include	<stdlib.h>
 #include	<string.h>
 
-#include	"libmythbase/mythconfig.h"
-
 #include	"samplerate.h"
 #include	"float_cast.h"
 #include	"common.h"

mythtv/libs/libmyth/audio/audiooutputbase.h

@@ -15,7 +15,9 @@ using namespace std;
 
 // MythTV headers
 #include "audiooutput.h"
+// external/libsamplerate
 #include "samplerate.h"
+
 #include "mythlogging.h"
 #include "mthread.h"
 

mythtv/libs/libmyth/libmyth.pro

@@ -87,17 +87,17 @@ SOURCES += mythrssmanager.cpp           netutils.cpp
 SOURCES += netgrabbermanager.cpp
 }
 
-INCLUDEPATH += ../libmythsamplerate ../libmythsoundtouch ../libmythfreesurround
+INCLUDEPATH += ../../external/libsamplerate ../libmythsoundtouch ../libmythfreesurround
 INCLUDEPATH += ../libmythbase
 INCLUDEPATH += ../.. ../ ./ ../libmythupnp ../libmythui
 INCLUDEPATH += ../../external/FFmpeg
-DEPENDPATH += ../libmythsamplerate ../libmythsoundtouch
+DEPENDPATH += ../../external/libsamplerate ../libmythsoundtouch
 DEPENDPATH += ../libmythfreesurround
 DEPENDPATH += ../ ../libmythui ../libmythbase
 DEPENDPATH += ../libmythupnp
 DEPENDPATH += ./audio
 
-LIBS += -L../libmythsamplerate   -lmythsamplerate-$${LIBVERSION}
+LIBS += -L../../external/libsamplerate   -lmythsamplerate-$${LIBVERSION}
 LIBS += -L../libmythsoundtouch   -lmythsoundtouch-$${LIBVERSION}
 LIBS += -L../libmythbase           -lmythbase-$${LIBVERSION}
 LIBS += -L../libmythui           -lmythui-$${LIBVERSION}
@@ -109,7 +109,7 @@ LIBS += -L../../external/FFmpeg/libavutil  -lmythavutil
 LIBS += -L../../external/FFmpeg/libavformat  -lmythavformat
 LIBS += -L../../external/FFmpeg/libswresample -lmythswresample
 
-POST_TARGETDEPS += ../libmythsamplerate/libmythsamplerate-$${MYTH_LIB_EXT}
+POST_TARGETDEPS += ../../external/libsamplerate/libmythsamplerate-$${MYTH_LIB_EXT}
 POST_TARGETDEPS += ../libmythsoundtouch/libmythsoundtouch-$${MYTH_LIB_EXT}
 POST_TARGETDEPS += ../libmythfreesurround/libmythfreesurround-$${MYTH_LIB_EXT}
 POST_TARGETDEPS += ../../external/FFmpeg/libavcodec/$$avLibName(avcodec)

mythtv/libs/libmythmetadata/libmythmetadata.pro

@@ -43,13 +43,13 @@ INCLUDEPATH += ../../external/FFmpeg ../libmyth  ../../external/libmythbluray
 # for TagLib
 INCLUDEPATH += $${CONFIG_TAGLIB_INCLUDES}
 
-DEPENDPATH += ../libmythsamplerate ../libmythsoundtouch
+DEPENDPATH += ../../external/libsamplerate ../libmythsoundtouch
 DEPENDPATH += ../libmythfreesurround
 DEPENDPATH += ../ ../libmythui ../libmythbase
 DEPENDPATH += ../libmythupnp ../libmythtv ../libmyth
 DEPENDPATH += ../../external/libmythbluray
 
-LIBS += -L../libmythsamplerate   -lmythsamplerate-$${LIBVERSION}
+LIBS += -L../../external/libsamplerate   -lmythsamplerate-$${LIBVERSION}
 LIBS += -L../libmythsoundtouch   -lmythsoundtouch-$${LIBVERSION}
 LIBS += -L../libmythbase           -lmythbase-$${LIBVERSION}
 LIBS += -L../libmythui           -lmythui-$${LIBVERSION}

mythtv/libs/libs.pro

@@ -3,7 +3,6 @@ include (../settings.pro)
 TEMPLATE = subdirs
 
 # Libraries without dependencies
-SUBDIRS += libmythsamplerate
 SUBDIRS += libmythsoundtouch libmythdvdnav
 SUBDIRS += libmythfreesurround libmythbase
 SUBDIRS += libmythservicecontracts
@@ -18,7 +17,8 @@ SUBDIRS += libmythui libmythupnp libmyth
 libmythui.depends = libmythbase
 libmythupnp.depends = libmythbase
 libmyth.depends =  libmythbase libmythui libmythupnp
-libmyth.depends += libmythsamplerate libmythsoundtouch libmythfreesurround
+libmyth.depends += libmythsoundtouch
+libmyth.depends += libmythfreesurround
 libmythupnp.depends = libmythbase libmythservicecontracts
 
 LIBMYTHTVDEPS = $$SUBDIRS

mythtv/programs/programs-libs.pro

@@ -2,7 +2,8 @@ INCLUDEPATH += ../.. ../../libs/ ../../libs/libmyth ../../libs/libmyth/audio
 INCLUDEPATH +=  ../../libs/libmythtv ../../external/FFmpeg
 INCLUDEPATH += ../../libs/libmythupnp ../../libs/libmythui ../../libs/libmythmetadata
 INCLUDEPATH += ../../libs/libmythlivemedia ../../libs/libmythbase
-INCLUDEPATH += ../../libs/libmythdvdnav ../../external/libmythbluray ../../libs/libmythsamplerate
+INCLUDEPATH += ../../libs/libmythdvdnav ../../external/libmythbluray
+INCLUDEPATH += ../../external/libsamplerate
 INCLUDEPATH += ../../libs/libmythtv/mpeg
 INCLUDEPATH += ../../libs/libmythtv/vbitext
 INCLUDEPATH += ../../libs/libmythservicecontracts