Genericificationalizeified AudioFilter (now Filter).

Added primitive (non-undoable, placeholder, etc) quantization.


git-svn-id: svn://localhost/ardour2/trunk@2254 d708f5d6-7413-0410-9779-e7cbd77b26cf

5 files changed, 24 insertions, 24 deletions

diff --git a/libs/ardour/ardour/audioregion.h b/libs/ardour/ardour/audioregion.h
index 52a07679af..ddda1f4321 100644
--- a/libs/ardour/ardour/audioregion.h
+++ b/libs/ardour/ardour/audioregion.h
@@ -38,7 +38,7 @@ namespace ARDOUR {
 class Route;
 class Playlist;
 class Session;
-class AudioFilter;
+class Filter;
 class AudioSource;
 
 class AudioRegion : public Region
@@ -115,10 +115,6 @@ class AudioRegion : public Region
 
 	int separate_by_channel (ARDOUR::Session&, vector<boost::shared_ptr<AudioRegion> >&) const;
 
-	/* filter */
-
-	int apply (AudioFilter&);
-
 	/* export */
 
 	int exportme (ARDOUR::Session&, ARDOUR::AudioExportSpecification&);
diff --git a/libs/ardour/ardour/audiofilter.h b/libs/ardour/ardour/filter.h
index 6b60544942..0e4c6b3de0 100644
--- a/libs/ardour/ardour/audiofilter.h
+++ b/libs/ardour/ardour/filter.h
@@ -1,5 +1,6 @@
 /*
-    Copyright (C) 2004 Paul Davis 
+    Copyright (C) 2007 Paul Davis 
+    Author: Dave Robillard
 
     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
@@ -17,34 +18,34 @@
 
 */
 
-#ifndef __ardour_audiofilter_h__
-#define __ardour_audiofilter_h__
+#ifndef __ardour_filter_h__
+#define __ardour_filter_h__
 
 #include <vector>
-#include <ardour/audioregion.h>
+#include <ardour/region.h>
 
 namespace ARDOUR {
 
-class AudioRegion;
+class Region;
 class Session;
 
-class AudioFilter {
+class Filter {
 
   public:
-	AudioFilter (ARDOUR::Session& s)
-		: session (s){}
-	virtual ~AudioFilter() {}
+	virtual ~Filter() {}
 
-	virtual int run (boost::shared_ptr<ARDOUR::AudioRegion>) = 0;
-	std::vector<boost::shared_ptr<ARDOUR::AudioRegion> > results;
+	virtual int run (boost::shared_ptr<ARDOUR::Region>) = 0;
+	std::vector<boost::shared_ptr<ARDOUR::Region> > results;
 
   protected:
-	ARDOUR::Session& session;
+	Filter (ARDOUR::Session& s) : session(s) {}
 
-	int make_new_sources (boost::shared_ptr<ARDOUR::AudioRegion>, ARDOUR::SourceList&);
-	int finish (boost::shared_ptr<ARDOUR::AudioRegion>, ARDOUR::SourceList&);
+	int make_new_sources (boost::shared_ptr<ARDOUR::Region>, ARDOUR::SourceList&);
+	int finish (boost::shared_ptr<ARDOUR::Region>, ARDOUR::SourceList&);
+	
+	ARDOUR::Session& session;
 };
 
 } /* namespace */
 
-#endif /* __ardour_audiofilter_h__ */
+#endif /* __ardour_filter_h__ */
diff --git a/libs/ardour/ardour/region.h b/libs/ardour/ardour/region.h
index c3aac3dfa8..e6b799fdcf 100644
--- a/libs/ardour/ardour/region.h
+++ b/libs/ardour/ardour/region.h
@@ -35,6 +35,7 @@ class XMLNode;
 namespace ARDOUR {
 
 class Playlist;
+class Filter;
 
 enum RegionEditState {
 	EditChangesNothing = 0,
@@ -165,6 +166,8 @@ class Region : public PBD::StatefulDestructible, public boost::enable_shared_fro
 	void set_opaque (bool yn);
 	void set_locked (bool yn);
 	void set_position_locked (bool yn);
+	
+	int apply (Filter&);
 
 	virtual uint32_t read_data_count() const { return _read_data_count; }
 
diff --git a/libs/ardour/ardour/reverse.h b/libs/ardour/ardour/reverse.h
index 3296c77c62..7870b5aa2e 100644
--- a/libs/ardour/ardour/reverse.h
+++ b/libs/ardour/ardour/reverse.h
@@ -20,16 +20,16 @@
 #ifndef __ardour_reverse_h__
 #define __ardour_reverse_h__
 
-#include <ardour/audiofilter.h>
+#include <ardour/filter.h>
 
 namespace ARDOUR {
 
-class Reverse : public AudioFilter {
+class Reverse : public Filter {
   public:
 	Reverse (ARDOUR::Session&);
 	~Reverse ();
 
-	int run (boost::shared_ptr<ARDOUR::AudioRegion>);
+	int run (boost::shared_ptr<ARDOUR::Region>);
 };
 
 } /* namespace */
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index 05d87620f2..63be24d9f7 100644
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -553,7 +553,7 @@ class Session : public PBD::StatefulDestructible
 
 	int region_name (string& result, string base = string(""), bool newlevel = false) const;
 	string new_region_name (string);
-	string path_from_region_name (string name, string identifier);
+	string path_from_region_name (DataType type, string name, string identifier);
 
 	boost::shared_ptr<Region> find_whole_file_parent (boost::shared_ptr<Region const>);