diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-06-16 14:58:33 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-06-16 14:58:33 +0000 |
| commit | 86f24d20e1616ffaafc97de65db49fd6a91270f8 (patch) | |
| tree | 17f4ac15f4ec6124e82482624f57ed2ceb8f81ca /gtk2_ardour | |
| parent | 9c8ee46c764f036707f45ebfa8f6696a9a6e56c6 (diff) | |
first pass (ok, third really) at internal send+return - audio routing inside ardour without JACK. lots still to do, but at least the obvious works
git-svn-id: svn://localhost/ardour2/branches/3.0@5202 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/arval-waf | 1 | ||||
| -rw-r--r-- | gtk2_ardour/audio_streamview.cc | 3 | ||||
| -rw-r--r-- | gtk2_ardour/midi_streamview.cc | 3 | ||||
| -rw-r--r-- | gtk2_ardour/mixer_strip.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/rc_option_editor.cc | 8 |
5 files changed, 14 insertions, 3 deletions
diff --git a/gtk2_ardour/arval-waf b/gtk2_ardour/arval-waf index 439bebd6aa..f8c8a336a7 100644 --- a/gtk2_ardour/arval-waf +++ b/gtk2_ardour/arval-waf @@ -1,4 +1,5 @@ #!/bin/sh . `dirname "$0"`/../build/default/gtk2_ardour/ardev_common_waf.sh +LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH export ARDOUR_RUNNING_UNDER_VALGRIND=TRUE exec valgrind --num-callers=50 --tool=memcheck $TOP/$EXECUTABLE --novst "$@" diff --git a/gtk2_ardour/audio_streamview.cc b/gtk2_ardour/audio_streamview.cc index 7dbae624e1..e61bd6e744 100644 --- a/gtk2_ardour/audio_streamview.cc +++ b/gtk2_ardour/audio_streamview.cc @@ -497,8 +497,9 @@ AudioStreamView::setup_rec_box () } boost::shared_ptr<AudioRegion> region (boost::dynamic_pointer_cast<AudioRegion> - (RegionFactory::create (sources, start, 1 , "", 0, (Region::Flag)(Region::DefaultFlags | Region::DoNotSaveState), false))); + (RegionFactory::create (sources, start, 1 , "", 0, (Region::Flag)(Region::DefaultFlags), false))); assert(region); + region->block_property_changes (); region->set_position (_trackview.session().transport_frame(), this); rec_regions.push_back (make_pair(region, (RegionView*)0)); } diff --git a/gtk2_ardour/midi_streamview.cc b/gtk2_ardour/midi_streamview.cc index ebc6b0d642..30718ad158 100644 --- a/gtk2_ardour/midi_streamview.cc +++ b/gtk2_ardour/midi_streamview.cc @@ -415,8 +415,9 @@ MidiStreamView::setup_rec_box () } boost::shared_ptr<MidiRegion> region (boost::dynamic_pointer_cast<MidiRegion> - (RegionFactory::create (sources, start, 1 , "", 0, (Region::Flag)(Region::DefaultFlags | Region::DoNotSaveState), false))); + (RegionFactory::create (sources, start, 1 , "", 0, Region::DefaultFlags, false))); assert(region); + region->block_property_changes (); region->set_position (_trackview.session().transport_frame(), this); rec_regions.push_back (make_pair(region, (RegionView*)0)); diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index 20f75f1100..89c3283062 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -1438,7 +1438,7 @@ MixerStrip::switch_io (boost::shared_ptr<Route> target) send->set_metering (false); } - _current_delivery = _route->send_for (target->input()); + _current_delivery = _route->internal_send_for (target); if (_current_delivery) { send = boost::dynamic_pointer_cast<Send>(_current_delivery); diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc index 4f96486ddc..33af778744 100644 --- a/gtk2_ardour/rc_option_editor.cc +++ b/gtk2_ardour/rc_option_editor.cc @@ -1143,6 +1143,14 @@ RCOptionEditor::RCOptionEditor () add_option (_("Audio"), new OptionEditorHeading (_("Connection of tracks and busses"))); + add_option (_("Audio"), + new BoolOption ( + "auto-connect-standard-busses", + _("Auto-connect master/monitor busses"), + mem_fun (*_rc_config, &RCConfiguration::get_auto_connect_standard_busses), + mem_fun (*_rc_config, &RCConfiguration::set_auto_connect_standard_busses) + )); + ComboOption<AutoConnectOption>* iac = new ComboOption<AutoConnectOption> ( "input-auto-connect", _("Connect track and bus inputs"), |