projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kill glib-induced abort caused by asymmetric lock/unlock of diskstream state lock
[ardour.git]
/
gtk2_ardour
/
ardour.menus
diff --git
a/gtk2_ardour/ardour.menus
b/gtk2_ardour/ardour.menus
index 0ba48a0d45143ee05fb8ddf1af0147096338a7a8..e7463553d2fadb399c6768ed8c8f19ddd36e274f 100644
(file)
--- a/
gtk2_ardour/ardour.menus
+++ b/
gtk2_ardour/ardour.menus
@@
-291,8
+291,12
@@
<menuitem action='OutputAutoConnectMaster'/>
<menuitem action='OutputAutoConnectManual'/>
</menu>
<menuitem action='OutputAutoConnectMaster'/>
<menuitem action='OutputAutoConnectManual'/>
</menu>
- <menu action='ControlSurfaces'/>
- <menu action='Monitoring'>
+ <menu action='ControlSurfaces'>
+ <menuitem action='RemoteUserDefined'/>
+ <menuitem action='RemoteMixerDefined'/>
+ <menuitem action='RemoteEditorDefined'/>
+ </menu>
+ <menu action='Monitoring'>
<menuitem action='UseHardwareMonitoring'/>
<menuitem action='UseSoftwareMonitoring'/>
<menuitem action='UseExternalMonitoring'/>
<menuitem action='UseHardwareMonitoring'/>
<menuitem action='UseSoftwareMonitoring'/>
<menuitem action='UseExternalMonitoring'/>
@@
-318,6
+322,7
@@
<menuitem action='LatchedSolo'/>
<menuitem action='SoloInPlace'/>
<menuitem action='SoloViaBus'/>
<menuitem action='LatchedSolo'/>
<menuitem action='SoloInPlace'/>
<menuitem action='SoloViaBus'/>
+ <menuitem action='ShowSoloMutes'/>
</menu>
<menu action='Crossfades'>
<menuitem action='toggle-xfades-active'/>
</menu>
<menu action='Crossfades'>
<menuitem action='toggle-xfades-active'/>
@@
-337,6
+342,7
@@
<menuitem action='SendMMC'/>
<menuitem action='UseMMC'/>
<separator/>
<menuitem action='SendMMC'/>
<menuitem action='UseMMC'/>
<separator/>
+ <menuitem action='UseOSC'/>
<menuitem action='StopPluginsWithTransport'/>
<menuitem action='DoNotRunPluginsWhileRecording'/>
<menuitem action='LatchedRecordEnable'/>
<menuitem action='StopPluginsWithTransport'/>
<menuitem action='DoNotRunPluginsWhileRecording'/>
<menuitem action='LatchedRecordEnable'/>