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

actally stop doing clip recording visual stuff when disarmed (gui)

Browse source
This commit is contained in:
Paul Davis 2024-10-18 09:50:31 -06:00
parent 837ea32898
commit 70b41d10b1
4 changed files with 28 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
gtk2_ardour/midi_cue_editor.cc
View file

@ -318,11 +318,12 @@ MidiCueEditor::maybe_update ()
} }
if (_track->rec_enable_control()->get_value()) { if (_track->rec_enable_control()->get_value()) {
/* data recorded will handle it */ /* ::data_captured() will handle it */
return; return;
} }
ARDOUR::TriggerPtr trigger = _track->triggerbox()->currently_playing (); ARDOUR::TriggerPtr trigger = _track->triggerbox()->currently_playing ();
if (!trigger) { if (!trigger) {
_playhead_cursor->set_position (0); _playhead_cursor->set_position (0);
} else { } else {
@ -503,14 +504,24 @@ MidiCueEditor::set_box (std::shared_ptr<ARDOUR::TriggerBox> b)
b->Captured.connect (capture_connections, invalidator (*this), boost::bind (&MidiCueEditor::data_captured, this, _1), gui_context()); b->Captured.connect (capture_connections, invalidator (*this), boost::bind (&MidiCueEditor::data_captured, this, _1), gui_context());
/* Don't bind a shared_ptr<TriggerBox> within the lambda */ /* Don't bind a shared_ptr<TriggerBox> within the lambda */
TriggerBox* tb (b.get()); TriggerBox* tb (b.get());
b->RecEnableChanged.connect (capture_connections, invalidator (*this), [&, tb]() { rec_enable_change (tb); }, gui_context()); b->RecEnableChanged.connect (capture_connections, invalidator (*this), [&, tb]() { box_rec_enable_change (*tb); }, gui_context());
} }
} }
void void
MidiCueEditor::rec_enable_change (ARDOUR::TriggerBox* b) MidiCueEditor::box_rec_enable_change (ARDOUR::TriggerBox const & b)
{ {
if (b->record_enabled()) { if (b.record_enabled()) {
view->begin_write();
} else {
view->end_write ();
}
}
void
MidiCueEditor::trigger_rec_enable_change (ARDOUR::Trigger const & t)
{
if (t.armed()) {
view->begin_write(); view->begin_write();
} else { } else {
view->end_write (); view->end_write ();

4
gtk2_ardour/midi_cue_editor.h
View file

@ -86,6 +86,9 @@ class MidiCueEditor : public CueEditor
Editing::MouseMode current_mouse_mode () const; Editing::MouseMode current_mouse_mode () const;
bool internal_editing() const; bool internal_editing() const;
void box_rec_enable_change (ARDOUR::TriggerBox const &);
void trigger_rec_enable_change (ARDOUR::Trigger const &);
double timebar_height; double timebar_height;
size_t n_timebars; size_t n_timebars;
@ -211,7 +214,6 @@ class MidiCueEditor : public CueEditor
void visual_changer (const VisualChange&); void visual_changer (const VisualChange&);
void bindings_changed (); void bindings_changed ();
void rec_enable_change (ARDOUR::TriggerBox*);
void data_captured (Temporal::timecnt_t); void data_captured (Temporal::timecnt_t);
bool idle_data_captured (); bool idle_data_captured ();
std::atomic<int> idle_update_queued; std::atomic<int> idle_update_queued;

4
gtk2_ardour/midi_view.cc
View file

@ -1560,9 +1560,8 @@ MidiView::apply_note_range (uint8_t min, uint8_t max, bool force)
void void
MidiView::begin_write() MidiView::begin_write()
{ {
std::cerr << "MV::begin write\n";
if (_active_notes) { if (_active_notes) {
delete[] _active_notes; delete [] _active_notes;
} }
_active_notes = new Note*[128]; _active_notes = new Note*[128];
for (unsigned i = 0; i < 128; ++i) { for (unsigned i = 0; i < 128; ++i) {
@ -1577,7 +1576,6 @@ MidiView::begin_write()
void void
MidiView::end_write() MidiView::end_write()
{ {
std::cerr << "MV::end write\n";
delete [] _active_notes; delete [] _active_notes;
_active_notes = nullptr; _active_notes = nullptr;
_marked_for_selection.clear(); _marked_for_selection.clear();

9
gtk2_ardour/trigger_page.cc
View file

@ -386,6 +386,13 @@ TriggerPage::clear_selected_slot ()
void void
TriggerPage::rec_enable_changed (Trigger const * trigger) TriggerPage::rec_enable_changed (Trigger const * trigger)
{ {
assert (trigger);
if (!trigger->armed()) {
_midi_editor->trigger_rec_enable_change (*trigger);
return;
}
/* hide everything */ /* hide everything */
_slot_prop_box.hide (); _slot_prop_box.hide ();
@ -406,7 +413,9 @@ TriggerPage::rec_enable_changed (Trigger const * trigger)
_audio_trig_box.set_trigger (ref); _audio_trig_box.set_trigger (ref);
_audio_trig_box.show (); _audio_trig_box.show ();
} }
} else { } else {
_midi_trig_box.set_trigger (ref); _midi_trig_box.set_trigger (ref);
_midi_trig_box.show (); _midi_trig_box.show ();