X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Frc_option_editor.cc;h=f9336cee31366711b2194deabf4577a728f13c4a;hb=482a90cccfe458c354b39e60856909eb863010f2;hp=3dc5972eac36d2956c37650835a89bb3f18c2976;hpb=df3eaf91886d1d33fc60235f15a4e45b260bd4db;p=ardour.git

diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc
index 3dc5972eac..f9336cee31 100644
--- a/gtk2_ardour/rc_option_editor.cc
+++ b/gtk2_ardour/rc_option_editor.cc
@@ -26,12 +26,11 @@
 #include <gtkmm/scale.h>
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/slider_controller.h>
+#include <gtkmm2ext/gtk_ui.h>
 
 #include "pbd/fpu.h"
 #include "pbd/cpus.h"
 
-#include "midi++/manager.h"
-
 #include "ardour/audioengine.h"
 #include "ardour/dB.h"
 #include "ardour/rc_configuration.h"
@@ -65,16 +64,14 @@ public:
 		Table* t = manage (new Table (2, 3));
 		t->set_spacings (4);
 
-		Label* l = manage (new Label (_("Click audio file:")));
-		l->set_alignment (0, 0.5);
+		Label* l = manage (left_aligned_label (_("Click audio file:")));
 		t->attach (*l, 0, 1, 0, 1, FILL);
 		t->attach (_click_path_entry, 1, 2, 0, 1, FILL);
 		Button* b = manage (new Button (_("Browse...")));
 		b->signal_clicked().connect (sigc::mem_fun (*this, &ClickOptions::click_browse_clicked));
 		t->attach (*b, 2, 3, 0, 1, FILL);
 
-		l = manage (new Label (_("Click emphasis audio file:")));
-		l->set_alignment (0, 0.5);
+		l = manage (left_aligned_label (_("Click emphasis audio file:")));
 		t->attach (*l, 0, 1, 1, 2, FILL);
 		t->attach (_click_emphasis_path_entry, 1, 2, 1, 2, FILL);
 		b = manage (new Button (_("Browse...")));
@@ -106,10 +103,7 @@ private:
 
 	void click_browse_clicked ()
 	{
-		SoundFileChooser sfdb (*_parent, _("Choose Click"));
-
-		sfdb.show_all ();
-		sfdb.present ();
+		SoundFileChooser sfdb (_("Choose Click"));
 
 		if (sfdb.run () == RESPONSE_OK) {
 			click_chosen (sfdb.get_filename());
@@ -129,7 +123,7 @@ private:
 	
 	void click_emphasis_browse_clicked ()
 	{
-		SoundFileChooser sfdb (*_parent, _("Choose Click Emphasis"));
+		SoundFileChooser sfdb (_("Choose Click Emphasis"));
 
 		sfdb.show_all ();
 		sfdb.present ();
@@ -171,16 +165,14 @@ public:
 		_limit_undo_spin.set_range (0, 512);
 		_limit_undo_spin.set_increments (1, 10);
 		t->attach (_limit_undo_spin, 1, 2, 0, 1, FILL | EXPAND);
-		Label* l = manage (new Label (_("commands")));
-		l->set_alignment (0, 0.5);
+		Label* l = manage (left_aligned_label (_("commands")));
 		t->attach (*l, 2, 3, 0, 1);
 
 		t->attach (_save_undo_button, 0, 1, 1, 2, FILL);
 		_save_undo_spin.set_range (0, 512);
 		_save_undo_spin.set_increments (1, 10);
 		t->attach (_save_undo_spin, 1, 2, 1, 2, FILL | EXPAND);
-		l = manage (new Label (_("commands")));
-		l->set_alignment (0, 0.5);
+		l = manage (left_aligned_label (_("commands")));
 		t->attach (*l, 2, 3, 1, 2);
 
 		_box->pack_start (*t);
@@ -318,9 +310,8 @@ public:
 		Table* t = manage (new Table (4, 4));
 		t->set_spacings (4);
 
-		Label* l = manage (new Label (_("Edit using:")));
+		Label* l = manage (left_aligned_label (_("Edit using:")));
 		l->set_name ("OptionsLabel");
-		l->set_alignment (0, 0.5);
 
 		t->attach (*l, 0, 1, 0, 1, FILL | EXPAND, FILL);
 		t->attach (_edit_modifier_combo, 1, 2, 0, 1, FILL | EXPAND, FILL);
@@ -345,9 +336,8 @@ public:
 			}
 		}
 
-		l = manage (new Label (_("Delete using:")));
+		l = manage (left_aligned_label (_("Delete using:")));
 		l->set_name ("OptionsLabel");
-		l->set_alignment (0, 0.5);
 
 		t->attach (*l, 0, 1, 1, 2, FILL | EXPAND, FILL);
 		t->attach (_delete_modifier_combo, 1, 2, 1, 2, FILL | EXPAND, FILL);
@@ -373,9 +363,8 @@ public:
 			}
 		}
 
-		l = manage (new Label (_("Insert note using:")));
+		l = manage (left_aligned_label (_("Insert note using:")));
 		l->set_name ("OptionsLabel");
-		l->set_alignment (0, 0.5);
 
 		t->attach (*l, 0, 1, 2, 3, FILL | EXPAND, FILL);
 		t->attach (_insert_note_modifier_combo, 1, 2, 2, 3, FILL | EXPAND, FILL);
@@ -401,9 +390,8 @@ public:
 			}
 		}
 
-		l = manage (new Label (_("Toggle snap using:")));
+		l = manage (left_aligned_label (_("Ignore snap using:")));
 		l->set_name ("OptionsLabel");
-		l->set_alignment (0, 0.5);
 
 		t->attach (*l, 0, 1, 3, 4, FILL | EXPAND, FILL);
 		t->attach (_snap_modifier_combo, 1, 2, 3, 4, FILL | EXPAND, FILL);
@@ -418,9 +406,8 @@ public:
 		_keyboard_layout_selector.set_active_text (Keyboard::current_binding_name());
 		_keyboard_layout_selector.signal_changed().connect (sigc::mem_fun (*this, &KeyboardOptions::bindings_changed));
 
-		l = manage (new Label (_("Keyboard layout:")));
+		l = manage (left_aligned_label (_("Keyboard layout:")));
 		l->set_name ("OptionsLabel");
-		l->set_alignment (0, 0.5);
 
 		t->attach (*l, 0, 1, 4, 5, FILL | EXPAND, FILL);
 		t->attach (_keyboard_layout_selector, 1, 2, 4, 5, FILL | EXPAND, FILL);
@@ -540,7 +527,7 @@ public:
 		_dpi_adjustment (50, 50, 250, 1, 10),
 		_dpi_slider (_dpi_adjustment)
 	{
-		_dpi_adjustment.set_value (_rc_config->get_font_scale () / 1024);
+		_dpi_adjustment.set_value (floor (_rc_config->get_font_scale () / 1024));
 
 		Label* l = manage (new Label (_("Font scaling:")));
 		l->set_name ("OptionsLabel");
@@ -559,7 +546,7 @@ public:
 	void parameter_changed (string const & p)
 	{
 		if (p == "font-scale") {
-			_dpi_adjustment.set_value (_rc_config->get_font_scale() / 1024);
+			_dpi_adjustment.set_value (floor (_rc_config->get_font_scale() / 1024));
 		}
 	}
 
@@ -664,7 +651,7 @@ public:
 	{
 		_store = ListStore::create (_model);
 		_view.set_model (_store);
-		_view.append_column (_("Name"), _model.name);
+		_view.append_column (_("Control Surface Protocol"), _model.name);
 		_view.get_column(0)->set_resizable (true);
 		_view.get_column(0)->set_expand (true);
 		_view.append_column_editable (_("Enabled"), _model.enabled);
@@ -678,7 +665,11 @@ public:
 		_box->pack_start (*label, false, false);
 		label->show ();
 
-		_store->signal_row_changed().connect (sigc::mem_fun (*this, &ControlSurfacesOptions::model_changed));
+		ControlProtocolManager& m = ControlProtocolManager::instance ();
+		m.ProtocolStatusChange.connect (protocol_status_connection, MISSING_INVALIDATOR,
+						boost::bind (&ControlSurfacesOptions::protocol_status_changed, this, _1), gui_context());
+
+		_store->signal_row_changed().connect (sigc::mem_fun (*this, &ControlSurfacesOptions::view_changed));
 		_view.signal_button_press_event().connect_notify (sigc::mem_fun(*this, &ControlSurfacesOptions::edit_clicked));
 	}
 
@@ -706,7 +697,18 @@ public:
 
 private:
 
-	void model_changed (TreeModel::Path const &, TreeModel::iterator const & i)
+        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) {
+			if ((*x)[_model.protocol_info] == cpi) {
+				(*x)[_model.enabled] = (cpi->protocol || cpi->requested);
+				break;
+			}
+		}
+	}
+
+	void view_changed (TreeModel::Path const &, TreeModel::iterator const & i)
 	{
 		TreeModel::Row r = *i;
 
@@ -722,7 +724,18 @@ private:
 			if (!was_enabled) {
 				ControlProtocolManager::instance().instantiate (*cpi);
 			} else {
+				Gtk::Window* win = r[_model.editor];
+				if (win) {
+					win->hide ();
+				}
+
 				ControlProtocolManager::instance().teardown (*cpi);
+					
+				if (win) {
+					delete win;
+				}
+				r[_model.editor] = 0;
+				cpi->requested = false;
 			}
 		}
 
@@ -757,6 +770,7 @@ private:
 				if (box) {
 					string title = row[_model.name];
 					ArdourWindow* win = new ArdourWindow (_parent, title);
+					win->set_title ("Control Protocol Options");
 					win->add (*box);
 					box->show ();
 					win->present ();
@@ -790,6 +804,125 @@ private:
 	ControlSurfacesModelColumns _model;
 	TreeView _view;
         Gtk::Window& _parent;
+        PBD::ScopedConnection protocol_status_connection;
+};
+
+class VideoTimelineOptions : public OptionEditorBox
+{
+public:
+	VideoTimelineOptions (RCConfiguration* c)
+		: _rc_config (c)
+		, _show_video_export_info_button (_("Show Video Export Info before export"))
+		, _show_video_server_dialog_button (_("Show Video Server Startup Dialog"))
+		, _video_advanced_setup_button (_("Advanced Setup (remote video server)"))
+	{
+		Table* t = manage (new Table (2, 6));
+		t->set_spacings (4);
+
+		t->attach (_video_advanced_setup_button, 0, 2, 0, 1);
+		_video_advanced_setup_button.signal_toggled().connect (sigc::mem_fun (*this, &VideoTimelineOptions::video_advanced_setup_toggled));
+		Gtkmm2ext::UI::instance()->set_tip (_video_advanced_setup_button,
+					    _("<b>When enabled</b> you can speficify a custom video-server URL and docroot. - Do not enable this option unless you know what you are doing."));
+
+		Label* l = manage (new Label (_("Video Server URL:")));
+		l->set_alignment (0, 0.5);
+		t->attach (*l, 0, 1, 1, 2, FILL);
+		t->attach (_video_server_url_entry, 1, 2, 1, 2, FILL);
+		Gtkmm2ext::UI::instance()->set_tip (_video_server_url_entry,
+					    _("Base URL of the video-server including http prefix. This is usually 'http://hostname.example.org:1554/' and defaults to 'http://localhost:1554/' when the video-server is running locally"));
+
+		l = manage (new Label (_("Video Folder:")));
+		l->set_alignment (0, 0.5);
+		t->attach (*l, 0, 1, 2, 3, FILL);
+		t->attach (_video_server_docroot_entry, 1, 2, 2, 3);
+		Gtkmm2ext::UI::instance()->set_tip (_video_server_docroot_entry,
+					    _("Local path to the video-server document-root. Only files below this directory will be accessible by the video-server. If the server run on a remote host, it should point to a network mounted folder of the server's docroot or be left empty if it is unvailable. It is used for the local video-monitor and file-browsing when opening/adding a video file."));
+
+		/* small vspace  y=3..4 */
+
+		t->attach (_show_video_export_info_button, 0, 2, 4, 5);
+		_show_video_export_info_button.signal_toggled().connect (sigc::mem_fun (*this, &VideoTimelineOptions::show_video_export_info_toggled));
+		Gtkmm2ext::UI::instance()->set_tip (_show_video_export_info_button,
+					    _("<b>When enabled</b> an information window with details is displayed before the video-export dialog."));
+
+		t->attach (_show_video_server_dialog_button, 0, 2, 5, 6);
+		_show_video_server_dialog_button.signal_toggled().connect (sigc::mem_fun (*this, &VideoTimelineOptions::show_video_server_dialog_toggled));
+		Gtkmm2ext::UI::instance()->set_tip (_show_video_server_dialog_button,
+					    _("<b>When enabled</b> the video server is never launched automatically without confirmation"));
+
+		_video_server_url_entry.signal_changed().connect (sigc::mem_fun(*this, &VideoTimelineOptions::server_url_changed));
+		_video_server_url_entry.signal_activate().connect (sigc::mem_fun(*this, &VideoTimelineOptions::server_url_changed));
+		_video_server_docroot_entry.signal_changed().connect (sigc::mem_fun(*this, &VideoTimelineOptions::server_docroot_changed));
+		_video_server_docroot_entry.signal_activate().connect (sigc::mem_fun(*this, &VideoTimelineOptions::server_docroot_changed));
+
+		_box->pack_start (*t,true,true);
+	}
+
+	void server_url_changed ()
+	{
+		_rc_config->set_video_server_url (_video_server_url_entry.get_text());
+	}
+
+	void server_docroot_changed ()
+	{
+		_rc_config->set_video_server_docroot (_video_server_docroot_entry.get_text());
+	}
+
+	void show_video_export_info_toggled ()
+	{
+		bool const x = _show_video_export_info_button.get_active ();
+		_rc_config->set_show_video_export_info (x);
+	}
+
+	void show_video_server_dialog_toggled ()
+	{
+		bool const x = _show_video_server_dialog_button.get_active ();
+		_rc_config->set_show_video_server_dialog (x);
+	}
+
+	void video_advanced_setup_toggled ()
+	{
+		bool const x = _video_advanced_setup_button.get_active ();
+		_rc_config->set_video_advanced_setup(x);
+	}
+
+	void parameter_changed (string const & p)
+	{
+		if (p == "video-server-url") {
+			_video_server_url_entry.set_text (_rc_config->get_video_server_url());
+		} else if (p == "video-server-docroot") {
+			_video_server_docroot_entry.set_text (_rc_config->get_video_server_docroot());
+		} else if (p == "show-video-export-info") {
+			bool const x = _rc_config->get_show_video_export_info();
+			_show_video_export_info_button.set_active (x);
+		} else if (p == "show-video-server-dialog") {
+			bool const x = _rc_config->get_show_video_server_dialog();
+			_show_video_server_dialog_button.set_active (x);
+		} else if (p == "video-advanced-setup") {
+			bool const x = _rc_config->get_video_advanced_setup();
+			_video_advanced_setup_button.set_active(x);
+			_video_server_docroot_entry.set_sensitive(x);
+			_video_server_url_entry.set_sensitive(x);
+		}
+	}
+
+	void set_state_from_config ()
+	{
+		parameter_changed ("video-server-url");
+		parameter_changed ("video-server-docroot");
+		parameter_changed ("video-monitor-setup-dialog");
+		parameter_changed ("show-video-export-info");
+		parameter_changed ("show-video-server-dialog");
+		parameter_changed ("video-advanced-setup");
+	}
+
+private:
+	RCConfiguration* _rc_config;
+	Entry _video_server_url_entry;
+	Entry _video_server_docroot_entry;
+	CheckButton _show_video_export_info_button;
+	CheckButton _show_video_server_dialog_button;
+	CheckButton _video_advanced_setup_button;
 };
 
 /** A class which allows control of visibility of some editor components usign
@@ -834,6 +967,8 @@ public:
 		add_widget_to_page (p, _visibility_group->list_view ());
 	}
 
+        Gtk::Widget& tip_widget() { return *_visibility_group->list_view (); }
+
 private:
 	void changed ()
 	{
@@ -851,6 +986,7 @@ private:
 };
 
 
+
 RCOptionEditor::RCOptionEditor ()
 	: OptionEditor (Config, string_compose (_("%1 Preferences"), PROGRAM_NAME))
         , _rc_config (Config)
@@ -859,6 +995,8 @@ RCOptionEditor::RCOptionEditor ()
 	/* MISC */
 
         uint32_t hwcpus = hardware_concurrency ();
+	BoolOption* bo;
+	BoolComboOption* bco;
 
         if (hwcpus > 1) {
                 add_option (_("Misc"), new OptionEditorHeading (_("DSP CPU Utilization")));
@@ -902,7 +1040,7 @@ RCOptionEditor::RCOptionEditor ()
 		     sigc::mem_fun (*_rc_config, &RCConfiguration::set_periodic_safety_backups)
 		     ));
 
-	add_option (_("Misc"), new OptionEditorHeading (_("Misc")));
+	add_option (_("Misc"), new OptionEditorHeading (_("Session Management")));
 
 	add_option (_("Misc"),
 	     new BoolOption (
@@ -935,84 +1073,219 @@ RCOptionEditor::RCOptionEditor ()
 	add_option (_("Misc"),
 	     new FaderOption (
 		     "click-gain",
-		     _("Click Gain Level"),
+		     _("Click gain level"),
 		     sigc::mem_fun (*_rc_config, &RCConfiguration::get_click_gain),
 		     sigc::mem_fun (*_rc_config, &RCConfiguration::set_click_gain)
 		     ));
 
+	add_option (_("Misc"), new OptionEditorHeading (_("Automation")));
+
+	add_option (_("Misc"),
+	     new SpinOption<double> (
+		     "automation-thinning-factor",
+		     _("Thinning factor (larger value => less data)"),
+		     sigc::mem_fun (*_rc_config, &RCConfiguration::get_automation_thinning_factor),
+		     sigc::mem_fun (*_rc_config, &RCConfiguration::set_automation_thinning_factor),
+		     0, 1000, 1, 20
+		     ));
+
+	add_option (_("Misc"),
+	     new SpinOption<double> (
+		     "automation-interval-msecs",
+		     _("Automation sampling interval (milliseconds)"),
+		     sigc::mem_fun (*_rc_config, &RCConfiguration::get_automation_interval_msecs),
+		     sigc::mem_fun (*_rc_config, &RCConfiguration::set_automation_interval_msecs),
+		     1, 1000, 1, 20
+		     ));
+
 	/* TRANSPORT */
 
-	add_option (_("Transport"),
-	     new BoolOption (
+	BoolOption* tsf;
+
+	tsf = new BoolOption (
 		     "latched-record-enable",
 		     _("Keep record-enable engaged on stop"),
 		     sigc::mem_fun (*_rc_config, &RCConfiguration::get_latched_record_enable),
 		     sigc::mem_fun (*_rc_config, &RCConfiguration::set_latched_record_enable)
-		     ));
+		     );
+	// Gtkmm2ext::UI::instance()->set_tip (tsf->tip_widget(), _(""));
+	add_option (_("Transport"), tsf);
 
-	add_option (_("Transport"),
-	     new BoolOption (
+	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(), 
+					    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);
 
-	add_option (_("Transport"),
-	     new BoolOption (
+	tsf = new BoolOption (
 		     "create-xrun-marker",
 		     _("Create markers where xruns occur"),
 		     sigc::mem_fun (*_rc_config, &RCConfiguration::get_create_xrun_marker),
 		     sigc::mem_fun (*_rc_config, &RCConfiguration::set_create_xrun_marker)
-		     ));
+		     );
+	// Gtkmm2ext::UI::instance()->set_tip (tsf->tip_widget(), _(""));
+	add_option (_("Transport"), tsf);
 
-	add_option (_("Transport"),
-	     new BoolOption (
+	tsf = new BoolOption (
 		     "stop-at-session-end",
 		     _("Stop at the end of the session"),
 		     sigc::mem_fun (*_rc_config, &RCConfiguration::get_stop_at_session_end),
 		     sigc::mem_fun (*_rc_config, &RCConfiguration::set_stop_at_session_end)
-		     ));
-
-	add_option (_("Transport"),
-	     new BoolOption (
+		     );
+	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"),
+							    PROGRAM_NAME));
+	add_option (_("Transport"), tsf);
+
+	tsf = new BoolOption (
 		     "seamless-loop",
-		     _("Do seamless looping (not possible when slaved to MTC, JACK etc)"),
+		     _("Do seamless looping (not possible when slaved to MTC, LTC etc)"),
 		     sigc::mem_fun (*_rc_config, &RCConfiguration::get_seamless_loop),
 		     sigc::mem_fun (*_rc_config, &RCConfiguration::set_seamless_loop)
-		     ));
-
-	add_option (_("Transport"),
-	     new BoolOption (
-		     "primary-clock-delta-edit-cursor",
-		     _("Primary clock delta to edit cursor"),
-		     sigc::mem_fun (*_rc_config, &RCConfiguration::get_primary_clock_delta_edit_cursor),
-		     sigc::mem_fun (*_rc_config, &RCConfiguration::set_primary_clock_delta_edit_cursor)
-		     ));
-
-	add_option (_("Transport"),
-	     new BoolOption (
-		     "secondary-clock-delta-edit-cursor",
-		     _("Secondary clock delta to edit cursor"),
-		     sigc::mem_fun (*_rc_config, &RCConfiguration::get_secondary_clock_delta_edit_cursor),
-		     sigc::mem_fun (*_rc_config, &RCConfiguration::set_secondary_clock_delta_edit_cursor)
-		     ));
-
-	add_option (_("Transport"),
-	     new BoolOption (
+		     );
+	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 "
+							      "which will often cause a small click or delay"), PROGRAM_NAME));
+	add_option (_("Transport"), tsf);
+
+	tsf = new BoolOption (
 		     "disable-disarm-during-roll",
 		     _("Disable per-track record disarm while rolling"),
 		     sigc::mem_fun (*_rc_config, &RCConfiguration::get_disable_disarm_during_roll),
 		     sigc::mem_fun (*_rc_config, &RCConfiguration::set_disable_disarm_during_roll)
-		     ));
+		     );
+	Gtkmm2ext::UI::instance()->set_tip (tsf->tip_widget(), _("<b>When enabled</b> this will prevent you from accidentally stopping specific tracks recording during a take"));
+	add_option (_("Transport"), tsf);
 
-	add_option (_("Transport"),
-	     new BoolOption (
+	tsf = new BoolOption (
 		     "quieten_at_speed",
 		     _("12dB gain reduction during fast-forward and fast-rewind"),
 		     sigc::mem_fun (*_rc_config, &RCConfiguration::get_quieten_at_speed),
 		     sigc::mem_fun (*_rc_config, &RCConfiguration::set_quieten_at_speed)
-		     ));
+		     );
+	Gtkmm2ext::UI::instance()->set_tip (tsf->tip_widget(), _("This will reduce the unpleasant increase in perceived volume "
+						   "that occurs when fast-forwarding or rewinding through some kinds of audio"));
+	add_option (_("Transport"), tsf);
+
+	add_option (_("Transport"), new OptionEditorHeading (S_("Sync/Slave")));
+
+	_sync_source = new ComboOption<SyncSource> (
+		"sync-source",
+		_("External timecode source"),
+		sigc::mem_fun (*_rc_config, &RCConfiguration::get_sync_source),
+		sigc::mem_fun (*_rc_config, &RCConfiguration::set_sync_source)
+		);
+
+	populate_sync_options ();
+	add_option (_("Transport"), _sync_source);
+
+	_sync_framerate = new BoolOption (
+		     "timecode-sync-frame-rate",
+		     _("Match session video frame rate to external timecode"),
+		     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 
+		(_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"
+				   "<b>When disabled</b> the session video frame rate will not be changed to match that of the selected external timecode source."
+				   "Instead the frame rate indication in the main clock will flash red and %1 will convert between the external "
+				   "timecode standard and the session standard."), PROGRAM_NAME));
+
+	add_option (_("Transport"), _sync_framerate);
+
+	_sync_genlock = new BoolOption (
+		"timecode-source-is-synced",
+		_("External timecode is sync locked"),
+		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 
+		(_sync_genlock->tip_widget(), 
+		 _("<b>When enabled</b> indicates that the selected external timecode source shares sync (Black &amp; Burst, Wordclock, etc) with the audio interface."));
+
+
+	add_option (_("Transport"), _sync_genlock);
+
+	_sync_source_2997 = new BoolOption (
+		"timecode-source-2997",
+		_("Lock to 29.9700 fps instead of 30000/1001"),
+		sigc::mem_fun (*_rc_config, &RCConfiguration::get_timecode_source_2997),
+		sigc::mem_fun (*_rc_config, &RCConfiguration::set_timecode_source_2997)
+		);
+	Gtkmm2ext::UI::instance()->set_tip
+		(_sync_source_2997->tip_widget(),
+		 _("<b>When enabled</b> the external timecode source is assumed to use 29.97 fps instead of 30000/1001.\n"
+			 "SMPTE 12M-1999 specifies 29.97df as 30000/1001. The spec further mentions that "
+			 "drop-frame timecode has an accumulated error of -86ms over a 24-hour period.\n"
+			 "Drop-frame timecode would compensate exactly for a NTSC color frame rate of 30 * 0.9990 (ie 29.970000). "
+			 "That is not the actual rate. However, some vendors use that rate - despite it being against the specs - "
+			 "because the variant of using exactly 29.97 fps has zero timecode drift.\n"
+			 ));
+
+	add_option (_("Transport"), _sync_source_2997);
+
+	add_option (_("Transport"), new OptionEditorHeading (S_("LTC Reader")));
+
+	_ltc_port = new ComboStringOption (
+		"ltc-source-port",
+		_("LTC incoming port"),
+		sigc::mem_fun (*_rc_config, &RCConfiguration::get_ltc_source_port),
+		sigc::mem_fun (*_rc_config, &RCConfiguration::set_ltc_source_port)
+		);
+
+	vector<string> physical_inputs;
+	physical_inputs.push_back (_("None"));
+	AudioEngine::instance()->get_physical_inputs (DataType::AUDIO, physical_inputs);
+	_ltc_port->set_popdown_strings (physical_inputs);
+
+	add_option (_("Transport"), _ltc_port);
+
+	// TODO; rather disable this button than not compile it..
+	add_option (_("Transport"), new OptionEditorHeading (S_("LTC Generator")));
+
+	add_option (_("Transport"),
+		    new BoolOption (
+			    "send-ltc",
+			    _("Enable LTC generator"),
+			    sigc::mem_fun (*_rc_config, &RCConfiguration::get_send_ltc),
+			    sigc::mem_fun (*_rc_config, &RCConfiguration::set_send_ltc)
+			    ));
+
+	_ltc_send_continuously = new BoolOption (
+			    "ltc-send-continuously",
+			    _("send LTC while stopped"),
+			    sigc::mem_fun (*_rc_config, &RCConfiguration::get_ltc_send_continuously),
+			    sigc::mem_fun (*_rc_config, &RCConfiguration::set_ltc_send_continuously)
+			    );
+	Gtkmm2ext::UI::instance()->set_tip
+		(_ltc_send_continuously->tip_widget(),
+		 string_compose (_("<b>When enabled</b> %1 will continue to send LTC information even when the transport (playhead) is not moving"), PROGRAM_NAME));
+	add_option (_("Transport"), _ltc_send_continuously);
+
+	_ltc_volume_adjustment = new Gtk::Adjustment(-18, -50, 0, .5, 5);
+	_ltc_volume_adjustment->set_value (20 * log10(_rc_config->get_ltc_output_volume()));
+	_ltc_volume_adjustment->signal_value_changed().connect (sigc::mem_fun (*this, &RCOptionEditor::ltc_generator_volume_changed));
+	_ltc_volume_slider = new HSliderOption("ltcvol", _("LTC generator level"), *_ltc_volume_adjustment);
+
+	Gtkmm2ext::UI::instance()->set_tip
+		(_ltc_volume_slider->tip_widget(),
+		 _("Specify the Peak Volume of the generated LTC signal in dbFS. A good value is  0dBu ^= -18dbFS in an EBU calibrated system"));
+
+	add_option (_("Transport"), _ltc_volume_slider);
+	parameter_changed ("send-ltc");
+
+	parameter_changed ("sync-source");
 
 	/* EDITOR */
 
@@ -1042,11 +1315,22 @@ RCOptionEditor::RCOptionEditor ()
 
 	add_option (_("Editor"),
 	     new BoolOption (
+		     "show-editor-meter",
+		     _("Display master-meter in the toolbar"),
+		     sigc::mem_fun (*_rc_config, &RCConfiguration::get_show_editor_meter),
+		     sigc::mem_fun (*_rc_config, &RCConfiguration::set_show_editor_meter)
+		     ));
+
+	bco = new BoolComboOption (
 		     "use-overlap-equivalency",
-		     _("Use overlap equivalency for regions"),
+		     _("Regions in active edit groups are edited together"),
+		     _("whenever they overlap in time"),
+		     _("only if they have identical length, position and origin"),
 		     sigc::mem_fun (*_rc_config, &RCConfiguration::get_use_overlap_equivalency),
 		     sigc::mem_fun (*_rc_config, &RCConfiguration::set_use_overlap_equivalency)
-		     ));
+		     );
+
+	add_option (_("Editor"), bco);
 
 	add_option (_("Editor"),
 	     new BoolOption (
@@ -1065,9 +1349,11 @@ RCOptionEditor::RCOptionEditor ()
 		     ));
 
 	add_option (_("Editor"),
-	     new BoolOption (
+	     new BoolComboOption (
 		     "show-region-gain-envelopes",
 		     _("Show gain envelopes in audio regions"),
+		     _("in all modes"),
+		     _("only in region gain mode"),
 		     sigc::mem_fun (*_rc_config, &RCConfiguration::get_show_region_gain),
 		     sigc::mem_fun (*_rc_config, &RCConfiguration::set_show_region_gain)
 		     ));
@@ -1144,13 +1430,24 @@ RCOptionEditor::RCOptionEditor ()
 		     sigc::mem_fun (*_rc_config, &RCConfiguration::set_link_editor_and_mixer_selection)
 		     ));
 
-	add_option (_("Editor"),
-	     new BoolOption (
+	bo = new BoolOption (
 		     "name-new-markers",
 		     _("Name new markers"),
 		     sigc::mem_fun (*_rc_config, &RCConfiguration::get_name_new_markers),
 		     sigc::mem_fun (*_rc_config, &RCConfiguration::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"));
+
+	add_option (_("Editor"),
+	    new BoolOption (
+		    "autoscroll-editor",
+		    _("Auto-scroll editor window when dragging near its edges"),
+		    sigc::mem_fun (*_rc_config, &RCConfiguration::get_autoscroll_editor),
+		    sigc::mem_fun (*_rc_config, &RCConfiguration::set_autoscroll_editor)
+		    ));
 
 	/* AUDIO */
 
@@ -1160,14 +1457,6 @@ RCOptionEditor::RCOptionEditor ()
 
 	add_option (_("Audio"), new OptionEditorHeading (_("Monitoring")));
 
-	add_option (_("Audio"),
-	     new BoolOption (
-		     "use-monitor-bus",
-		     _("Use a monitor bus (allows AFL/PFL and more control)"),
-		     sigc::mem_fun (*_rc_config, &RCConfiguration::get_use_monitor_bus),
-		     sigc::mem_fun (*_rc_config, &RCConfiguration::set_use_monitor_bus)
-		     ));
-
 	ComboOption<MonitorModel>* mm = new ComboOption<MonitorModel> (
 		"monitoring-model",
 		_("Record monitoring handled by"),
@@ -1175,12 +1464,10 @@ RCOptionEditor::RCOptionEditor ()
 		sigc::mem_fun (*_rc_config, &RCConfiguration::set_monitoring_model)
 		);
 
-#ifndef __APPLE__
-        /* no JACK monitoring on CoreAudio */
-        if (AudioEngine::instance()->can_request_hardware_monitoring()) {
-                mm->add (HardwareMonitoring, _("JACK"));
+        if (AudioEngine::instance()->port_engine().can_monitor_input()) {
+                mm->add (HardwareMonitoring, _("via Audio Driver"));
         }
-#endif
+
 	mm->add (SoftwareMonitoring, _("ardour"));
 	mm->add (ExternalMonitoring, _("audio hardware"));
 
@@ -1269,19 +1556,11 @@ RCOptionEditor::RCOptionEditor ()
 	add_option (_("Audio"),
 	     new BoolOption (
 		     "plugins-stop-with-transport",
-		     _("Flush plugins when the transport is stopped"),
+		     _("Silence plugins when the transport is stopped"),
 		     sigc::mem_fun (*_rc_config, &RCConfiguration::get_plugins_stop_with_transport),
 		     sigc::mem_fun (*_rc_config, &RCConfiguration::set_plugins_stop_with_transport)
 		     ));
 
-	add_option (_("Audio"),
-	     new BoolOption (
-		     "do-not-record-plugins",
-		     _("Disable plugins during recording"),
-		     sigc::mem_fun (*_rc_config, &RCConfiguration::get_do_not_record_plugins),
-		     sigc::mem_fun (*_rc_config, &RCConfiguration::set_do_not_record_plugins)
-		     ));
-
 	add_option (_("Audio"),
 	     new BoolOption (
 		     "new-plugins-active",
@@ -1523,13 +1802,24 @@ RCOptionEditor::RCOptionEditor ()
 
 	/* USER INTERACTION */
 
+	if (getenv ("ARDOUR_BUNDLED")) {
+		add_option (_("User interaction"), 
+			    new BoolOption (
+				    "enable-translation",
+				    string_compose (_("Use translations of %1 messages\n"
+						      "   <i>(requires a restart of %1 to take effect)</i>\n"
+						      "   <i>(if available for your language preferences)</i>"), PROGRAM_NAME),
+				    sigc::ptr_fun (ARDOUR::translations_are_enabled),
+				    sigc::ptr_fun (ARDOUR::set_translations_enabled)));
+	}
+
 	add_option (_("User interaction"), new OptionEditorHeading (_("Keyboard")));
 
 	add_option (_("User interaction"), new KeyboardOptions);
 
-	add_option (_("User interaction"), new OptionEditorHeading (_("Control surfaces")));
+	/* Control Surfaces */
 
-	add_option (_("User interaction"), new ControlSurfacesOptions (*this));
+	add_option (_("Control Surfaces"), new ControlSurfacesOptions (*this));
 
 	ComboOption<RemoteModel>* rm = new ComboOption<RemoteModel> (
 		"remote-model",
@@ -1542,11 +1832,14 @@ RCOptionEditor::RCOptionEditor ()
 	rm->add (MixerOrdered, _("follows order of mixer"));
 	rm->add (EditorOrdered, _("follows order of editor"));
 
-	add_option (_("User interaction"), rm);
+	add_option (_("Control Surfaces"), rm);
+
+	/* VIDEO Timeline */
+	add_option (_("Video"), new VideoTimelineOptions (_rc_config));
 
 	/* INTERFACE */
 
-	add_option (S_("Visual|Interface"),
+	add_option (S_("Preferences|GUI"),
 	     new BoolOption (
 		     "widget-prelight",
 		     _("Graphically indicate mouse pointer hovering over various widgets"),
@@ -1554,16 +1847,25 @@ RCOptionEditor::RCOptionEditor ()
 		     sigc::mem_fun (*_rc_config, &RCConfiguration::set_widget_prelight)
 		     ));
 
+	add_option (S_("Preferences|GUI"),
+	     new BoolOption (
+		     "use-tooltips",
+		     _("Show tooltips if mouse hovers over a control"),
+		     sigc::mem_fun (*_rc_config, &RCConfiguration::get_use_tooltips),
+		     sigc::mem_fun (*_rc_config, &RCConfiguration::set_use_tooltips)
+		     ));
+
 #ifndef GTKOSX
 	/* font scaling does nothing with GDK/Quartz */
-	add_option (S_("Visual|Interface"), new FontScalingOptions (_rc_config));
+	add_option (S_("Preferences|GUI"), new FontScalingOptions (_rc_config));
 #endif
-	add_option (S_("Visual|Interface"),
+
+	add_option (S_("GUI"),
 		    new BoolOption (
-			    "use-own-plugin-gui",
-			    _("Use plugins' own interface instead of a builtin one"),
-			    sigc::mem_fun (*_rc_config, &RCConfiguration::get_use_plugin_own_gui),
-			    sigc::mem_fun (*_rc_config, &RCConfiguration::set_use_plugin_own_gui)
+			    "super-rapid-clock-update",
+			    _("update transport clock display every 40ms instead of every 100ms"),
+			    sigc::mem_fun (*_rc_config, &RCConfiguration::get_super_rapid_clock_update),
+			    sigc::mem_fun (*_rc_config, &RCConfiguration::set_super_rapid_clock_update)
 			    ));
 
 	/* The names of these controls must be the same as those given in MixerStrip
@@ -1573,11 +1875,10 @@ RCOptionEditor::RCOptionEditor ()
 	_mixer_strip_visibility.add (0, X_("SoloSafe"), _("Solo Safe"));
 	_mixer_strip_visibility.add (0, X_("SoloIsolated"), _("Solo Isolated"));
 	_mixer_strip_visibility.add (0, X_("Comments"), _("Comments"));
-	_mixer_strip_visibility.add (0, X_("Group"), _("Group"));
 	_mixer_strip_visibility.add (0, X_("MeterPoint"), _("Meter Point"));
 	
 	add_option (
-		S_("Visual|Interface"),
+		S_("Preferences|GUI"),
 		new VisibilityOption (
 			_("Mixer Strip"),
 			&_mixer_strip_visibility,
@@ -1586,19 +1887,19 @@ RCOptionEditor::RCOptionEditor ()
 			)
 		);
 
-	add_option (S_("Visual|Interface"),
+	add_option (S_("Preferences|GUI"),
 	     new BoolOption (
 		     "default-narrow_ms",
-		     _("Use narrow mixer strips by default"),
+		     _("Use narrow strips in the mixer by default"),
 		     sigc::mem_fun (*_rc_config, &RCConfiguration::get_default_narrow_ms),
 		     sigc::mem_fun (*_rc_config, &RCConfiguration::set_default_narrow_ms)
 		     ));
 
-	add_option (S_("Visual|Interface"), new OptionEditorHeading (_("Metering")));
+	add_option (S_("Preferences|GUI"), new OptionEditorHeading (_("Metering")));
 
 	ComboOption<float>* mht = new ComboOption<float> (
 		"meter-hold",
-		_("Meter hold time"),
+		_("Peak hold time"),
 		sigc::mem_fun (*_rc_config, &RCConfiguration::get_meter_hold),
 		sigc::mem_fun (*_rc_config, &RCConfiguration::set_meter_hold)
 		);
@@ -1608,24 +1909,95 @@ RCOptionEditor::RCOptionEditor ()
 	mht->add (MeterHoldMedium, _("medium"));
 	mht->add (MeterHoldLong, _("long"));
 
-	add_option (S_("Visual|Interface"), mht);
+	add_option (S_("Preferences|GUI"), mht);
 
 	ComboOption<float>* mfo = new ComboOption<float> (
 		"meter-falloff",
-		_("Meter fall-off"),
+		_("DPM fall-off"),
 		sigc::mem_fun (*_rc_config, &RCConfiguration::get_meter_falloff),
 		sigc::mem_fun (*_rc_config, &RCConfiguration::set_meter_falloff)
 		);
 
-	mfo->add (METER_FALLOFF_OFF, _("off"));
-	mfo->add (METER_FALLOFF_SLOWEST, _("slowest"));
-	mfo->add (METER_FALLOFF_SLOW, _("slow"));
-	mfo->add (METER_FALLOFF_MEDIUM, _("medium"));
-	mfo->add (METER_FALLOFF_FAST, _("fast"));
-	mfo->add (METER_FALLOFF_FASTER, _("faster"));
-	mfo->add (METER_FALLOFF_FASTEST, _("fastest"));
+	mfo->add (METER_FALLOFF_OFF,      _("off"));
+	mfo->add (METER_FALLOFF_SLOWEST,  _("slowest [6.6dB/sec]"));
+	mfo->add (METER_FALLOFF_SLOW,     _("slow [8.6dB/sec] (BBC PPM, EBU PPM)"));
+	mfo->add (METER_FALLOFF_SLOWISH,  _("slowish [12.0dB/sec] (DIN)"));
+	mfo->add (METER_FALLOFF_MODERATE, _("moderate [13.3dB/sec] (EBU Digi PPM, IRT Digi PPM)"));
+	mfo->add (METER_FALLOFF_MEDIUM,   _("medium [20dB/sec]"));
+	mfo->add (METER_FALLOFF_FAST,     _("fast [32dB/sec]"));
+	mfo->add (METER_FALLOFF_FASTER,   _("faster [46dB/sec]"));
+	mfo->add (METER_FALLOFF_FASTEST,  _("fastest [70dB/sec]"));
+
+	add_option (S_("Preferences|GUI"), mfo);
+
+	ComboOption<MeterLineUp>* mlu = new ComboOption<MeterLineUp> (
+		"meter-line-up-level",
+		_("Meter line-up level; 0dBu"),
+		sigc::mem_fun (*_rc_config, &RCConfiguration::get_meter_line_up_level),
+		sigc::mem_fun (*_rc_config, &RCConfiguration::set_meter_line_up_level)
+		);
+
+	mlu->add (MeteringLineUp24, _("-24dBFS (SMPTE US: 4dBu = -20dBFS)"));
+	mlu->add (MeteringLineUp20, _("-20dBFS (SMPTE RP.0155)"));
+	mlu->add (MeteringLineUp18, _("-18dBFS (EBU, BBC)"));
+	mlu->add (MeteringLineUp15, _("-15dBFS (DIN)"));
+
+	Gtkmm2ext::UI::instance()->set_tip (mlu->tip_widget(), _("Configure meter-marks and color-knee point for dBFS scale DPM, set reference level for IEC1/Nordic, IEC2 PPM and VU meter."));
+
+	add_option (S_("Preferences|GUI"), mlu);
+
+	ComboOption<MeterLineUp>* mld = new ComboOption<MeterLineUp> (
+		"meter-line-up-din",
+		_("IEC1/DIN Meter line-up level; 0dBu"),
+		sigc::mem_fun (*_rc_config, &RCConfiguration::get_meter_line_up_din),
+		sigc::mem_fun (*_rc_config, &RCConfiguration::set_meter_line_up_din)
+		);
+
+	mld->add (MeteringLineUp24, _("-24dBFS (SMPTE US: 4dBu = -20dBFS)"));
+	mld->add (MeteringLineUp20, _("-20dBFS (SMPTE RP.0155)"));
+	mld->add (MeteringLineUp18, _("-18dBFS (EBU, BBC)"));
+	mld->add (MeteringLineUp15, _("-15dBFS (DIN)"));
+
+	Gtkmm2ext::UI::instance()->set_tip (mld->tip_widget(), _("Reference level for IEC1/DIN meter."));
+
+	add_option (S_("Preferences|GUI"), mld);
+
+	ComboOption<VUMeterStandard>* mvu = new ComboOption<VUMeterStandard> (
+		"meter-vu-standard",
+		_("VU Meter standard"),
+		sigc::mem_fun (*_rc_config, &RCConfiguration::get_meter_vu_standard),
+		sigc::mem_fun (*_rc_config, &RCConfiguration::set_meter_vu_standard)
+		);
+
+	mvu->add (MeteringVUfrench,   _("0VU = -2dBu (France)"));
+	mvu->add (MeteringVUamerican, _("0VU = 0dBu (North America, Australia)"));
+	mvu->add (MeteringVUstandard, _("0VU = +4dBu (standard)"));
+	mvu->add (MeteringVUeight,    _("0VU = +8dBu"));
+
+	add_option (S_("Preferences|GUI"), mvu);
+
+	Gtk::Adjustment *mpk = manage (new Gtk::Adjustment(0, -10, 0, .1, .1));
+	HSliderOption *mpks = new HSliderOption("meter-peak",
+			_("Peak threshold [dBFS]"),
+			mpk,
+			sigc::mem_fun (*_rc_config, &RCConfiguration::get_meter_peak),
+			sigc::mem_fun (*_rc_config, &RCConfiguration::set_meter_peak)
+			);
+
+	Gtkmm2ext::UI::instance()->set_tip
+		(mpks->tip_widget(),
+		 _("Specify the audio signal level in dbFS at and above which the meter-peak indicator will flash red."));
+
+	add_option (S_("Preferences|GUI"), mpks);
+
+	add_option (S_("Preferences|GUI"),
+	     new BoolOption (
+		     "meter-style-led",
+		     _("LED meter style"),
+		     sigc::mem_fun (*_rc_config, &RCConfiguration::get_meter_style_led),
+		     sigc::mem_fun (*_rc_config, &RCConfiguration::set_meter_style_led)
+		     ));
 
-	add_option (S_("Visual|Interface"), mfo);
 }
 
 void
@@ -1641,5 +2013,43 @@ RCOptionEditor::parameter_changed (string const & p)
 		}
 		_solo_control_is_listen_control->set_sensitive (s);
 		_listen_position->set_sensitive (s);
+	} else if (p == "sync-source") {
+		_sync_source->set_sensitive (true);
+		if (_session) {
+			_sync_source->set_sensitive (!_session->config.get_external_sync());
+		}
+		switch(Config->get_sync_source()) {
+		case ARDOUR::MTC:
+		case ARDOUR::LTC:
+			_sync_genlock->set_sensitive (true);
+			_sync_framerate->set_sensitive (true);
+			_sync_source_2997->set_sensitive (true);
+			break;
+		default:
+			_sync_genlock->set_sensitive (false);
+			_sync_framerate->set_sensitive (false);
+			_sync_source_2997->set_sensitive (false);
+			break;
+		}
+	} else if (p == "send-ltc") {
+		bool const s = Config->get_send_ltc ();
+		_ltc_send_continuously->set_sensitive (s);
+		_ltc_volume_slider->set_sensitive (s);
+	}
+}
+
+void RCOptionEditor::ltc_generator_volume_changed () {
+	_rc_config->set_ltc_output_volume (pow(10, _ltc_volume_adjustment->get_value() / 20));
+}
+
+void
+RCOptionEditor::populate_sync_options ()
+{
+	vector<SyncSource> sync_opts = ARDOUR::get_available_sync_options ();
+
+	_sync_source->clear ();
+
+	for (vector<SyncSource>::iterator i = sync_opts.begin(); i != sync_opts.end(); ++i) {
+		_sync_source->add (*i, sync_source_to_string (*i));
 	}
 }