ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

patch from colinf to make dbl-click on send "box" map its controls to the strip; remove related stub functions from ProcessorBox; fix crash when removing send due to the process lock not being held

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@11274 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-01-20 03:39:45 +00:00
parent 5de9a8f38b
commit cc5e8d41da
3 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gtk2_ardour/processor_box.cc
View File

@ -656,16 +656,6 @@ ProcessorBox::build_possible_aux_menu ()
return menu;
}
void
ProcessorBox::show_send_controls ()
{
}
void
ProcessorBox::new_send ()
{
}
void
ProcessorBox::show_processor_menu (int arg)
{
@ -1830,6 +1820,11 @@ ProcessorBox::toggle_edit_processor (boost::shared_ptr<Processor> processor)
if (boost::dynamic_pointer_cast<InternalSend> (processor) == 0) {
SendUIWindow* w = new SendUIWindow (send, _session);
w->show ();
} else {
/* assign internal send to main fader */
if (_parent_strip) {
_parent_strip->show_send(send);
}
}
} else if ((retrn = boost::dynamic_pointer_cast<Return> (processor)) != 0) {

3
gtk2_ardour/processor_box.h
View File

@ -271,9 +271,6 @@ class ProcessorBox : public Gtk::HBox, public PluginInterestedObject, public ARD
Width _width;
void new_send ();
void show_send_controls ();
Gtk::Menu *processor_menu;
gint processor_menu_map_handler (GdkEventAny *ev);
Gtk::Menu * build_processor_menu ();

1
libs/ardour/route.cc
View File

@ -2565,6 +2565,7 @@ Route::add_send_to_internal_return (InternalSend* send)
void
Route::remove_send_from_internal_return (InternalSend* send)
{
Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
Glib::RWLock::ReaderLock rm (_processor_lock);
for (ProcessorList::const_iterator x = _processors.begin(); x != _processors.end(); ++x) {