Merge branch 'master' into saveas

[ardour.git] / libs / ardour / filter.cc

diff --git a/libs/ardour/filter.cc b/libs/ardour/filter.cc
index 2ff93316f316392880f9c605d373d30fe9bf8523..d782db96f24a1679903f003713f96b9bff17f602 100644 (file)
--- a/libs/ardour/filter.cc
+++ b/libs/ardour/filter.cc
@@ -21,15 +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 "ardour/audioregion.h"
 
 #include "i18n.h"
 
@@ -58,10 +59,11 @@ 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;
@@ -116,12 +118,12 @@ Filter::finish (boost::shared_ptr<Region> region, SourceList& nsrcs, string regi
        /* 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 ();
 
        PropertyList plist;
-       
+
        plist.add (Properties::start, 0);
        plist.add (Properties::length, region->length());
        plist.add (Properties::name, region_name);
@@ -138,6 +140,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);