summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2018-12-22 17:40:26 -0500
committerPaul Davis <paul@linuxaudiosystems.com>2018-12-27 17:18:21 -0500
commitb09ac181e0efdb68ea4a22e44f483ded339d93a8 (patch)
tree7305ab10eba65ecf06560c6dde2b0178a03253bc
parentd50d8b9d3367358b970755eb82c4e608b09314f0 (diff)
div wrapping
-rw-r--r--gtk2_ardour/route_ui.cc5
-rw-r--r--gtk2_ardour/step_editor.cc5
-rw-r--r--libs/ardour/midi_track.cc2
3 files changed, 10 insertions, 2 deletions
diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index 68c9a0909e..06c984adcb 100644
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -779,9 +779,9 @@ RouteUI::rec_enable_press(GdkEventButton* ev)
if (is_midi_track()) {
- /* rec-enable button exits from step editing */
+ /* rec-enable button exits from step editing, but not context click */
- if (midi_track()->step_editing()) {
+ if (!Keyboard::is_context_menu_event (ev) && midi_track()->step_editing()) {
midi_track()->set_step_editing (false);
return false;
}
@@ -992,6 +992,7 @@ RouteUI::toggle_rec_safe ()
void
RouteUI::step_edit_changed (bool yn)
{
+ cerr << _route->name() << " step editing changed to " << yn << endl;
if (yn) {
if (rec_enable_button) {
rec_enable_button->set_active_state (Gtkmm2ext::ExplicitActive);
diff --git a/gtk2_ardour/step_editor.cc b/gtk2_ardour/step_editor.cc
index 1b017bbd53..175d58a0c0 100644
--- a/gtk2_ardour/step_editor.cc
+++ b/gtk2_ardour/step_editor.cc
@@ -17,6 +17,8 @@
*/
+#include "pbd/stacktrace.h"
+
#include "ardour/midi_track.h"
#include "ardour/midi_region.h"
#include "ardour/tempo.h"
@@ -155,8 +157,11 @@ StepEditor::step_entry_hidden (GdkEventAny*)
void
StepEditor::step_entry_done ()
{
+ cerr << this << " SE done\n";
+
hide_connection.disconnect ();
delete_connection.disconnect ();
+
/* everything else will follow the change in the model */
_track->set_step_editing (false);
}
diff --git a/libs/ardour/midi_track.cc b/libs/ardour/midi_track.cc
index 1608f13c7e..ca2bb91c42 100644
--- a/libs/ardour/midi_track.cc
+++ b/libs/ardour/midi_track.cc
@@ -660,6 +660,8 @@ MidiTrack::set_step_editing (bool yn)
}
if (yn != _step_editing) {
+ std::cerr << "\n\n\n" << name() << " changed step editing to " << yn << std::endl;
+ PBD::stacktrace (std::cerr, 100);
_step_editing = yn;
StepEditStatusChange (yn);
}