diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2006-04-06 01:52:45 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2006-04-06 01:52:45 +0000 |
| commit | 0f530372d285a618dfa51494bffa2100e3e20e8f (patch) | |
| tree | 3b8ac9067292f6796e8a8b46b26fc3cb9d3712dd /gtk2_ardour | |
| parent | 4605736d1d601d1698c295ebb2d6e6fce9d1b8cf (diff) | |
significant extensions to tranzport support
git-svn-id: svn://localhost/trunk/ardour2@446 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
| -rwxr-xr-x | gtk2_ardour/arval | 2 | ||||
| -rw-r--r-- | gtk2_ardour/editor.cc | 7 | ||||
| -rw-r--r-- | gtk2_ardour/editor_markers.cc | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/gtk2_ardour/arval b/gtk2_ardour/arval index a91943fb4d..5254ad4df0 100755 --- a/gtk2_ardour/arval +++ b/gtk2_ardour/arval @@ -1,3 +1,3 @@ #!/bin/sh source ardev_common.sh -exec valgrind --db-attach=yes --num-callers=12 --tool=memcheck ./ardour.bin --novst $* +exec valgrind --num-callers=12 --tool=memcheck ./ardour.bin --novst $* diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 98a1ada17c..04b9ede947 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -46,6 +46,7 @@ #include <ardour/session_route.h> #include <ardour/tempo.h> #include <ardour/utils.h> +#include <ardour/control_protocol.h> #include "ardour_ui.h" #include "editor.h" @@ -713,6 +714,12 @@ Editor::Editor (AudioEngine& eng) signal_configure_event().connect (mem_fun (*ARDOUR_UI::instance(), &ARDOUR_UI::configure_handler)); signal_delete_event().connect (mem_fun (*ARDOUR_UI::instance(), &ARDOUR_UI::exit_on_main_window_close)); + /* allow external control surfaces/protocols to do various things */ + + ControlProtocol::ZoomToSession.connect (mem_fun (*this, &Editor::temporal_zoom_session)); + ControlProtocol::ZoomIn.connect (bind (mem_fun (*this, &Editor::temporal_zoom_step), false)); + ControlProtocol::ZoomOut.connect (bind (mem_fun (*this, &Editor::temporal_zoom_step), true)); + constructed = true; instant_save (); } diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc index bbeeeefec1..e301736566 100644 --- a/gtk2_ardour/editor_markers.cc +++ b/gtk2_ardour/editor_markers.cc @@ -55,6 +55,8 @@ Editor::clear_marker_display () void Editor::add_new_location (Location *location) { + ENSURE_GUI_THREAD (bind (mem_fun(*this, &Editor::add_new_location), location)); + LocationMarkers *lam = new LocationMarkers; uint32_t color; |