smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-07 23:35:03 +01:00
Code Issues Projects Releases Wiki Activity

Remove region-output export (GUI)

Browse source 
This use-case is better served via stem-export.

This export mode never worked correctly when latent plugins
are present on the track. or when realtime export was chosen.

This used to call
  track.export_stuff() -> bounce_process()
periodically in small chunks from freewheeling callback,
which is no longer functional.
This commit is contained in:
Robin Gareus 2020-03-06 03:19:07 +01:00
parent 751f9f9654
commit fc65097686
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
4 changed files with 3 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

16
gtk2_ardour/export_channel_selector.cc
View file

@ -463,11 +463,9 @@ RegionExportChannelSelector::RegionExportChannelSelector (ARDOUR::Session * _ses
region (region), region (region),
track (track), track (track),
region_chans (region.n_channels()), region_chans (region.n_channels()),
track_chans (track.n_outputs().n_audio()),
raw_button (type_group), raw_button (type_group),
fades_button (type_group), fades_button (type_group)
processed_button (type_group)
{ {
pack_start (vbox); pack_start (vbox);
@ -483,10 +481,6 @@ RegionExportChannelSelector::RegionExportChannelSelector (ARDOUR::Session * _ses
fades_button.signal_toggled ().connect (sigc::mem_fun (*this, &RegionExportChannelSelector::handle_selection)); fades_button.signal_toggled ().connect (sigc::mem_fun (*this, &RegionExportChannelSelector::handle_selection));
vbox.pack_start (fades_button, false, false); vbox.pack_start (fades_button, false, false);
processed_button.set_label (string_compose (_("Track output (channels: %1)"), track_chans));
processed_button.signal_toggled ().connect (sigc::mem_fun (*this, &RegionExportChannelSelector::handle_selection));
vbox.pack_start (processed_button, false, false);
sync_with_manager(); sync_with_manager();
vbox.show_all_children (); vbox.show_all_children ();
show_all_children (); show_all_children ();
@ -509,9 +503,6 @@ RegionExportChannelSelector::sync_with_manager ()
case RegionExportChannelFactory::Fades: case RegionExportChannelFactory::Fades:
fades_button.set_active (true); fades_button.set_active (true);
break; break;
case RegionExportChannelFactory::Processed:
processed_button.set_active (true);
break;
} }
handle_selection (); handle_selection ();
@ -531,8 +522,6 @@ RegionExportChannelSelector::handle_selection ()
type = RegionExportChannelFactory::Raw; type = RegionExportChannelFactory::Raw;
} else if (fades_button.get_active ()) { } else if (fades_button.get_active ()) {
type = RegionExportChannelFactory::Fades; type = RegionExportChannelFactory::Fades;
} else if (processed_button.get_active ()) {
type = RegionExportChannelFactory::Processed;
} else { } else {
CriticalSelectionChanged (); CriticalSelectionChanged ();
return; return;
@ -541,8 +530,7 @@ RegionExportChannelSelector::handle_selection ()
factory.reset (new RegionExportChannelFactory (_session, region, track, type)); factory.reset (new RegionExportChannelFactory (_session, region, track, type));
state->config->set_region_processing_type (type); state->config->set_region_processing_type (type);
const size_t cc = type == RegionExportChannelFactory::Processed ? track_chans : region_chans; for (size_t chan = 0; chan < region_chans; ++chan) {
for (size_t chan = 0; chan < cc; ++chan) {
state->config->register_channel (factory->create (chan)); state->config->register_channel (factory->create (chan));
} }

2
gtk2_ardour/export_channel_selector.h
View file

@ -231,7 +231,6 @@ private:
ARDOUR::AudioTrack & track; ARDOUR::AudioTrack & track;
uint32_t region_chans; uint32_t region_chans;
uint32_t track_chans;
/*** GUI components ***/ /*** GUI components ***/
@ -240,7 +239,6 @@ private:
Gtk::RadioButtonGroup type_group; Gtk::RadioButtonGroup type_group;
Gtk::RadioButton raw_button; Gtk::RadioButton raw_button;
Gtk::RadioButton fades_button; Gtk::RadioButton fades_button;
Gtk::RadioButton processed_button;
}; };
class TrackExportChannelSelector : public ExportChannelSelector class TrackExportChannelSelector : public ExportChannelSelector

13
gtk2_ardour/export_dialog.cc
View file

@ -293,22 +293,11 @@ ExportDialog::update_realtime_selection ()
bool rt_ok = true; bool rt_ok = true;
switch (profile_manager->type ()) { switch (profile_manager->type ()) {
case ExportProfileManager::RegularExport: case ExportProfileManager::RegularExport:
break;
case ExportProfileManager::RangeExport: case ExportProfileManager::RangeExport:
break;
case ExportProfileManager::SelectionExport: case ExportProfileManager::SelectionExport:
break; break;
case ExportProfileManager::RegionExport: case ExportProfileManager::RegionExport:
if (!profile_manager->get_channel_configs().empty ()) { rt_ok = false;
switch (profile_manager->get_channel_configs().front()->config->region_processing_type ()) {
case RegionExportChannelFactory::Raw:
case RegionExportChannelFactory::Fades:
rt_ok = false;
break;
default:
break;
}
}
break; break;
case ExportProfileManager::StemExport: case ExportProfileManager::StemExport:
if (! static_cast<TrackExportChannelSelector*>(channel_selector.get())->track_output ()) { if (! static_cast<TrackExportChannelSelector*>(channel_selector.get())->track_output ()) {

1
libs/ardour/ardour/export_channel.h
View file

@ -105,7 +105,6 @@ class LIBARDOUR_API RegionExportChannelFactory
None, None,
Raw, Raw,
Fades, Fades,
Processed
}; };
RegionExportChannelFactory (Session * session, AudioRegion const & region, AudioTrack & track, Type type); RegionExportChannelFactory (Session * session, AudioRegion const & region, AudioTrack & track, Type type);