smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-16 03:36:32 +01:00
Code Issues Projects Releases Wiki Activity

triggerbox: allow access to default number of triggers per box (and change type)

Browse source
This commit is contained in:
Paul Davis 2021-11-03 18:44:18 -06:00
parent 62c80e1430
commit 79baafde15
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
libs/ardour/ardour/triggerbox.h
View file

@ -386,6 +386,8 @@ class LIBARDOUR_API TriggerBox : public Processor
static void scene_bang (uint32_t scene_number); static void scene_bang (uint32_t scene_number);
static void scene_unbang (uint32_t scene_number); static void scene_unbang (uint32_t scene_number);
static const int32_t default_triggers_per_box;
private: private:
static Temporal::BBT_Offset _assumed_trigger_duration; static Temporal::BBT_Offset _assumed_trigger_duration;
@ -423,7 +425,6 @@ class LIBARDOUR_API TriggerBox : public Processor
void reconnect_to_default (); void reconnect_to_default ();
void parameter_changed (std::string const &); void parameter_changed (std::string const &);
static const uint64_t default_triggers_per_box;
static int _first_midi_note; static int _first_midi_note;
static TriggerMidiMapMode _midi_map_mode; static TriggerMidiMapMode _midi_map_mode;
static std::atomic<int32_t> _pending_scene; static std::atomic<int32_t> _pending_scene;

6
libs/ardour/triggerbox.cc
View file

@ -1317,7 +1317,7 @@ Trigger::make_property_quarks ()
DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for follow-action-1 = %1\n", Properties::follow_action1.property_id)); DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for follow-action-1 = %1\n", Properties::follow_action1.property_id));
} }
const uint64_t TriggerBox::default_triggers_per_box = 8; const int32_t TriggerBox::default_triggers_per_box = 8;
Temporal::BBT_Offset TriggerBox::_assumed_trigger_duration (4, 0, 0); Temporal::BBT_Offset TriggerBox::_assumed_trigger_duration (4, 0, 0);
//TriggerBox::TriggerMidiMapMode TriggerBox::_midi_map_mode (TriggerBox::AbletonPush); //TriggerBox::TriggerMidiMapMode TriggerBox::_midi_map_mode (TriggerBox::AbletonPush);
TriggerBox::TriggerMidiMapMode TriggerBox::_midi_map_mode (TriggerBox::SequentialNote); TriggerBox::TriggerMidiMapMode TriggerBox::_midi_map_mode (TriggerBox::SequentialNote);
@ -1369,7 +1369,7 @@ TriggerBox::scene_unbang (uint32_t n)
void void
TriggerBox::maybe_find_scene_bang () TriggerBox::maybe_find_scene_bang ()
{ {
uint32_t pending = _pending_scene.exchange (-1); int32_t pending = _pending_scene.exchange (-1);
if (pending >= 0) { if (pending >= 0) {
_active_scene = pending; _active_scene = pending;
@ -1740,7 +1740,7 @@ TriggerBox::run (BufferSet& bufs, samplepos_t start_sample, samplepos_t end_samp
if (_active_scene >= 0) { if (_active_scene >= 0) {
DEBUG_TRACE (DEBUG::Triggers, string_compose ("tb noticed active scene %1\n", _active_scene)); DEBUG_TRACE (DEBUG::Triggers, string_compose ("tb noticed active scene %1\n", _active_scene));
if (_active_scene < all_triggers.size()) { if (_active_scene < (int32_t) all_triggers.size()) {
all_triggers[_active_scene]->bang (); all_triggers[_active_scene]->bang ();
} }
} }