diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2006-10-20 16:50:46 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2006-10-20 16:50:46 +0000 |
commit | 3e577fee98555166cc92b78af3e8873e3cabb7d6 (patch) | |
tree | a4fc63510efb7b33fb9e85cf8f06768bdc88f305 /libs | |
parent | 502057064c93980f239c58b905f5c3d15aefb31b (diff) |
move BWF header options into Configuration option, rationalize crossfade parameter names, ensure full GUI display of crossfade parameters (in menus)
git-svn-id: svn://localhost/ardour2/trunk@996 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
-rw-r--r-- | libs/ardour/ardour/audiofilesource.h | 2 | ||||
-rw-r--r-- | libs/ardour/ardour/configuration_vars.h | 9 | ||||
-rw-r--r-- | libs/ardour/audio_playlist.cc | 2 | ||||
-rw-r--r-- | libs/ardour/audiofilesource.cc | 4 | ||||
-rw-r--r-- | libs/ardour/crossfade.cc | 2 | ||||
-rw-r--r-- | libs/ardour/sndfilesource.cc | 4 |
6 files changed, 11 insertions, 12 deletions
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<Region> 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<void> 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<AudioRegion> in, boost::shared_ptr<Audio _follow_overlap = true; } - _active = Config->get_crossfades_active (); + _active = Config->get_xfades_active (); _fixed = true; initialize (); diff --git a/libs/ardour/sndfilesource.cc b/libs/ardour/sndfilesource.cc index c30b1af2a4..1e408e12bc 100644 --- a/libs/ardour/sndfilesource.cc +++ b/libs/ardour/sndfilesource.cc @@ -442,8 +442,8 @@ SndFileSource::setup_broadcast_info (nframes_t when, struct tm& now, time_t tnow int random_code = random() % 999999999; snprintf (_broadcast_info->originator_reference, sizeof (_broadcast_info->originator_reference), "%2s%3s%12s%02d%02d%02d%9d", - bwf_country_code, - bwf_organization_code, + Config->get_bwf_country_code().c_str(), + Config->get_bwf_organization_code().c_str(), bwf_serial_number, now.tm_hour, now.tm_min, |