summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2008-11-29 22:09:24 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2008-11-29 22:09:24 +0000
commit6d6841bc36d7bd5017715c0b1dac0b381d54f41e (patch)
tree8c6ab4d31f1513fd1ca68c30c2d37d2e24f62051
parent6d393c72358bf1ead59c1aa437d9a6ca07289e5b (diff)
revert markus' change, add back debug output
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@4271 d708f5d6-7413-0410-9779-e7cbd77b26cf
-rw-r--r--gtk2_ardour/editor_ops.cc11
1 files changed, 8 insertions, 3 deletions
diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index 7bb4188e40..51cb8b6f2d 100644
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -6167,18 +6167,23 @@ Editor::goto_visual_state (uint32_t n)
void
Editor::start_visual_state_op (uint32_t n)
{
+ cerr << "Start visual op\n";
if (visual_state_op_connection.empty()) {
visual_state_op_connection = Glib::signal_timeout().connect (bind (mem_fun (*this, &Editor::end_visual_state_op), n), 1000);
+ cerr << "\tqueued new timeout\n";
}
}
void
Editor::cancel_visual_state_op (uint32_t n)
{
- if (visual_state_op_connection.empty()) {
- // visual_state_op_connection.disconnect();
+ if (!visual_state_op_connection.empty()) {
+ cerr << "cancel visual op, time to goto\n";
+ visual_state_op_connection.disconnect();
goto_visual_state (n);
- }
+ } else {
+ cerr << "cancel visual op, do nothing\n";
+ }
}
bool