ardour/livetrax
13
0
Fork 0
Code

move sync-frame-rate option to Transport tab, rename "Interface" tab as "GUI"

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@13234 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-10-10 22:46:21 +00:00
parent 8007939839
commit d5b5c78e0e
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
gtk2_ardour/rc_option_editor.cc
View File

@ -885,17 +885,6 @@ RCOptionEditor::RCOptionEditor ()
add_option (_("Misc"), procs); add_option (_("Misc"), procs);
} }
add_option (_("Misc"), new OptionEditorHeading (S_("Sync/Slave")));
BoolOption* tsf = new BoolOption (
"timecode-sync-frame-rate",
_("Force Ardour's timecode rate to match timecode master"),
sigc::mem_fun (*_rc_config, &RCConfiguration::get_timecode_sync_frame_rate),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_timecode_sync_frame_rate)
);
tsf->set_note (_("If off, Ardour will chase the master but will use its own timecode frame rate"));
add_option (_("Misc"), tsf);
add_option (_("Misc"), new OptionEditorHeading (S_("Options|Undo"))); add_option (_("Misc"), new OptionEditorHeading (S_("Options|Undo")));
add_option (_("Misc"), new UndoOptions (_rc_config)); add_option (_("Misc"), new UndoOptions (_rc_config));
@ -1023,6 +1012,17 @@ RCOptionEditor::RCOptionEditor ()
sigc::mem_fun (*_rc_config, &RCConfiguration::set_quieten_at_speed) sigc::mem_fun (*_rc_config, &RCConfiguration::set_quieten_at_speed)
)); ));
add_option (_("Transport"), new OptionEditorHeading (S_("Sync/Slave")));
BoolOption* tsf = new BoolOption (
"timecode-sync-frame-rate",
_("Force Ardour's timecode rate to match timecode master"),
sigc::mem_fun (*_rc_config, &RCConfiguration::get_timecode_sync_frame_rate),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_timecode_sync_frame_rate)
);
tsf->set_note (_("If off, Ardour will chase the master but will use its own timecode frame rate"));
add_option (_("Transport"), tsf);
/* EDITOR */ /* EDITOR */
add_option (_("Editor"), add_option (_("Editor"),
@ -1565,7 +1565,7 @@ RCOptionEditor::RCOptionEditor ()
/* INTERFACE */ /* INTERFACE */
add_option (S_("Visual|Interface"), add_option (S_("GUI"),
new BoolOption ( new BoolOption (
"widget-prelight", "widget-prelight",
_("Graphically indicate mouse pointer hovering over various widgets"), _("Graphically indicate mouse pointer hovering over various widgets"),
@ -1575,9 +1575,9 @@ RCOptionEditor::RCOptionEditor ()
#ifndef GTKOSX #ifndef GTKOSX
/* font scaling does nothing with GDK/Quartz */ /* font scaling does nothing with GDK/Quartz */
add_option (S_("Visual|Interface"), new FontScalingOptions (_rc_config)); add_option (S_("GUI"), new FontScalingOptions (_rc_config));
#endif #endif
add_option (S_("Visual|Interface"), add_option (S_("GUI"),
new BoolOption ( new BoolOption (
"use-own-plugin-gui", "use-own-plugin-gui",
_("Use plugins' own interfaces instead of Ardour's"), _("Use plugins' own interfaces instead of Ardour's"),
@ -1596,7 +1596,7 @@ RCOptionEditor::RCOptionEditor ()
_mixer_strip_visibility.add (0, X_("MeterPoint"), _("Meter Point")); _mixer_strip_visibility.add (0, X_("MeterPoint"), _("Meter Point"));
add_option ( add_option (
S_("Visual|Interface"), S_("GUI"),
new VisibilityOption ( new VisibilityOption (
_("Mixer Strip"), _("Mixer Strip"),
&_mixer_strip_visibility, &_mixer_strip_visibility,
@ -1605,7 +1605,7 @@ RCOptionEditor::RCOptionEditor ()
) )
); );
add_option (S_("Visual|Interface"), add_option (S_("GUI"),
new BoolOption ( new BoolOption (
"default-narrow_ms", "default-narrow_ms",
_("Use narrow strips in the mixer by default"), _("Use narrow strips in the mixer by default"),
@ -1613,7 +1613,7 @@ RCOptionEditor::RCOptionEditor ()
sigc::mem_fun (*_rc_config, &RCConfiguration::set_default_narrow_ms) sigc::mem_fun (*_rc_config, &RCConfiguration::set_default_narrow_ms)
)); ));
add_option (S_("Visual|Interface"), new OptionEditorHeading (_("Metering"))); add_option (S_("GUI"), new OptionEditorHeading (_("Metering")));
ComboOption<float>* mht = new ComboOption<float> ( ComboOption<float>* mht = new ComboOption<float> (
"meter-hold", "meter-hold",
@ -1627,7 +1627,7 @@ RCOptionEditor::RCOptionEditor ()
mht->add (MeterHoldMedium, _("medium")); mht->add (MeterHoldMedium, _("medium"));
mht->add (MeterHoldLong, _("long")); mht->add (MeterHoldLong, _("long"));
add_option (S_("Visual|Interface"), mht); add_option (S_("GUI"), mht);
ComboOption<float>* mfo = new ComboOption<float> ( ComboOption<float>* mfo = new ComboOption<float> (
"meter-falloff", "meter-falloff",
@ -1644,7 +1644,7 @@ RCOptionEditor::RCOptionEditor ()
mfo->add (METER_FALLOFF_FASTER, _("faster")); mfo->add (METER_FALLOFF_FASTER, _("faster"));
mfo->add (METER_FALLOFF_FASTEST, _("fastest")); mfo->add (METER_FALLOFF_FASTEST, _("fastest"));
add_option (S_("Visual|Interface"), mfo); add_option (S_("GUI"), mfo);
} }
void void