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

fix some issues with context menu management

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@6456 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2010-01-05 14:57:01 +00:00
parent 6d3dfd0ded
commit 27eb926d3f
3 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gtk2_ardour/midi_time_axis.cc
View file

@ -322,9 +322,7 @@ MidiTimeAxisView::build_def_channel_menu ()
{ {
using namespace Menu_Helpers; using namespace Menu_Helpers;
if (default_channel_menu == 0) {
default_channel_menu = manage (new Menu ()); default_channel_menu = manage (new Menu ());
}
uint8_t defchn = midi_track()->default_channel(); uint8_t defchn = midi_track()->default_channel();
MenuList& def_channel_items = default_channel_menu->items(); MenuList& def_channel_items = default_channel_menu->items();

17
gtk2_ardour/route_time_axis.cc
View file

@ -427,26 +427,31 @@ RouteTimeAxisView::build_automation_action_menu ()
automation_items.push_back (MenuElem (_("Hide all automation"), automation_items.push_back (MenuElem (_("Hide all automation"),
sigc::mem_fun(*this, &RouteTimeAxisView::hide_all_automation))); sigc::mem_fun(*this, &RouteTimeAxisView::hide_all_automation)));
if (subplugin_menu.get_attach_widget()) if (subplugin_menu.gobj()) {
/* this will break if the underlying GTK menu has never been set up, hence
the if() above. we have to do this
*/
if (subplugin_menu.get_attach_widget()) {
subplugin_menu.detach(); subplugin_menu.detach();
}
automation_items.push_back (MenuElem (_("Plugins"), subplugin_menu)); automation_items.push_back (MenuElem (_("Plugins..."), subplugin_menu));
} else {
automation_items.push_back (MenuElem (_("Plugins")));
}
automation_items.back().set_sensitive (!subplugin_menu.items().empty()); automation_items.back().set_sensitive (!subplugin_menu.items().empty());
map<Evoral::Parameter, RouteAutomationNode*>::iterator i; map<Evoral::Parameter, RouteAutomationNode*>::iterator i;
for (i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) { for (i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) {
automation_items.push_back (SeparatorElem()); automation_items.push_back (SeparatorElem());
delete i->second->menu_item;
automation_items.push_back(CheckMenuElem (_route->describe_parameter(i->second->param), automation_items.push_back(CheckMenuElem (_route->describe_parameter(i->second->param),
sigc::bind (sigc::mem_fun(*this, &RouteTimeAxisView::toggle_automation_track), i->second->param))); sigc::bind (sigc::mem_fun(*this, &RouteTimeAxisView::toggle_automation_track), i->second->param)));
i->second->menu_item = static_cast<Gtk::CheckMenuItem*>(&automation_items.back()); i->second->menu_item = static_cast<Gtk::CheckMenuItem*>(&automation_items.back());
i->second->menu_item->set_active(show_automation(i->second->param)); i->second->menu_item->set_active(show_automation(i->second->param));
//i->second->menu_item->set_active(false);
} }
} }

2
gtk2_ardour/time_axis_view.cc
View file

@ -664,6 +664,8 @@ TimeAxisView::build_display_menu ()
{ {
using namespace Menu_Helpers; using namespace Menu_Helpers;
delete display_menu;
display_menu = new Menu; display_menu = new Menu;
display_menu->set_name ("ArdourContextMenu"); display_menu->set_name ("ArdourContextMenu");