summaryrefslogtreecommitdiff
path: root/gtk2_ardour
diff options
context:
space:
mode:
authorTim Mayberry <mojofunk@gmail.com>2005-12-12 04:42:39 +0000
committerTim Mayberry <mojofunk@gmail.com>2005-12-12 04:42:39 +0000
commit088a5289dc41b9066e9f518b94af546f80601d56 (patch)
treece7c10f2bab69f53157a56d4705bb567aa737b88 /gtk2_ardour
parentfa89a453a12af4d22766244ddccc9197cd65593a (diff)
added shuttle popups
git-svn-id: svn://localhost/trunk/ardour2@186 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
-rw-r--r--gtk2_ardour/ardour-menus.xml11
-rw-r--r--gtk2_ardour/ardour_ui2.cc4
2 files changed, 13 insertions, 2 deletions
diff --git a/gtk2_ardour/ardour-menus.xml b/gtk2_ardour/ardour-menus.xml
index 961db16558..d95f2e8dd9 100644
--- a/gtk2_ardour/ardour-menus.xml
+++ b/gtk2_ardour/ardour-menus.xml
@@ -85,4 +85,15 @@
<menuitem action='edit'/>
</popup>
+ <popup name='ShuttleUnitPopup'>
+ <menuitem action='SetShuttleUnitsPercentage'/>
+ <menuitem action='SetShuttleUnitsSemitones'/>
+ </popup>
+
+ <popup name='ShuttleStylePopup'>
+ <menuitem action='SetShuttleActionSprung'/>
+ <menuitem action='SetShuttleActionWheel'/>
+ </popup>
+
+
</ui>
diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc
index 71a6f82a60..c3063b6ed5 100644
--- a/gtk2_ardour/ardour_ui2.cc
+++ b/gtk2_ardour/ardour_ui2.cc
@@ -754,7 +754,7 @@ void
ARDOUR_UI::shuttle_style_clicked ()
{
if (shuttle_style_menu == 0) {
- shuttle_style_menu = dynamic_cast<Menu*> (ActionManager::get_widget ("ShuttleStylePopup"));
+ shuttle_style_menu = dynamic_cast<Menu*> (ActionManager::get_widget ("/ShuttleStylePopup"));
}
shuttle_style_menu->popup (1, 0);
}
@@ -763,7 +763,7 @@ void
ARDOUR_UI::shuttle_unit_clicked ()
{
if (shuttle_unit_menu == 0) {
- shuttle_unit_menu = dynamic_cast<Menu*> (ActionManager::get_widget ("ShuttleUnitPopup"));
+ shuttle_unit_menu = dynamic_cast<Menu*> (ActionManager::get_widget ("/ShuttleUnitPopup"));
}
shuttle_unit_menu->popup (1, 0);
}