diff options
| -rw-r--r-- | gtk2_ardour/ardour.menus.in | 151 | ||||
| -rw-r--r-- | gtk2_ardour/ardour_ui.cc | 49 | ||||
| -rw-r--r-- | gtk2_ardour/ardour_ui.h | 52 | ||||
| -rw-r--r-- | gtk2_ardour/ardour_ui_ed.cc | 161 | ||||
| -rw-r--r-- | gtk2_ardour/ardour_ui_options.cc | 891 | ||||
| -rw-r--r-- | gtk2_ardour/editor.h | 24 | ||||
| -rw-r--r-- | gtk2_ardour/editor_actions.cc | 509 | ||||
| -rw-r--r-- | gtk2_ardour/rc_option_editor.cc | 8 | ||||
| -rw-r--r-- | libs/ardour/ardour/rc_configuration_vars.h | 1 | ||||
| -rw-r--r-- | libs/ardour/ardour/session.h | 4 | ||||
| -rw-r--r-- | libs/ardour/ardour/utils.h | 1 | ||||
| -rw-r--r-- | libs/ardour/session_time.cc | 8 | ||||
| -rw-r--r-- | libs/ardour/utils.cc | 16 |
13 files changed, 0 insertions, 1875 deletions
diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in index 7e5ce64d12..798b44b1f3 100644 --- a/gtk2_ardour/ardour.menus.in +++ b/gtk2_ardour/ardour.menus.in @@ -326,21 +326,6 @@ <menuitem action='snap-to-region-sync'/> <menuitem action='snap-to-region-boundary'/> </menu> - <menu name='MeterFalloff' action='MeterFalloff'> - <menuitem action='MeterFalloffOff'/> - <menuitem action='MeterFalloffSlowest'/> - <menuitem action='MeterFalloffSlow'/> - <menuitem action='MeterFalloffMedium'/> - <menuitem action='MeterFalloffFast'/> - <menuitem action='MeterFalloffFaster'/> - <menuitem action='MeterFalloffFastest'/> - </menu> - <menu name='MeterHold' action='MeterHold'> - <menuitem action='MeterHoldOff'/> - <menuitem action='MeterHoldShort'/> - <menuitem action='MeterHoldMedium'/> - <menuitem action='MeterHoldLong'/> - </menu> <menu action="PrimaryClockMenu"> <menuitem action="primary-clock-bbt"/> <menuitem action="primary-clock-minsec"/> @@ -403,8 +388,6 @@ <menuitem action='ToggleMeasureVisibility'/> <menuitem action='toggle-waveform-visible'/> <menuitem action='ToggleWaveformsWhileRecording'/> - <menuitem action='SyncEditorAndMixerTrackOrder'/> - <menuitem action='toggle-region-fades-visible'/> </menu> <menu name='JACK' action='JACK'> <menuitem action='JACKDisconnect'/> @@ -440,19 +423,6 @@ <separator/> </menu> <menu name='Options' action='Options'> - <menu action='AudioFileFormat'> - <menu action='AudioFileFormatData'> - <menuitem action='FileDataFormatFloat'/> - <menuitem action='FileDataFormat24bit'/> - <menuitem action='FileDataFormat16bit'/> - </menu> - <menu action='AudioFileFormatHeader'> - <menuitem action='FileHeaderFormatBWF'/> - <menuitem action='FileHeaderFormatWAVE'/> - <menuitem action='FileHeaderFormatWAVE64'/> - <menuitem action='FileHeaderFormatCAF'/> - </menu> - </menu> <menu action='SyncMenu'> <menuitem action='SendMTC'/> <menuitem action='SendMMC'/> @@ -463,127 +433,6 @@ <menuitem action='set-tempo-from-region'/> <menuitem action='set-tempo-from-edit-range'/> </menu> - <menu action='Timecode'> - <menuitem action='Smpte23976'/> - <menuitem action='Smpte24'/> - <menuitem action='Smpte24976'/> - <menuitem action='Smpte25'/> - <menuitem action='Smpte2997'/> - <menuitem action='Smpte2997drop'/> - <menuitem action='Smpte30'/> - <menuitem action='Smpte30drop'/> - <menuitem action='Smpte5994'/> - <menuitem action='Smpte60'/> - </menu> - <menu action='Pullup'> - <menuitem action='PullupPlus4Plus1'/> - <menuitem action='PullupPlus4'/> - <menuitem action='PullupPlus4Minus1'/> - <menuitem action='PullupPlus1'/> - <menuitem action='PullupNone'/> - <menuitem action='PullupMinus1'/> - <menuitem action='PullupMinus4Plus1'/> - <menuitem action='PullupMinus4'/> - <menuitem action='PullupMinus4Minus1'/> - </menu> - <menu action='Subframes'> - <menuitem action='Subframes80'/> - <menuitem action='Subframes100'/> - </menu> - <separator/> - <menu action='Autoconnect'> - <menuitem action='InputAutoConnectPhysical'/> - <menuitem action='InputAutoConnectManual'/> - <separator/> - <menuitem action='OutputAutoConnectPhysical'/> - <menuitem action='OutputAutoConnectMaster'/> - <menuitem action='OutputAutoConnectManual'/> - </menu> - <menu action='ControlSurfaces'> - <menuitem action='RemoteUserDefined'/> - <menuitem action='RemoteMixerDefined'/> - <menuitem action='RemoteEditorDefined'/> - <separator/> - <menuitem action='AutoRebinding'/> - </menu> - <menu action='Monitoring'> - <menuitem action='UseExternalMonitoring'/> - <menuitem action='UseSoftwareMonitoring'/> - <menuitem action='UseHardwareMonitoring'/> - <separator/> - <menuitem action='ToggleTapeMachineMode'/> - </menu> - <menu action='Metering'> - <menuitem action='ShowTrackMeters'/> - <menu action='MeteringFallOffRate'> - <menuitem action='MeterFalloffOff'/> - <menuitem action='MeterFalloffSlowest'/> - <menuitem action='MeterFalloffSlow'/> - <menuitem action='MeterFalloffMedium'/> - <menuitem action='MeterFalloffFast'/> - <menuitem action='MeterFalloffFaster'/> - <menuitem action='MeterFalloffFastest'/> - </menu> - <menu action='MeteringHoldTime'> - <menuitem action='MeterHoldOff'/> - <menuitem action='MeterHoldShort'/> - <menuitem action='MeterHoldMedium'/> - <menuitem action='MeterHoldLong'/> - </menu> - </menu> - <menu action='Solo'> - <menuitem action='LatchedSolo'/> - <menuitem action='SoloInPlace'/> - <menuitem action='SoloViaBus'/> - <menuitem action='ShowSoloMutes'/> - <menuitem action='SoloMuteOverride'/> - </menu> - <menu action='Crossfades'> - <menuitem action='toggle-xfades-active'/> - <menuitem action='toggle-xfades-visible'/> - <menuitem action='toggle-auto-xfades'/> - <separator/> - <menuitem action='CrossfadesFull'/> - <menuitem action='CrossfadesShort'/> - </menu> - <menu action='Layering'> - <menuitem action='LayerLaterHigher'/> - <menuitem action='LayerMoveAddHigher'/> - <menuitem action='LayerAddHigher'/> - </menu> - <menu name='Denormals' action='Denormals'> - <menuitem action='DenormalProtection'/> - <separator/> - <menuitem action='DenormalNone'/> - <menuitem action='DenormalFTZ'/> - <menuitem action='DenormalDAZ'/> - <menuitem action='DenormalFTZDAZ'/> - </menu> - <separator/> - <menu action='MiscOptions'> - <menuitem action='StopPluginsWithTransport'/> - <menuitem action='NewPluginsActive'/> - <menuitem action='DoNotRunPluginsWhileRecording'/> - <menuitem action='LatchedRecordEnable'/> - <menuitem action='RegionEquivalentsOverlap'/> - <menuitem action='PeriodicSafetyBackups'/> - <menuitem action='VerifyRemoveLastCapture'/> - <menuitem action='StopRecordingOnXrun'/> - <menuitem action='CreateXrunMarker'/> - <menuitem action='StopTransportAtEndOfSession'/> - <menuitem action='GainReduceFastTransport'/> - <menuitem action='PrimaryClockDeltaEditCursor'/> - <menuitem action='SecondaryClockDeltaEditCursor'/> - <menuitem action='OnlyCopyImportedFiles'/> - <menuitem action='ShowTrackMeters'/> - <menuitem action='DefaultNarrowMS'/> - <menuitem action='link-region-and-track-selection'/> - <menuitem action='NameNewMarkers'/> - <menuitem action='RubberbandingSnapsToGrid'/> - <menuitem action='AutoAnalyseAudio'/> - <menuitem action='toggle-region-fades'/> - <menuitem action='automation-follows-regions'/> - </menu> </menu> <menu name='Help' action='Help'> <menuitem action='About'/> diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index fa028ee24b..0af0a88e11 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -3166,55 +3166,6 @@ ARDOUR_UI::reconnect_to_jack () void ARDOUR_UI::use_config () { - Glib::RefPtr<Action> act; - - assert (session); - - switch (session->config.get_native_file_data_format ()) { - case FormatFloat: - act = ActionManager::get_action (X_("options"), X_("FileDataFormatFloat")); - break; - case FormatInt24: - act = ActionManager::get_action (X_("options"), X_("FileDataFormat24bit")); - break; - case FormatInt16: - act = ActionManager::get_action (X_("options"), X_("FileDataFormat16bit")); - break; - } - - if (act) { - Glib::RefPtr<RadioAction> ract = Glib::RefPtr<RadioAction>::cast_dynamic(act); - ract->set_active (); - } - - switch (session->config.get_native_file_header_format ()) { - case BWF: - act = ActionManager::get_action (X_("options"), X_("FileHeaderFormatBWF")); - break; - case WAVE: - act = ActionManager::get_action (X_("options"), X_("FileHeaderFormatWAVE")); - break; - case WAVE64: - act = ActionManager::get_action (X_("options"), X_("FileHeaderFormatWAVE64")); - break; - case iXML: - act = ActionManager::get_action (X_("options"), X_("FileHeaderFormatiXML")); - break; - case RF64: - act = ActionManager::get_action (X_("options"), X_("FileHeaderFormatRF64")); - break; - case CAF: - act = ActionManager::get_action (X_("options"), X_("FileHeaderFormatCAF")); - break; - case AIFF: - act = ActionManager::get_action (X_("options"), X_("FileHeaderFormatAIFF")); - break; - } - - if (act) { - Glib::RefPtr<RadioAction> ract = Glib::RefPtr<RadioAction>::cast_dynamic(act); - ract->set_active (); - } XMLNode* node = Config->extra_xml (X_("TransportControllables")); if (node) { diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index a1a36f3d99..64d7ce04a1 100644 --- a/gtk2_ardour/ardour_ui.h +++ b/gtk2_ardour/ardour_ui.h @@ -233,9 +233,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI void maximise_editing_space (); void restore_editing_space (); - void set_native_file_header_format (ARDOUR::HeaderFormat sf); - void set_native_file_data_format (ARDOUR::SampleFormat sf); - void setup_profile (); void setup_theme (); @@ -685,58 +682,9 @@ class ARDOUR_UI : public Gtkmm2ext::UI void toggle_use_osc (); - void toggle_denormal_protection (); - - void set_input_auto_connect (ARDOUR::AutoConnectOption); - void set_output_auto_connect (ARDOUR::AutoConnectOption); - void set_solo_model (ARDOUR::SoloModel); - void set_monitor_model (ARDOUR::MonitorModel); - void set_remote_model (ARDOUR::RemoteModel); - void set_denormal_model (ARDOUR::DenormalModel); - - void toggle_sync_order_keys (); - void toggle_new_plugins_active(); - void toggle_StopPluginsWithTransport(); - void toggle_DoNotRunPluginsWhileRecording(); - void toggle_VerifyRemoveLastCapture(); - void toggle_PeriodicSafetyBackups(); - void toggle_StopRecordingOnXrun(); - void toggle_CreateXrunMarker(); - void toggle_StopTransportAtEndOfSession(); - void toggle_GainReduceFastTransport(); - void toggle_LatchedSolo(); - void toggle_ShowSoloMutes(); - void toggle_SoloMuteOverride(); - void toggle_LatchedRecordEnable (); - void toggle_RegionEquivalentsOverlap (); - void toggle_PrimaryClockDeltaEditCursor (); - void toggle_SecondaryClockDeltaEditCursor (); - void toggle_ShowTrackMeters (); - void toggle_only_copy_imported_files (); - void toggle_use_narrow_ms(); - void toggle_NameNewMarkers (); - void toggle_rubberbanding_snaps_to_grid (); - void toggle_auto_analyse_audio (); - void toggle_TapeMachineMode(); - void mtc_port_changed (); - void map_solo_model (); - void map_monitor_model (); - void map_denormal_model (); - void map_denormal_protection (); - void map_remote_model (); - void map_file_header_format (); - void map_file_data_format (); - void map_input_auto_connect (); - void map_output_auto_connect (); - void map_only_copy_imported_files (); void parameter_changed (std::string); - void set_meter_hold (ARDOUR::MeterHold); - void set_meter_falloff (ARDOUR::MeterFalloff); - void map_meter_hold (); - void map_meter_falloff (); - void toggle_control_protocol (ARDOUR::ControlProtocolInfo*); void toggle_control_protocol_feedback (ARDOUR::ControlProtocolInfo*, const char* group_name, std::string action_name); diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc index 6a9661b082..61bb5d6ef7 100644 --- a/gtk2_ardour/ardour_ui_ed.cc +++ b/gtk2_ardour/ardour_ui_ed.cc @@ -441,167 +441,6 @@ ARDOUR_UI::install_actions () ActionManager::session_sensitive_actions.push_back (act); act = ActionManager::register_toggle_action (option_actions, X_("SendMIDIfeedback"), _("Send MIDI Feedback"), mem_fun (*this, &ARDOUR_UI::toggle_send_midi_feedback)); ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_toggle_action (option_actions, X_("ToggleTapeMachineMode"), _("Tape Machine Mode"), mem_fun (*this, &ARDOUR_UI::toggle_TapeMachineMode)); - ActionManager::session_sensitive_actions.push_back (act); - - ActionManager::register_toggle_action (option_actions, X_("SyncEditorAndMixerTrackOrder"), _("Sync Editor and Mixer Track Order"), mem_fun (*this, &ARDOUR_UI::toggle_sync_order_keys)); - ActionManager::register_toggle_action (option_actions, X_("StopPluginsWithTransport"), _("Stop Plugins with Transport"), mem_fun (*this, &ARDOUR_UI::toggle_StopPluginsWithTransport)); - ActionManager::register_toggle_action (option_actions, X_("NewPluginsActive"), _("New Plugins are Active"), mem_fun (*this, &ARDOUR_UI::toggle_new_plugins_active)); - ActionManager::register_toggle_action (option_actions, X_("VerifyRemoveLastCapture"), _("Verify Remove Last Capture"), mem_fun (*this, &ARDOUR_UI::toggle_VerifyRemoveLastCapture)); - ActionManager::register_toggle_action (option_actions, X_("PeriodicSafetyBackups"), _("Make Periodic Safety Backups"), mem_fun (*this, &ARDOUR_UI::toggle_PeriodicSafetyBackups)); - ActionManager::register_toggle_action (option_actions, X_("StopRecordingOnXrun"), _("Stop Recording on xrun"), mem_fun (*this, &ARDOUR_UI::toggle_StopRecordingOnXrun)); - ActionManager::register_toggle_action (option_actions, X_("CreateXrunMarker"), _("Create Marker at xrun Location"), mem_fun (*this, &ARDOUR_UI::toggle_CreateXrunMarker)); - ActionManager::register_toggle_action (option_actions, X_("StopTransportAtEndOfSession"), _("Stop Transport at Session End"), mem_fun (*this, &ARDOUR_UI::toggle_StopTransportAtEndOfSession)); - ActionManager::register_toggle_action (option_actions, X_("GainReduceFastTransport"), _("-12dB Gain Reduce ffwd/rewind"), mem_fun (*this, &ARDOUR_UI::toggle_GainReduceFastTransport)); - ActionManager::register_toggle_action (option_actions, X_("LatchedRecordEnable"), _("Rec-enable Stays Engaged at Stop"), mem_fun (*this, &ARDOUR_UI::toggle_LatchedRecordEnable)); - ActionManager::register_toggle_action (option_actions, X_("RegionEquivalentsOverlap"), _("Region Equivalents Overlap"), mem_fun (*this, &ARDOUR_UI::toggle_RegionEquivalentsOverlap)); - ActionManager::register_toggle_action (option_actions, X_("PrimaryClockDeltaEditCursor"), _("Primary Clock Delta to Edit Point"), mem_fun (*this, &ARDOUR_UI::toggle_PrimaryClockDeltaEditCursor)); - ActionManager::register_toggle_action (option_actions, X_("SecondaryClockDeltaEditCursor"), _("Secondary Clock Delta to Edit Point"), mem_fun (*this, &ARDOUR_UI::toggle_SecondaryClockDeltaEditCursor)); - ActionManager::register_toggle_action (option_actions, X_("ShowTrackMeters"), _("Enable Editor Meters"), mem_fun (*this, &ARDOUR_UI::toggle_ShowTrackMeters)); - ActionManager::register_toggle_action (option_actions, X_("OnlyCopyImportedFiles"), _("Always Copy Imported Files"), mem_fun (*this, &ARDOUR_UI::toggle_only_copy_imported_files)); - ActionManager::register_toggle_action (option_actions, X_("RubberbandingSnapsToGrid"), _("Rubberbanding Snaps to Grid"), mem_fun (*this, &ARDOUR_UI::toggle_rubberbanding_snaps_to_grid)); - ActionManager::register_toggle_action (option_actions, X_("AutoAnalyseAudio"), _("Auto-analyse new audio"), mem_fun (*this, &ARDOUR_UI::toggle_auto_analyse_audio)); - - ActionManager::register_toggle_action (option_actions, X_("DefaultNarrowMS"), _("Use narrow mixer strips"), mem_fun (*this, &ARDOUR_UI::toggle_use_narrow_ms)); - ActionManager::register_toggle_action (option_actions, X_("NameNewMarkers"), _("Name New Markers"), mem_fun (*this, &ARDOUR_UI::toggle_NameNewMarkers)); - - RadioAction::Group denormal_group; - - ActionManager::register_toggle_action (option_actions, X_("DenormalProtection"), _("Use DC bias"), mem_fun (*this, &ARDOUR_UI::toggle_denormal_protection)); - ActionManager::register_radio_action (option_actions, denormal_group, X_("DenormalNone"), _("No processor handling"), bind (mem_fun (*this, &ARDOUR_UI::set_denormal_model), DenormalNone)); - - // as of September 10th 2007, Valgrind cannot handle various FPU flag setting instructions - // so avoid them - - if (getenv ("ARDOUR_RUNNING_UNDER_VALGRIND")) { - - /* we still need these actions to exist, but make them all insensitive */ - - act = ActionManager::register_radio_action (option_actions, denormal_group, X_("DenormalFTZ"), _("Use FlushToZero"), bind (mem_fun (*this, &ARDOUR_UI::set_denormal_model), DenormalFTZ)); - act->set_sensitive (false); - act = ActionManager::register_radio_action (option_actions, denormal_group, X_("DenormalDAZ"), _("Use DenormalsAreZero"), bind (mem_fun (*this, &ARDOUR_UI::set_denormal_model), DenormalDAZ)); - act->set_sensitive (false); - act = ActionManager::register_radio_action (option_actions, denormal_group, X_("DenormalFTZDAZ"), _("Use FlushToZero & DenormalsAreZero"), bind (mem_fun (*this, &ARDOUR_UI::set_denormal_model), DenormalFTZDAZ)); - act->set_sensitive (false); - - } else { - - FPU fpu; - - act = ActionManager::register_radio_action (option_actions, denormal_group, X_("DenormalFTZ"), _("Use FlushToZero"), bind (mem_fun (*this, &ARDOUR_UI::set_denormal_model), DenormalFTZ)); - if (!fpu.has_flush_to_zero()) { - act->set_sensitive (false); - } - - act = ActionManager::register_radio_action (option_actions, denormal_group, X_("DenormalDAZ"), _("Use DenormalsAreZero"), bind (mem_fun (*this, &ARDOUR_UI::set_denormal_model), DenormalDAZ)); - if (!fpu.has_denormals_are_zero()) { - act->set_sensitive (false); - } - - act = ActionManager::register_radio_action (option_actions, denormal_group, X_("DenormalFTZDAZ"), _("Use FlushToZero & DenormalsAreZero"), bind (mem_fun (*this, &ARDOUR_UI::set_denormal_model), DenormalFTZDAZ)); - if (!fpu.has_flush_to_zero() || !fpu.has_denormals_are_zero()) { - act->set_sensitive (false); - } - } - - act = ActionManager::register_toggle_action (option_actions, X_("DoNotRunPluginsWhileRecording"), _("Do not Run Plugins While Recording"), mem_fun (*this, &ARDOUR_UI::toggle_DoNotRunPluginsWhileRecording)); - ActionManager::session_sensitive_actions.push_back (act); - - act = ActionManager::register_toggle_action (option_actions, X_("LatchedSolo"), _("Latched Solo"), mem_fun (*this, &ARDOUR_UI::toggle_LatchedSolo)); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_toggle_action (option_actions, X_("ShowSoloMutes"), _("Show Solo Muting"), mem_fun (*this, &ARDOUR_UI::toggle_ShowSoloMutes)); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_toggle_action (option_actions, X_("SoloMuteOverride"), _("Override Muting"), mem_fun (*this, &ARDOUR_UI::toggle_SoloMuteOverride)); - ActionManager::session_sensitive_actions.push_back (act); - - /* act = ActionManager::register_action (option_actions, X_("DisableAllPlugins"), _("Disable All Plugins"), mem_fun (*this, &ARDOUR_UI::disable_all_plugins)); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_action (option_actions, X_("ABAllPlugins"), _("A/B All Plugins"), mem_fun (*this, &ARDOUR_UI::ab_all_plugins)); - ActionManager::session_sensitive_actions.push_back (act); */ - - /* !!! REMEMBER THAT RADIO ACTIONS HAVE TO BE HANDLED WITH MORE FINESSE THAN SIMPLE TOGGLES !!! */ - - RadioAction::Group meter_falloff_group; - RadioAction::Group meter_hold_group; - - ActionManager::register_radio_action (option_actions, meter_falloff_group, X_("MeterFalloffOff"), _("Off"), bind (mem_fun (*this, &ARDOUR_UI::set_meter_falloff), MeterFalloffOff)); - ActionManager::register_radio_action (option_actions, meter_falloff_group, X_("MeterFalloffSlowest"), _("Slowest"), bind (mem_fun (*this, &ARDOUR_UI::set_meter_falloff), MeterFalloffSlowest)); - ActionManager::register_radio_action (option_actions, meter_falloff_group, X_("MeterFalloffSlow"), _("Slow"), bind (mem_fun (*this, &ARDOUR_UI::set_meter_falloff), MeterFalloffSlow)); - ActionManager::register_radio_action (option_actions, meter_falloff_group, X_("MeterFalloffMedium"), _("Medium"), bind (mem_fun (*this, &ARDOUR_UI::set_meter_falloff), MeterFalloffMedium)); - ActionManager::register_radio_action (option_actions, meter_falloff_group, X_("MeterFalloffFast"), _("Fast"), bind (mem_fun (*this, &ARDOUR_UI::set_meter_falloff), MeterFalloffFast)); - ActionManager::register_radio_action (option_actions, meter_falloff_group, X_("MeterFalloffFaster"), _("Faster"), bind (mem_fun (*this, &ARDOUR_UI::set_meter_falloff), MeterFalloffFaster)); - ActionManager::register_radio_action (option_actions, meter_falloff_group, X_("MeterFalloffFastest"), _("Fastest"), bind (mem_fun (*this, &ARDOUR_UI::set_meter_falloff), MeterFalloffFastest)); - - ActionManager::register_radio_action (option_actions, meter_hold_group, X_("MeterHoldOff"), _("Off"), bind (mem_fun (*this, &ARDOUR_UI::set_meter_hold), MeterHoldOff)); - ActionManager::register_radio_action (option_actions, meter_hold_group, X_("MeterHoldShort"), _("Short"), bind (mem_fun (*this, &ARDOUR_UI::set_meter_hold), MeterHoldShort)); - ActionManager::register_radio_action (option_actions, meter_hold_group, X_("MeterHoldMedium"), _("Medium"), bind (mem_fun (*this, &ARDOUR_UI::set_meter_hold), MeterHoldMedium)); - ActionManager::register_radio_action (option_actions, meter_hold_group, X_("MeterHoldLong"), _("Long"), bind (mem_fun (*this, &ARDOUR_UI::set_meter_hold), MeterHoldLong)); - - RadioAction::Group file_header_group; - - act = ActionManager::register_radio_action (option_actions, file_header_group, X_("FileHeaderFormatBWF"), X_("Broadcast WAVE"), bind (mem_fun (*this, &ARDOUR_UI::set_native_file_header_format), ARDOUR::BWF)); - act = ActionManager::register_radio_action (option_actions, file_header_group, X_("FileHeaderFormatWAVE"), X_("WAVE"), bind (mem_fun (*this, &ARDOUR_UI::set_native_file_header_format), ARDOUR::WAVE)); - act = ActionManager::register_radio_action (option_actions, file_header_group, X_("FileHeaderFormatWAVE64"), X_("WAVE-64"), bind (mem_fun (*this, &ARDOUR_UI::set_native_file_header_format), ARDOUR::WAVE64)); - // act = ActionManager::register_radio_action (option_actions, file_header_group, X_("FileHeaderFormatiXML"), X_("iXML"), bind (mem_fun (*this, &ARDOUR_UI::set_native_file_header_format), ARDOUR::iXML)); - // act = ActionManager::register_radio_action (option_actions, file_header_group, X_("FileHeaderFormatRF64"), X_("RF64"), bind (mem_fun (*this, &ARDOUR_UI::set_native_file_header_format), ARDOUR::RF64)); - act = ActionManager::register_radio_action (option_actions, file_header_group, X_("FileHeaderFormatCAF"), X_("CAF"), bind (mem_fun (*this, &ARDOUR_UI::set_native_file_header_format), ARDOUR::CAF)); - - RadioAction::Group file_data_group; - - - act = ActionManager::register_radio_action (option_actions, file_data_group, X_("FileDataFormatFloat"), X_("32-bit Floating Point"), bind (mem_fun (*this, &ARDOUR_UI::set_native_file_data_format), ARDOUR::FormatFloat)); - act = ActionManager::register_radio_action (option_actions, file_data_group, X_("FileDataFormat24bit"), X_("24-bit Integer"), bind (mem_fun (*this, &ARDOUR_UI::set_native_file_data_format), ARDOUR::FormatInt24)); - act = ActionManager::register_radio_action (option_actions, file_data_group, X_("FileDataFormat16bit"), X_("16-bit Integer"), bind (mem_fun (*this, &ARDOUR_UI::set_native_file_data_format), ARDOUR::FormatInt16)); - - RadioAction::Group monitoring_group; - - /* it would be nice not to even show this item, but that messes up the - menus which are not dynamically modified at runtime. so we make it - sensitive only if it makes sense. - */ - - act = ActionManager::register_radio_action (option_actions, monitoring_group, X_("UseHardwareMonitoring"), _("JACK Does Monitoring"), bind (mem_fun (*this, &ARDOUR_UI::set_monitor_model), HardwareMonitoring)); - if (!engine->can_request_hardware_monitoring()) { - act->set_sensitive (false); - } - act = ActionManager::register_radio_action (option_actions, monitoring_group, X_("UseSoftwareMonitoring"), _("Ardour Does Monitoring"), bind (mem_fun (*this, &ARDOUR_UI::set_monitor_model), SoftwareMonitoring)); - act = ActionManager::register_radio_action (option_actions, monitoring_group, X_("UseExternalMonitoring"), _("Audio Hardware Does Monitoring"), bind (mem_fun (*this, &ARDOUR_UI::set_monitor_model), ExternalMonitoring)); - - RadioAction::Group solo_group; - - act = ActionManager::register_radio_action (option_actions, solo_group, X_("SoloInPlace"), _("Solo in-place"), hide_return (bind (mem_fun (*this, &ARDOUR_UI::set_solo_model), InverseMute))); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_radio_action (option_actions, solo_group, X_("SoloViaBus"), _("Solo via Bus"), hide_return (bind (mem_fun (*this, &ARDOUR_UI::set_solo_model), SoloBus))); - ActionManager::session_sensitive_actions.push_back (act); - - RadioAction::Group input_auto_connect_group; - - act = ActionManager::register_radio_action (option_actions, input_auto_connect_group, X_("InputAutoConnectPhysical"), _("Auto-connect Inputs to Physical Inputs"), hide_return (bind (mem_fun (*this, &ARDOUR_UI::set_input_auto_connect), AutoConnectPhysical))); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_radio_action (option_actions, input_auto_connect_group, X_("InputAutoConnectManual"), _("Manually Connect Inputs"), hide_return (bind (mem_fun (*this, &ARDOUR_UI::set_input_auto_connect), (AutoConnectOption) 0))); - ActionManager::session_sensitive_actions.push_back (act); - - RadioAction::Group output_auto_connect_group; - - act = ActionManager::register_radio_action (option_actions, output_auto_connect_group, X_("OutputAutoConnectPhysical"), _("Auto-connect Outputs to Physical Outputs"), hide_return (bind (mem_fun (*this, &ARDOUR_UI::set_output_auto_connect), AutoConnectPhysical))); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_radio_action (option_actions, output_auto_connect_group, X_("OutputAutoConnectMaster"), _("Auto-connect Outputs to Master Bus"), hide_return (bind (mem_fun (*this, &ARDOUR_UI::set_output_auto_connect), AutoConnectMaster))); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_radio_action (option_actions, output_auto_connect_group, X_("OutputAutoConnectManual"), _("Manually Connect Outputs"), hide_return (bind (mem_fun (*this, &ARDOUR_UI::set_output_auto_connect), (AutoConnectOption) 0))); - ActionManager::session_sensitive_actions.push_back (act); - - RadioAction::Group remote_group; - - act = ActionManager::register_radio_action (option_actions, remote_group, X_("RemoteUserDefined"), _("Remote ID Assigned by User"), hide_return (bind (mem_fun (*this, &ARDOUR_UI::set_remote_model), UserOrdered))); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_radio_action (option_actions, remote_group, X_("RemoteMixerDefined"), _("Remote ID Follows Order of Mixer"), hide_return (bind (mem_fun (*this, &ARDOUR_UI::set_remote_model), MixerOrdered))); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_radio_action (option_actions, remote_group, X_("RemoteEditorDefined"), _("Remote ID Follows Order of Editor"), hide_return (bind (mem_fun (*this, &ARDOUR_UI::set_remote_model), EditorOrdered))); - ActionManager::session_sensitive_actions.push_back (act); - - act = ActionManager::register_toggle_action (option_actions, X_("AutoRebinding"), _("Auto Rebind Controls"), mem_fun (*(this->mixer), &Mixer_UI::toggle_auto_rebinding)); - ActionManager::session_sensitive_actions.push_back (act); - ActionManager::add_action_group (shuttle_actions); ActionManager::add_action_group (option_actions); diff --git a/gtk2_ardour/ardour_ui_options.cc b/gtk2_ardour/ardour_ui_options.cc index 882a1f2b87..e20d7521fd 100644 --- a/gtk2_ardour/ardour_ui_options.cc +++ b/gtk2_ardour/ardour_ui_options.cc @@ -86,278 +86,6 @@ ARDOUR_UI::toggle_send_midi_feedback () } void -ARDOUR_UI::toggle_denormal_protection () -{ - ActionManager::toggle_config_state ("options", "DenormalProtection", &RCConfiguration::set_denormal_protection, &RCConfiguration::get_denormal_protection); -} - -void -ARDOUR_UI::toggle_only_copy_imported_files () -{ - ActionManager::toggle_config_state ("options", "OnlyCopyImportedFiles", &RCConfiguration::set_only_copy_imported_files, &RCConfiguration::get_only_copy_imported_files); -} - - -void -ARDOUR_UI::set_native_file_header_format (HeaderFormat hf) -{ - const char *action = 0; - - switch (hf) { - case BWF: - action = X_("FileHeaderFormatBWF"); - break; - case WAVE: - action = X_("FileHeaderFormatWAVE"); - break; - case WAVE64: - action = X_("FileHeaderFormatWAVE64"); - break; - case iXML: - action = X_("FileHeaderFormatiXML"); - break; - case RF64: - action = X_("FileHeaderFormatRF64"); - break; - case CAF: - action = X_("FileHeaderFormatCAF"); - break; - case AIFF: - action = X_("FileHeaderFormatAIFF"); - break; - default: - fatal << string_compose (_("programming error: %1"), "illegal file header format in ::set_native_file_header_format") << endmsg; - /*NOTREACHED*/ - } - - Glib::RefPtr<Action> act = ActionManager::get_action ("options", action); - - if (act) { - Glib::RefPtr<RadioAction> ract = Glib::RefPtr<RadioAction>::cast_dynamic(act); - if (ract && ract->get_active() && session->config.get_native_file_header_format() != hf) { - session->config.set_native_file_header_format (hf); - } - } -} - -void -ARDOUR_UI::set_native_file_data_format (SampleFormat sf) -{ - const char* action = 0; - - switch (sf) { - case FormatFloat: - action = X_("FileDataFormatFloat"); - break; - case FormatInt24: - action = X_("FileDataFormat24bit"); - break; - case FormatInt16: - action = X_("FileDataFormat16bit"); - break; - default: - fatal << string_compose (_("programming error: %1"), "illegal file data format in ::set_native_file_data_format") << endmsg; - /*NOTREACHED*/ - } - - Glib::RefPtr<Action> act = ActionManager::get_action ("options", action); - - if (act) { - Glib::RefPtr<RadioAction> ract = Glib::RefPtr<RadioAction>::cast_dynamic(act); - if (ract && ract->get_active() && session->config.get_native_file_data_format() != sf) { - session->config.set_native_file_data_format (sf); - } - } -} - -void -ARDOUR_UI::set_input_auto_connect (AutoConnectOption option) -{ - const char* action; - - switch (option) { - case AutoConnectPhysical: - action = X_("InputAutoConnectPhysical"); - break; - default: - action = X_("InputAutoConnectManual"); - } - - Glib::RefPtr<Action> act = ActionManager::get_action ("options", action); - - if (act) { - Glib::RefPtr<RadioAction> ract = Glib::RefPtr<RadioAction>::cast_dynamic(act); - - if (ract && ract->get_active() && Config->get_input_auto_connect() != option) { - Config->set_input_auto_connect (option); - } - } -} - -void -ARDOUR_UI::set_output_auto_connect (AutoConnectOption option) -{ - const char* action; - - switch (option) { - case AutoConnectPhysical: - action = X_("OutputAutoConnectPhysical"); - break; - case AutoConnectMaster: - action = X_("OutputAutoConnectMaster"); - break; - default: - action = X_("OutputAutoConnectManual"); - } - - Glib::RefPtr<Action> act = ActionManager::get_action ("options", action); - - if (act) { - Glib::RefPtr<RadioAction> ract = Glib::RefPtr<RadioAction>::cast_dynamic(act); - - if (ract && ract->get_active() && Config->get_output_auto_connect() != option) { - Config->set_output_auto_connect (option); - } - } -} - -void -ARDOUR_UI::set_solo_model (SoloModel model) -{ - const char* action = 0; - - switch (model) { - case SoloBus: - action = X_("SoloViaBus"); - break; - - case InverseMute: - action = X_("SoloInPlace"); - break; - default: - fatal << string_compose (_("programming error: unknown solo model in ARDOUR_UI::set_solo_model: %1"), model) << endmsg; - /*NOTREACHED*/ - } - - Glib::RefPtr<Action> act = ActionManager::get_action ("options", action); - - if (act) { - Glib::RefPtr<RadioAction> ract = Glib::RefPtr<RadioAction>::cast_dynamic(act); - - if (ract && ract->get_active() && Config->get_solo_model() != model) { - Config->set_solo_model (model); - } - } - -} - -void -ARDOUR_UI::set_remote_model (RemoteModel model) -{ - const char* action = 0; - - switch (model) { - case UserOrdered: - action = X_("RemoteUserDefined"); - break; - case MixerOrdered: - action = X_("RemoteMixerDefined"); - break; - case EditorOrdered: - action = X_("RemoteEditorDefined"); - break; - - default: - fatal << string_compose (_("programming error: unknown remote model in ARDOUR_UI::set_remote_model: %1"), model) << endmsg; - /*NOTREACHED*/ - } - - Glib::RefPtr<Action> act = ActionManager::get_action ("options", action); - - if (act) { - Glib::RefPtr<RadioAction> ract = Glib::RefPtr<RadioAction>::cast_dynamic(act); - - if (ract && ract->get_active() && Config->get_remote_model() != model) { - Config->set_remote_model (model); - } - } - -} - -void -ARDOUR_UI::set_monitor_model (MonitorModel model) -{ - const char* action = 0; - - switch (model) { - case HardwareMonitoring: - action = X_("UseHardwareMonitoring"); - break; - - case SoftwareMonitoring: - action = X_("UseSoftwareMonitoring"); - break; - case ExternalMonitoring: - action = X_("UseExternalMonitoring"); - break; - - default: - fatal << string_compose (_("programming error: unknown monitor model in ARDOUR_UI::set_monitor_model: %1"), model) << endmsg; - /*NOTREACHED*/ - } - - Glib::RefPtr<Action> act = ActionManager::get_action ("options", action); - - if (act) { - Glib::RefPtr<RadioAction> ract = Glib::RefPtr<RadioAction>::cast_dynamic(act); - - if (ract && ract->get_active() && Config->get_monitoring_model() != model) { - Config->set_monitoring_model (model); - } - } - -} - -void -ARDOUR_UI::set_denormal_model (DenormalModel model) -{ - const char* action = 0; - - switch (model) { - case DenormalNone: - action = X_("DenormalNone"); - break; - - case DenormalFTZ: - action = X_("DenormalFTZ"); - break; - - case DenormalDAZ: - action = X_("DenormalDAZ"); - break; - - case DenormalFTZDAZ: - action = X_("DenormalFTZDAZ"); - break; - - default: - fatal << string_compose (_("programming error: unknown denormal model in ARDOUR_UI::set_denormal_model: %1"), model) << endmsg; - /*NOTREACHED*/ - } - - Glib::RefPtr<Action> act = ActionManager::get_action ("options", action); - - if (act) { - Glib::RefPtr<RadioAction> ract = Glib::RefPtr<RadioAction>::cast_dynamic(act); - - if (ract && ract->get_active() && Config->get_denormal_model() != model) { - Config->set_denormal_model (model); - } - } - -} - -void ARDOUR_UI::toggle_auto_input () { ActionManager::toggle_config_state_foo ("Transport", "ToggleAutoInput", mem_fun (session->config, &SessionConfiguration::set_auto_input), mem_fun (session->config, &SessionConfiguration::get_auto_input)); @@ -480,144 +208,6 @@ ARDOUR_UI::toggle_editing_space() } void -ARDOUR_UI::toggle_new_plugins_active () -{ - ActionManager::toggle_config_state ("options", "NewPluginsActive", &RCConfiguration::set_new_plugins_active, &RCConfiguration::get_new_plugins_active); -} - -void -ARDOUR_UI::toggle_StopPluginsWithTransport() -{ - ActionManager::toggle_config_state ("options", "StopPluginsWithTransport", &RCConfiguration::set_plugins_stop_with_transport, &RCConfiguration::get_plugins_stop_with_transport); -} - -void -ARDOUR_UI::toggle_LatchedRecordEnable() -{ - ActionManager::toggle_config_state ("options", "LatchedRecordEnable", &RCConfiguration::set_latched_record_enable, &RCConfiguration::get_latched_record_enable); -} - -void -ARDOUR_UI::toggle_RegionEquivalentsOverlap() -{ - ActionManager::toggle_config_state ("options", "RegionEquivalentsOverlap", &RCConfiguration::set_use_overlap_equivalency, &RCConfiguration::get_use_overlap_equivalency); -} - -void -ARDOUR_UI::toggle_DoNotRunPluginsWhileRecording() -{ - ActionManager::toggle_config_state ("options", "DoNotRunPluginsWhileRecording", &RCConfiguration::set_do_not_record_plugins, &RCConfiguration::get_do_not_record_plugins); -} - -void -ARDOUR_UI::toggle_VerifyRemoveLastCapture() -{ - ActionManager::toggle_config_state ("options", "VerifyRemoveLastCapture", &RCConfiguration::set_verify_remove_last_capture, &RCConfiguration::get_verify_remove_last_capture); -} - -void -ARDOUR_UI::toggle_PeriodicSafetyBackups() -{ - ActionManager::toggle_config_state ("options", "PeriodicSafetyBackups", &RCConfiguration::set_periodic_safety_backups, &RCConfiguration::get_periodic_safety_backups); -} - -void -ARDOUR_UI::toggle_StopRecordingOnXrun() -{ - ActionManager::toggle_config_state ("options", "StopRecordingOnXrun", &RCConfiguration::set_stop_recording_on_xrun, &RCConfiguration::get_stop_recording_on_xrun); -} - -void -ARDOUR_UI::toggle_CreateXrunMarker() -{ - ActionManager::toggle_config_state ("options", "CreateXrunMarker", &RCConfiguration::set_create_xrun_marker, &RCConfiguration::get_create_xrun_marker); -} - -void -ARDOUR_UI::toggle_sync_order_keys () -{ - ActionManager::toggle_config_state ("options", "SyncEditorAndMixerTrackOrder", &RCConfiguration::set_sync_all_route_ordering, &RCConfiguration::get_sync_all_route_ordering); -} - -void -ARDOUR_UI::toggle_StopTransportAtEndOfSession() -{ - ActionManager::toggle_config_state ("options", "StopTransportAtEndOfSession", &RCConfiguration::set_stop_at_session_end, &RCConfiguration::get_stop_at_session_end); -} - -void -ARDOUR_UI::toggle_GainReduceFastTransport() -{ - ActionManager::toggle_config_state ("options", "GainReduceFastTransport", &RCConfiguration::set_quieten_at_speed, &RCConfiguration::get_quieten_at_speed); -} - -void -ARDOUR_UI::toggle_LatchedSolo() -{ - ActionManager::toggle_config_state ("options", "LatchedSolo", &RCConfiguration::set_solo_latched, &RCConfiguration::get_solo_latched); -} - -void -ARDOUR_UI::toggle_ShowSoloMutes() -{ - ActionManager::toggle_config_state ("options", "ShowSoloMutes", &RCConfiguration::set_show_solo_mutes, &RCConfiguration::get_show_solo_mutes); -} - -void -ARDOUR_UI::toggle_SoloMuteOverride() -{ - ActionManager::toggle_config_state ("options", "SoloMuteOverride", &RCConfiguration::set_solo_mute_override, &RCConfiguration::get_solo_mute_override); -} - -void -ARDOUR_UI::toggle_PrimaryClockDeltaEditCursor() -{ - ActionManager::toggle_config_state ("options", "PrimaryClockDeltaEditCursor", &RCConfiguration::set_primary_clock_delta_edit_cursor, &RCConfiguration::get_primary_clock_delta_edit_cursor); -} - -void -ARDOUR_UI::toggle_SecondaryClockDeltaEditCursor() -{ - ActionManager::toggle_config_state ("options", "SecondaryClockDeltaEditCursor", &RCConfiguration::set_secondary_clock_delta_edit_cursor, &RCConfiguration::get_secondary_clock_delta_edit_cursor); -} - -void -ARDOUR_UI::toggle_ShowTrackMeters() -{ - ActionManager::toggle_config_state ("options", "ShowTrackMeters", &RCConfiguration::set_show_track_meters, &RCConfiguration::get_show_track_meters); -} - -void -ARDOUR_UI::toggle_TapeMachineMode () -{ - ActionManager::toggle_config_state ("options", "ToggleTapeMachineMode", &RCConfiguration::set_tape_machine_mode, &RCConfiguration::get_tape_machine_mode); -} - -void -ARDOUR_UI::toggle_use_narrow_ms() -{ - ActionManager::toggle_config_state ("options", "DefaultNarrowMS", &RCConfiguration::set_default_narrow_ms, &RCConfiguration::get_default_narrow_ms); -} - -void -ARDOUR_UI::toggle_NameNewMarkers() -{ - ActionManager::toggle_config_state ("options", "NameNewMarkers", &RCConfiguration::set_name_new_markers, &RCConfiguration::get_name_new_markers); -} - -void -ARDOUR_UI::toggle_rubberbanding_snaps_to_grid () -{ - ActionManager::toggle_config_state ("options", "RubberbandingSnapsToGrid", &RCConfiguration::set_rubberbanding_snaps_to_grid, &RCConfiguration::get_rubberbanding_snaps_to_grid); -} - -void -ARDOUR_UI::toggle_auto_analyse_audio () -{ - ActionManager::toggle_config_state ("options", "AutoAnalyseAudio", &RCConfiguration::set_auto_analyse_audio, &RCConfiguration::get_auto_analyse_audio); -} - -void ARDOUR_UI::mtc_port_changed () { bool have_mtc; @@ -660,420 +250,6 @@ ARDOUR_UI::setup_session_options () Config->ParameterChanged.connect (mem_fun (*this, &ARDOUR_UI::parameter_changed)); } - -void -ARDOUR_UI::map_solo_model () -{ - const char* on; - - if (Config->get_solo_model() == InverseMute) { - on = X_("SoloInPlace"); - } else { - on = X_("SoloViaBus"); - } - - Glib::RefPtr<Action> act = ActionManager::get_action ("options", on); - if (act) { - Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act); - - if (tact && !tact->get_active()) { - tact->set_active (true); - } - } -} - -void -ARDOUR_UI::map_monitor_model () -{ - const char* on = 0; - - switch (Config->get_monitoring_model()) { - case HardwareMonitoring: - on = X_("UseHardwareMonitoring"); - break; - case SoftwareMonitoring: - on = X_("UseSoftwareMonitoring"); - break; - case ExternalMonitoring: - on = X_("UseExternalMonitoring"); - break; - } - - Glib::RefPtr<Action> act = ActionManager::get_action ("options", on); - if (act) { - Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act); - - if (tact && !tact->get_active()) { - tact->set_active (true); - } - } -} - -void -ARDOUR_UI::map_denormal_protection () -{ - Glib::RefPtr<Action> act = ActionManager::get_action ("options", X_("DenormalProtection")); - if (act) { - Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act); - - if (tact && !tact->get_active()) { - tact->set_active (Config->get_denormal_protection()); - } - } -} - -void -ARDOUR_UI::map_denormal_model () -{ - const char* on = 0; - - switch (Config->get_denormal_model()) { - case DenormalNone: - on = X_("DenormalNone"); - break; - case DenormalFTZ: - on = X_("DenormalFTZ"); - break; - case DenormalDAZ: - on = X_("DenormalDAZ"); - break; - case DenormalFTZDAZ: - on = X_("DenormalFTZDAZ"); - break; - } - - Glib::RefPtr<Action> act = ActionManager::get_action ("options", on); - if (act) { - Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act); - - if (tact && !tact->get_active()) { - tact->set_active (true); - } - } -} - -void -ARDOUR_UI::map_remote_model () -{ - const char* on = 0; - - switch (Config->get_remote_model()) { - case UserOrdered: - on = X_("RemoteUserDefined"); - break; - case MixerOrdered: - on = X_("RemoteMixerDefined"); - break; - case EditorOrdered: - on = X_("RemoteEditorDefined"); - break; - } - - Glib::RefPtr<Action> act = ActionManager::get_action ("options", on); - if (act) { - Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act); - - if (tact && !tact->get_active()) { - tact->set_active (true); - } - } -} - -void -ARDOUR_UI::map_file_header_format () -{ - const char* action = 0; - - switch (session->config.get_native_file_header_format()) { - case BWF: - action = X_("FileHeaderFormatBWF"); - break; - - case WAVE: - action = X_("FileHeaderFormatWAVE"); - break; - - case WAVE64: - action = X_("FileHeaderFormatWAVE64"); - break; - - case iXML: - action = X_("FileHeaderFormatiXML"); - break; - - case RF64: - action = X_("FileHeaderFormatRF64"); - break; - - case CAF: - action = X_("FileHeaderFormatCAF"); - break; - - default: - fatal << string_compose (_("programming error: unknown file header format passed to ARDOUR_UI::map_file_data_format: %1"), - session->config.get_native_file_header_format()) << endmsg; - /*NOTREACHED*/ - } - - - Glib::RefPtr<Action> act = ActionManager::get_action ("options", action); - - if (act) { - Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act); - - if (tact && !tact->get_active()) { - tact->set_active (true); - } - } -} - -void -ARDOUR_UI::map_file_data_format () -{ - const char* action = 0; - - switch (session->config.get_native_file_data_format()) { - case FormatFloat: - action = X_("FileDataFormatFloat"); - break; - - case FormatInt24: - action = X_("FileDataFormat24bit"); - break; - - case FormatInt16: - action = X_("FileDataFormat16bit"); - break; - - default: - fatal << string_compose (_("programming error: unknown file data format passed to ARDOUR_UI::map_file_data_format: %1"), - session->config.get_native_file_data_format()) << endmsg; - /*NOTREACHED*/ - } - - - Glib::RefPtr<Action> act = ActionManager::get_action ("options", action); - - if (act) { - Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act); - - if (tact && !tact->get_active()) { - tact->set_active (true); - } - } -} - -void -ARDOUR_UI::map_input_auto_connect () -{ - const char* on; - - if (Config->get_input_auto_connect() == (AutoConnectOption) 0) { - on = "InputAutoConnectManual"; - } else { - on = "InputAutoConnectPhysical"; - } - - Glib::RefPtr<Action> act = ActionManager::get_action ("options", on); - if (act) { - Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act); - - if (tact && !tact->get_active()) { - tact->set_active (true); - } - } -} - -void -ARDOUR_UI::map_output_auto_connect () -{ - const char* on; - - if (Config->get_output_auto_connect() == (AutoConnectOption) 0) { - on = "OutputAutoConnectManual"; - } else if (Config->get_output_auto_connect() == AutoConnectPhysical) { - on = "OutputAutoConnectPhysical"; - } else { - on = "OutputAutoConnectMaster"; - } - - Glib::RefPtr<Action> act = ActionManager::get_action ("options", on); - if (act) { - Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act); - - if (tact && !tact->get_active()) { - tact->set_active (true); - } - } -} - -void -ARDOUR_UI::map_only_copy_imported_files () -{ - Glib::RefPtr<Action> act = ActionManager::get_action ("options", X_("OnlyCopyImportedFiles")); - if (act) { - Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act); - - if (tact && !tact->get_active()) { - tact->set_active (Config->get_only_copy_imported_files()); - } - } - -} - - -void -ARDOUR_UI::map_meter_falloff () -{ - const char* action = X_("MeterFalloffMedium"); - - float val = Config->get_meter_falloff (); - MeterFalloff code = meter_falloff_from_float(val); - - switch (code) { - case MeterFalloffOff: - action = X_("MeterFalloffOff"); - break; - case MeterFalloffSlowest: - action = X_("MeterFalloffSlowest"); - break; - case MeterFalloffSlow: - action = X_("MeterFalloffSlow"); - break; - case MeterFalloffMedium: - action = X_("MeterFalloffMedium"); - break; - case MeterFalloffFast: - action = X_("MeterFalloffFast"); - break; - case MeterFalloffFaster: - action = X_("MeterFalloffFaster"); - break; - case MeterFalloffFastest: - action = X_("MeterFalloffFastest"); - break; - } - - Glib::RefPtr<Action> act = ActionManager::get_action (X_("options"), action); - - if (act) { - Glib::RefPtr<RadioAction> ract = Glib::RefPtr<RadioAction>::cast_dynamic(act); - if (ract && !ract->get_active()) { - ract->set_active (true); - } - } -} - -void -ARDOUR_UI::map_meter_hold () -{ - const char* action = X_("MeterHoldMedium"); - - /* XXX hack alert. Fix this. Please */ - - float val = Config->get_meter_hold (); - MeterHold code = (MeterHold) (int) (floor (val)); - - switch (code) { - case MeterHoldOff: - action = X_("MeterHoldOff"); - break; - case MeterHoldShort: - action = X_("MeterHoldShort"); - break; - case MeterHoldMedium: - action = X_("MeterHoldMedium"); - break; - case MeterHoldLong: - action = X_("MeterHoldLong"); - break; - } - - Glib::RefPtr<Action> act = ActionManager::get_action (X_("options"), action); - - if (act) { - Glib::RefPtr<RadioAction> ract = Glib::RefPtr<RadioAction>::cast_dynamic(act); - if (ract && !ract->get_active()) { - ract->set_active (true); - } - } -} - -void -ARDOUR_UI::set_meter_hold (MeterHold val) -{ - const char* action = 0; - float fval; - - fval = meter_hold_to_float (val); - - switch (val) { - case MeterHoldOff: - action = X_("MeterHoldOff"); - break; - case MeterHoldShort: - action = X_("MeterHoldShort"); - break; - case MeterHoldMedium: - action = X_("MeterHoldMedium"); - break; - case MeterHoldLong: - action = X_("MeterHoldLong"); - break; - } - - Glib::RefPtr<Action> act = ActionManager::get_action (X_("options"), action); - - if (act) { - Glib::RefPtr<RadioAction> ract = Glib::RefPtr<RadioAction>::cast_dynamic(act); - if (ract && ract->get_active() && Config->get_meter_hold() != fval) { - Config->set_meter_hold (fval); - } - } -} - -void -ARDOUR_UI::set_meter_falloff (MeterFalloff val) -{ - const char* action = 0; - float fval; - - fval = meter_falloff_to_float (val); - - switch (val) { - case MeterFalloffOff: - action = X_("MeterFalloffOff"); - break; - case MeterFalloffSlowest: - action = X_("MeterFalloffSlowest"); - break; - case MeterFalloffSlow: - action = X_("MeterFalloffSlow"); - break; - case MeterFalloffMedium: - action = X_("MeterFalloffMedium"); - break; - case MeterFalloffFast: - action = X_("MeterFalloffFast"); - break; - case MeterFalloffFaster: - action = X_("MeterFalloffFaster"); - break; - case MeterFalloffFastest: - action = X_("MeterFalloffFastest"); - break; - } - - Glib::RefPtr<Action> act = ActionManager::get_action (X_("options"), action); - - if (act) { - Glib::RefPtr<RadioAction> ract = Glib::RefPtr<RadioAction>::cast_dynamic(act); - if (ract && ract->get_active() && Config->get_meter_falloff () != fval) { - Config->set_meter_falloff (fval); - } - } -} - void ARDOUR_UI::parameter_changed (std::string p) { @@ -1120,26 +296,12 @@ ARDOUR_UI::parameter_changed (std::string p) ActionManager::map_some_state ("options", "UseMMC", &RCConfiguration::get_mmc_control); } else if (p == "midi-feedback") { ActionManager::map_some_state ("options", "SendMIDIfeedback", &RCConfiguration::get_midi_feedback); - } else if (p == "do-not-record-plugins") { - ActionManager::map_some_state ("options", "DoNotRunPluginsWhileRecording", &RCConfiguration::get_do_not_record_plugins); - } else if (p == "latched-record-enable") { - ActionManager::map_some_state ("options", "LatchedRecordEnable", &RCConfiguration::get_latched_record_enable); - } else if (p == "solo-latched") { - ActionManager::map_some_state ("options", "LatchedSolo", &RCConfiguration::get_solo_latched); - } else if (p == "show-solo-mutes") { - ActionManager::map_some_state ("options", "ShowSoloMutes", &RCConfiguration::get_show_solo_mutes); - } else if (p == "solo-mute-override") { - ActionManager::map_some_state ("options", "SoloMuteOverride", &RCConfiguration::get_solo_mute_override); - } else if (p == "solo-model") { - map_solo_model (); } else if (p == "auto-play") { ActionManager::map_some_state ("Transport", "ToggleAutoPlay", mem_fun (session->config, &SessionConfiguration::get_auto_play)); } else if (p == "auto-return") { ActionManager::map_some_state ("Transport", "ToggleAutoReturn", mem_fun (session->config, &SessionConfiguration::get_auto_return)); } else if (p == "auto-input") { ActionManager::map_some_state ("Transport", "ToggleAutoInput", mem_fun (session->config, &SessionConfiguration::get_auto_input)); - } else if (p == "tape-machine-mode") { - ActionManager::map_some_state ("options", "ToggleTapeMachineMode", &RCConfiguration::get_tape_machine_mode); } else if (p == "punch-out") { ActionManager::map_some_state ("Transport", "TogglePunchOut", mem_fun (session->config, &SessionConfiguration::get_punch_out)); if (!session->config.get_punch_out()) { @@ -1154,36 +316,8 @@ ARDOUR_UI::parameter_changed (std::string p) ActionManager::map_some_state ("Transport", "ToggleClick", &RCConfiguration::get_clicking); } else if (p == "jack-time-master") { ActionManager::map_some_state ("Transport", "ToggleTimeMaster", mem_fun (session->config, &SessionConfiguration::get_jack_time_master)); - } else if (p == "plugins-stop-with-transport") { - ActionManager::map_some_state ("options", "StopPluginsWithTransport", &RCConfiguration::get_plugins_stop_with_transport); - } else if (p == "new-plugins-active") { - ActionManager::map_some_state ("options", "NewPluginsActive", &RCConfiguration::get_new_plugins_active); - } else if (p == "latched-record-enable") { - ActionManager::map_some_state ("options", "LatchedRecordEnable", &RCConfiguration::get_latched_record_enable); - } else if (p == "verify-remove-last-capture") { - ActionManager::map_some_state ("options", "VerifyRemoveLastCapture", &RCConfiguration::get_verify_remove_last_capture); - } else if (p == "periodic-safety-backups") { - ActionManager::map_some_state ("options", "PeriodicSafetyBackups", &RCConfiguration::get_periodic_safety_backups); - } else if (p == "stop-recording-on-xrun") { - ActionManager::map_some_state ("options", "StopRecordingOnXrun", &RCConfiguration::get_stop_recording_on_xrun); - } else if (p == "create-xrun-marker") { - ActionManager::map_some_state ("options", "CreateXrunMarker", &RCConfiguration::get_create_xrun_marker); - } else if (p == "sync-all-route-ordering") { - ActionManager::map_some_state ("options", "SyncEditorAndMixerTrackOrder", &RCConfiguration::get_sync_all_route_ordering); - } else if (p == "stop-at-session-end") { - ActionManager::map_some_state ("options", "StopTransportAtEndOfSession", &RCConfiguration::get_stop_at_session_end); - } else if (p == "monitoring-model") { - map_monitor_model (); - } else if (p == "denormal-model") { - map_denormal_model (); - } else if (p == "denormal-protection") { - map_denormal_protection (); - } else if (p == "remote-model") { - map_remote_model (); } else if (p == "use-video-sync") { ActionManager::map_some_state ("Transport", "ToggleVideoSync", mem_fun (session->config, &SessionConfiguration::get_use_video_sync)); - } else if (p == "quieten-at-speed") { - ActionManager::map_some_state ("options", "GainReduceFastTransport", &RCConfiguration::get_quieten_at_speed); } else if (p == "shuttle-behaviour") { switch (Config->get_shuttle_behaviour ()) { @@ -1213,18 +347,6 @@ ARDOUR_UI::parameter_changed (std::string p) shuttle_units_button.set_label(_("ST")); break; } - } else if (p == "input-auto-connect") { - map_input_auto_connect (); - } else if (p == "output-auto-connect") { - map_output_auto_connect (); - } else if (p == "native-file-header-format") { - map_file_header_format (); - } else if (p == "native-file-data-format") { - map_file_data_format (); - } else if (p == "meter-hold") { - map_meter_hold (); - } else if (p == "meter-falloff") { - map_meter_falloff (); } else if (p == "video-pullup" || p == "smpte-format") { if (session) { primary_clock.set (session->audible_frame(), true); @@ -1233,20 +355,7 @@ ARDOUR_UI::parameter_changed (std::string p) primary_clock.set (0, true); secondary_clock.set (0, true); } - } else if (p == "use-overlap-equivalency") { - ActionManager::map_some_state ("options", "RegionEquivalentsOverlap", &RCConfiguration::get_use_overlap_equivalency); - } else if (p == "primary-clock-delta-edit-cursor") { - ActionManager::map_some_state ("options", "PrimaryClockDeltaEditCursor", &RCConfiguration::get_primary_clock_delta_edit_cursor); - } else if (p == "secondary-clock-delta-edit-cursor") { - ActionManager::map_some_state ("options", "SecondaryClockDeltaEditCursor", &RCConfiguration::get_secondary_clock_delta_edit_cursor); - } else if (p == "only-copy-imported-files") { - map_only_copy_imported_files (); } else if (p == "show-track-meters") { - ActionManager::map_some_state ("options", "ShowTrackMeters", &RCConfiguration::get_show_track_meters); editor->toggle_meter_updating(); - } else if (p == "default-narrow_ms") { - ActionManager::map_some_state ("options", "DefaultNarrowMS", &RCConfiguration::get_default_narrow_ms); - } else if (p =="rubberbanding-snaps-to-grid") { - ActionManager::map_some_state ("options", "RubberbandingSnapsToGrid", &RCConfiguration::get_rubberbanding_snaps_to_grid); } } diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index 2259b4007e..ffe0154fe4 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -334,36 +334,12 @@ class Editor : public PublicEditor double physical_screen_width; double physical_screen_height; - /* SMPTE timecode & video sync */ - - void smpte_fps_chosen (ARDOUR::SmpteFormat format); - void video_pullup_chosen (ARDOUR::Session::PullupFormat pullup); - void subframes_per_frame_chosen (uint32_t); - - void update_smpte_mode (); - void update_video_pullup (); - void update_subframes_per_frame (); - /* fades/xfades */ - void toggle_region_fades (); - void toggle_region_fades_visible (); void toggle_selected_region_fades (int dir); void update_region_fade_visibility (); - void toggle_auto_xfade (); - void toggle_xfades_active (); - void toggle_xfade_visibility (); bool xfade_visibility() const { return _xfade_visibility; } void update_xfade_visibility (); - void update_crossfade_model (); - void set_crossfade_model (ARDOUR::CrossfadeModel); - - /* layers */ - void set_layer_model (ARDOUR::LayerModel); - void update_layering_model (); - - void toggle_link_region_and_track_selection (); - void toggle_automation_follows_regions (); /* redirect shared ops menu. caller must free returned menu */ diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc index 91bf421d44..87b354eb28 100644 --- a/gtk2_ardour/editor_actions.cc +++ b/gtk2_ardour/editor_actions.cc @@ -100,8 +100,6 @@ Editor::register_actions () /* add named actions for the editor */ - ActionManager::register_toggle_action (editor_actions, "link-region-and-track-selection", _("Link Region/Track Selection"), mem_fun (*this, &Editor::toggle_link_region_and_track_selection)); - ActionManager::register_toggle_action (editor_actions, "automation-follows-regions", _("Automation Follows Regions"), mem_fun (*this, &Editor::toggle_automation_follows_regions)); ActionManager::register_action (editor_actions, "break-drag", _("Break drag"), mem_fun (*this, &Editor::break_drag)); act = ActionManager::register_toggle_action (editor_actions, "show-editor-mixer", _("Show Editor Mixer"), mem_fun (*this, &Editor::editor_mixer_button_toggled)); @@ -109,24 +107,6 @@ Editor::register_actions () act = ActionManager::register_toggle_action (editor_actions, "show-editor-list", _("Show Editor List"), mem_fun (*this, &Editor::editor_list_button_toggled)); ActionManager::session_sensitive_actions.push_back (act); - RadioAction::Group crossfade_model_group; - - act = ActionManager::register_radio_action (editor_actions, crossfade_model_group, "CrossfadesFull", _("Span Entire Overlap"), bind (mem_fun(*this, &Editor::set_crossfade_model), FullCrossfade)); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_radio_action (editor_actions, crossfade_model_group, "CrossfadesShort", _("Short"), bind (mem_fun(*this, &Editor::set_crossfade_model), ShortCrossfade)); - ActionManager::session_sensitive_actions.push_back (act); - - act = ActionManager::register_toggle_action (editor_actions, "toggle-xfades-active", _("Active"), mem_fun(*this, &Editor::toggle_xfades_active)); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_toggle_action (editor_actions, "toggle-xfades-visible", _("Show"), mem_fun(*this, &Editor::toggle_xfade_visibility)); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_toggle_action (editor_actions, "toggle-auto-xfades", _("Created Automatically"), mem_fun(*this, &Editor::toggle_auto_xfade)); - ActionManager::session_sensitive_actions.push_back (act); - - act = ActionManager::register_toggle_action (editor_actions, "toggle-region-fades", _("Use Region Fades (global)"), mem_fun(*this, &Editor::toggle_region_fades)); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_toggle_action (editor_actions, "toggle-region-fades-visible", _("Show Region Fades"), mem_fun(*this, &Editor::toggle_region_fades_visible)); - ActionManager::session_sensitive_actions.push_back (act); act = ActionManager::register_action (editor_actions, "toggle-selected-region-fade-in", _("Toggle Region Fade In"), bind (mem_fun(*this, &Editor::toggle_selected_region_fades), 1));; ActionManager::session_sensitive_actions.push_back (act); act = ActionManager::register_action (editor_actions, "toggle-selected-region-fade-out", _("Toggle Region Fade Out"), bind (mem_fun(*this, &Editor::toggle_selected_region_fades), -1));; @@ -844,44 +824,6 @@ Editor::register_actions () Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act); tact->set_active (true); - RadioAction::Group layer_model_group; - - ActionManager::register_radio_action (editor_actions, layer_model_group, X_("LayerLaterHigher"), _("Later is Higher"), bind (mem_fun (*this, &Editor::set_layer_model), LaterHigher)); - ActionManager::register_radio_action (editor_actions, layer_model_group, X_("LayerMoveAddHigher"), _("Most Recently Moved/Added is Higher"), bind (mem_fun (*this, &Editor::set_layer_model), MoveAddHigher)); - ActionManager::register_radio_action (editor_actions, layer_model_group, X_("LayerAddHigher"), _("Most Recently Added is Higher"), bind (mem_fun (*this, &Editor::set_layer_model), AddHigher)); - - RadioAction::Group smpte_group; - - ActionManager::register_radio_action (editor_actions, smpte_group, X_("Smpte23976"), _("23.976"), bind (mem_fun (*this, &Editor::smpte_fps_chosen), smpte_23976)); - ActionManager::register_radio_action (editor_actions, smpte_group, X_("Smpte24"), _("24"), bind (mem_fun (*this, &Editor::smpte_fps_chosen), smpte_24)); - ActionManager::register_radio_action (editor_actions, smpte_group, X_("Smpte24976"), _("24.976"), bind (mem_fun (*this, &Editor::smpte_fps_chosen), smpte_24976)); - ActionManager::register_radio_action (editor_actions, smpte_group, X_("Smpte25"), _("25"), bind (mem_fun (*this, &Editor::smpte_fps_chosen), smpte_25)); - ActionManager::register_radio_action (editor_actions, smpte_group, X_("Smpte2997"), _("29.97"), bind (mem_fun (*this, &Editor::smpte_fps_chosen), smpte_2997)); - ActionManager::register_radio_action (editor_actions, smpte_group, X_("Smpte2997drop"), _("29.97 drop"), bind (mem_fun (*this, &Editor::smpte_fps_chosen), smpte_2997drop)); - ActionManager::register_radio_action (editor_actions, smpte_group, X_("Smpte30"), _("30"), bind (mem_fun (*this, &Editor::smpte_fps_chosen), smpte_30)); - ActionManager::register_radio_action (editor_actions, smpte_group, X_("Smpte30drop"), _("30 drop"), bind (mem_fun (*this, &Editor::smpte_fps_chosen), smpte_30drop)); - ActionManager::register_radio_action (editor_actions, smpte_group, X_("Smpte5994"), _("59.94"), bind (mem_fun (*this, &Editor::smpte_fps_chosen), smpte_5994)); - ActionManager::register_radio_action (editor_actions, smpte_group, X_("Smpte60"), _("60"), bind (mem_fun (*this, &Editor::smpte_fps_chosen), smpte_60)); - - RadioAction::Group pullup_group; - - ActionManager::register_radio_action (editor_actions, pullup_group, X_("PullupPlus4Plus1"), _("+4.1667% + 0.1%"), bind (mem_fun (*this, &Editor::video_pullup_chosen), Session::pullup_Plus4Plus1)); - ActionManager::register_radio_action (editor_actions, pullup_group, X_("PullupPlus4"), _("+4.1667%"), bind (mem_fun (*this, &Editor::video_pullup_chosen), Session::pullup_Plus4)); - ActionManager::register_radio_action (editor_actions, pullup_group, X_("PullupPlus4Minus1"), _("+4.1667% - 0.1%"), bind (mem_fun (*this, &Editor::video_pullup_chosen), Session::pullup_Plus4Minus1)); - ActionManager::register_radio_action (editor_actions, pullup_group, X_("PullupPlus1"), _("+ 0.1%"), bind (mem_fun (*this, &Editor::video_pullup_chosen), Session::pullup_Plus1)); - ActionManager::register_radio_action (editor_actions, pullup_group, X_("PullupNone"), _("None"), bind (mem_fun (*this, &Editor::video_pullup_chosen), Session::pullup_None)); - ActionManager::register_radio_action (editor_actions, pullup_group, X_("PullupMinus1"), _("- 0.1%"), bind (mem_fun (*this, &Editor::video_pullup_chosen), Session::pullup_Minus1)); - ActionManager::register_radio_action (editor_actions, pullup_group, X_("PullupMinus4Plus1"), _("-4.1667% + 0.1%"), bind (mem_fun (*this, &Editor::video_pullup_chosen), Session::pullup_Minus4Plus1)); - ActionManager::register_radio_action (editor_actions, pullup_group, X_("PullupMinus4"), _("-4.1667%"), bind (mem_fun (*this, &Editor::video_pullup_chosen), Session::pullup_Minus4)); - ActionManager::register_radio_action (editor_actions, pullup_group, X_("PullupMinus4Minus1"), _("-4.1667% - 0.1%"), bind (mem_fun (*this, &Editor::video_pullup_chosen), Session::pullup_Minus4Minus1)); - - RadioAction::Group subframe_group; - - ActionManager::register_radio_action (editor_actions, subframe_group, X_("Subframes80"), _("80 per frame"), bind (mem_fun (*this, -&Editor::subframes_per_frame_chosen), 80)); - ActionManager::register_radio_action (editor_actions, subframe_group, X_("Subframes100"), _("100 per frame"), bind (mem_fun (*this, -&Editor::subframes_per_frame_chosen), 100)); - ActionManager::add_action_group (rl_actions); ActionManager::add_action_group (ruler_actions); ActionManager::add_action_group (zoom_actions); @@ -1014,206 +956,6 @@ Editor::waveform_scale_chosen (Editing::WaveformScale ws) } } -void -Editor::set_crossfade_model (CrossfadeModel model) -{ - RefPtr<Action> act; - - /* this is driven by a toggle on a radio group, and so is invoked twice, - once for the item that became inactive and once for the one that became - active. - */ - - switch (model) { - case FullCrossfade: - act = ActionManager::get_action (X_("Editor"), X_("CrossfadesFull")); - break; - case ShortCrossfade: - act = ActionManager::get_action (X_("Editor"), X_("CrossfadesShort")); - break; - } - - if (act) { - RefPtr<RadioAction> ract = RefPtr<RadioAction>::cast_dynamic(act); - if (ract && ract->get_active()) { - session->config.set_xfade_model (model); - } - } -} - -void -Editor::update_crossfade_model () -{ - RefPtr<Action> act; - - switch (session->config.get_xfade_model()) { - case FullCrossfade: - act = ActionManager::get_action (X_("Editor"), X_("CrossfadesFull")); - break; - case ShortCrossfade: - act = ActionManager::get_action (X_("Editor"), X_("CrossfadesShort")); - break; - } - - if (act) { - RefPtr<RadioAction> ract = RefPtr<RadioAction>::cast_dynamic(act); - if (ract && !ract->get_active()) { - ract->set_active (true); - } - } -} - - -void -Editor::update_smpte_mode () -{ - ENSURE_GUI_THREAD(mem_fun(*this, &Editor::update_smpte_mode)); - - RefPtr<Action> act; - const char* action = 0; - - switch (session->config.get_smpte_format()) { - case smpte_23976: - action = X_("Smpte23976"); - break; - case smpte_24: - action = X_("Smpte24"); - break; - case smpte_24976: - action = X_("Smpte24976"); - break; - case smpte_25: - action = X_("Smpte25"); - break; - case smpte_2997: - action = X_("Smpte2997"); - break; - case smpte_2997drop: - action = X_("Smpte2997drop"); - break; - case smpte_30: - action = X_("Smpte30"); - break; - case smpte_30drop: - action = X_("Smpte30drop"); - break; - case smpte_5994: - action = X_("Smpte5994"); - break; - case smpte_60: - action = X_("Smpte60"); - break; - } - - act = ActionManager::get_action (X_("Editor"), action); - - if (act) { - RefPtr<RadioAction> ract = RefPtr<RadioAction>::cast_dynamic(act); - if (ract && !ract->get_active()) { - ract->set_active (true); - } - } -} - -void -Editor::update_video_pullup () -{ - ENSURE_GUI_THREAD (mem_fun(*this, &Editor::update_video_pullup)); - - RefPtr<Action> act; - const char* action = 0; - - float pullup = session->config.get_video_pullup(); - - if ( pullup < (-4.1667 - 0.1) * 0.99) { - action = X_("PullupMinus4Minus1"); - } else if ( pullup < (-4.1667) * 0.99 ) { - action = X_("PullupMinus4"); - } else if ( pullup < (-4.1667 + 0.1) * 0.99 ) { - action = X_("PullupMinus4Plus1"); - } else if ( pullup < (-0.1) * 0.99 ) { - action = X_("PullupMinus1"); - } else if (pullup > (4.1667 + 0.1) * 0.99 ) { - action = X_("PullupPlus4Plus1"); - } else if ( pullup > (4.1667) * 0.99 ) { - action = X_("PullupPlus4"); - } else if ( pullup > (4.1667 - 0.1) * 0.99) { - action = X_("PullupPlus4Minus1"); - } else if ( pullup > (0.1) * 0.99 ) { - action = X_("PullupPlus1"); - } else { - action = X_("PullupNone"); - } - - act = ActionManager::get_action (X_("Editor"), action); - - if (act) { - RefPtr<RadioAction> ract = RefPtr<RadioAction>::cast_dynamic(act); - if (ract && !ract->get_active()) { - ract->set_active (true); - } - } -} - -void -Editor::update_layering_model () -{ - RefPtr<Action> act; - - assert (session); - - switch (session->config.get_layer_model()) { - case LaterHigher: - act = ActionManager::get_action (X_("Editor"), X_("LayerLaterHigher")); - break; - case MoveAddHigher: - act = ActionManager::get_action (X_("Editor"), X_("LayerMoveAddHigher")); - break; - case AddHigher: - act = ActionManager::get_action (X_("Editor"), X_("LayerAddHigher")); - break; - } - - if (act) { - RefPtr<RadioAction> ract = RefPtr<RadioAction>::cast_dynamic(act); - if (ract && !ract->get_active()) { - ract->set_active (true); - } - } -} - -void -Editor::set_layer_model (LayerModel model) -{ - /* this is driven by a toggle on a radio group, and so is invoked twice, - once for the item that became inactive and once for the one that became - active. - */ - - assert (session); - - RefPtr<Action> act; - - switch (model) { - case LaterHigher: - act = ActionManager::get_action (X_("Editor"), X_("LayerLaterHigher")); - break; - case MoveAddHigher: - act = ActionManager::get_action (X_("Editor"), X_("LayerMoveAddHigher")); - break; - case AddHigher: - act = ActionManager::get_action (X_("Editor"), X_("LayerAddHigher")); - break; - } - - if (act) { - RefPtr<RadioAction> ract = RefPtr<RadioAction>::cast_dynamic(act); - if (ract && ract->get_active() && session->config.get_layer_model() != model) { - session->config.set_layer_model (model); - } - } -} - RefPtr<RadioAction> Editor::snap_type_action (SnapType type) { @@ -1539,237 +1281,6 @@ Editor::zoom_focus_chosen (ZoomFocus focus) } } -void -Editor::smpte_fps_chosen (SmpteFormat format) -{ - /* this is driven by a toggle on a radio group, and so is invoked twice, - once for the item that became inactive and once for the one that became - active. - */ - - if (session) { - - RefPtr<Action> act; - - switch (format) { - case smpte_23976: - act = ActionManager::get_action (X_("Editor"), X_("Smpte23976")); - break; - case smpte_24: - act = ActionManager::get_action (X_("Editor"), X_("Smpte24")); - break; - case smpte_24976: - act = ActionManager::get_action (X_("Editor"), X_("Smpte24976")); - break; - case smpte_25: - act = ActionManager::get_action (X_("Editor"), X_("Smpte25")); - break; - case smpte_2997: - act = ActionManager::get_action (X_("Editor"), X_("Smpte2997")); - break; - case smpte_2997drop: - act = ActionManager::get_action (X_("Editor"), X_("Smpte2997drop")); - break; - case smpte_30: - act = ActionManager::get_action (X_("Editor"), X_("Smpte30")); - break; - case smpte_30drop: - act = ActionManager::get_action (X_("Editor"), X_("Smpte30drop")); - break; - case smpte_5994: - act = ActionManager::get_action (X_("Editor"), X_("Smpte5994")); - break; - case smpte_60: - act = ActionManager::get_action (X_("Editor"), X_("Smpte60")); - break; - default: - cerr << "Editor received unexpected smpte type" << endl; - } - - if (act) { - RefPtr<RadioAction> ract = RefPtr<RadioAction>::cast_dynamic(act); - if (ract && ract->get_active()) { - session->set_smpte_format (format); - } - } - } -} - -void -Editor::video_pullup_chosen (Session::PullupFormat pullup) -{ - /* this is driven by a toggle on a radio group, and so is invoked twice, - once for the item that became inactive and once for the one that became - active. - */ - - const char* action = 0; - - RefPtr<Action> act; - - float pull = 0.0; - - switch (pullup) { - case Session::pullup_Plus4Plus1: - pull = 4.1667 + 0.1; - action = X_("PullupPlus4Plus1"); - break; - case Session::pullup_Plus4: - pull = 4.1667; - action = X_("PullupPlus4"); - break; - case Session::pullup_Plus4Minus1: - pull = 4.1667 - 0.1; - action = X_("PullupPlus4Minus1"); - break; - case Session::pullup_Plus1: - pull = 0.1; - action = X_("PullupPlus1"); - break; - case Session::pullup_None: - pull = 0.0; - action = X_("PullupNone"); - break; - case Session::pullup_Minus1: - pull = -0.1; - action = X_("PullupMinus1"); - break; - case Session::pullup_Minus4Plus1: - pull = -4.1667 + 0.1; - action = X_("PullupMinus4Plus1"); - break; - case Session::pullup_Minus4: - pull = -4.1667; - action = X_("PullupMinus4"); - break; - case Session::pullup_Minus4Minus1: - pull = -4.1667 - 0.1; - action = X_("PullupMinus4Minus1"); - break; - default: - fatal << string_compose (_("programming error: %1"), "Session received unexpected pullup type") << endmsg; - /*NOTREACHED*/ - } - - act = ActionManager::get_action (X_("Editor"), action); - - if (act) { - RefPtr<RadioAction> ract = RefPtr<RadioAction>::cast_dynamic(act); - if (ract && ract->get_active()) { - session->config.set_video_pullup ( pull ); - } - - } else { - error << string_compose (_("programming error: %1"), "Editor::video_pullup_chosen could not find action to match pullup.") << endmsg; - } -} - -void -Editor::update_subframes_per_frame () -{ - ENSURE_GUI_THREAD (mem_fun(*this, &Editor::update_subframes_per_frame)); - - RefPtr<Action> act; - const char* action = 0; - - uint32_t const sfpf = session->config.get_subframes_per_frame(); - - if (sfpf == 80) { - action = X_("Subframes80"); - } else if (sfpf == 100) { - action = X_("Subframes100"); - } else { - warning << string_compose (_("Configuraton is using unhandled subframes per frame value: %1"), sfpf) << endmsg; - /*NOTREACHED*/ - return; - } - - act = ActionManager::get_action (X_("Editor"), action); - - if (act) { - RefPtr<RadioAction> ract = RefPtr<RadioAction>::cast_dynamic(act); - if (ract && !ract->get_active()) { - ract->set_active (true); - } - } -} - -void -Editor::subframes_per_frame_chosen (uint32_t sfpf) -{ - /* this is driven by a toggle on a radio group, and so is invoked twice, - once for the item that became inactive and once for the one that became - active. - */ - - const char* action = 0; - - RefPtr<Action> act; - - if (sfpf == 80) { - action = X_("Subframes80"); - } else if (sfpf == 100) { - action = X_("Subframes100"); - } else { - fatal << string_compose (_("programming error: %1 %2"), "Session received unexpected subframes per frame value: ", sfpf) << endmsg; - /*NOTREACHED*/ - } - - act = ActionManager::get_action (X_("Editor"), action); - - if (act) { - RefPtr<RadioAction> ract = RefPtr<RadioAction>::cast_dynamic(act); - if (ract && ract->get_active()) { - session->config.set_subframes_per_frame ((uint32_t) rint (sfpf)); - } - - } else { - error << string_compose (_("programming error: %1"), "Editor::subframes_per_frame_chosen could not find action to match value.") << endmsg; - } -} - -void -Editor::toggle_region_fades () -{ - ActionManager::toggle_config_state_foo ("Editor", "toggle-region-fades", mem_fun (session->config, &SessionConfiguration::set_use_region_fades), mem_fun (session->config, &SessionConfiguration::get_use_region_fades)); -} - -void -Editor::toggle_region_fades_visible () -{ - ActionManager::toggle_config_state_foo ("Editor", "toggle-region-fades-visible", mem_fun (session->config, &SessionConfiguration::set_show_region_fades), mem_fun (session->config, &SessionConfiguration::get_show_region_fades)); -} - -void -Editor::toggle_auto_xfade () -{ - ActionManager::toggle_config_state_foo ("Editor", "toggle-auto-xfades", mem_fun (session->config, &SessionConfiguration::set_auto_xfade), mem_fun (session->config, &SessionConfiguration::get_auto_xfade)); -} - -void -Editor::toggle_xfades_active () -{ - ActionManager::toggle_config_state_foo ("Editor", "toggle-xfades-active", mem_fun (session->config, &SessionConfiguration::set_xfades_active), mem_fun (session->config, &SessionConfiguration::get_xfades_active)); -} - -void -Editor::toggle_xfade_visibility () -{ - ActionManager::toggle_config_state_foo ("Editor", "toggle-xfades-visible", mem_fun (session->config, &SessionConfiguration::set_xfades_visible), mem_fun (session->config, &SessionConfiguration::get_xfades_visible)); -} - -void -Editor::toggle_link_region_and_track_selection () -{ - ActionManager::toggle_config_state ("Editor", "link-region-and-track-selection", &RCConfiguration::set_link_region_and_track_selection, &RCConfiguration::get_link_region_and_track_selection); -} - -void -Editor::toggle_automation_follows_regions () -{ - ActionManager::toggle_config_state ("Editor", "automation-follows-regions", &RCConfiguration::set_automation_follows_regions, &RCConfiguration::get_automation_follows_regions); -} - /** A Configuration parameter has changed. * @param parameter_name Name of the changed parameter. */ @@ -1784,38 +1295,18 @@ Editor::parameter_changed (std::string p) update_punch_range_view (true); } else if (p == "punch-out") { update_punch_range_view (true); - } else if (p == "layer-model") { - update_layering_model (); } else if (p == "smpte-format") { - update_smpte_mode (); update_just_smpte (); - } else if (p == "video-pullup") { - update_video_pullup (); - } else if (p == "xfades-active") { - ActionManager::map_some_state ("Editor", "toggle-xfades-active", mem_fun (session->config, &SessionConfiguration::get_xfades_active)); } else if (p == "xfades-visible") { - ActionManager::map_some_state ("Editor", "toggle-xfades-visible", mem_fun (session->config, &SessionConfiguration::get_xfades_visible)); update_xfade_visibility (); } else if (p == "show-region-fades") { - ActionManager::map_some_state ("Editor", "toggle-region-fades-visible", mem_fun (session->config, &SessionConfiguration::get_show_region_fades)); update_region_fade_visibility (); - } else if (p == "use-region-fades") { - ActionManager::map_some_state ("Editor", "toggle-region-fades", mem_fun (session->config, &SessionConfiguration::get_use_region_fades)); - } else if (p == "auto-xfade") { - ActionManager::map_some_state ("Editor", "toggle-auto-xfades", mem_fun (session->config, &SessionConfiguration::get_auto_xfade)); - } else if (p == "xfade-model") { - update_crossfade_model (); } else if (p == "edit-mode") { edit_mode_selector.set_active_text (edit_mode_to_string (Config->get_edit_mode())); } else if (p == "subframes-per-frame") { - update_subframes_per_frame (); update_just_smpte (); } else if (p == "show-track-meters") { toggle_meter_updating(); - } else if (p == "link-region-and-track-selection") { - ActionManager::map_some_state ("Editor", "link-region-and-track-selection", &RCConfiguration::get_link_region_and_track_selection); - } else if (p == "automation-follows-regions") { - ActionManager::map_some_state ("Editor", "automation-follows-regions", &RCConfiguration::get_automation_follows_regions); } } diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc index a97e1743d3..1bd437ab8a 100644 --- a/gtk2_ardour/rc_option_editor.cc +++ b/gtk2_ardour/rc_option_editor.cc @@ -828,14 +828,6 @@ RCOptionEditor::RCOptionEditor () add_option (_("Transport"), new BoolOption ( - "quieten-at-speed", - _("Reduce output level by 12dB during fast forward / rewind"), - mem_fun (*_rc_config, &RCConfiguration::get_quieten_at_speed), - mem_fun (*_rc_config, &RCConfiguration::set_quieten_at_speed) - )); - - add_option (_("Transport"), - new BoolOption ( "stop-at-session-end", _("Stop at the end of the session"), mem_fun (*_rc_config, &RCConfiguration::get_stop_at_session_end), diff --git a/libs/ardour/ardour/rc_configuration_vars.h b/libs/ardour/ardour/rc_configuration_vars.h index 7f319cf2b2..99ac902629 100644 --- a/libs/ardour/ardour/rc_configuration_vars.h +++ b/libs/ardour/ardour/rc_configuration_vars.h @@ -107,7 +107,6 @@ CONFIG_VARIABLE (float, shuttle_speed_threshold, "shuttle-speed-threshold", 5.0f CONFIG_VARIABLE (SlaveSource, slave_source, "slave-source", None) CONFIG_VARIABLE (ShuttleBehaviour, shuttle_behaviour, "shuttle-behaviour", Sprung) CONFIG_VARIABLE (ShuttleUnits, shuttle_units, "shuttle-units", Percentage) -CONFIG_VARIABLE (bool, quieten_at_speed, "quieten-at-speed", true) CONFIG_VARIABLE (bool, primary_clock_delta_edit_cursor, "primary-clock-delta-edit-cursor", false) CONFIG_VARIABLE (bool, secondary_clock_delta_edit_cursor, "secondary-clock-delta-edit-cursor", false) CONFIG_VARIABLE (bool, show_track_meters, "show-track-meters", true) diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index 7c07b2cba9..3d85c8d200 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -550,7 +550,6 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable pullup_Minus4Minus1 }; - int set_smpte_format (SmpteFormat); void sync_time_vars(); void bbt_time (nframes_t when, BBT_Time&); @@ -1722,9 +1721,6 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable int find_all_sources (std::string path, std::set<std::string>& result); int find_all_sources_across_snapshots (std::set<std::string>& result, bool exclude_this_snapshot); - LayerModel layer_model; - CrossfadeModel xfade_model; - typedef std::set<boost::shared_ptr<PBD::Controllable> > Controllables; Glib::Mutex controllables_lock; Controllables controllables; diff --git a/libs/ardour/ardour/utils.h b/libs/ardour/ardour/utils.h index fc5d98115f..19599eb348 100644 --- a/libs/ardour/ardour/utils.h +++ b/libs/ardour/ardour/utils.h @@ -80,7 +80,6 @@ ARDOUR::EditMode string_to_edit_mode (std::string); float meter_falloff_to_float (ARDOUR::MeterFalloff); ARDOUR::MeterFalloff meter_falloff_from_float (float); float meter_falloff_to_db_per_sec (float); -float meter_hold_to_float (ARDOUR::MeterHold); #if defined(HAVE_COREAUDIO) || defined(HAVE_AUDIOUNITS) std::string CFStringRefToStdString(CFStringRef stringRef); diff --git a/libs/ardour/session_time.cc b/libs/ardour/session_time.cc index 4e4c066ba4..32a94adee1 100644 --- a/libs/ardour/session_time.cc +++ b/libs/ardour/session_time.cc @@ -181,14 +181,6 @@ Session::sync_time_vars () }; } -int -Session::set_smpte_format (SmpteFormat format) -{ - /* this will trigger any other changes needed */ - config.set_smpte_format (format); - return 0; -} - void Session::set_smpte_offset (nframes_t off) { diff --git a/libs/ardour/utils.cc b/libs/ardour/utils.cc index 052d583976..9565b4450f 100644 --- a/libs/ardour/utils.cc +++ b/libs/ardour/utils.cc @@ -427,22 +427,6 @@ meter_falloff_from_float (float val) } } -float -meter_hold_to_float (MeterHold hold) -{ - switch (hold) { - case MeterHoldOff: - return 0.0f; - case MeterHoldShort: - return 40.0f; - case MeterHoldMedium: - return 100.0f; - case MeterHoldLong: - default: - return 200.0f; - } -} - AutoState ARDOUR::string_to_auto_state (std::string str) { |