#include <cairo/cairo.h>
-#include <boost/algorithm/string.hpp>
+#include <boost/algorithm/string.hpp>
#include <gtkmm/liststore.h>
#include <gtkmm/stock.h>
#include "canvas/wave_view.h"
-#include "ardour_ui.h"
#include "ardour_window.h"
#include "ardour_dialog.h"
#include "gui_thread.h"
, _click_browse_button (_("Browse..."))
, _click_emphasis_browse_button (_("Browse..."))
{
- Table* t = manage (new Table (3, 3));
+ Table* t = manage (new Table (4, 3));
t->set_spacings (4);
Label* l = manage (left_aligned_label (_("Use default Click:")));
_use_default_click_check_button.signal_toggled().connect (
sigc::mem_fun (*this, &ClickOptions::use_default_click_toggled));
- l = manage (left_aligned_label (_("Click audio file:")));
+ l = manage (left_aligned_label (_("Emphasis on first beat:")));
t->attach (*l, 0, 1, 1, 2, FILL);
- t->attach (_click_path_entry, 1, 2, 1, 2, FILL);
+ t->attach (_use_emphasis_on_click_check_button, 1, 2, 1, 2, FILL);
+ _use_emphasis_on_click_check_button.signal_toggled().connect (
+ sigc::mem_fun (*this, &ClickOptions::use_emphasis_on_click_toggled));
+
+ l = manage (left_aligned_label (_("Click audio file:")));
+ t->attach (*l, 0, 1, 2, 3, FILL);
+ t->attach (_click_path_entry, 1, 2, 2, 3, FILL);
_click_browse_button.signal_clicked ().connect (
sigc::mem_fun (*this, &ClickOptions::click_browse_clicked));
- t->attach (_click_browse_button, 2, 3, 1, 2, FILL);
+ t->attach (_click_browse_button, 2, 3, 2, 3, FILL);
l = manage (left_aligned_label (_("Click emphasis audio file:")));
- t->attach (*l, 0, 1, 2, 3, FILL);
- t->attach (_click_emphasis_path_entry, 1, 2, 2, 3, FILL);
+ t->attach (*l, 0, 1, 3, 4, FILL);
+ t->attach (_click_emphasis_path_entry, 1, 2, 3, 4, FILL);
_click_emphasis_browse_button.signal_clicked ().connect (
sigc::mem_fun (*this, &ClickOptions::click_emphasis_browse_clicked));
- t->attach (_click_emphasis_browse_button, 2, 3, 2, 3, FILL);
-
+ t->attach (_click_emphasis_browse_button, 2, 3, 3, 4, FILL);
+
_box->pack_start (*t, false, false);
- _click_path_entry.signal_activate().connect (sigc::mem_fun (*this, &ClickOptions::click_changed));
+ _click_path_entry.signal_activate().connect (sigc::mem_fun (*this, &ClickOptions::click_changed));
_click_emphasis_path_entry.signal_activate().connect (sigc::mem_fun (*this, &ClickOptions::click_emphasis_changed));
if (_rc_config->get_click_sound ().empty() &&
_rc_config->get_click_emphasis_sound().empty()) {
_use_default_click_check_button.set_active (true);
+ _use_emphasis_on_click_check_button.set_active (true);
} else {
_use_default_click_check_button.set_active (false);
+ _use_emphasis_on_click_check_button.set_active (false);
}
}
_click_path_entry.set_text (_rc_config->get_click_sound());
} else if (p == "click-emphasis-sound") {
_click_emphasis_path_entry.set_text (_rc_config->get_click_emphasis_sound());
+ } else if (p == "use-click-emphasis") {
+ bool x = _rc_config->get_use_click_emphasis ();
+ _use_emphasis_on_click_check_button.set_active (x);
}
}
{
parameter_changed ("click-sound");
parameter_changed ("click-emphasis-sound");
+ parameter_changed ("use-click-emphasis");
}
private:
{
click_chosen (_click_path_entry.get_text ());
}
-
+
void click_emphasis_browse_clicked ()
{
SoundFileChooser sfdb (_("Choose Click Emphasis"));
}
}
+ void use_emphasis_on_click_toggled ()
+ {
+ if (_use_emphasis_on_click_check_button.get_active ()) {
+ _rc_config->set_use_click_emphasis(true);
+ } else {
+ _rc_config->set_use_click_emphasis(false);
+ }
+ }
+
RCConfiguration* _rc_config;
CheckButton _use_default_click_check_button;
+ CheckButton _use_emphasis_on_click_check_button;
Entry _click_path_entry;
Entry _click_emphasis_path_entry;
Button _click_browse_button;
Option/Alt = Mod1
*/
{ "Key|Shift", GDK_SHIFT_MASK },
- { "Command", GDK_META_MASK },
+ { "Command", GDK_MOD2_MASK },
{ "Control", GDK_CONTROL_MASK },
{ "Option", GDK_MOD1_MASK },
- { "Command-Shift", GDK_META_MASK|GDK_SHIFT_MASK },
- { "Command-Option", GDK_MOD1_MASK|GDK_META_MASK },
+ { "Command-Shift", GDK_MOD2_MASK|GDK_SHIFT_MASK },
+ { "Command-Option", GDK_MOD2_MASK|GDK_MOD1_MASK },
+ { "Command-Option-Control", GDK_MOD2_MASK|GDK_MOD1_MASK|GDK_CONTROL_MASK },
+ { "Option-Control", GDK_MOD1_MASK|GDK_CONTROL_MASK },
{ "Option-Shift", GDK_MOD1_MASK|GDK_SHIFT_MASK },
{ "Control-Shift", GDK_CONTROL_MASK|GDK_SHIFT_MASK },
- { "Shift-Command-Option", GDK_MOD5_MASK|GDK_SHIFT_MASK|GDK_META_MASK },
+ { "Shift-Command-Option", GDK_MOD5_MASK|GDK_SHIFT_MASK|GDK_MOD2_MASK },
#else
{ "Key|Shift", GDK_SHIFT_MASK },
{ "Alt", GDK_MOD1_MASK },
{ "Control-Shift", GDK_CONTROL_MASK|GDK_SHIFT_MASK },
{ "Control-Alt", GDK_CONTROL_MASK|GDK_MOD1_MASK },
- { "Shift-Alt", GDK_SHIFT_MASK|GDK_MOD1_MASK },
{ "Control-Shift-Alt", GDK_CONTROL_MASK|GDK_SHIFT_MASK|GDK_MOD1_MASK },
{ "Alt-Windows", GDK_MOD1_MASK|GDK_MOD4_MASK },
+ { "Alt-Shift", GDK_MOD1_MASK|GDK_SHIFT_MASK },
+ { "Alt-Shift-Windows", GDK_MOD1_MASK|GDK_SHIFT_MASK|GDK_MOD4_MASK },
{ "Mod2", GDK_MOD2_MASK },
{ "Mod3", GDK_MOD3_MASK },
{ "Windows", GDK_MOD4_MASK },
_insert_note_button_adjustment (3, 1, 5),
_insert_note_button_spin (_insert_note_button_adjustment)
{
+ const Glib::ustring restart_msg = _("\nChanges to this setting will only persist after your project has been saved.");
/* internationalize and prepare for use with combos */
vector<string> dumb;
set_popdown_strings (_edit_modifier_combo, dumb);
_edit_modifier_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::edit_modifier_chosen));
-
+ Gtkmm2ext::UI::instance()->set_tip (_edit_modifier_combo,
+ (string_compose (_("<b>Recommended Setting: %1 + button 3</b>%2"), Keyboard::copy_modifier_name (), restart_msg)));
for (int x = 0; modifiers[x].name; ++x) {
if (modifiers[x].modifier == Keyboard::edit_modifier ()) {
_edit_modifier_combo.set_active_text (S_(modifiers[x].name));
set_popdown_strings (_delete_modifier_combo, dumb);
_delete_modifier_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::delete_modifier_chosen));
-
+ Gtkmm2ext::UI::instance()->set_tip (_delete_modifier_combo,
+ (string_compose (_("<b>Recommended Setting: %1 + button 3</b>%2"), Keyboard::tertiary_modifier_name (), restart_msg)));
for (int x = 0; modifiers[x].name; ++x) {
if (modifiers[x].modifier == Keyboard::delete_modifier ()) {
_delete_modifier_combo.set_active_text (S_(modifiers[x].name));
set_popdown_strings (_insert_note_modifier_combo, dumb);
_insert_note_modifier_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::insert_note_modifier_chosen));
-
+ Gtkmm2ext::UI::instance()->set_tip (_insert_note_modifier_combo,
+ (string_compose (_("<b>Recommended Setting: %1 + button 1</b>%2"), Keyboard::copy_modifier_name (), restart_msg)));
for (int x = 0; modifiers[x].name; ++x) {
if (modifiers[x].modifier == Keyboard::insert_note_modifier ()) {
_insert_note_modifier_combo.set_active_text (S_(modifiers[x].name));
/* copy modifier */
set_popdown_strings (_copy_modifier_combo, dumb);
_copy_modifier_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::copy_modifier_chosen));
-
+ Gtkmm2ext::UI::instance()->set_tip (_copy_modifier_combo,
+ (string_compose (_("<b>Recommended Setting: %1</b>%2"), Keyboard::copy_modifier_name (), restart_msg)));
for (int x = 0; modifiers[x].name; ++x) {
if (modifiers[x].modifier == (guint) Keyboard::CopyModifier) {
_copy_modifier_combo.set_active_text (S_(modifiers[x].name));
/* constraint modifier */
set_popdown_strings (_constraint_modifier_combo, dumb);
_constraint_modifier_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::constraint_modifier_chosen));
-
+ Gtkmm2ext::UI::instance()->set_tip (_constraint_modifier_combo,
+ (string_compose (_("<b>Recommended Setting: %1</b>%2"), Keyboard::secondary_modifier_name (), restart_msg)));
for (int x = 0; modifiers[x].name; ++x) {
if (modifiers[x].modifier == (guint) ArdourKeyboard::constraint_modifier ()) {
_constraint_modifier_combo.set_active_text (S_(modifiers[x].name));
/* trim_contents */
set_popdown_strings (_trim_contents_combo, dumb);
_trim_contents_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::trim_contents_modifier_chosen));
-
+ Gtkmm2ext::UI::instance()->set_tip (_trim_contents_combo,
+ (string_compose (_("<b>Recommended Setting: %1</b>%2"), Keyboard::primary_modifier_name (), restart_msg)));
for (int x = 0; modifiers[x].name; ++x) {
if (modifiers[x].modifier == (guint) ArdourKeyboard::trim_contents_modifier ()) {
_trim_contents_combo.set_active_text (S_(modifiers[x].name));
/* anchored trim */
set_popdown_strings (_trim_anchored_combo, dumb);
_trim_anchored_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::trim_anchored_modifier_chosen));
-
+ Gtkmm2ext::UI::instance()->set_tip (_trim_anchored_combo,
+ (string_compose (_("<b>Recommended Setting: %1</b>%2"), Keyboard::tertiary_modifier_name (), restart_msg)));
for (int x = 0; modifiers[x].name; ++x) {
if (modifiers[x].modifier == (guint) ArdourKeyboard::trim_anchored_modifier ()) {
_trim_anchored_combo.set_active_text (S_(modifiers[x].name));
/* note resize relative */
set_popdown_strings (_note_size_relative_combo, dumb);
_note_size_relative_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::note_size_relative_modifier_chosen));
-
+ Gtkmm2ext::UI::instance()->set_tip (_note_size_relative_combo,
+ (string_compose (_("<b>Recommended Setting: %1</b>%2"), Keyboard::primary_modifier_name (), restart_msg)));
for (int x = 0; modifiers[x].name; ++x) {
if (modifiers[x].modifier == (guint) ArdourKeyboard::note_size_relative_modifier ()) {
_note_size_relative_combo.set_active_text (S_(modifiers[x].name));
/* ignore snap */
set_popdown_strings (_snap_modifier_combo, dumb);
_snap_modifier_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::snap_modifier_chosen));
-
+#ifdef GTKOSX
+ Glib::ustring mod_str = string_compose (X_("%1-%2"), Keyboard::level4_modifier_name (), Keyboard::tertiary_modifier_name ());
+#else
+ Glib::ustring mod_str = Keyboard::secondary_modifier_name();
+#endif
+ Gtkmm2ext::UI::instance()->set_tip (_snap_modifier_combo,
+ (string_compose (_("<b>Recommended Setting: %1</b>%2"), mod_str, restart_msg)));
for (int x = 0; modifiers[x].name; ++x) {
if (modifiers[x].modifier == (guint) Keyboard::snap_modifier ()) {
_snap_modifier_combo.set_active_text (S_(modifiers[x].name));
/* snap delta */
set_popdown_strings (_snap_delta_combo, dumb);
_snap_delta_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::snap_delta_modifier_chosen));
-
+#ifdef GTKOSX
+ mod_str = Keyboard::level4_modifier_name ();
+#else
+ mod_str = string_compose (X_("%1-%2"), Keyboard::secondary_modifier_name (), Keyboard::level4_modifier_name ());
+#endif
+ Gtkmm2ext::UI::instance()->set_tip (_snap_delta_combo,
+ (string_compose (_("<b>Recommended Setting: %1</b>%2"), mod_str, restart_msg)));
for (int x = 0; modifiers[x].name; ++x) {
if (modifiers[x].modifier == (guint) Keyboard::snap_delta_modifier ()) {
_snap_delta_combo.set_active_text (S_(modifiers[x].name));
set_popdown_strings (_trim_overlap_combo, dumb);
_trim_overlap_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::trim_overlap_modifier_chosen));
+ Gtkmm2ext::UI::instance()->set_tip (_trim_overlap_combo,
+ (string_compose (_("<b>Recommended Setting: %1</b>%2"), Keyboard::tertiary_modifier_name (), restart_msg)));
for (int x = 0; modifiers[x].name; ++x) {
if (modifiers[x].modifier == (guint) ArdourKeyboard::trim_overlap_modifier ()) {
_trim_overlap_combo.set_active_text (S_(modifiers[x].name));
set_popdown_strings (_fine_adjust_combo, dumb);
_fine_adjust_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::fine_adjust_modifier_chosen));
+ mod_str = string_compose (X_("%1-%2"), Keyboard::secondary_modifier_name (), Keyboard::tertiary_modifier_name ());
+ Gtkmm2ext::UI::instance()->set_tip (_fine_adjust_combo,
+ (string_compose (_("<b>Recommended Setting: %1</b>%2"), mod_str, restart_msg)));
for (int x = 0; modifiers[x].name; ++x) {
if (modifiers[x].modifier == (guint) ArdourKeyboard::fine_adjust_modifier ()) {
_fine_adjust_combo.set_active_text (S_(modifiers[x].name));
set_popdown_strings (_push_points_combo, dumb);
_push_points_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::push_points_modifier_chosen));
+ Gtkmm2ext::UI::instance()->set_tip (_push_points_combo,
+ (string_compose (_("<b>Recommended Setting: %1</b>%2"), Keyboard::primary_modifier_name (), restart_msg)));
for (int x = 0; modifiers[x].name; ++x) {
if (modifiers[x].modifier == (guint) ArdourKeyboard::push_points_modifier ()) {
_push_points_combo.set_active_text (S_(modifiers[x].name));
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");
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.);
}
}
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;
};
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");
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());
}
}
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;
};
vector<string> presets;
/* these must match the order of the enums for BufferingPreset */
-
+
presets.push_back (_("Small sessions (4-16 tracks)"));
presets.push_back (_("Medium sessions (16-64 tracks)"));
presets.push_back (_("Large sessions (64+ tracks)"));
_box->pack_start (*h, false, false);
_buffering_presets_combo.signal_changed().connect (sigc::mem_fun (*this, &BufferingOptions::preset_changed));
-
+
_playback_adjustment.set_value (_rc_config->get_audio_playback_buffer_seconds());
l = manage (new Label (_("Playback (seconds of buffering):")));
break;
}
}
-
+
void playback_changed ()
{
_rc_config->set_audio_playback_buffer_seconds ((long) _playback_adjustment.get_value());
void protocol_status_changed (ControlProtocolInfo* cpi) {
/* find the row */
TreeModel::Children rows = _store->children();
-
+
for (TreeModel::Children::iterator x = rows.begin(); x != rows.end(); ++x) {
string n = ((*x)[_model.name]);
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"))
_("<b>When enabled</b> new VST plugins are searched, tested and added to the cache index on application start. When disabled new plugins will only be available after triggering a 'Scan' manually"));
#ifdef LXVST_SUPPORT
- t->attach (*manage (left_aligned_label (_("Linux VST Path:"))), 0, 1, n, n+1);
+ t->attach (*manage (right_aligned_label (_("Linux VST Path:"))), 0, 1, n, n+1);
b = manage (new Button (_("Edit")));
b->signal_clicked().connect (sigc::mem_fun (*this, &PluginOptions::edit_lxvst_path_clicked));
t->attach (*b, 1, 2, n, n+1, FILL); ++n;
#endif
#ifdef WINDOWS_VST_SUPPORT
- t->attach (*manage (left_aligned_label (_("Windows VST Path:"))), 0, 1, n, n+1);
+ t->attach (*manage (right_aligned_label (_("Windows VST Path:"))), 0, 1, n, n+1);
b = manage (new Button (_("Edit")));
b->signal_clicked().connect (sigc::mem_fun (*this, &PluginOptions::edit_vst_path_clicked));
t->attach (*b, 1, 2, n, n+1, FILL); ++n;
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") {
private:
RCConfiguration* _rc_config;
- UIConfiguration* _ui_config;
CheckButton _display_plugin_scan_progress;
CheckButton _discover_vst_on_start;
CheckButton _discover_au_on_start;
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 () {
*/
_set (_visibility_group->get_state_value ());
}
-
+
OptionEditorHeading _heading;
VisibilityGroup* _visibility_group;
sigc::slot<std::string> _get;
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 */
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 (
sigc::mem_fun (*_rc_config, &RCConfiguration::get_loop_is_mode),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_loop_is_mode)
);
- Gtkmm2ext::UI::instance()->set_tip (tsf->tip_widget(),
+ Gtkmm2ext::UI::instance()->set_tip (tsf->tip_widget(),
(_("<b>When enabled</b> the loop button does not start playback but forces playback to always play the loop\n\n"
"<b>When disabled</b> the loop button starts playing the loop, but stop then cancels loop playback")));
add_option (_("Transport"), tsf);
-
+
tsf = new BoolOption (
"stop-recording-on-xrun",
_("Stop recording when an xrun occurs"),
sigc::mem_fun (*_rc_config, &RCConfiguration::get_stop_recording_on_xrun),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_stop_recording_on_xrun)
);
- Gtkmm2ext::UI::instance()->set_tip (tsf->tip_widget(),
+ Gtkmm2ext::UI::instance()->set_tip (tsf->tip_widget(),
string_compose (_("<b>When enabled</b> %1 will stop recording if an over- or underrun is detected by the audio engine"),
PROGRAM_NAME));
add_option (_("Transport"), tsf);
sigc::mem_fun (*_rc_config, &RCConfiguration::get_stop_at_session_end),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_stop_at_session_end)
);
- Gtkmm2ext::UI::instance()->set_tip (tsf->tip_widget(),
+ Gtkmm2ext::UI::instance()->set_tip (tsf->tip_widget(),
string_compose (_("<b>When enabled</b> if %1 is <b>not recording</b>, it will stop the transport "
"when it reaches the current session end marker\n\n"
"<b>When disabled</b> %1 will continue to roll past the session end marker at all times"),
sigc::mem_fun (*_rc_config, &RCConfiguration::get_seamless_loop),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_seamless_loop)
);
- Gtkmm2ext::UI::instance()->set_tip (tsf->tip_widget(),
+ Gtkmm2ext::UI::instance()->set_tip (tsf->tip_widget(),
string_compose (_("<b>When enabled</b> this will loop by reading ahead and wrapping around at the loop point, "
"preventing any need to do a transport locate at the end of the loop\n\n"
"<b>When disabled</b> looping is done by locating back to the start of the loop when %1 reaches the end "
sigc::mem_fun (*_rc_config, &RCConfiguration::get_timecode_sync_frame_rate),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_timecode_sync_frame_rate)
);
- Gtkmm2ext::UI::instance()->set_tip
+ Gtkmm2ext::UI::instance()->set_tip
(_sync_framerate->tip_widget(),
string_compose (_("This option controls the value of the video frame rate <i>while chasing</i> an external timecode source.\n\n"
"<b>When enabled</b> the session video frame rate will be changed to match that of the selected external timecode source.\n\n"
sigc::mem_fun (*_rc_config, &RCConfiguration::get_timecode_source_is_synced),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_timecode_source_is_synced)
);
- Gtkmm2ext::UI::instance()->set_tip
+ Gtkmm2ext::UI::instance()->set_tip
(_sync_genlock->tip_widget(),
string_compose (_("<b>When enabled</b> %1 will never varispeed when slaved to external timecode. "
"Sync Lock indicates that the selected external timecode source shares clock-sync "
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"),
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> (
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"),
_("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"));
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"));
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);
Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget(), _("If enabled, popup a dialog when a new marker is created to allow its name to be set as it is created."
"\n\nYou can always rename markers by right-clicking on them"));
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> (
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")));
#endif
)
{
- add_option (_("User interaction"),
+ add_option (_("User interaction"),
new BoolOption (
"enable-translation",
string_compose (_("Use translations of %1 messages\n"
#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 */
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 (
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));
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
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
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)
));
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
(sics->tip_widget(),
_("Increasing the cache size uses more memory to store waveform images, which can improve graphical performance."));
add_option (S_("Preferences|GUI"), sics);
-
+
/* Lock GUI timeout */
Gtk::Adjustment *lts = manage (new Gtk::Adjustment(0, 0, 1000, 1, 10));
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
_mixer_strip_visibility.add (0, X_("SoloIsoLock"), _("Solo Iso / Lock"));
_mixer_strip_visibility.add (0, X_("Output"), _("Output"));
_mixer_strip_visibility.add (0, X_("Comments"), _("Comments"));
-
+
add_option (
S_("Preferences|GUI"),
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)
)
);
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")));
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"));
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)"));
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)"));
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)"));
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)
);
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 */
projects / ardour.git / blobdiff