View Issue Details
| ID | Project | Category | View Status | Date Submitted | Last Update |
|---|---|---|---|---|---|
| 0004403 | ardour | other | public | 2011-10-28 01:06 | 2020-04-19 20:15 |
| Reporter | nettings | Assigned To | paul | ||
| Priority | low | Severity | minor | Reproducibility | N/A |
| Status | closed | Resolution | fixed | ||
| Target Version | 3.0-beta1 | ||||
| Summary | 0004403: [PATCH] soundtouch leftovers that need to be removed | ||||
| Description | there are still some bits and pieces left over from soundtouch. the most obvious is the ./waf configure check, which is particularly irritating since it will complain about a missing soundtouch library even though it is there. i'm attaching a list of soundtouch occurrences in case somebody feels like cleaning up. i'd do it myself if some dev gives me the go-ahead - or is soundtouch going to come back at some point? | ||||
| Additional Information | nettings@kleineronkel:/local/build/ardour3-svn> grep -ir soundtouch * .waf-1.6.7-a67d361057c95502ae581ba77b8e3ed1/ build/config.log:Checking for 'soundtouch-1.0' build/config.log:['/usr/bin/pkg-config', 'soundtouch-1.0', '--cflags', '--libs'] build/config.log:err: Package soundtouch-1.0 was not found in the pkg-config search path. build/config.log:Perhaps you should add the directory containing `soundtouch-1.0.pc' build/config.log:No package 'soundtouch-1.0' found build/c4che/_cache.py:CHECKED_SOUNDTOUCH = 1 build/gtk2_ardour/ardev_common_waf.sh:export LD_LIBRARY_PATH=$libs/qm-dsp:$libs/vamp-sdk:$libs/surfaces:$libs/surfaces/control_protocol:$libs/ardour:$libs/midi++2:$libs/pbd:$libs/rubberband:$libs/soundtouch:$libs/gtkmm2ext:$libs/gnomecanvas:$libs/libsndfile:$libs/appleutility:$libs/taglib:$libs/evoral:$libs/evoral/src/libsmf:$libs/audiographer:$libs/timecode:${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} Binary file build/libs/ardour/libardour.so matches Binary file build/libs/ardour/config_text.cc.1.o matches Binary file build/libs/ardour/libardour.so.3.0.0 matches Binary file build/libs/ardour/libardour.so.3 matches gtk2_ardour/.svn/text-base/time_fx_dialog.h.svn-base: /* SoundTouch */ gtk2_ardour/.svn/text-base/editor_drag.cc.svn-base: // Soundtouch uses percentage / 100 instead of normal (/ 1) gtk2_ardour/.svn/text-base/ardev_common.sh.in.svn-base:export LD_LIBRARY_PATH=$libs/qm-dsp:$libs/vamp-sdk:$libs/surfaces:$libs/surfaces/control_protocol:$libs/ardour:$libs/midi++2:$libs/pbd:$libs/rubberband:$libs/soundtouch:$libs/gtkmm2ext:$libs/gnomecanvas:$libs/libsndfile:$libs/appleutility:$libs/taglib:$libs/evoral:$libs/evoral/src/libsmf:$libs/audiographer:$libs/timecode:${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} Binary file gtk2_ardour/core matches gtk2_ardour/editor_drag.cc: // Soundtouch uses percentage / 100 instead of normal (/ 1) gtk2_ardour/ardev_common.sh.in:export LD_LIBRARY_PATH=$libs/qm-dsp:$libs/vamp-sdk:$libs/surfaces:$libs/surfaces/control_protocol:$libs/ardour:$libs/midi++2:$libs/pbd:$libs/rubberband:$libs/soundtouch:$libs/gtkmm2ext:$libs/gnomecanvas:$libs/libsndfile:$libs/appleutility:$libs/taglib:$libs/evoral:$libs/evoral/src/libsmf:$libs/audiographer:$libs/timecode:${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} gtk2_ardour/time_fx_dialog.h: /* SoundTouch */ libs/ardour/wscript: autowaf.check_pkg(conf, 'soundtouch-1.0', uselib_store='SOUNDTOUCH', libs/ardour/wscript: #obj.uselib += ' SOUNDTOUCH ' libs/ardour/.svn/text-base/st_stretch.cc.svn-base:using namespace soundtouch; libs/ardour/.svn/text-base/st_stretch.cc.svn-base: /* the soundtouch code wants a *tempo* change percentage, which is libs/ardour/.svn/text-base/st_stretch.cc.svn-base: // soundtouch throws runtime_error on error libs/ardour/.svn/text-base/wscript.svn-base: autowaf.check_pkg(conf, 'soundtouch-1.0', uselib_store='SOUNDTOUCH', libs/ardour/.svn/text-base/wscript.svn-base: #obj.uselib += ' SOUNDTOUCH ' libs/ardour/.svn/text-base/run-tests.sh.svn-base:export LD_LIBRARY_PATH=$libs/audiographer:$libs/vamp-sdk:$libs/surfaces:$libs/surfaces/control_protocol:$libs/ardour:$libs/midi++2:$libs/pbd:$libs/rubberband:$libs/soundtouch:$libs/gtkmm2ext:$libs/appleutility:$libs/taglib:$libs/evoral:$libs/evoral/src/libsmf:$libs/timecode:$LD_LIBRARY_PATH libs/ardour/ardour/stretch.h:#include <soundtouch/SoundTouch.h> libs/ardour/ardour/stretch.h: soundtouch::SoundTouch st; libs/ardour/ardour/.svn/text-base/stretch.h.svn-base:#include <soundtouch/SoundTouch.h> libs/ardour/ardour/.svn/text-base/stretch.h.svn-base: soundtouch::SoundTouch st; libs/ardour/ardour/.svn/text-base/types.h.svn-base: /* SoundTouch */ libs/ardour/ardour/types.h: /* SoundTouch */ libs/ardour/run-tests.sh:export LD_LIBRARY_PATH=$libs/audiographer:$libs/vamp-sdk:$libs/surfaces:$libs/surfaces/control_protocol:$libs/ardour:$libs/midi++2:$libs/pbd:$libs/rubberband:$libs/soundtouch:$libs/gtkmm2ext:$libs/appleutility:$libs/taglib:$libs/evoral:$libs/evoral/src/libsmf:$libs/timecode:$LD_LIBRARY_PATH libs/ardour/macosx/ardour.xcodeproj/.svn/text-base/project.pbxproj.svn-base: 696C91080B8D52F300D66CAF /* soundtouch.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 696C90FF0B8D52F300D66CAF /* soundtouch.framework */; }; libs/ardour/macosx/ardour.xcodeproj/.svn/text-base/project.pbxproj.svn-base: 696C90FF0B8D52F300D66CAF /* soundtouch.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = soundtouch.framework; path = /Library/Frameworks/soundtouch.framework; sourceTree = "<absolute>"; }; libs/ardour/macosx/ardour.xcodeproj/.svn/text-base/project.pbxproj.svn-base: 696C91080B8D52F300D66CAF /* soundtouch.framework in Frameworks */, libs/ardour/macosx/ardour.xcodeproj/.svn/text-base/project.pbxproj.svn-base: 696C90FF0B8D52F300D66CAF /* soundtouch.framework */, libs/ardour/macosx/ardour.xcodeproj/project.pbxproj: 696C91080B8D52F300D66CAF /* soundtouch.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 696C90FF0B8D52F300D66CAF /* soundtouch.framework */; }; libs/ardour/macosx/ardour.xcodeproj/project.pbxproj: 696C90FF0B8D52F300D66CAF /* soundtouch.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = soundtouch.framework; path = /Library/Frameworks/soundtouch.framework; sourceTree = "<absolute>"; }; libs/ardour/macosx/ardour.xcodeproj/project.pbxproj: 696C91080B8D52F300D66CAF /* soundtouch.framework in Frameworks */, libs/ardour/macosx/ardour.xcodeproj/project.pbxproj: 696C90FF0B8D52F300D66CAF /* soundtouch.framework */, libs/ardour/st_stretch.cc:using namespace soundtouch; libs/ardour/st_stretch.cc: /* the soundtouch code wants a *tempo* change percentage, which is libs/ardour/st_stretch.cc: // soundtouch throws runtime_error on error libs/pbd/.svn/text-base/run-tests.sh.svn-base:export LD_LIBRARY_PATH=$libs/audiographer:$libs/vamp-sdk:$libs/surfaces:$libs/surfaces/control_protocol:$libs/ardour:$libs/midi++2:$libs/pbd:$libs/rubberband:$libs/soundtouch:$libs/gtkmm2ext:$libs/sigc++2:$libs/glibmm2:$libs/gtkmm2/atk:$libs/gtkmm2/pango:$libs/gtkmm2/gdk:$libs/gtkmm2/gtk:$libs/libgnomecanvasmm:$libs/libsndfile:$libs/appleutility:$libs/cairomm:$libs/taglib:$libs/evoral:$libs/evoral/src/libsmf:$LD_LIBRARY_PATH libs/pbd/run-tests.sh:export LD_LIBRARY_PATH=$libs/audiographer:$libs/vamp-sdk:$libs/surfaces:$libs/surfaces/control_protocol:$libs/ardour:$libs/midi++2:$libs/pbd:$libs/rubberband:$libs/soundtouch:$libs/gtkmm2ext:$libs/sigc++2:$libs/glibmm2:$libs/gtkmm2/atk:$libs/gtkmm2/pango:$libs/gtkmm2/gdk:$libs/gtkmm2/gtk:$libs/libgnomecanvasmm:$libs/libsndfile:$libs/appleutility:$libs/cairomm:$libs/taglib:$libs/evoral:$libs/evoral/src/libsmf:$LD_LIBRARY_PATH tools/linux_packaging/.svn/text-base/build.svn-base:OURLIBS=$OURLIBDIR/vamp-sdk:$OURLIBDIR/surfaces/control_protocol:$OURLIBDIR/ardour:$OURLIBDIR/midi++2:$OURLIBDIR/pbd:$OURLIBDIR/rubberband:$OURLIBDIR/soundtouch:$OURLIBDIR/gtkmm2ext:$OURLIBDIR/sigc++2:$OURLIBDIR/glibmm2:$OURLIBDIR/gtkmm2/atk:$OURLIBDIR/gtkmm2/pango:$OURLIBDIR/gtkmm2/gdk:$OURLIBDIR/gtkmm2/gtk:$OURLIBDIR/libgnomecanvasmm:$OURLIBDIR/libsndfile:$OURLIBDIR/evoral:$OURLIBDIR/evoral/src/libsmf:$OURLIBDIR/audiographer:$OURLIBDIR/timecode:$OURLIBDIR/taglib:$OURLIBDIR/qm-dsp tools/linux_packaging/build:OURLIBS=$OURLIBDIR/vamp-sdk:$OURLIBDIR/surfaces/control_protocol:$OURLIBDIR/ardour:$OURLIBDIR/midi++2:$OURLIBDIR/pbd:$OURLIBDIR/rubberband:$OURLIBDIR/soundtouch:$OURLIBDIR/gtkmm2ext:$OURLIBDIR/sigc++2:$OURLIBDIR/glibmm2:$OURLIBDIR/gtkmm2/atk:$OURLIBDIR/gtkmm2/pango:$OURLIBDIR/gtkmm2/gdk:$OURLIBDIR/gtkmm2/gtk:$OURLIBDIR/libgnomecanvasmm:$OURLIBDIR/libsndfile:$OURLIBDIR/evoral:$OURLIBDIR/evoral/src/libsmf:$OURLIBDIR/audiographer:$OURLIBDIR/timecode:$OURLIBDIR/taglib:$OURLIBDIR/qm-dsp wscript: write_config_text('Soundtouch', conf.is_defined('HAVE_SOUNDTOUCH')) nettings@kleineronkel:/local/build/ardour3-svn> | ||||
| Tags | No tags attached. | ||||
|
2011-10-28 16:26
|
a3-dont_check_for_soundtouch.diff (1,780 bytes)
Index: libs/ardour/wscript
===================================================================
--- libs/ardour/wscript (revision 10326)
+++ libs/ardour/wscript (working copy)
@@ -112,6 +112,7 @@
'interpolation.cc',
'io.cc',
'io_processor.cc',
+ 'jack_connections.cc',
'jack_slave.cc',
'ladspa_plugin.cc',
'location.cc',
@@ -259,8 +260,8 @@
if conf.is_defined('HAVE_LILV'):
autowaf.check_pkg(conf, 'suil-0', uselib_store='SUIL',
atleast_version='0.2.0', mandatory=False)
- autowaf.check_pkg(conf, 'soundtouch-1.0', uselib_store='SOUNDTOUCH',
- mandatory=False)
+ # autowaf.check_pkg(conf, 'soundtouch-1.0', uselib_store='SOUNDTOUCH',
+ # mandatory=False)
autowaf.check_pkg(conf, 'cppunit', uselib_store='CPPUNIT',
atleast_version='1.12.0', mandatory=False)
autowaf.check_pkg(conf, 'ogg', uselib_store='OGG', atleast_version='1.1.2')
Index: wscript
===================================================================
--- wscript (revision 10326)
+++ wscript (working copy)
@@ -603,7 +603,7 @@
write_config_text('Program name', opts.program_name)
write_config_text('Rubberband', conf.is_defined('HAVE_RUBBERBAND'))
write_config_text('Samplerate', conf.is_defined('HAVE_SAMPLERATE'))
- write_config_text('Soundtouch', conf.is_defined('HAVE_SOUNDTOUCH'))
+ # write_config_text('Soundtouch', conf.is_defined('HAVE_SOUNDTOUCH'))
write_config_text('Translation', opts.nls)
write_config_text('Tranzport', opts.tranzport)
write_config_text('Unit tests', conf.is_defined('BUILD_TESTS'))
|
|
|
paul mentions on IRC that soundtouch is better for some types of audio than rubberband. there are no immediate plans to bring it back right now, though. the attached trivial patch just comments out the erroneous waf checks and leaves all other hooks in place. please apply |
|
|
Applied to SVN 10329. Thanks! |
|
|
Issue has been closed automatically, by Trigger Close Plugin. Feel free to re-open with additional information if you think the issue is not resolved. |
| Date Modified | Username | Field | Change |
|---|---|---|---|
| 2011-10-28 01:06 | nettings | New Issue | |
| 2011-10-28 01:06 | nettings | cost | => 0.00 |
| 2011-10-28 01:07 | nettings | Relationship added | related to 0004349 |
| 2011-10-28 14:32 | cth103 | Target Version | => 3.0-beta1 |
| 2011-10-28 16:26 | nettings | File Added: a3-dont_check_for_soundtouch.diff | |
| 2011-10-28 16:28 | nettings | Note Added: 0011822 | |
| 2011-10-28 16:28 | nettings | Assigned To | => paul |
| 2011-10-28 16:28 | nettings | Status | new => assigned |
| 2011-10-28 16:28 | nettings | Summary | soundtouch leftovers that need to be removed => [PATCH] soundtouch leftovers that need to be removed |
| 2011-10-29 00:12 | cth103 | Note Added: 0011823 | |
| 2011-10-29 00:12 | cth103 | Status | assigned => resolved |
| 2011-10-29 00:12 | cth103 | Resolution | open => fixed |
| 2020-04-19 20:15 | system | Note Added: 0022794 | |
| 2020-04-19 20:15 | system | Status | resolved => closed |