X-Git-Url: https://main.carlh.net/gitweb/?p=ardour.git;a=blobdiff_plain;f=gtk2_ardour%2Fsession_option_editor.cc;h=a2f0227d3f4bdfa4403bc724a0d20a5f44f162ba;hp=229d3762554487dc1fc5ef4f32f4694673bd673c;hb=65bda27d4;hpb=0c3e840700a915fc1476cef73c591048f688f81e

diff --git a/gtk2_ardour/session_option_editor.cc b/gtk2_ardour/session_option_editor.cc
index 229d376255..a2f0227d3f 100644
--- a/gtk2_ardour/session_option_editor.cc
+++ b/gtk2_ardour/session_option_editor.cc
@@ -18,23 +18,25 @@
 */
 
 #include "ardour/session.h"
+#include "ardour/transport_master_manager.h"
 
+#include "actions.h"
 #include "gui_thread.h"
 #include "session_option_editor.h"
 #include "search_path_option.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
 using namespace Timecode;
 
 SessionOptionEditor::SessionOptionEditor (Session* s)
-	: OptionEditor (&(s->config), _("Session Properties"))
+	: OptionEditorWindow (&(s->config), _("Session Properties"))
 	, _session_config (&(s->config))
 {
 	set_session (s);
 
-        set_name ("SessionProperties");
+	set_name ("SessionProperties");
 
 	/* TIMECODE*/
 
@@ -42,7 +44,7 @@ SessionOptionEditor::SessionOptionEditor (Session* s)
 
 	ComboOption<TimecodeFormat>* smf = new ComboOption<TimecodeFormat> (
 		"timecode-format",
-		_("Timecode frames-per-second"),
+		_("Timecode samples-per-second"),
 		sigc::mem_fun (*_session_config, &SessionConfiguration::get_timecode_format),
 		sigc::mem_fun (*_session_config, &SessionConfiguration::set_timecode_format)
 		);
@@ -78,23 +80,6 @@ SessionOptionEditor::SessionOptionEditor (Session* s)
 	_vpu->add (-4.1667 - 0.1, _("-4.1667 - 0.1%"));
 
 	add_option (_("Timecode"), _vpu);
-
-#ifdef WITH_VIDEOTIMELINE
-	add_option (_("Sync"), new BoolOption (
-			    "use-video-file-fps",
-			    _("Use Video File's FPS Instead of Timecode Value for Timeline and Video Monitor."),
-			    sigc::mem_fun (*_session_config, &SessionConfiguration::get_use_video_file_fps),
-			    sigc::mem_fun (*_session_config, &SessionConfiguration::set_use_video_file_fps)
-			    ));
-
-	add_option (_("Sync"), new BoolOption (
-			    "videotimeline-pullup",
-			    _("Apply Pull-Up/Down to Video Timeline and Video Monitor (Unless in JACK-sync)."),
-			    sigc::mem_fun (*_session_config, &SessionConfiguration::get_videotimeline_pullup),
-			    sigc::mem_fun (*_session_config, &SessionConfiguration::set_videotimeline_pullup)
-			    ));
-#endif
-
 	add_option (_("Timecode"), new OptionEditorHeading (_("Ext Timecode Offsets")));
 
 	ClockOption* sco = new ClockOption (
@@ -132,20 +117,28 @@ SessionOptionEditor::SessionOptionEditor (Session* s)
 			    sigc::mem_fun (*_session_config, &SessionConfiguration::set_jack_time_master)
 			    ));
 
-	/* FADES */
+	/* Sync */
 
-	ComboOption<CrossfadeChoice>* cfc = new ComboOption<CrossfadeChoice> (
-		"xfade-choice",
-		_("Default crossfade type"),
-		sigc::mem_fun (*_session_config, &SessionConfiguration::get_xfade_choice),
-		sigc::mem_fun (*_session_config, &SessionConfiguration::set_xfade_choice)
-		);
+	add_option (_("Sync"), new OptionEditorHeading (_("A/V Synchronization")));
+	add_option (_("Sync"), new BoolOption (
+			    "use-video-file-fps",
+			    _("Use Video File's FPS Instead of Timecode Value for Timeline and Video Monitor."),
+			    sigc::mem_fun (*_session_config, &SessionConfiguration::get_use_video_file_fps),
+			    sigc::mem_fun (*_session_config, &SessionConfiguration::set_use_video_file_fps)
+			    ));
+
+	add_option (_("Sync"), new BoolOption (
+			    "videotimeline-pullup",
+			    _("Apply Pull-Up/Down to Video Timeline and Video Monitor (Unless using JACK-sync)."),
+			    sigc::mem_fun (*_session_config, &SessionConfiguration::get_videotimeline_pullup),
+			    sigc::mem_fun (*_session_config, &SessionConfiguration::set_videotimeline_pullup)
+			    ));
 
-	cfc->add (ConstantPowerMinus3dB, _("Constant power (-3dB) crossfade"));
-	cfc->add (ConstantPowerMinus6dB, _("Linear (-6dB) crossfade"));
+	add_option (_("Sync"), new OptionEditorBlank ());
 
-	add_option (_("Fades"), cfc);
+	/* FADES */
 
+	add_option (_("Fades"), new OptionEditorHeading (_("Audio Fades")));
 	add_option (_("Fades"), new SpinOption<float> (
 		_("destructive-xfade-seconds"),
 		_("Destructive crossfade length"),
@@ -155,6 +148,20 @@ SessionOptionEditor::SessionOptionEditor (Session* s)
 		_("ms")
 			    ));
 
+	add_option (_("Fades"), new BoolOption (
+			    "use-transport-fades",
+			    _("Declick when transport starts and stops"),
+			    sigc::mem_fun (*_session_config, &SessionConfiguration::get_use_transport_fades),
+			    sigc::mem_fun (*_session_config, &SessionConfiguration::set_use_transport_fades)
+			    ));
+
+	add_option (_("Fades"), new BoolOption (
+			    "use-monitor-fades",
+			    _("Declick when monitor state changes"),
+			    sigc::mem_fun (*_session_config, &SessionConfiguration::get_use_monitor_fades),
+			    sigc::mem_fun (*_session_config, &SessionConfiguration::set_use_monitor_fades)
+			    ));
+
 	add_option (_("Fades"), new BoolOption (
 			    "use-region-fades",
 			    _("Region fades active"),
@@ -171,20 +178,17 @@ SessionOptionEditor::SessionOptionEditor (Session* s)
 
 	/* Media */
 
-	add_option (_("Media"), new OptionEditorHeading (_("Audio file format")));
+	add_option (_("Media"), new OptionEditorHeading (_("Audio File Format")));
 
-	ComboOption<SampleFormat>* sf = new ComboOption<SampleFormat> (
+	_sf = new ComboOption<SampleFormat> (
 		"native-file-data-format",
 		_("Sample format"),
 		sigc::mem_fun (*_session_config, &SessionConfiguration::get_native_file_data_format),
 		sigc::mem_fun (*_session_config, &SessionConfiguration::set_native_file_data_format)
 		);
-
-	sf->add (FormatFloat, _("32-bit floating point"));
-	sf->add (FormatInt24, _("24-bit integer"));
-	sf->add (FormatInt16, _("16-bit integer"));
-
-	add_option (_("Media"), sf);
+	add_option (_("Media"), _sf);
+	/* refill available sample-formats, depening on file-format */
+	parameter_changed ("native-file-header-format");
 
 	ComboOption<HeaderFormat>* hf = new ComboOption<HeaderFormat> (
 		"native-file-header-format",
@@ -193,86 +197,215 @@ SessionOptionEditor::SessionOptionEditor (Session* s)
 		sigc::mem_fun (*_session_config, &SessionConfiguration::set_native_file_header_format)
 		);
 
-	hf->add (BWF, _("Broadcast WAVE"));
-	hf->add (WAVE, _("WAVE"));
+	hf->add (BWF, _("Broadcast WAVE (4GB size limit)"));
+#ifdef HAVE_RF64_RIFF
+	hf->add (MBWF, _("Broadcast RF64"));
+#endif
+	hf->add (WAVE, _("WAVE (4GB size limit)"));
 	hf->add (WAVE64, _("WAVE-64"));
 	hf->add (CAF, _("CAF"));
+	hf->add (RF64, _("RF64"));
+#ifdef HAVE_RF64_RIFF
+	hf->add (RF64_WAV, _("RF64 (WAV compatible)"));
+#endif
+	hf->add (FLAC, _("FLAC"));
 
 	add_option (_("Media"), hf);
 
-	add_option (_("Media"), new OptionEditorHeading (_("File locations")));
+	add_option (S_("Files|Locations"), new OptionEditorHeading (_("File Locations")));
+
+	SearchPathOption* spo = new SearchPathOption ("audio-search-path", _("Search for audio files in:"),
+			_session->path(),
+			sigc::mem_fun (*_session_config, &SessionConfiguration::get_audio_search_path),
+			sigc::mem_fun (*_session_config, &SessionConfiguration::set_audio_search_path));
+	add_option (S_("Files|Locations"), spo);
+
+	spo = new SearchPathOption ("midi-search-path", _("Search for MIDI files in:"),
+			_session->path(),
+			sigc::mem_fun (*_session_config, &SessionConfiguration::get_midi_search_path),
+			sigc::mem_fun (*_session_config, &SessionConfiguration::set_midi_search_path));
+
+	add_option (S_("Files|Locations"), spo);
+
+	/* File Naming  */
+
+	add_option (_("Filenames"), new OptionEditorHeading (_("File Naming")));
+
+	BoolOption *bo;
+
+	bo = new RouteDisplayBoolOption (
+			"track-name-number",
+			_("Prefix Track number"),
+			sigc::mem_fun (*_session_config, &SessionConfiguration::get_track_name_number),
+			sigc::mem_fun (*_session_config, &SessionConfiguration::set_track_name_number)
+			);
+	Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget(),
+			_("Adds the current track number to the beginning of the recorded file name."));
+	add_option (_("Filenames"), bo);
+
+	bo = new BoolOption (
+			"track-name-take",
+			_("Prefix Take Name"),
+			sigc::mem_fun (*_session_config, &SessionConfiguration::get_track_name_take),
+			sigc::mem_fun (*_session_config, &SessionConfiguration::set_track_name_take)
+			);
+	Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget(),
+			_("Adds the Take Name to the beginning of the recorded file name."));
+	add_option (_("Filenames"), bo);
+
+	_take_name = new EntryOption (
+		"take-name",
+		_("Take Name"),
+		sigc::mem_fun (*_session_config, &SessionConfiguration::get_take_name),
+		sigc::mem_fun (*_session_config, &SessionConfiguration::set_take_name)
+		);
+	_take_name->set_invalid_chars(".");
+	_take_name->set_sensitive(_session_config->get_track_name_take());
 
-        SearchPathOption* spo = new SearchPathOption ("audio-search-path", _("Search for audio files in:"),
-						      _session->path(),
-                                                      sigc::mem_fun (*_session_config, &SessionConfiguration::get_audio_search_path),
-                                                      sigc::mem_fun (*_session_config, &SessionConfiguration::set_audio_search_path));
-        add_option (_("Media"), spo);
+	add_option (_("Filenames"), _take_name);
 
-        spo = new SearchPathOption ("midi-search-path", _("Search for MIDI files in:"),
-				    _session->path(),
-                                    sigc::mem_fun (*_session_config, &SessionConfiguration::get_midi_search_path),
-                                    sigc::mem_fun (*_session_config, &SessionConfiguration::set_midi_search_path));
+	/* Monitoring */
 
-        add_option (_("Media"), spo);
+	add_option (_("Monitoring"), new OptionEditorHeading (_("Monitoring")));
+	add_option (_("Monitoring"), new BoolOption (
+				"auto-input",
+				_("Track Input Monitoring automatically follows transport state (\"auto-input\")"),
+				sigc::mem_fun (*_session_config, &SessionConfiguration::get_auto_input),
+				sigc::mem_fun (*_session_config, &SessionConfiguration::set_auto_input)
+				));
+
+	add_option (_("Monitoring"), new CheckOption (
+				"have-monitor-section",
+				_("Use monitor section in this session"),
+				ActionManager::get_action(X_("Monitor"), "UseMonitorSection")
+				));
+
+	add_option (_("Monitoring"), new OptionEditorBlank ());
+
+	/* Meterbridge */
+	add_option (_("Meterbridge"), new OptionEditorHeading (_("Route Display")));
+
+	add_option (_("Meterbridge"), new BoolOption (
+			    "show-midi-on-meterbridge",
+			    _("Show Midi Tracks"),
+			    sigc::mem_fun (*_session_config, &SessionConfiguration::get_show_midi_on_meterbridge),
+			    sigc::mem_fun (*_session_config, &SessionConfiguration::set_show_midi_on_meterbridge)
+			    ));
 
-	/* Monitoring */
+	add_option (_("Meterbridge"), new BoolOption (
+			    "show-busses-on-meterbridge",
+			    _("Show Busses"),
+			    sigc::mem_fun (*_session_config, &SessionConfiguration::get_show_busses_on_meterbridge),
+			    sigc::mem_fun (*_session_config, &SessionConfiguration::set_show_busses_on_meterbridge)
+			    ));
 
-        add_option (_("Monitoring"), new BoolOption (
-			    "auto-input",
-			    _("Track Input Monitoring automatically follows transport state (\"auto-input\")"),
-			    sigc::mem_fun (*_session_config, &SessionConfiguration::get_auto_input),
-			    sigc::mem_fun (*_session_config, &SessionConfiguration::set_auto_input)
+	add_option (_("Meterbridge"), new BoolOption (
+			    "show-master-on-meterbridge",
+			    _("Include Master Bus"),
+			    sigc::mem_fun (*_session_config, &SessionConfiguration::get_show_master_on_meterbridge),
+			    sigc::mem_fun (*_session_config, &SessionConfiguration::set_show_master_on_meterbridge)
 			    ));
 
-        add_option (_("Monitoring"), new BoolOption (
-			    "have-monitor-section",
-			    _("Use monitor section in this session"),
-			    sigc::mem_fun (*this, &SessionOptionEditor::get_use_monitor_section),
-			    sigc::mem_fun (*this, &SessionOptionEditor::set_use_monitor_section)
+	add_option (_("Meterbridge"), new OptionEditorHeading (_("Button Area")));
+
+	add_option (_("Meterbridge"), new BoolOption (
+			    "show-rec-on-meterbridge",
+			    _("Rec-enable Button"),
+			    sigc::mem_fun (*_session_config, &SessionConfiguration::get_show_rec_on_meterbridge),
+			    sigc::mem_fun (*_session_config, &SessionConfiguration::set_show_rec_on_meterbridge)
 			    ));
 
-        /* Misc */
+	add_option (_("Meterbridge"), new BoolOption (
+			    "show-mute-on-meterbridge",
+			    _("Mute Button"),
+			    sigc::mem_fun (*_session_config, &SessionConfiguration::get_show_mute_on_meterbridge),
+			    sigc::mem_fun (*_session_config, &SessionConfiguration::set_show_mute_on_meterbridge)
+			    ));
 
-	add_option (_("Misc"), new OptionEditorHeading (_("MIDI Options")));
+	add_option (_("Meterbridge"), new BoolOption (
+			    "show-solo-on-meterbridge",
+			    _("Solo Button"),
+			    sigc::mem_fun (*_session_config, &SessionConfiguration::get_show_solo_on_meterbridge),
+			    sigc::mem_fun (*_session_config, &SessionConfiguration::set_show_solo_on_meterbridge)
+			    ));
 
-        add_option (_("Misc"), new BoolOption (
-			    "midi-copy-is-fork",
-			    _("MIDI region copies are independent"),
-			    sigc::mem_fun (*_session_config, &SessionConfiguration::get_midi_copy_is_fork),
-			    sigc::mem_fun (*_session_config, &SessionConfiguration::set_midi_copy_is_fork)
+	add_option (_("Meterbridge"), new BoolOption (
+			    "show-monitor-on-meterbridge",
+			    _("Monitor Buttons"),
+			    sigc::mem_fun (*_session_config, &SessionConfiguration::get_show_monitor_on_meterbridge),
+			    sigc::mem_fun (*_session_config, &SessionConfiguration::set_show_monitor_on_meterbridge)
 			    ));
 
-	ComboOption<InsertMergePolicy>* li = new ComboOption<InsertMergePolicy> (
-		"insert-merge-policy",
-		_("Policy for handling overlapping notes\n on the same MIDI channel"),
-		sigc::mem_fun (*_session_config, &SessionConfiguration::get_insert_merge_policy),
-		sigc::mem_fun (*_session_config, &SessionConfiguration::set_insert_merge_policy)
-		);
+	add_option (_("Meterbridge"), new OptionEditorHeading (_("Name Labels")));
+
+	add_option (_("Meterbridge"), new BoolOption (
+			    "show-name-on-meterbridge",
+			    _("Track Name"),
+			    sigc::mem_fun (*_session_config, &SessionConfiguration::get_show_name_on_meterbridge),
+			    sigc::mem_fun (*_session_config, &SessionConfiguration::set_show_name_on_meterbridge)
+			    ));
+
+	add_option (_("Meterbridge"), new OptionEditorBlank ());
+
+	/* Misc */
 
-        li->add (InsertMergeReject, _("never allow them"));
-        li->add (InsertMergeRelax, _("don't do anything in particular"));
-        li->add (InsertMergeReplace, _("replace any overlapped existing note"));
-        li->add (InsertMergeTruncateExisting, _("shorten the overlapped existing note"));
-        li->add (InsertMergeTruncateAddition, _("shorten the overlapping new note"));
-        li->add (InsertMergeExtend, _("replace both overlapping notes with a single note"));
+	add_option (_("Misc"), new OptionEditorHeading (_("MIDI Options")));
+
+	add_option (_("Misc"), new BoolOption (
+				"midi-copy-is-fork",
+				_("MIDI region copies are independent"),
+				sigc::mem_fun (*_session_config, &SessionConfiguration::get_midi_copy_is_fork),
+				sigc::mem_fun (*_session_config, &SessionConfiguration::set_midi_copy_is_fork)
+				));
+
+	ComboOption<InsertMergePolicy>* li = new ComboOption<InsertMergePolicy> (
+			"insert-merge-policy",
+			_("Policy for handling overlapping notes\n on the same MIDI channel"),
+			sigc::mem_fun (*_session_config, &SessionConfiguration::get_insert_merge_policy),
+			sigc::mem_fun (*_session_config, &SessionConfiguration::set_insert_merge_policy)
+			);
+
+	li->add (InsertMergeReject, _("never allow them"));
+	li->add (InsertMergeRelax, _("don't do anything in particular"));
+	li->add (InsertMergeReplace, _("replace any overlapped existing note"));
+	li->add (InsertMergeTruncateExisting, _("shorten the overlapped existing note"));
+	li->add (InsertMergeTruncateAddition, _("shorten the overlapping new note"));
+	li->add (InsertMergeExtend, _("replace both overlapping notes with a single note"));
 
 	add_option (_("Misc"), li);
 
-	add_option (_("Misc"), new OptionEditorHeading (_("Glue to bars and beats")));
+	add_option (_("Misc"), new OptionEditorHeading (_("Glue to Bars and Beats")));
 
 	add_option (_("Misc"), new BoolOption (
-			    "glue-new-markers-to-bars-and-beats",
-			    _("Glue new markers to bars and beats"),
-			    sigc::mem_fun (*_session_config, &SessionConfiguration::get_glue_new_markers_to_bars_and_beats),
-			    sigc::mem_fun (*_session_config, &SessionConfiguration::set_glue_new_markers_to_bars_and_beats)
-			    ));
+				"glue-new-markers-to-bars-and-beats",
+				_("Glue new markers to bars and beats"),
+				sigc::mem_fun (*_session_config, &SessionConfiguration::get_glue_new_markers_to_bars_and_beats),
+				sigc::mem_fun (*_session_config, &SessionConfiguration::set_glue_new_markers_to_bars_and_beats)
+				));
 
 	add_option (_("Misc"), new BoolOption (
-			    "glue-new-regions-to-bars-and-beats",
-			    _("Glue new regions to bars and beats"),
-			    sigc::mem_fun (*_session_config, &SessionConfiguration::get_glue_new_regions_to_bars_and_beats),
-			    sigc::mem_fun (*_session_config, &SessionConfiguration::set_glue_new_regions_to_bars_and_beats)
-			    ));
+				"glue-new-regions-to-bars-and-beats",
+				_("Glue new regions to bars and beats"),
+				sigc::mem_fun (*_session_config, &SessionConfiguration::get_glue_new_regions_to_bars_and_beats),
+				sigc::mem_fun (*_session_config, &SessionConfiguration::set_glue_new_regions_to_bars_and_beats)
+				));
+
+	add_option (_("Misc"), new OptionEditorHeading (_("Metronome")));
+
+	add_option (_("Misc"), new BoolOption (
+				"count-in",
+				_("Always count-in when recording"),
+				sigc::mem_fun (*_session_config, &SessionConfiguration::get_count_in),
+				sigc::mem_fun (*_session_config, &SessionConfiguration::set_count_in)
+				));
+
+	add_option (_("Misc"), new OptionEditorHeading (_("Defaults")));
+
+	Gtk::Button* btn = Gtk::manage (new Gtk::Button (_("Use these settings as defaults")));
+	btn->signal_clicked().connect (sigc::mem_fun (*this, &SessionOptionEditor::save_defaults));
+	add_option (_("Misc"), new FooOption (btn));
+
+	set_current_page (_("Timecode"));
 }
 
 void
@@ -280,43 +413,43 @@ SessionOptionEditor::parameter_changed (std::string const & p)
 {
 	OptionEditor::parameter_changed (p);
 	if (p == "external-sync") {
-		if (Config->get_sync_source() == JACK) {
+		if (TransportMasterManager::instance().current()->type() == Engine) {
 			_vpu->set_sensitive(!_session_config->get_external_sync());
 		} else {
 			_vpu->set_sensitive(true);
 		}
 	}
-	if (p == "timecode-format") {
+	else if (p == "timecode-format") {
 		/* update offset clocks */
 		parameter_changed("timecode-generator-offset");
 		parameter_changed("slave-timecode-offset");
 	}
-}
-
-/* the presence of absence of a monitor section is not really a regular session
- * property so we provide these two functions to act as setter/getter slots
- */
-
-bool
-SessionOptionEditor::set_use_monitor_section (bool yn)
-{
-	bool had_monitor_section = _session->monitor_out();
-
-	if (yn) {
-		_session->add_monitor_section ();
-	} else {
-		_session->remove_monitor_section ();
+	else if (p == "track-name-take") {
+		_take_name->set_sensitive(_session_config->get_track_name_take());
+	}
+	else if (p == "native-file-header-format") {
+		bool need_refill = true;
+		_sf->clear ();
+		if (_session_config->get_native_file_header_format() == FLAC) {
+			_sf->add (FormatInt24, _("24-bit integer"));
+			_sf->add (FormatInt16, _("16-bit integer"));
+			if (_session_config->get_native_file_data_format() == FormatFloat) {
+				_session_config->set_native_file_data_format (FormatInt24);
+				need_refill = false;
+			}
+		} else {
+			_sf->add (FormatFloat, _("32-bit floating point"));
+			_sf->add (FormatInt24, _("24-bit integer"));
+			_sf->add (FormatInt16, _("16-bit integer"));
+		}
+		if (need_refill) {
+			parameter_changed ("native-file-data-format");
+		}
 	}
-
-	/* store this choice for any new sessions */
-	
-	Config->set_use_monitor_bus (yn);
-
-	return had_monitor_section != yn;
 }
 
-bool
-SessionOptionEditor::get_use_monitor_section ()
+void
+SessionOptionEditor::save_defaults ()
 {
-	return _session->monitor_out() != 0;
+	_session->save_default_options();
 }