X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Ffilter.cc;h=36a74da0f50756375ecb5490c85deb39a84c5682;hb=e845b9f9357c4ff471c02b1f63a61275bb4a7d28;hp=5922936b85da0815f75763d411353a7999d9ffb5;hpb=d1bc9e330b5b36d1d31af61e057871fc66a98749;p=ardour.git

diff --git a/libs/ardour/filter.cc b/libs/ardour/filter.cc
index 5922936b85..36a74da0f5 100644
--- a/libs/ardour/filter.cc
+++ b/libs/ardour/filter.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2004-2007 Paul Davis 
+    Copyright (C) 2004-2007 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -21,14 +21,16 @@
 #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 "i18n.h"
 
@@ -37,7 +39,7 @@ 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());
@@ -57,21 +59,34 @@ 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) {
-			error << string_compose (_("filter: error creating name for new file based on %1"), region->name()) 
+		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, true,
-					false, session.frame_rate())));
-		} 
+				                 SourceFactory::createWritable (region->data_type(), session,
+				                                                path, false, sample_rate)));
+		}
 
 		catch (failed_constructor& err) {
 			error << string_compose (_("filter: error creating new file %1 (%2)"), path, strerror (errno)) << endmsg;
@@ -97,30 +112,51 @@ Filter::finish (boost::shared_ptr<Region> region, SourceList& nsrcs, string regi
 	for (SourceList::iterator si = nsrcs.begin(); si != nsrcs.end(); ++si) {
 		boost::shared_ptr<AudioFileSource> afs = boost::dynamic_pointer_cast<AudioFileSource>(*si);
 		if (afs) {
+			afs->done_with_peakfile_writes ();
 			afs->update_header (region->position(), *now, xnow);
 			afs->mark_immutable ();
 		}
-		
+
 		boost::shared_ptr<SMFSource> smfs = boost::dynamic_pointer_cast<SMFSource>(*si);
 		if (smfs) {
 			smfs->set_timeline_position (region->position());
 			smfs->flush ();
 		}
-		
+
 		/* now that there is data there, requeue the file for analysis */
-		
+
 		Analyser::queue_source_for_analysis (*si, false);
 	}
 
 	/* create a new region */
 
 	if (region_name.empty()) {
-		region_name = session.new_region_name (region->name());
+		region_name = RegionFactory::new_region_name (region->name());
 	}
 	results.clear ();
-	results.push_back (RegionFactory::create (nsrcs, 0, region->length(), region_name, 0, 
-			Region::Flag (Region::WholeFile|Region::DefaultFlags)));
-	
+
+	PropertyList plist;
+
+	plist.add (Properties::start, 0);
+	plist.add (Properties::length, region->length());
+	plist.add (Properties::name, region_name);
+	plist.add (Properties::whole_file, true);
+	plist.add (Properties::position, region->position());
+
+	boost::shared_ptr<Region> r = RegionFactory::create (nsrcs, plist);
+
+	boost::shared_ptr<AudioRegion> audio_region = boost::dynamic_pointer_cast<AudioRegion> (region);
+	boost::shared_ptr<AudioRegion> audio_r = boost::dynamic_pointer_cast<AudioRegion> (r);
+	if (audio_region && audio_r) {
+		audio_r->set_scale_amplitude (audio_region->scale_amplitude());
+		audio_r->set_fade_in_active (audio_region->fade_in_active ());
+		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);
+
 	return 0;
 }