ardour/livetrax
13
0
Fork 0
Code

triggerbox: catch file-name-based incorrect types when loading into slots

Browse Source
This commit is contained in:
Paul Davis 2021-12-18 09:31:44 -07:00
parent 16dfb410bc
commit 4d980bee6a
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libs/ardour/triggerbox.cc
View File

@ -30,6 +30,7 @@
#include "ardour/session_object.h" #include "ardour/session_object.h"
#include "ardour/sidechain.h" #include "ardour/sidechain.h"
#include "ardour/source_factory.h" #include "ardour/source_factory.h"
#include "ardour/smf_source.h"
#include "ardour/sndfilesource.h" #include "ardour/sndfilesource.h"
#include "ardour/triggerbox.h" #include "ardour/triggerbox.h"
#include "ardour/types_convert.h" #include "ardour/types_convert.h"
@ -1757,6 +1758,15 @@ TriggerBox::set_from_path (uint64_t slot, std::string const & path)
return; return;
} }
const DataType source_type = SMFSource::safe_midi_file_extension (path) ? DataType::MIDI : DataType::AUDIO;
if (source_type != _data_type) {
error << string_compose (_("Cannot use %1 files in %2 slots"),
((source_type == DataType::MIDI) ? "MIDI" : "audio"),
((source_type == DataType::MIDI) ? "audio" : "MIDI")) << endmsg;
return;
}
try { try {
ImportStatus status; ImportStatus status;
@ -1780,8 +1790,6 @@ TriggerBox::set_from_path (uint64_t slot, std::string const & path)
return; return;
} }
/* XXX need to check data type */
SourceList src_list; SourceList src_list;
for (auto& src : status.sources) { for (auto& src : status.sources) {
@ -1800,8 +1808,6 @@ TriggerBox::set_from_path (uint64_t slot, std::string const & path)
all_triggers[slot]->set_region (the_region); all_triggers[slot]->set_region (the_region);
/* XXX catch region going away */
} catch (std::exception& e) { } catch (std::exception& e) {
cerr << "loading sample from " << path << " failed: " << e.what() << endl; cerr << "loading sample from " << path << " failed: " << e.what() << endl;
return; return;