mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-06 23:05:04 +01:00
Move UIConfiguration Singleton into UIConfiguration header
This removes the direct dependence on ardour_ui.h from 39 files
This commit is contained in:
Tim Mayberry
Paul Davis
parent
45d487f16e
commit
6b019a4953
84 changed files with 726 additions and 712 deletions
|
|
@ -50,7 +50,6 @@
|
|||
|
||||
#include "canvas/wave_view.h"
|
||||
|
||||
#include "ardour_ui.h"
|
||||
#include "ardour_window.h"
|
||||
#include "ardour_dialog.h"
|
||||
#include "gui_thread.h"
|
||||
|
|
@ -952,12 +951,11 @@ private:
|
|||
class FontScalingOptions : public OptionEditorBox
|
||||
{
|
||||
public:
|
||||
FontScalingOptions (UIConfiguration* uic) :
|
||||
_ui_config (uic),
|
||||
FontScalingOptions () :
|
||||
_dpi_adjustment (100, 50, 250, 1, 5),
|
||||
_dpi_slider (_dpi_adjustment)
|
||||
{
|
||||
_dpi_adjustment.set_value (_ui_config->get_font_scale() / 1024.);
|
||||
_dpi_adjustment.set_value (UIConfiguration::instance().get_font_scale() / 1024.);
|
||||
|
||||
Label* l = manage (new Label (_("GUI and Font scaling:")));
|
||||
l->set_name ("OptionsLabel");
|
||||
|
|
@ -996,7 +994,7 @@ public:
|
|||
void parameter_changed (string const & p)
|
||||
{
|
||||
if (p == "font-scale") {
|
||||
_dpi_adjustment.set_value (_ui_config->get_font_scale() / 1024.);
|
||||
_dpi_adjustment.set_value (UIConfiguration::instance().get_font_scale() / 1024.);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1009,12 +1007,11 @@ private:
|
|||
|
||||
void dpi_changed ()
|
||||
{
|
||||
_ui_config->set_font_scale ((long) floor (_dpi_adjustment.get_value() * 1024.));
|
||||
UIConfiguration::instance().set_font_scale ((long) floor (_dpi_adjustment.get_value() * 1024.));
|
||||
/* XXX: should be triggered from the parameter changed signal */
|
||||
_ui_config->reset_dpi ();
|
||||
UIConfiguration::instance().reset_dpi ();
|
||||
}
|
||||
|
||||
UIConfiguration* _ui_config;
|
||||
Adjustment _dpi_adjustment;
|
||||
HScale _dpi_slider;
|
||||
};
|
||||
|
|
@ -1022,12 +1019,11 @@ private:
|
|||
class ClipLevelOptions : public OptionEditorBox
|
||||
{
|
||||
public:
|
||||
ClipLevelOptions (UIConfiguration* c)
|
||||
: _ui_config (c)
|
||||
, _clip_level_adjustment (-.5, -50.0, 0.0, 0.1, 1.0) /* units of dB */
|
||||
ClipLevelOptions ()
|
||||
: _clip_level_adjustment (-.5, -50.0, 0.0, 0.1, 1.0) /* units of dB */
|
||||
, _clip_level_slider (_clip_level_adjustment)
|
||||
{
|
||||
_clip_level_adjustment.set_value (_ui_config->get_waveform_clip_level ());
|
||||
_clip_level_adjustment.set_value (UIConfiguration::instance().get_waveform_clip_level ());
|
||||
|
||||
Label* l = manage (new Label (_("Waveform Clip Level (dBFS):")));
|
||||
l->set_name ("OptionsLabel");
|
||||
|
|
@ -1046,7 +1042,7 @@ public:
|
|||
void parameter_changed (string const & p)
|
||||
{
|
||||
if (p == "waveform-clip-level") {
|
||||
_clip_level_adjustment.set_value (_ui_config->get_waveform_clip_level());
|
||||
_clip_level_adjustment.set_value (UIConfiguration::instance().get_waveform_clip_level());
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1059,12 +1055,11 @@ private:
|
|||
|
||||
void clip_level_changed ()
|
||||
{
|
||||
_ui_config->set_waveform_clip_level (_clip_level_adjustment.get_value());
|
||||
UIConfiguration::instance().set_waveform_clip_level (_clip_level_adjustment.get_value());
|
||||
/* XXX: should be triggered from the parameter changed signal */
|
||||
ArdourCanvas::WaveView::set_clip_level (_clip_level_adjustment.get_value());
|
||||
}
|
||||
|
||||
UIConfiguration* _ui_config;
|
||||
Adjustment _clip_level_adjustment;
|
||||
HScale _clip_level_slider;
|
||||
};
|
||||
|
|
@ -1507,9 +1502,8 @@ private:
|
|||
class PluginOptions : public OptionEditorBox
|
||||
{
|
||||
public:
|
||||
PluginOptions (RCConfiguration* c, UIConfiguration* uic)
|
||||
PluginOptions (RCConfiguration* c)
|
||||
: _rc_config (c)
|
||||
, _ui_config (uic)
|
||||
, _display_plugin_scan_progress (_("Always Display Plugin Scan Progress"))
|
||||
, _discover_vst_on_start (_("Scan for [new] VST Plugins on Application Start"))
|
||||
, _discover_au_on_start (_("Scan for AudioUnit Plugins on Application Start"))
|
||||
|
|
@ -1624,7 +1618,7 @@ public:
|
|||
|
||||
void parameter_changed (string const & p) {
|
||||
if (p == "show-plugin-scan-window") {
|
||||
bool const x = _ui_config->get_show_plugin_scan_window();
|
||||
bool const x = UIConfiguration::instance().get_show_plugin_scan_window();
|
||||
_display_plugin_scan_progress.set_active (x);
|
||||
}
|
||||
else if (p == "discover-vst-on-start") {
|
||||
|
|
@ -1655,7 +1649,6 @@ public:
|
|||
|
||||
private:
|
||||
RCConfiguration* _rc_config;
|
||||
UIConfiguration* _ui_config;
|
||||
CheckButton _display_plugin_scan_progress;
|
||||
CheckButton _discover_vst_on_start;
|
||||
CheckButton _discover_au_on_start;
|
||||
|
|
@ -1665,7 +1658,7 @@ private:
|
|||
|
||||
void display_plugin_scan_progress_toggled () {
|
||||
bool const x = _display_plugin_scan_progress.get_active();
|
||||
_ui_config->set_show_plugin_scan_window(x);
|
||||
UIConfiguration::instance().set_show_plugin_scan_window(x);
|
||||
}
|
||||
|
||||
void discover_vst_on_start_toggled () {
|
||||
|
|
@ -1805,7 +1798,6 @@ private:
|
|||
RCOptionEditor::RCOptionEditor ()
|
||||
: OptionEditor (Config, string_compose (_("%1 Preferences"), PROGRAM_NAME))
|
||||
, _rc_config (Config)
|
||||
, _ui_config (ARDOUR_UI::config())
|
||||
, _mixer_strip_visibility ("mixer-element-visibility")
|
||||
{
|
||||
/* MISC */
|
||||
|
|
@ -1862,8 +1854,8 @@ RCOptionEditor::RCOptionEditor ()
|
|||
new BoolOption (
|
||||
"only-copy-imported-files",
|
||||
_("Always copy imported files"),
|
||||
sigc::mem_fun (*_ui_config, &UIConfiguration::get_only_copy_imported_files),
|
||||
sigc::mem_fun (*_ui_config, &UIConfiguration::set_only_copy_imported_files)
|
||||
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_only_copy_imported_files),
|
||||
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_only_copy_imported_files)
|
||||
));
|
||||
|
||||
add_option (_("Misc"), new DirectoryOption (
|
||||
|
|
@ -2131,8 +2123,8 @@ RCOptionEditor::RCOptionEditor ()
|
|||
new BoolOption (
|
||||
"draggable-playhead",
|
||||
_("Allow dragging of playhead"),
|
||||
sigc::mem_fun (*ARDOUR_UI::config(), &UIConfiguration::get_draggable_playhead),
|
||||
sigc::mem_fun (*ARDOUR_UI::config(), &UIConfiguration::set_draggable_playhead)
|
||||
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_draggable_playhead),
|
||||
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_draggable_playhead)
|
||||
));
|
||||
|
||||
add_option (_("Editor"),
|
||||
|
|
@ -2147,16 +2139,16 @@ RCOptionEditor::RCOptionEditor ()
|
|||
new BoolOption (
|
||||
"show-track-meters",
|
||||
_("Show meters on tracks in the editor"),
|
||||
sigc::mem_fun (*_ui_config, &UIConfiguration::get_show_track_meters),
|
||||
sigc::mem_fun (*_ui_config, &UIConfiguration::set_show_track_meters)
|
||||
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_show_track_meters),
|
||||
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_track_meters)
|
||||
));
|
||||
|
||||
add_option (_("Editor"),
|
||||
new BoolOption (
|
||||
"show-editor-meter",
|
||||
_("Display master-meter in the toolbar"),
|
||||
sigc::mem_fun (*_ui_config, &UIConfiguration::get_show_editor_meter),
|
||||
sigc::mem_fun (*_ui_config, &UIConfiguration::set_show_editor_meter)
|
||||
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_show_editor_meter),
|
||||
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_editor_meter)
|
||||
));
|
||||
|
||||
ComboOption<FadeShape>* fadeshape = new ComboOption<FadeShape> (
|
||||
|
|
@ -2204,16 +2196,16 @@ RCOptionEditor::RCOptionEditor ()
|
|||
new BoolOption (
|
||||
"rubberbanding-snaps-to-grid",
|
||||
_("Make rubberband selection rectangle snap to the grid"),
|
||||
sigc::mem_fun (*_ui_config, &UIConfiguration::get_rubberbanding_snaps_to_grid),
|
||||
sigc::mem_fun (*_ui_config, &UIConfiguration::set_rubberbanding_snaps_to_grid)
|
||||
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_rubberbanding_snaps_to_grid),
|
||||
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_rubberbanding_snaps_to_grid)
|
||||
));
|
||||
|
||||
add_option (_("Editor"),
|
||||
new BoolOption (
|
||||
"show-waveforms",
|
||||
_("Show waveforms in regions"),
|
||||
sigc::mem_fun (*_ui_config, &UIConfiguration::get_show_waveforms),
|
||||
sigc::mem_fun (*_ui_config, &UIConfiguration::set_show_waveforms)
|
||||
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_show_waveforms),
|
||||
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_waveforms)
|
||||
));
|
||||
|
||||
add_option (_("Editor"),
|
||||
|
|
@ -2222,15 +2214,15 @@ RCOptionEditor::RCOptionEditor ()
|
|||
_("Show gain envelopes in audio regions"),
|
||||
_("in all modes"),
|
||||
_("only in Draw and Internal Edit modes"),
|
||||
sigc::mem_fun (*_ui_config, &UIConfiguration::get_show_region_gain),
|
||||
sigc::mem_fun (*_ui_config, &UIConfiguration::set_show_region_gain)
|
||||
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_show_region_gain),
|
||||
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_region_gain)
|
||||
));
|
||||
|
||||
ComboOption<WaveformScale>* wfs = new ComboOption<WaveformScale> (
|
||||
"waveform-scale",
|
||||
_("Waveform scale"),
|
||||
sigc::mem_fun (*_ui_config, &UIConfiguration::get_waveform_scale),
|
||||
sigc::mem_fun (*_ui_config, &UIConfiguration::set_waveform_scale)
|
||||
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_waveform_scale),
|
||||
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_waveform_scale)
|
||||
);
|
||||
|
||||
wfs->add (Linear, _("linear"));
|
||||
|
|
@ -2241,8 +2233,8 @@ RCOptionEditor::RCOptionEditor ()
|
|||
ComboOption<WaveformShape>* wfsh = new ComboOption<WaveformShape> (
|
||||
"waveform-shape",
|
||||
_("Waveform shape"),
|
||||
sigc::mem_fun (*_ui_config, &UIConfiguration::get_waveform_shape),
|
||||
sigc::mem_fun (*_ui_config, &UIConfiguration::set_waveform_shape)
|
||||
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_waveform_shape),
|
||||
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_waveform_shape)
|
||||
);
|
||||
|
||||
wfsh->add (Traditional, _("traditional"));
|
||||
|
|
@ -2250,37 +2242,37 @@ RCOptionEditor::RCOptionEditor ()
|
|||
|
||||
add_option (_("Editor"), wfsh);
|
||||
|
||||
add_option (_("Editor"), new ClipLevelOptions (_ui_config));
|
||||
add_option (_("Editor"), new ClipLevelOptions ());
|
||||
|
||||
add_option (_("Editor"),
|
||||
new BoolOption (
|
||||
"show-waveforms-while-recording",
|
||||
_("Show waveforms for audio while it is being recorded"),
|
||||
sigc::mem_fun (*_ui_config, &UIConfiguration::get_show_waveforms_while_recording),
|
||||
sigc::mem_fun (*_ui_config, &UIConfiguration::set_show_waveforms_while_recording)
|
||||
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_show_waveforms_while_recording),
|
||||
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_waveforms_while_recording)
|
||||
));
|
||||
|
||||
add_option (_("Editor"),
|
||||
new BoolOption (
|
||||
"show-zoom-tools",
|
||||
_("Show zoom toolbar"),
|
||||
sigc::mem_fun (*_ui_config, &UIConfiguration::get_show_zoom_tools),
|
||||
sigc::mem_fun (*_ui_config, &UIConfiguration::set_show_zoom_tools)
|
||||
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_show_zoom_tools),
|
||||
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_zoom_tools)
|
||||
));
|
||||
|
||||
add_option (_("Editor"),
|
||||
new BoolOption (
|
||||
"update-editor-during-summary-drag",
|
||||
_("Update editor window during drags of the summary"),
|
||||
sigc::mem_fun (*_ui_config, &UIConfiguration::get_update_editor_during_summary_drag),
|
||||
sigc::mem_fun (*_ui_config, &UIConfiguration::set_update_editor_during_summary_drag)
|
||||
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_update_editor_during_summary_drag),
|
||||
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_update_editor_during_summary_drag)
|
||||
));
|
||||
|
||||
bo = new BoolOption (
|
||||
"name-new-markers",
|
||||
_("Name new markers"),
|
||||
sigc::mem_fun (*_ui_config, &UIConfiguration::get_name_new_markers),
|
||||
sigc::mem_fun (*_ui_config, &UIConfiguration::set_name_new_markers)
|
||||
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_name_new_markers),
|
||||
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_name_new_markers)
|
||||
);
|
||||
|
||||
add_option (_("Editor"), bo);
|
||||
|
|
@ -2291,8 +2283,8 @@ RCOptionEditor::RCOptionEditor ()
|
|||
new BoolOption (
|
||||
"autoscroll-editor",
|
||||
_("Auto-scroll editor window when dragging near its edges"),
|
||||
sigc::mem_fun (*_ui_config, &UIConfiguration::get_autoscroll_editor),
|
||||
sigc::mem_fun (*_ui_config, &UIConfiguration::set_autoscroll_editor)
|
||||
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_autoscroll_editor),
|
||||
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_autoscroll_editor)
|
||||
));
|
||||
|
||||
ComboOption<RegionSelectionAfterSplit> *rsas = new ComboOption<RegionSelectionAfterSplit> (
|
||||
|
|
@ -2693,16 +2685,16 @@ RCOptionEditor::RCOptionEditor ()
|
|||
new BoolOption (
|
||||
"never-display-periodic-midi",
|
||||
_("Never display periodic MIDI messages (MTC, MIDI Clock)"),
|
||||
sigc::mem_fun (*_ui_config, &UIConfiguration::get_never_display_periodic_midi),
|
||||
sigc::mem_fun (*_ui_config, &UIConfiguration::set_never_display_periodic_midi)
|
||||
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_never_display_periodic_midi),
|
||||
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_never_display_periodic_midi)
|
||||
));
|
||||
|
||||
add_option (_("MIDI"),
|
||||
new BoolOption (
|
||||
"sound-midi-notes",
|
||||
_("Sound MIDI notes as they are selected"),
|
||||
sigc::mem_fun (*_ui_config, &UIConfiguration::get_sound_midi_notes),
|
||||
sigc::mem_fun (*_ui_config, &UIConfiguration::set_sound_midi_notes)
|
||||
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_sound_midi_notes),
|
||||
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_sound_midi_notes)
|
||||
));
|
||||
|
||||
add_option (_("MIDI"), new OptionEditorHeading (_("Midi Audition")));
|
||||
|
|
@ -2775,7 +2767,7 @@ RCOptionEditor::RCOptionEditor ()
|
|||
|
||||
#if (defined WINDOWS_VST_SUPPORT || defined LXVST_SUPPORT || defined AUDIOUNIT_SUPPORT)
|
||||
/* Plugin options (currrently VST only) */
|
||||
add_option (_("Plugins"), new PluginOptions (_rc_config, _ui_config));
|
||||
add_option (_("Plugins"), new PluginOptions (_rc_config));
|
||||
#endif
|
||||
|
||||
/* INTERFACE */
|
||||
|
|
@ -2784,8 +2776,8 @@ RCOptionEditor::RCOptionEditor ()
|
|||
BoolOption* bgc = new BoolOption (
|
||||
"cairo-image-surface",
|
||||
_("Disable Graphics Hardware Acceleration (requires restart)"),
|
||||
sigc::mem_fun (*_ui_config, &UIConfiguration::get_cairo_image_surface),
|
||||
sigc::mem_fun (*_ui_config, &UIConfiguration::set_cairo_image_surface)
|
||||
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_cairo_image_surface),
|
||||
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_cairo_image_surface)
|
||||
);
|
||||
|
||||
Gtkmm2ext::UI::instance()->set_tip (bgc->tip_widget(), string_compose (
|
||||
|
|
@ -2797,8 +2789,8 @@ RCOptionEditor::RCOptionEditor ()
|
|||
BoolOption* bgo = new BoolOption (
|
||||
"buggy-gradients",
|
||||
_("Possibly improve slow graphical performance (requires restart)"),
|
||||
sigc::mem_fun (*_ui_config, &UIConfiguration::get_buggy_gradients),
|
||||
sigc::mem_fun (*_ui_config, &UIConfiguration::set_buggy_gradients)
|
||||
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_buggy_gradients),
|
||||
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_buggy_gradients)
|
||||
);
|
||||
|
||||
Gtkmm2ext::UI::instance()->set_tip (bgo->tip_widget(), string_compose (_("Disables hardware gradient rendering on buggy video drivers (\"buggy gradients patch\").\nThis requires restarting %1 before having an effect"), PROGRAM_NAME));
|
||||
|
|
@ -2809,8 +2801,8 @@ RCOptionEditor::RCOptionEditor ()
|
|||
new BoolOption (
|
||||
"widget-prelight",
|
||||
_("Graphically indicate mouse pointer hovering over various widgets"),
|
||||
sigc::mem_fun (*_ui_config, &UIConfiguration::get_widget_prelight),
|
||||
sigc::mem_fun (*_ui_config, &UIConfiguration::set_widget_prelight)
|
||||
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_widget_prelight),
|
||||
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_widget_prelight)
|
||||
));
|
||||
|
||||
#ifdef TOOLTIPS_GOT_FIXED
|
||||
|
|
@ -2818,8 +2810,8 @@ RCOptionEditor::RCOptionEditor ()
|
|||
new BoolOption (
|
||||
"use-tooltips",
|
||||
_("Show tooltips if mouse hovers over a control"),
|
||||
sigc::mem_fun (*_ui_config, &UIConfiguration::get_use_tooltips),
|
||||
sigc::mem_fun (*_ui_config, &UIConfiguration::set_use_tooltips)
|
||||
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_use_tooltips),
|
||||
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_use_tooltips)
|
||||
));
|
||||
#endif
|
||||
|
||||
|
|
@ -2827,21 +2819,21 @@ RCOptionEditor::RCOptionEditor ()
|
|||
new BoolOption (
|
||||
"show-name-highlight",
|
||||
_("Use name highlight bars in region displays (requires a restart)"),
|
||||
sigc::mem_fun (*_ui_config, &UIConfiguration::get_show_name_highlight),
|
||||
sigc::mem_fun (*_ui_config, &UIConfiguration::set_show_name_highlight)
|
||||
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_show_name_highlight),
|
||||
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_name_highlight)
|
||||
));
|
||||
|
||||
#ifndef GTKOSX
|
||||
/* font scaling does nothing with GDK/Quartz */
|
||||
add_option (S_("Preferences|GUI"), new FontScalingOptions (_ui_config));
|
||||
add_option (S_("Preferences|GUI"), new FontScalingOptions ());
|
||||
#endif
|
||||
|
||||
add_option (S_("GUI"),
|
||||
new BoolOption (
|
||||
"super-rapid-clock-update",
|
||||
_("update transport clock display at FPS instead of every 100ms"),
|
||||
sigc::mem_fun (*_ui_config, &UIConfiguration::get_super_rapid_clock_update),
|
||||
sigc::mem_fun (*_ui_config, &UIConfiguration::set_super_rapid_clock_update)
|
||||
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_super_rapid_clock_update),
|
||||
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_super_rapid_clock_update)
|
||||
));
|
||||
|
||||
|
||||
|
|
@ -2851,8 +2843,8 @@ RCOptionEditor::RCOptionEditor ()
|
|||
HSliderOption *sics = new HSliderOption("waveform-cache-size",
|
||||
_("Waveform image cache size (megabytes)"),
|
||||
ics,
|
||||
sigc::mem_fun (*ARDOUR_UI::config(), &UIConfiguration::get_waveform_cache_size),
|
||||
sigc::mem_fun (*ARDOUR_UI::config(), &UIConfiguration::set_waveform_cache_size)
|
||||
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_waveform_cache_size),
|
||||
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_waveform_cache_size)
|
||||
);
|
||||
sics->scale().set_digits (0);
|
||||
Gtkmm2ext::UI::instance()->set_tip
|
||||
|
|
@ -2866,8 +2858,8 @@ RCOptionEditor::RCOptionEditor ()
|
|||
HSliderOption *slts = new HSliderOption("lock-gui-after-seconds",
|
||||
_("Lock timeout (seconds)"),
|
||||
lts,
|
||||
sigc::mem_fun (*ARDOUR_UI::config(), &UIConfiguration::get_lock_gui_after_seconds),
|
||||
sigc::mem_fun (*ARDOUR_UI::config(), &UIConfiguration::set_lock_gui_after_seconds)
|
||||
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_lock_gui_after_seconds),
|
||||
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_lock_gui_after_seconds)
|
||||
);
|
||||
slts->scale().set_digits (0);
|
||||
Gtkmm2ext::UI::instance()->set_tip
|
||||
|
|
@ -2890,8 +2882,8 @@ RCOptionEditor::RCOptionEditor ()
|
|||
new VisibilityOption (
|
||||
_("Mixer Strip"),
|
||||
&_mixer_strip_visibility,
|
||||
sigc::mem_fun (*_ui_config, &UIConfiguration::get_mixer_strip_visibility),
|
||||
sigc::mem_fun (*_ui_config, &UIConfiguration::set_mixer_strip_visibility)
|
||||
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_mixer_strip_visibility),
|
||||
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_mixer_strip_visibility)
|
||||
)
|
||||
);
|
||||
|
||||
|
|
@ -2899,8 +2891,8 @@ RCOptionEditor::RCOptionEditor ()
|
|||
new BoolOption (
|
||||
"default-narrow_ms",
|
||||
_("Use narrow strips in the mixer by default"),
|
||||
sigc::mem_fun (*_ui_config, &UIConfiguration::get_default_narrow_ms),
|
||||
sigc::mem_fun (*_ui_config, &UIConfiguration::set_default_narrow_ms)
|
||||
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_default_narrow_ms),
|
||||
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_default_narrow_ms)
|
||||
));
|
||||
|
||||
add_option (S_("Preferences|Metering"), new OptionEditorHeading (_("Metering")));
|
||||
|
|
@ -2908,8 +2900,8 @@ RCOptionEditor::RCOptionEditor ()
|
|||
ComboOption<float>* mht = new ComboOption<float> (
|
||||
"meter-hold",
|
||||
_("Peak hold time"),
|
||||
sigc::mem_fun (*_ui_config, &UIConfiguration::get_meter_hold),
|
||||
sigc::mem_fun (*_ui_config, &UIConfiguration::set_meter_hold)
|
||||
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_meter_hold),
|
||||
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_meter_hold)
|
||||
);
|
||||
|
||||
mht->add (MeterHoldOff, _("off"));
|
||||
|
|
@ -2939,8 +2931,8 @@ RCOptionEditor::RCOptionEditor ()
|
|||
ComboOption<MeterLineUp>* mlu = new ComboOption<MeterLineUp> (
|
||||
"meter-line-up-level",
|
||||
_("Meter line-up level; 0dBu"),
|
||||
sigc::mem_fun (*_ui_config, &UIConfiguration::get_meter_line_up_level),
|
||||
sigc::mem_fun (*_ui_config, &UIConfiguration::set_meter_line_up_level)
|
||||
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_meter_line_up_level),
|
||||
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_meter_line_up_level)
|
||||
);
|
||||
|
||||
mlu->add (MeteringLineUp24, _("-24dBFS (SMPTE US: 4dBu = -20dBFS)"));
|
||||
|
|
@ -2955,8 +2947,8 @@ RCOptionEditor::RCOptionEditor ()
|
|||
ComboOption<MeterLineUp>* mld = new ComboOption<MeterLineUp> (
|
||||
"meter-line-up-din",
|
||||
_("IEC1/DIN Meter line-up level; 0dBu"),
|
||||
sigc::mem_fun (*_ui_config, &UIConfiguration::get_meter_line_up_din),
|
||||
sigc::mem_fun (*_ui_config, &UIConfiguration::set_meter_line_up_din)
|
||||
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_meter_line_up_din),
|
||||
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_meter_line_up_din)
|
||||
);
|
||||
|
||||
mld->add (MeteringLineUp24, _("-24dBFS (SMPTE US: 4dBu = -20dBFS)"));
|
||||
|
|
@ -2971,8 +2963,8 @@ RCOptionEditor::RCOptionEditor ()
|
|||
ComboOption<VUMeterStandard>* mvu = new ComboOption<VUMeterStandard> (
|
||||
"meter-vu-standard",
|
||||
_("VU Meter standard"),
|
||||
sigc::mem_fun (*_ui_config, &UIConfiguration::get_meter_vu_standard),
|
||||
sigc::mem_fun (*_ui_config, &UIConfiguration::set_meter_vu_standard)
|
||||
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_meter_vu_standard),
|
||||
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_meter_vu_standard)
|
||||
);
|
||||
|
||||
mvu->add (MeteringVUfrench, _("0VU = -2dBu (France)"));
|
||||
|
|
@ -2986,8 +2978,8 @@ RCOptionEditor::RCOptionEditor ()
|
|||
HSliderOption *mpks = new HSliderOption("meter-peak",
|
||||
_("Peak threshold [dBFS]"),
|
||||
mpk,
|
||||
sigc::mem_fun (*_ui_config, &UIConfiguration::get_meter_peak),
|
||||
sigc::mem_fun (*_ui_config, &UIConfiguration::set_meter_peak)
|
||||
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_meter_peak),
|
||||
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_meter_peak)
|
||||
);
|
||||
|
||||
|
||||
|
|
@ -3048,8 +3040,8 @@ RCOptionEditor::RCOptionEditor ()
|
|||
new BoolOption (
|
||||
"meter-style-led",
|
||||
_("LED meter style"),
|
||||
sigc::mem_fun (*_ui_config, &UIConfiguration::get_meter_style_led),
|
||||
sigc::mem_fun (*_ui_config, &UIConfiguration::set_meter_style_led)
|
||||
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_meter_style_led),
|
||||
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_meter_style_led)
|
||||
));
|
||||
|
||||
/* and now the theme manager */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue