ardour/livetrax
13
0
Fork 0
Code

Nearly remove Options menu.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@5086 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2009-05-16 03:37:54 +00:00
parent 400d2a86aa
commit a53fa597ed
2 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gtk2_ardour/ardour.menus.in
View File

@ -121,6 +121,12 @@
</menu>
<separator/>
<menu action='SyncMenu'>
<menuitem action='SendMTC'/>
<menuitem action='SendMMC'/>
<menuitem action='UseMMC'/>
<menuitem action='SendMidiClock'/>
</menu>
<menuitem action='ToggleTimeMaster'/>
<menuitem action='TogglePunch'/>
<menuitem action='TogglePunchIn'/>
@ -220,6 +226,10 @@
<separator/>
<menuitem action='break-drag'/>
</menu>
<menu action="TempoMenu">
<menuitem action='set-tempo-from-region'/>
<menuitem action='set-tempo-from-edit-range'/>
</menu>
#ifndef GTKOSX
<separator/>
<menuitem action='ToggleRCOptionsEditor'/>
@ -423,16 +433,6 @@
<separator/>
</menu>
<menu name='Options' action='Options'>
<menu action='SyncMenu'>
<menuitem action='SendMTC'/>
<menuitem action='SendMMC'/>
<menuitem action='UseMMC'/>
<menuitem action='SendMidiClock'/>
</menu>
<menu action="TempoMenu">
<menuitem action='set-tempo-from-region'/>
<menuitem action='set-tempo-from-edit-range'/>
</menu>
</menu>
<menu name='Help' action='Help'>
<menuitem action='About'/>

8
gtk2_ardour/ardour_ui_options.cc
View File

@ -73,12 +73,6 @@ ARDOUR_UI::toggle_use_mmc ()
ActionManager::toggle_config_state ("options", "UseMMC", &RCConfiguration::set_mmc_control, &RCConfiguration::get_mmc_control);
}
void
ARDOUR_UI::toggle_use_osc ()
{
ActionManager::toggle_config_state ("options", "UseOSC", &RCConfiguration::set_use_osc, &RCConfiguration::get_use_osc);
}
void
ARDOUR_UI::toggle_send_midi_feedback ()
{
@ -290,8 +284,6 @@ ARDOUR_UI::parameter_changed (std::string p)
}
#endif
ActionManager::map_some_state ("options", "UseOSC", &RCConfiguration::get_use_osc);
} else if (p == "mmc-control") {
ActionManager::map_some_state ("options", "UseMMC", &RCConfiguration::get_mmc_control);
} else if (p == "midi-feedback") {