ardour/livetrax
13
0
Fork 0
Code

triggerbox: NOOP - change name of set_region_threaded() to set_region_in_worker_thread()

Browse Source
This commit is contained in:
Paul Davis 2021-12-22 07:42:52 -07:00
parent 8f44a11329
commit b89d181560
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/ardour/ardour/triggerbox.h
View File

@ -178,7 +178,7 @@ class LIBARDOUR_API Trigger : public PBD::Stateful {
void set_region (boost::shared_ptr<Region>); void set_region (boost::shared_ptr<Region>);
void clear_region (); void clear_region ();
virtual int set_region_threaded (boost::shared_ptr<Region>) = 0; virtual int set_region_in_worker_thread (boost::shared_ptr<Region>) = 0;
boost::shared_ptr<Region> region() const { return _region; } boost::shared_ptr<Region> region() const { return _region; }
Temporal::BBT_Offset quantization() const; Temporal::BBT_Offset quantization() const;
@ -312,7 +312,7 @@ class LIBARDOUR_API AudioTrigger : public Trigger {
double position_as_fraction() const; double position_as_fraction() const;
int set_region_threaded (boost::shared_ptr<Region>); int set_region_in_worker_thread (boost::shared_ptr<Region>);
void startup (); void startup ();
void jump_start (); void jump_start ();
void jump_stop (); void jump_stop ();
@ -384,7 +384,7 @@ class LIBARDOUR_API MIDITrigger : public Trigger {
double position_as_fraction() const; double position_as_fraction() const;
int set_region_threaded (boost::shared_ptr<Region>); int set_region_in_worker_thread (boost::shared_ptr<Region>);
void startup (); void startup ();
void jump_start (); void jump_start ();
void jump_stop (); void jump_stop ();

6
libs/ardour/triggerbox.cc
View File

@ -785,7 +785,7 @@ AudioTrigger::natural_length() const
} }
int int
AudioTrigger::set_region_threaded (boost::shared_ptr<Region> r) AudioTrigger::set_region_in_worker_thread (boost::shared_ptr<Region> r)
{ {
assert (!active()); assert (!active());
@ -1464,7 +1464,7 @@ MIDITrigger::natural_length() const
} }
int int
MIDITrigger::set_region_threaded (boost::shared_ptr<Region> r) MIDITrigger::set_region_in_worker_thread (boost::shared_ptr<Region> r)
{ {
boost::shared_ptr<MidiRegion> mr = boost::dynamic_pointer_cast<MidiRegion> (r); boost::shared_ptr<MidiRegion> mr = boost::dynamic_pointer_cast<MidiRegion> (r);
@ -1748,7 +1748,7 @@ TriggerBox::set_region (uint32_t slot, boost::shared_ptr<Region> region)
break; break;
} }
t->set_region_threaded (region); t->set_region_in_worker_thread (region);
/* XXX what happens if pending is already set? */ /* XXX what happens if pending is already set? */