diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-11-29 22:29:25 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-11-29 22:29:25 -0500 |
| commit | 15cee60021eada542b2dae0fafbb3150fcaa5010 (patch) | |
| tree | 5fc73ceb1c5136b7051292ea938bf6c2eb55aff6 /gtk2_ardour | |
| parent | d63e8ba0e8eeda4f53684bbd20f027c0cd6f7c89 (diff) | |
| parent | d1cc7e5a50e2144d7aea01bc5eceed6657513c1b (diff) | |
merge and resolve conflict with master
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/engine_dialog.cc | 12 | ||||
| -rw-r--r-- | gtk2_ardour/engine_dialog.h | 1 | ||||
| -rw-r--r-- | gtk2_ardour/wscript | 20 |
3 files changed, 11 insertions, 22 deletions
diff --git a/gtk2_ardour/engine_dialog.cc b/gtk2_ardour/engine_dialog.cc index 37c29f4187..d438ff8327 100644 --- a/gtk2_ardour/engine_dialog.cc +++ b/gtk2_ardour/engine_dialog.cc @@ -87,7 +87,6 @@ EngineControl::EngineControl () , midi_refresh_button (_("Refresh list")) , ignore_changes (0) , _desired_sample_rate (0) - , no_push (true) , started_at_least_once (false) { using namespace Notebook_Helpers; @@ -290,8 +289,6 @@ EngineControl::EngineControl () output_channels.signal_changed().connect (sigc::mem_fun (*this, &EngineControl::parameter_changed)); notebook.signal_switch_page().connect (sigc::mem_fun (*this, &EngineControl::on_switch_page)); - - no_push = false; } void @@ -874,10 +871,6 @@ EngineControl::EngineControl () /* pick up any saved state for this device */ maybe_display_saved_state (); - - /* and push it to the backend */ - - push_state_to_backend (false); } string @@ -1207,14 +1200,9 @@ EngineControl::EngineControl () } } - int EngineControl::push_state_to_backend (bool start) { - if (no_push) { - return 0; - } - boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance()->current_backend(); if (!backend) { diff --git a/gtk2_ardour/engine_dialog.h b/gtk2_ardour/engine_dialog.h index 31648b6dbb..6d10eb76ac 100644 --- a/gtk2_ardour/engine_dialog.h +++ b/gtk2_ardour/engine_dialog.h @@ -114,7 +114,6 @@ class EngineControl : public ArdourDialog, public PBD::ScopedConnectionList { uint32_t ignore_changes; uint32_t _desired_sample_rate; - bool no_push; bool started_at_least_once; void driver_changed (); diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index a4ec9deee8..97677bc5fc 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -379,12 +379,13 @@ def build(bld): ../libs/fst/vstwin.c ../vst/winmain.c ''' - obj.uselib = 'ALSA' obj.use = [ 'libpbd', 'libmidipp', 'libtaglib', 'libardour', 'libardour_cp', + 'libtimecode', + 'libmidipp', 'libgtk2_ardour', 'libgtkmm2ext', 'libtaglib'] @@ -407,21 +408,22 @@ def build(bld): obj.source = gtk2_ardour_sources obj.target = 'ardour-' + bld.env['VERSION'] obj.includes = ['.'] + obj.use = [ 'libpbd', + 'libardour', + 'libardour_cp', + 'libtimecode', + 'libmidipp', + 'libgtk2_ardour', + 'libgtkmm2ext', + ] # continue with setup of obj, which could be a shared library # or an executable. obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3') - - obj.uselib = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD GTK OGG ALSA CURL DL' + obj.uselib = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD GTK OGG CURL DL' obj.uselib += ' GTKMM GNOMECANVASMM GNOMECANVAS FFTW3F' obj.uselib += ' AUDIOUNITS OSX GTKOSX LO ' - obj.use = [ 'libpbd', - 'libmidipp', - 'ardour', - 'libardour_cp', - 'libgtkmm2ext', - ] if bld.env['build_target'] == 'mingw': if bld.env['DEBUG'] == False: |