X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Ffilter.cc;h=6ebf23102ab0ff13db88e51a23d299296e2a2acb;hb=935fd3b32f600d6f20c134fa2ccae78aa4781de5;hp=44e7f11cbde0c79f26f0d3588a44833d4c72d545;hpb=e3dd8cc3ee481924997a1650e3a130b2579be209;p=ardour.git

diff --git a/libs/ardour/filter.cc b/libs/ardour/filter.cc
index 44e7f11cbd..6ebf23102a 100644
--- a/libs/ardour/filter.cc
+++ b/libs/ardour/filter.cc
@@ -21,24 +21,25 @@
 #include <cerrno>
 
 #include "pbd/basename.h"
-#include "ardour/sndfilesource.h"
-#include "ardour/smf_source.h"
-#include "ardour/session.h"
-#include "ardour/region.h"
+
+#include "ardour/analyser.h"
+#include "ardour/audiofilesource.h"
+#include "ardour/audioregion.h"
 #include "ardour/filter.h"
+#include "ardour/region.h"
 #include "ardour/region_factory.h"
+#include "ardour/session.h"
+#include "ardour/smf_source.h"
 #include "ardour/source_factory.h"
-#include "ardour/analyser.h"
-#include "ardour/audioregion.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 
 int
-Filter::make_new_sources (boost::shared_ptr<Region> region, SourceList& nsrcs, string suffix)
+Filter::make_new_sources (boost::shared_ptr<Region> region, SourceList& nsrcs, std::string suffix, bool use_session_sample_rate)
 {
 	vector<string> names = region->master_source_names();
 	assert (region->n_channels() <= names.size());
@@ -58,19 +59,33 @@ Filter::make_new_sources (boost::shared_ptr<Region> region, SourceList& nsrcs, s
 			}
 		}
 
-		string path = session.path_from_region_name (region->data_type(),
-				PBD::basename_nosuffix (names[i]), string (""));
+		const string path = (region->data_type() == DataType::MIDI)
+			? session.new_midi_source_path (name)
+			: session.new_audio_source_path (name, region->n_channels(), i, false, false);
 
-		if (path.length() == 0) {
+		if (path.empty()) {
 			error << string_compose (_("filter: error creating name for new file based on %1"), region->name())
 			      << endmsg;
 			return -1;
 		}
 
 		try {
+			framecnt_t sample_rate;
+			if (use_session_sample_rate) {
+				sample_rate = session.frame_rate();
+			} else {
+				boost::shared_ptr<AudioRegion> aregion = boost::dynamic_pointer_cast<AudioRegion>(region);
+
+				if (aregion) {
+					sample_rate = aregion->audio_source()->sample_rate();
+				} else {
+					return -1;
+				}
+			}
+
 			nsrcs.push_back (boost::dynamic_pointer_cast<Source> (
-				SourceFactory::createWritable (region->data_type(), session,
-							       path, false, session.frame_rate())));
+				                 SourceFactory::createWritable (region->data_type(), session,
+				                                                path, false, sample_rate)));
 		}
 
 		catch (failed_constructor& err) {
@@ -121,7 +136,7 @@ Filter::finish (boost::shared_ptr<Region> region, SourceList& nsrcs, string regi
 	results.clear ();
 
 	PropertyList plist;
-	
+
 	plist.add (Properties::start, 0);
 	plist.add (Properties::length, region->length());
 	plist.add (Properties::name, region_name);
@@ -138,6 +153,7 @@ Filter::finish (boost::shared_ptr<Region> region, SourceList& nsrcs, string regi
 		audio_r->set_fade_in (audio_region->fade_in ());
 		audio_r->set_fade_out_active (audio_region->fade_out_active ());
 		audio_r->set_fade_out (audio_region->fade_out ());
+		*(audio_r->envelope()) = *(audio_region->envelope ());
 	}
 	results.push_back (r);