ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Allow for bounces with dedicated source and region-name

Browse Source 
This restores a popular feature to use bounce to export
ranges with track name file-name, while keeping a dedicated
name for the region in the GUI.
This commit is contained in:
Robin Gareus 2023-10-16 20:59:23 +02:00
parent 866c784f33
commit 88365ae149
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
5 changed files with 34 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/ardour/ardour/auditioner.h
View File

@ -94,7 +94,7 @@ public:
return std::shared_ptr<Region> ();
}
std::shared_ptr<Region> bounce_range (samplepos_t, samplepos_t, InterThreadInfo&, std::shared_ptr<Processor>, bool, std::string const&) {
std::shared_ptr<Region> bounce_range (samplepos_t, samplepos_t, InterThreadInfo&, std::shared_ptr<Processor>, bool, std::string const&, bool) {
return std::shared_ptr<Region> ();
}

7
libs/ardour/ardour/session.h
View File

@ -949,9 +949,10 @@ public:
/* flattening stuff */
std::shared_ptr<Region> write_one_track (Track&, samplepos_t start, samplepos_t end,
bool overwrite, std::vector<std::shared_ptr<Source> >&, InterThreadInfo& wot,
std::shared_ptr<Processor> endpoint,
bool include_endpoint, bool for_export, bool for_freeze, std::string const& name);
bool overwrite, std::vector<std::shared_ptr<Source> >&, InterThreadInfo& wot,
std::shared_ptr<Processor> endpoint,
bool include_endpoint, bool for_export, bool for_freeze,
std::string const& source_name = "", std::string const& region_name = "");
int freeze_all (InterThreadInfo&);
/* session-wide solo/mute/rec-enable */

2
libs/ardour/ardour/track.h
View File

@ -110,7 +110,7 @@ public:
*/
virtual std::shared_ptr<Region> bounce_range (samplepos_t start, samplepos_t end, InterThreadInfo& itt,
std::shared_ptr<Processor> endpoint, bool include_endpoint,
std::string const& name);
std::string const& name = "", bool prefix_track_name = false);
virtual int export_stuff (BufferSet& bufs, samplepos_t start_sample, samplecnt_t nframes,
std::shared_ptr<Processor> endpoint, bool include_endpoint, bool for_export, bool for_freeze,

30
libs/ardour/session.cc
View File

@ -5861,10 +5861,11 @@ struct MidiSourceLockMap
std::shared_ptr<Region>
Session::write_one_track (Track& track, samplepos_t start, samplepos_t end,
bool /*overwrite*/, vector<std::shared_ptr<Source> >& srcs,
InterThreadInfo& itt,
std::shared_ptr<Processor> endpoint, bool include_endpoint,
bool for_export, bool for_freeze, std::string const& name)
bool /*overwrite*/, vector<std::shared_ptr<Source> >& srcs,
InterThreadInfo& itt,
std::shared_ptr<Processor> endpoint, bool include_endpoint,
bool for_export, bool for_freeze,
std::string const& source_name, std::string const& region_name)
{
std::shared_ptr<Region> result;
std::shared_ptr<Playlist> playlist;
@ -5879,7 +5880,7 @@ Session::write_one_track (Track& track, samplepos_t start, samplepos_t end,
samplepos_t len = end - start;
bool need_block_size_reset = false;
ChanCount const max_proc = track.max_processor_streams ();
string legal_playlist_name;
string legal_name;
string possible_path;
MidiBuffer resolved (256);
MidiNoteTracker tracker;
@ -5917,18 +5918,18 @@ Session::write_one_track (Track& track, samplepos_t start, samplepos_t end,
goto out;
}
if (name.length() > 0) {
if (source_name.length() > 0) {
/*if the user passed in a name, we will use it, and also prepend the resulting sources with that name*/
legal_playlist_name.append (legalize_for_path (name));
legal_name = legalize_for_path (source_name);
} else {
legal_playlist_name.append (legalize_for_path (playlist->name ()));
legal_name = legalize_for_path (playlist->name ());
}
for (uint32_t chan_n = 0; chan_n < diskstream_channels.n(data_type); ++chan_n) {
string path = ((data_type == DataType::AUDIO)
? new_audio_source_path (legal_playlist_name, diskstream_channels.n_audio(), chan_n, false)
: new_midi_source_path (legal_playlist_name));
? new_audio_source_path (legal_name, diskstream_channels.n_audio(), chan_n, false)
: new_midi_source_path (legal_name));
if (path.empty()) {
goto out;
@ -6161,12 +6162,17 @@ Session::write_one_track (Track& track, samplepos_t start, samplepos_t end,
plist.add (Properties::whole_file, true);
plist.add (Properties::length, len); //ToDo: in nutempo, if the Range is snapped to bbt, this should be in bbt (?)
plist.add (Properties::name, region_name_from_path (srcs.front()->name(), true));
plist.add (Properties::name, region_name_from_path (srcs.front()->name(), true)); // TODO: allow custom region-name when consolidating
plist.add (Properties::tags, "(bounce)");
result = RegionFactory::create (srcs, plist, true);
result->set_name(legal_playlist_name); /*setting name in the properties didn't seem to work, but this does*/
if (region_name.empty ()) {
/* setting name in the properties didn't seem to work, but this does */
result->set_name(legal_name);
} else {
result->set_name(region_name);
}
}
out:

12
libs/ardour/track.cc
View File

@ -943,10 +943,18 @@ Track::bounce_range (samplepos_t start,
InterThreadInfo& itt,
std::shared_ptr<Processor> endpoint,
bool include_endpoint,
std::string const& name)
std::string const& nm, bool prefix_track_name)
{
std::string source_name;
if (prefix_track_name && nm.length() > 0) {
source_name = string_compose ("%1 - %2", name(), nm);
} else {
source_name = nm;
}
vector<std::shared_ptr<Source> > srcs;
return _session.write_one_track (*this, start, end, false, srcs, itt, endpoint, include_endpoint, false, false, name);
return _session.write_one_track (*this, start, end, false, srcs, itt, endpoint, include_endpoint, false, false, source_name, nm);
}
void