X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fsession_option_editor.cc;h=6c16245ae6192a07ee2992400aaea43ce0ce904b;hb=3c25d26e91d4703ba76c90d5175aa94e4ddd850b;hp=9560fddc7902adf547e41dddaddce8688c455a7c;hpb=aac77d08a3c4c896ceed7aeb756f169e028668c5;p=ardour.git diff --git a/gtk2_ardour/session_option_editor.cc b/gtk2_ardour/session_option_editor.cc index 9560fddc79..6c16245ae6 100644 --- a/gtk2_ardour/session_option_editor.cc +++ b/gtk2_ardour/session_option_editor.cc @@ -22,19 +22,19 @@ #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*/ @@ -78,21 +78,6 @@ SessionOptionEditor::SessionOptionEditor (Session* s) _vpu->add (-4.1667 - 0.1, _("-4.1667 - 0.1%")); add_option (_("Timecode"), _vpu); - - 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) - )); - add_option (_("Timecode"), new OptionEditorHeading (_("Ext Timecode Offsets"))); ClockOption* sco = new ClockOption ( @@ -130,20 +115,28 @@ SessionOptionEditor::SessionOptionEditor (Session* s) sigc::mem_fun (*_session_config, &SessionConfiguration::set_jack_time_master) )); - /* FADES */ + /* Sync */ - ComboOption* cfc = new ComboOption ( - "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) + )); - cfc->add (ConstantPowerMinus3dB, _("Constant power (-3dB) crossfade")); - cfc->add (ConstantPowerMinus6dB, _("Linear (-6dB) crossfade")); + 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) + )); + + add_option (_("Sync"), new OptionEditorBlank ()); - add_option (_("Fades"), cfc); + /* FADES */ + add_option (_("Fades"), new OptionEditorHeading (_("Audio Fades"))); add_option (_("Fades"), new SpinOption ( _("destructive-xfade-seconds"), _("Destructive crossfade length"), @@ -153,6 +146,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"), @@ -169,7 +176,7 @@ SessionOptionEditor::SessionOptionEditor (Session* s) /* Media */ - add_option (_("Media"), new OptionEditorHeading (_("Audio file format"))); + add_option (_("Media"), new OptionEditorHeading (_("Audio File Format"))); ComboOption* sf = new ComboOption ( "native-file-data-format", @@ -191,87 +198,92 @@ 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 add_option (_("Media"), hf); - add_option (_("Media"), 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 (_("Media"), 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 (_("Media"), spo); - - /* 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 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) - )); - - /* Misc */ - - 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* li = new ComboOption ( - "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 (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()); - 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 (_("Filenames"), _take_name); - add_option (_("Misc"), li); + /* Monitoring */ - add_option (_("Misc"), new OptionEditorHeading (_("Glue to bars and beats"))); + 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 (_("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) - )); + 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 (_("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) - )); + add_option (_("Monitoring"), new OptionEditorBlank ()); + /* Meterbridge */ add_option (_("Meterbridge"), new OptionEditorHeading (_("Route Display"))); add_option (_("Meterbridge"), new BoolOption ( @@ -334,6 +346,67 @@ SessionOptionEditor::SessionOptionEditor (Session* s) sigc::mem_fun (*_session_config, &SessionConfiguration::set_show_name_on_meterbridge) )); + add_option (_("Meterbridge"), new OptionEditorBlank ()); + + /* Misc */ + + 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* li = new ComboOption ( + "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 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) + )); + + 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) + )); + + 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 @@ -347,11 +420,14 @@ SessionOptionEditor::parameter_changed (std::string const & p) _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"); } + else if (p == "track-name-take") { + _take_name->set_sensitive(_session_config->get_track_name_take()); + } } /* the presence of absence of a monitor section is not really a regular session @@ -361,7 +437,7 @@ SessionOptionEditor::parameter_changed (std::string const & p) bool SessionOptionEditor::set_use_monitor_section (bool yn) { - bool had_monitor_section = _session->monitor_out(); + bool had_monitor_section = _session->monitor_out() != 0; if (yn) { _session->add_monitor_section (); @@ -370,10 +446,10 @@ SessionOptionEditor::set_use_monitor_section (bool yn) } /* store this choice for any new sessions */ - + Config->set_use_monitor_bus (yn); - return had_monitor_section != yn; + return had_monitor_section != (_session->monitor_out() != 0); } bool @@ -381,3 +457,9 @@ SessionOptionEditor::get_use_monitor_section () { return _session->monitor_out() != 0; } + +void +SessionOptionEditor::save_defaults () +{ + _session->save_default_options(); +}