smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-10 07:26:32 +01:00
Code Issues Projects Releases Wiki Activity

finish merge of vamp-sdk into source tree; write OSC URL to file in ~/.ardour2 ; change stretch button name; fix bad handling of cancel-in-progress during stretch/pitch operation

Browse source 
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2870 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2008-01-10 14:40:42 +00:00
parent ea98e56b1c
commit aa45017cdc
4 changed files with 32 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

43
SConstruct
View file

@ -767,34 +767,14 @@ def prep_libcheck(topenv, libinfo):
prep_libcheck(env, env)
#
# check for VAMP and rubberband (currently optional)
#
libraries['vamp'] = LibraryInfo()
env['RUBBERBAND'] = False
conf = env.Configure (custom_tests = { 'CheckPKGExists' : CheckPKGExists } )
if conf.CheckPKGExists('vamp-sdk'):
have_vamp = True
libraries['vamp'].ParseConfig('pkg-config --cflags --libs vamp-sdk')
else:
have_vamp = False
libraries['vamp'] = conf.Finish ()
if have_vamp:
if os.path.exists ('libs/rubberband/src'):
conf = Configure (libraries['vamp'])
if conf.CheckHeader ('fftw3.h'):
env['RUBBERBAND'] = True
libraries['rubberband'] = LibraryInfo (LIBS='rubberband',
LIBPATH='#libs/rubberband',
CPPPATH='#libs/rubberband',
CCFLAGS='-DUSE_RUBBERBAND')
libraries['vamp'] = conf.Finish ()
env['RUBBERBAND'] = True
libraries['rubberband'] = LibraryInfo (LIBS='rubberband',
LIBPATH='#libs/rubberband',
CPPPATH='#libs/rubberband',
CCFLAGS='-DUSE_RUBBERBAND')
libraries['vamp'] = LibraryInfo (LIBS='vampsdk',
LIBPATH='#libs/vamp-sdk',
CPPPATH='#libs/vamp-sdk/vamp')
#
# Check for libusb
@ -981,6 +961,7 @@ if env['SYSLIBS']:
'libs/pbd',
'libs/midi++2',
'libs/ardour',
'libs/vamp-sdk',
# these are unconditionally included but have
# tests internally to avoid compilation etc
# if VST is not set
@ -1045,6 +1026,7 @@ else:
'libs/pbd',
'libs/midi++2',
'libs/ardour',
'libs/vamp-sdk',
# these are unconditionally included but have
# tests internally to avoid compilation etc
# if VST is not set
@ -1107,9 +1089,8 @@ else:
#
timefx_subdirs = ['libs/soundtouch']
if env['RUBBERBAND']:
timefx_subdirs += ['libs/rubberband']
timefx_subdirs += ['libs/rubberband']
opts.Save('scache.conf', env)
Help(opts.GenerateHelpText(env))

4
gtk2_ardour/editor_timefx.cc
View file

@ -71,7 +71,7 @@ Editor::TimeFXDialog::TimeFXDialog (Editor& e, bool pitch)
quick_button (_("Quick but Ugly")),
antialias_button (_("Skip Anti-aliasing")),
stretch_opts_label (_("Contents:")),
precise_button (_("Correct Onset"))
precise_button (_("Strict Linear"))
{
set_modal (true);
set_position (Gtk::WIN_POS_MOUSE);
@ -332,7 +332,7 @@ Editor::time_fx (RegionSelection& regions, float val, bool pitching)
sigc::connection c = Glib::signal_timeout().connect (mem_fun (current_timefx, &TimeFXDialog::update_progress), 100);
while (!current_timefx->request.done) {
while (!current_timefx->request.done && !current_timefx->request.cancel) {
gtk_main_iteration ();
}

1
libs/ardour/ardour/osc.h
View file

@ -54,6 +54,7 @@ class OSC : public BasicUI, public sigc::trackable
lo_server _osc_server;
lo_server _osc_unix_server;
std::string _osc_unix_socket_path;
std::string _osc_url_file;
pthread_t _osc_thread;
int _request_pipe[2];

17
libs/ardour/osc.cc
View file

@ -18,6 +18,7 @@
*/
#include <iostream>
#include <fstream>
#include <cstdio>
#include <cstdlib>
#include <cerrno>
@ -101,6 +102,19 @@ OSC::start ()
#endif
cerr << "OSC @ " << get_server_url () << endl;
_osc_url_file = get_user_ardour_path () + "/osc_url";
ofstream urlfile;
urlfile.open(_osc_url_file.c_str(),ios::trunc);
if ( urlfile )
{
urlfile << get_server_url () << endl;
urlfile.close();
}
else
{
cerr << "Couldn't write '" << _osc_url_file << "'" <<endl;
}
register_callbacks();
@ -131,6 +145,9 @@ OSC::stop ()
unlink(_osc_unix_socket_path.c_str());
}
if (! _osc_url_file.empty() ) {
unlink(_osc_url_file.c_str() );
}
return 0;
}