diff --git a/gtk2_ardour/audio_streamview.cc b/gtk2_ardour/audio_streamview.cc index 0e6997b59c..24924fec4f 100644 --- a/gtk2_ardour/audio_streamview.cc +++ b/gtk2_ardour/audio_streamview.cc @@ -288,7 +288,7 @@ AudioStreamView::add_crossfade (Crossfade *crossfade) crossfade->Invalidated.connect (mem_fun (*this, &AudioStreamView::remove_crossfade)); crossfade_views.push_back (cv); - if (!Config->get_crossfades_visible() || !crossfades_visible) { + if (!Config->get_xfades_visible() || !crossfades_visible) { cv->hide (); } } diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc index 6fb8950047..0485f4cc8a 100644 --- a/gtk2_ardour/editor_actions.cc +++ b/gtk2_ardour/editor_actions.cc @@ -782,13 +782,13 @@ Editor::toggle_auto_xfade () void Editor::toggle_xfades_active () { - ActionManager::toggle_config_state ("Editor", "toggle-xfades-active", &Configuration::set_crossfades_active, &Configuration::get_crossfades_active); + ActionManager::toggle_config_state ("Editor", "toggle-xfades-active", &Configuration::set_xfades_active, &Configuration::get_xfades_active); } void Editor::toggle_xfade_visibility () { - ActionManager::toggle_config_state ("Editor", "toggle-xfades-visibility", &Configuration::set_crossfades_visible, &Configuration::get_crossfades_visible); + ActionManager::toggle_config_state ("Editor", "toggle-xfades-visibility", &Configuration::set_xfades_visible, &Configuration::get_xfades_visible); } void @@ -811,12 +811,14 @@ Editor::parameter_changed (const char* parameter_name) update_just_smpte (); } else if (PARAM_IS ("video-pullup")) { update_video_pullup (); - } else if (PARAM_IS ("crossfades-active")) { - ActionManager::map_some_state ("Editor", "toggle-xfades-active", &Configuration::get_crossfades_active); - } else if (PARAM_IS ("crossfades-visible")) { - ActionManager::map_some_state ("Editor", "toggle-xfades-visible", &Configuration::get_crossfades_visible); + } else if (PARAM_IS ("xfades-active")) { + ActionManager::map_some_state ("Editor", "toggle-xfades-active", &Configuration::get_xfades_active); + } else if (PARAM_IS ("xfades-visible")) { + ActionManager::map_some_state ("Editor", "toggle-xfades-visible", &Configuration::get_xfades_visible); } else if (PARAM_IS ("auto-xfade")) { ActionManager::map_some_state ("Editor", "toggle-auto-xfades", &Configuration::get_auto_xfade); + } else if (PARAM_IS ("xfade-model")) { + update_crossfade_model (); } else if (PARAM_IS ("edit-mode")) { edit_mode_selector.set_active_text (edit_mode_to_string (Config->get_edit_mode())); } diff --git a/libs/ardour/ardour/audiofilesource.h b/libs/ardour/ardour/audiofilesource.h index de12cb05e5..53e27b1df9 100644 --- a/libs/ardour/ardour/audiofilesource.h +++ b/libs/ardour/ardour/audiofilesource.h @@ -81,8 +81,6 @@ class AudioFileSource : public AudioSource { void mark_take (string); string take_id() const { return _take_id; } - static void set_bwf_country_code (string x); - static void set_bwf_organization_code (string x); static void set_bwf_serial_number (int); static void set_search_path (string); diff --git a/libs/ardour/ardour/configuration_vars.h b/libs/ardour/ardour/configuration_vars.h index 92ca659eac..fe65e9d433 100644 --- a/libs/ardour/ardour/configuration_vars.h +++ b/libs/ardour/ardour/configuration_vars.h @@ -48,8 +48,8 @@ CONFIG_VARIABLE (bool, use_overlap_equivalency, "use-overlap-equivalency", true) CONFIG_VARIABLE (CrossfadeModel, xfade_model, "xfade-model", FullCrossfade) CONFIG_VARIABLE (bool, auto_xfade, "auto-xfade", true) CONFIG_VARIABLE (float, short_xfade_seconds, "short-xfade-seconds", 0.015) -CONFIG_VARIABLE (bool, crossfades_active, "crossfades-active", true) -CONFIG_VARIABLE (bool, crossfades_visible, "crossfades-visible", true) +CONFIG_VARIABLE (bool, xfades_active, "xfades-active", true) +CONFIG_VARIABLE (bool, xfades_visible, "xfades-visible", true) CONFIG_VARIABLE (uint32_t, destructive_xfade_msecs, "destructive-xfade-msecs", 2) /* editing related */ @@ -121,6 +121,11 @@ CONFIG_VARIABLE (bool, verify_remove_last_capture, "verify-remove-last-capture", CONFIG_VARIABLE (bool, no_new_session_dialog, "no-new-session-dialog", false) CONFIG_VARIABLE (bool, use_vst, "use-vst", true) +/* BWAV */ + +CONFIG_VARIABLE (string, bwf_country_code, "bwf-country-code", "US") +CONFIG_VARIABLE (string, bwf_organization_code, "bwf-organization-code", "US") + /* these variables have custom set() methods (e.g. path globbing) */ CONFIG_VARIABLE_SPECIAL(std::string, raid_path, "raid-path", "", path_expand) diff --git a/libs/ardour/audio_playlist.cc b/libs/ardour/audio_playlist.cc index 00c3038d25..be8680882f 100644 --- a/libs/ardour/audio_playlist.cc +++ b/libs/ardour/audio_playlist.cc @@ -419,7 +419,7 @@ AudioPlaylist::check_dependents (boost::shared_ptr r, bool norefresh) } else { - xfade = new Crossfade (other, region, Config->get_xfade_model(), Config->get_crossfades_active()); + xfade = new Crossfade (other, region, Config->get_xfade_model(), Config->get_xfades_active()); add_crossfade (*xfade); } } diff --git a/libs/ardour/audiofilesource.cc b/libs/ardour/audiofilesource.cc index 0eb416e905..77709e3a3c 100644 --- a/libs/ardour/audiofilesource.cc +++ b/libs/ardour/audiofilesource.cc @@ -59,10 +59,6 @@ string AudioFileSource::search_path; sigc::signal AudioFileSource::HeaderPositionOffsetChanged; uint64_t AudioFileSource::header_position_offset = 0; -/* XXX turn this into a Config option */ -char AudioFileSource::bwf_country_code[3] = "US"; -/* XXX turn this into a Config option */ -char AudioFileSource::bwf_organization_code[4] = "LAS"; /* XXX maybe this too */ char AudioFileSource::bwf_serial_number[13] = "000000000000"; diff --git a/libs/ardour/crossfade.cc b/libs/ardour/crossfade.cc index 1c4bdb6cad..50e3ff2905 100644 --- a/libs/ardour/crossfade.cc +++ b/libs/ardour/crossfade.cc @@ -92,7 +92,7 @@ Crossfade::Crossfade (boost::shared_ptr in, boost::shared_ptr