diff --git a/libs/ardour/ardour/triggerbox.h b/libs/ardour/ardour/triggerbox.h index e51e461663..4830f11f1e 100644 --- a/libs/ardour/ardour/triggerbox.h +++ b/libs/ardour/ardour/triggerbox.h @@ -178,7 +178,7 @@ class LIBARDOUR_API Trigger : public PBD::Stateful { void set_region (boost::shared_ptr); void clear_region (); - virtual int set_region_threaded (boost::shared_ptr) = 0; + virtual int set_region_in_worker_thread (boost::shared_ptr) = 0; boost::shared_ptr region() const { return _region; } Temporal::BBT_Offset quantization() const; @@ -312,7 +312,7 @@ class LIBARDOUR_API AudioTrigger : public Trigger { double position_as_fraction() const; - int set_region_threaded (boost::shared_ptr); + int set_region_in_worker_thread (boost::shared_ptr); void startup (); void jump_start (); void jump_stop (); @@ -384,7 +384,7 @@ class LIBARDOUR_API MIDITrigger : public Trigger { double position_as_fraction() const; - int set_region_threaded (boost::shared_ptr); + int set_region_in_worker_thread (boost::shared_ptr); void startup (); void jump_start (); void jump_stop (); diff --git a/libs/ardour/triggerbox.cc b/libs/ardour/triggerbox.cc index 6a76df382f..5c15efbd95 100644 --- a/libs/ardour/triggerbox.cc +++ b/libs/ardour/triggerbox.cc @@ -785,7 +785,7 @@ AudioTrigger::natural_length() const } int -AudioTrigger::set_region_threaded (boost::shared_ptr r) +AudioTrigger::set_region_in_worker_thread (boost::shared_ptr r) { assert (!active()); @@ -1464,7 +1464,7 @@ MIDITrigger::natural_length() const } int -MIDITrigger::set_region_threaded (boost::shared_ptr r) +MIDITrigger::set_region_in_worker_thread (boost::shared_ptr r) { boost::shared_ptr mr = boost::dynamic_pointer_cast (r); @@ -1748,7 +1748,7 @@ TriggerBox::set_region (uint32_t slot, boost::shared_ptr region) break; } - t->set_region_threaded (region); + t->set_region_in_worker_thread (region); /* XXX what happens if pending is already set? */