ardour/livetrax
13
0
Fork 0
Code

Merge branch 'ardour'

Browse Source
This commit is contained in:
Paul Davis 2024-05-10 08:37:13 -06:00
commit 5f0c2a4d32
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk2_ardour/ardour_ui_aaf.cc
View File

@ -466,7 +466,7 @@ ARDOUR_UI::new_session_from_aaf (string const& aaf, string const& target_dir, st
} }
/* extract or set session name */ /* extract or set session name */
if (aafi->compositionName && aafi->compositionName[0] != 0x00) { if (/* Temporary - in the absence of user-options, don't rely on extracted session names which can be meaningless... aafi->compositionName && aafi->compositionName[0] != */ 0x00) {
string compositionName = string (aafi->compositionName); string compositionName = string (aafi->compositionName);
snapshot = laaf_util_clean_filename (&compositionName[0]); snapshot = laaf_util_clean_filename (&compositionName[0]);
} else { } else {

4
libs/ardour/region.cc
View File

@ -1535,7 +1535,9 @@ Region::_set_state (const XMLNode& node, int version, PropertyChange& what_chang
match. match.
*/ */
if ((length().time_domain() == Temporal::AudioTime) && (_sources.front()->length().time_domain() == Temporal::AudioTime) && (length().distance() > _sources.front()->length())) { if ((length().time_domain() == Temporal::AudioTime) && (_sources.front()->length().time_domain() == Temporal::AudioTime) && (length().distance() > _sources.front()->length())) {
_length = timecnt_t (start().distance (_sources.front()->length()), _length.val().position()); std::cerr << "Region " << _name << " has length " << _length.val().str() << " which is longer than its (first?) source's length of " << _sources.front()->length().str() << std::endl;
throw failed_constructor();
// _length = timecnt_t (start().distance (_sources.front()->length()), _length.val().position());
} }
} }