diff options
| -rw-r--r-- | configure.ac | 12 | ||||
| -rw-r--r-- | plugins/converter/Makefile | 32 | ||||
| -rw-r--r-- | plugins/converter/Makefile.am | 29 | ||||
| -rw-r--r-- | plugins/soundtouch/soundtouch/source/SoundTouch/FIFOSampleBuffer.cpp | 3 | ||||
| -rw-r--r-- | plugins/soundtouch/soundtouch/source/SoundTouch/FIRFilter.cpp | 8 | ||||
| -rw-r--r-- | plugins/soundtouch/soundtouch/source/SoundTouch/RateTransposer.cpp | 1 | ||||
| -rwxr-xr-x | scripts/portable_postbuild.sh | 4 | ||||
| -rwxr-xr-x | scripts/quickinstall.sh | 4 |
8 files changed, 50 insertions, 43 deletions
diff --git a/configure.ac b/configure.ac index 41204e59..0ef0ac5e 100644 --- a/configure.ac +++ b/configure.ac @@ -102,6 +102,7 @@ AC_ARG_ENABLE(portable, [AS_HELP_STRING([--enable-portable ], [make portable bui AC_ARG_ENABLE(src, [AS_HELP_STRING([--enable-src ], [build libsamplerate (SRC) plugin (default: auto)])], [enable_src=$enableval], [enable_src=yes]) AC_ARG_ENABLE(m3u, [AS_HELP_STRING([--enable-m3u ], [build m3u plugin (default: auto)])], [enable_m3u=$enableval], [enable_m3u=yes]) AC_ARG_ENABLE(vfs-zip, [AS_HELP_STRING([--enable-vfs-zip ], [build vfs_zip plugin (default: auto)])], [enable_vfs_zip=$enableval], [enable_vfs_zip=yes]) +AC_ARG_ENABLE(converter, [AS_HELP_STRING([--enable-converter ], [build converter plugin (default: auto)])], [enable_converter=$enableval], [enable_converter=yes]) if test "x$enable_staticlink" != "xno" ; then AC_DEFINE_UNQUOTED([STATICLINK], [1], [Define if building static version]) @@ -523,7 +524,13 @@ if test "x$enable_vfs_zip" != "xno" ; then fi fi -PLUGINS_DIRS="plugins/lastfm plugins/mpgmad plugins/vorbis plugins/flac plugins/wavpack plugins/sndfile plugins/vfs_curl plugins/cdda plugins/gtkui plugins/alsa plugins/ffmpeg plugins/hotkeys plugins/oss plugins/artwork plugins/adplug plugins/ffap plugins/sid plugins/nullout plugins/supereq plugins/vtx plugins/gme plugins/pulse plugins/notify plugins/musepack plugins/wildmidi plugins/tta plugins/dca plugins/aac plugins/mms plugins/shellexec plugins/dsp_libsrc plugins/m3u plugins/vfs_zip" +if test "x$enable_converter" != "xno" ; then + if test "x$HAVE_GTK" = "xyes" ; then + HAVE_CONVERTER=yes + fi +fi + +PLUGINS_DIRS="plugins/lastfm plugins/mpgmad plugins/vorbis plugins/flac plugins/wavpack plugins/sndfile plugins/vfs_curl plugins/cdda plugins/gtkui plugins/alsa plugins/ffmpeg plugins/hotkeys plugins/oss plugins/artwork plugins/adplug plugins/ffap plugins/sid plugins/nullout plugins/supereq plugins/vtx plugins/gme plugins/pulse plugins/notify plugins/musepack plugins/wildmidi plugins/tta plugins/dca plugins/aac plugins/mms plugins/shellexec plugins/dsp_libsrc plugins/m3u plugins/vfs_zip plugins/converter" AM_CONDITIONAL(HAVE_VORBIS, test "x$HAVE_VORBISPLUGIN" = "xyes") AM_CONDITIONAL(HAVE_FLAC, test "x$HAVE_FLACPLUGIN" = "xyes") @@ -561,6 +568,7 @@ AM_CONDITIONAL(PORTABLE_FULL, test "x$PORTABLE_FULL" = "xyes") AM_CONDITIONAL(HAVE_DSP_SRC, test "x$HAVE_DSP_SRC" = "xyes") AM_CONDITIONAL(HAVE_M3U, test "x$HAVE_M3U" = "xyes") AM_CONDITIONAL(HAVE_VFS_ZIP, test "x$HAVE_VFS_ZIP" = "xyes") +AM_CONDITIONAL(HAVE_CONVERTER, test "x$HAVE_CONVERTER" = "xyes") AC_SUBST(PLUGINS_DIRS) @@ -621,6 +629,7 @@ PRINT_PLUGIN_INFO([mms],[mms streaming support],[test "x$HAVE_MMS" = "xyes"]) PRINT_PLUGIN_INFO([dsp_src],[High quality samplerate conversion using libsamplerate],[test "x$HAVE_DSP_SRC" = "xyes"]) PRINT_PLUGIN_INFO([m3u],[M3U and PLS playlist support],[test "x$HAVE_M3U" = "xyes"]) PRINT_PLUGIN_INFO([vfs_zip],[zip archive support],[test "x$HAVE_VFS_ZIP" = "xyes"]) +PRINT_PLUGIN_INFO([converter],[plugin for converting files to any formats],[test "x$HAVE_CONVERTER" = "xyes"]) echo @@ -661,6 +670,7 @@ plugins/mms/Makefile plugins/dsp_libsrc/Makefile plugins/m3u/Makefile plugins/vfs_zip/Makefile +plugins/converter/Makefile intl/Makefile po/Makefile.in deadbeef.desktop diff --git a/plugins/converter/Makefile b/plugins/converter/Makefile deleted file mode 100644 index 7cd742a0..00000000 --- a/plugins/converter/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -CONVERTER_OUT=converter.so -GUI_OUT=converter_gtkui.so - -CC=gcc - -CFLAGS+=-Wall -D_GNU_SOURCE -std=c99 -fPIC -g -I../.. - -LDFLAGS+=-module -shared - -CONVERTER_SOURCES=converter.c -GUI_SOURCES=convgui.c interface.c support.c - -CONVERTER_OBJECTS=$(CONVERTER_SOURCES:.c=.o) -GUI_OBJECTS=$(GUI_SOURCES:.c=.o) - -all: $(CONVERTER_SOURCES) $(CONVERTER_OUT) $(GUI_SOURCES) $(GUI_OUT) - -$(CONVERTER_OUT): $(CONVERTER_OBJECTS) - $(CC) $(LDFLAGS) $(CONVERTER_OBJECTS) -o $@ - -GTK_CFLAGS=`pkg-config --cflags gtk+-2.0` -GTK_LIBS=`pkg-config --libs gtk+-2.0` - -$(GUI_OUT): $(GUI_OBJECTS) - $(CC) $(LDFLAGS) $(GUI_OBJECTS) $(GTK_LIBS) -o $@ - -.c.o: - $(CC) $(CFLAGS) $(GTK_CFLAGS) $< -c -o $@ - -clean: - rm $(CONVERTER_OBJECTS) $(CONVERTER_OUT) $(GUI_OBJECTS) $(GUI_OUT) - diff --git a/plugins/converter/Makefile.am b/plugins/converter/Makefile.am new file mode 100644 index 00000000..72c4e19b --- /dev/null +++ b/plugins/converter/Makefile.am @@ -0,0 +1,29 @@ +if HAVE_CONVERTER + +if STATICLINK +pkglib_LTLIBRARIES = converter.la converter_gtkui.la convgui_fallback.la +else +pkglib_LTLIBRARIES = converter.la converter_gtkui.la +endif + +AM_CFLAGS = $(CFLAGS) -std=c99 -fPIC +converter_la_SOURCES = converter.c converter.h +converter_la_LDFLAGS = -module +converter_gtkui_la_SOURCES = convgui.c interface.c support.c callbacks.h converter.h interface.h support.h +converter_gtkui_la_LDFLAGS = -module +converter_gtkui_la_LIBADD = $(LDADD) $(GTKUI_DEPS_LIBS) +converter_gtkui_la_CFLAGS = -std=c99 $(GTKUI_DEPS_CFLAGS) + +# fallback lib +if STATICLINK +GTK_ROOT=../../../deadbeef-deps/gtk-debian/usr +convgui_fallback_la_SOURCES = convgui.c interface.c support.c callbacks.h converter.h interface.h support.h +convgui_fallback_la_LDFLAGS = -module + +convgui_fallback_la_LIBADD = $(LDADD) -L$(GTK_ROOT)/lib $(GTK_ROOT)/lib/libgtk-x11-2.0.la $(GTK_ROOT)/lib/libgdk-x11-2.0.la $(GTK_ROOT)/lib/libpangoft2-1.0.la $(GTK_ROOT)/lib/libpangocairo-1.0.la $(GTK_ROOT)/lib/libgdk_pixbuf-2.0.la -lm $(GTK_ROOT)/lib/libcairo.la $(GTK_ROOT)/lib/libpango-1.0.la $(GTK_ROOT)/lib/libgobject-2.0.la $(GTK_ROOT)/lib/libgmodule-2.0.la $(GTK_ROOT)/lib/libgthread-2.0.la -lrt $(GTK_ROOT)/lib/libglib-2.0.la + +convgui_fallback_la_CFLAGS = -std=c99 -I $(GTK_ROOT)/include -I $(GTK_ROOT)/lib/gtk-2.0/include -I $(GTK_ROOT)/include/glib-2.0 -I $(GTK_ROOT)/include/gtk-2.0 -I $(GTK_ROOT)/include/cairo -I $(GTK_ROOT)/lib/glib-2.0/include/ -I $(GTK_ROOT)/include/pango-1.0 -I $(GTK_ROOT)/include/atk-1.0 -DULTRA_COMPATIBLE=1 +endif + + +endif diff --git a/plugins/soundtouch/soundtouch/source/SoundTouch/FIFOSampleBuffer.cpp b/plugins/soundtouch/soundtouch/source/SoundTouch/FIFOSampleBuffer.cpp index 01f64b08..39c2528f 100644 --- a/plugins/soundtouch/soundtouch/source/SoundTouch/FIFOSampleBuffer.cpp +++ b/plugins/soundtouch/soundtouch/source/SoundTouch/FIFOSampleBuffer.cpp @@ -47,7 +47,6 @@ #include <memory.h>
#include <string.h>
#include <assert.h>
-#include <stdexcept>
#include "FIFOSampleBuffer.h"
@@ -175,7 +174,7 @@ void FIFOSampleBuffer::ensureCapacity(uint capacityRequirement) tempUnaligned = new SAMPLETYPE[sizeInBytes / sizeof(SAMPLETYPE) + 16 / sizeof(SAMPLETYPE)];
if (tempUnaligned == NULL)
{
- throw std::runtime_error("Couldn't allocate memory!\n");
+ exit (-1);
}
// Align the buffer to begin at 16byte cache line boundary for optimal performance
temp = (SAMPLETYPE *)(((ulong)tempUnaligned + 15) & (ulong)-16);
diff --git a/plugins/soundtouch/soundtouch/source/SoundTouch/FIRFilter.cpp b/plugins/soundtouch/soundtouch/source/SoundTouch/FIRFilter.cpp index 231263ad..96472ad2 100644 --- a/plugins/soundtouch/soundtouch/source/SoundTouch/FIRFilter.cpp +++ b/plugins/soundtouch/soundtouch/source/SoundTouch/FIRFilter.cpp @@ -43,7 +43,7 @@ #include <assert.h>
#include <math.h>
#include <stdlib.h>
-#include <stdexcept>
+#include <stdio.h>
#include "FIRFilter.h"
#include "cpu_detect.h"
@@ -174,7 +174,10 @@ uint FIRFilter::evaluateFilterMono(SAMPLETYPE *dest, const SAMPLETYPE *src, uint void FIRFilter::setCoefficients(const SAMPLETYPE *coeffs, uint newLength, uint uResultDivFactor)
{
assert(newLength > 0);
- if (newLength % 8) throw std::runtime_error("FIR filter length not divisible by 8");
+ if (newLength % 8) {
+ fprintf (stderr, "soundtouch: FIR filter length not divisible by 8");
+ exit (-1);
+ }
lengthDiv8 = newLength / 8;
length = lengthDiv8 * 8;
@@ -222,7 +225,6 @@ uint FIRFilter::evaluate(SAMPLETYPE *dest, const SAMPLETYPE *src, uint numSample void * FIRFilter::operator new(size_t s)
{
// Notice! don't use "new FIRFilter" directly, use "newInstance" to create a new instance instead!
- throw std::runtime_error("Error in FIRFilter::new: Don't use 'new FIRFilter', use 'newInstance' member instead!");
return NULL;
}
diff --git a/plugins/soundtouch/soundtouch/source/SoundTouch/RateTransposer.cpp b/plugins/soundtouch/soundtouch/source/SoundTouch/RateTransposer.cpp index 7e0b277d..59ba4295 100644 --- a/plugins/soundtouch/soundtouch/source/SoundTouch/RateTransposer.cpp +++ b/plugins/soundtouch/soundtouch/source/SoundTouch/RateTransposer.cpp @@ -108,7 +108,6 @@ public: // depending on if we've a MMX/SSE/etc-capable CPU available or not.
void * RateTransposer::operator new(size_t s)
{
- throw runtime_error("Error in RateTransoser::new: don't use \"new TDStretch\" directly, use \"newInstance\" to create a new instance instead!");
return NULL;
}
diff --git a/scripts/portable_postbuild.sh b/scripts/portable_postbuild.sh index ad2ec8df..968e4c49 100755 --- a/scripts/portable_postbuild.sh +++ b/scripts/portable_postbuild.sh @@ -19,7 +19,7 @@ for i in nullout cdda flac alsa mpgmad hotkeys vtx \ lastfm sid adplug sndfile artwork \ supereq gme dumb notify musepack wildmidi \ tta dca aac mms shn ao shellexec vfs_zip \ - m3u ; do + m3u converter ; do if [ -f ./plugins/$i/.libs/$i.so ]; then cp ./plugins/$i/.libs/$i.so $PLUGDIR/ else @@ -47,7 +47,7 @@ for i in pause_16.png play_16.png noartwork.jpg buffering_16.png; do done # docs -for i in ChangeLog help.txt COPYING.GPLv2 about.txt translators.txt; do +for i in ChangeLog help.txt COPYING.GPLv2 COPYING.LGPLv2.1 about.txt translators.txt; do cp ./$i $DOCDIR/ done diff --git a/scripts/quickinstall.sh b/scripts/quickinstall.sh index 59d270cf..0f6d5c92 100755 --- a/scripts/quickinstall.sh +++ b/scripts/quickinstall.sh @@ -37,7 +37,7 @@ cp ./plugins/shellexec/.libs/shellexec.so /usr/local/lib/deadbeef/ cp ./plugins/dsp_libsrc/.libs/dsp_libsrc.so /usr/local/lib/deadbeef/ cp ./plugins/m3u/.libs/m3u.so /usr/local/lib/deadbeef/ cp ./plugins/ddb_input_uade2/ddb_input_uade2.so /usr/local/lib/deadbeef/ -cp ./plugins/converter/converter.so /usr/local/lib/deadbeef/ -cp ./plugins/converter/converter_gtkui.so /usr/local/lib/deadbeef/ +cp ./plugins/converter/.libs/converter.so /usr/local/lib/deadbeef/ +cp ./plugins/converter/.libs/converter_gtkui.so /usr/local/lib/deadbeef/ cp ./plugins/soundtouch/ddb_soundtouch.so /usr/local/lib/deadbeef/ cp ./plugins/vfs_zip/.libs/vfs_zip.so /usr/local/lib/deadbeef/ |