summaryrefslogtreecommitdiff
path: root/libs/ardour/ardour
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2009-02-14 19:45:30 +0000
committerCarl Hetherington <carl@carlh.net>2009-02-14 19:45:30 +0000
commit9a3734a6bd0450faf92a8b1add2d5e052a4534ca (patch)
treec7feafe8169e8782e4133dd38b8cd1e140c639bc /libs/ardour/ardour
parentb35f3088942ff623e9d09fe6acb1f214dddf73ce (diff)
Make DnD copy processors using their XML representations. Remove unused
copy constructors from the Processor hierarchy, and declare them private to explicitly disallow copy construction. git-svn-id: svn://localhost/ardour2/branches/3.0@4556 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour')
-rw-r--r--libs/ardour/ardour/io_processor.h6
-rw-r--r--libs/ardour/ardour/meter.h2
-rw-r--r--libs/ardour/ardour/panner.h3
-rw-r--r--libs/ardour/ardour/plugin_insert.h3
-rw-r--r--libs/ardour/ardour/port_insert.h4
-rw-r--r--libs/ardour/ardour/processor.h6
-rw-r--r--libs/ardour/ardour/route.h1
-rw-r--r--libs/ardour/ardour/send.h4
8 files changed, 22 insertions, 7 deletions
diff --git a/libs/ardour/ardour/io_processor.h b/libs/ardour/ardour/io_processor.h
index af11e8cacf..985a2c387c 100644
--- a/libs/ardour/ardour/io_processor.h
+++ b/libs/ardour/ardour/io_processor.h
@@ -48,7 +48,6 @@ class IOProcessor : public Processor
IOProcessor (Session&, const string& name, Placement,
int input_min = -1, int input_max = -1, int output_min = -1, int output_max = -1,
ARDOUR::DataType default_type = DataType::AUDIO);
- IOProcessor (const IOProcessor&);
virtual ~IOProcessor ();
virtual ChanCount output_streams() const;
@@ -74,6 +73,11 @@ class IOProcessor : public Processor
protected:
boost::shared_ptr<IO> _io;
+
+ private:
+ /* disallow copy construction */
+ IOProcessor (const IOProcessor&);
+
};
} // namespace ARDOUR
diff --git a/libs/ardour/ardour/meter.h b/libs/ardour/ardour/meter.h
index 112f306ccb..2cf474afba 100644
--- a/libs/ardour/ardour/meter.h
+++ b/libs/ardour/ardour/meter.h
@@ -63,6 +63,8 @@ public:
}
private:
+ /* disallow copy construction */
+ PeakMeter (PeakMeter const &);
friend class IO;
void meter();
diff --git a/libs/ardour/ardour/panner.h b/libs/ardour/ardour/panner.h
index 34b99e63bf..f6839f6d29 100644
--- a/libs/ardour/ardour/panner.h
+++ b/libs/ardour/ardour/panner.h
@@ -298,6 +298,9 @@ class Panner : public Processor
}
private:
+ /* disallow copy construction */
+ Panner (Panner const &);
+
void distribute_no_automation(BufferSet& src, BufferSet& dest, nframes_t nframes, nframes_t offset, gain_t gain_coeff);
std::vector<StreamPanner*> _streampanners;
uint32_t current_outs;
diff --git a/libs/ardour/ardour/plugin_insert.h b/libs/ardour/ardour/plugin_insert.h
index 2583728ef3..ee5c7405fb 100644
--- a/libs/ardour/ardour/plugin_insert.h
+++ b/libs/ardour/ardour/plugin_insert.h
@@ -46,7 +46,6 @@ class PluginInsert : public Processor
public:
PluginInsert (Session&, boost::shared_ptr<Plugin>, Placement);
PluginInsert (Session&, const XMLNode&);
- PluginInsert (const PluginInsert&);
~PluginInsert ();
static const string port_automation_node_name;
@@ -117,6 +116,8 @@ class PluginInsert : public Processor
}
private:
+ /* disallow copy construction */
+ PluginInsert (const PluginInsert&);
void parameter_changed (Evoral::Parameter, float);
diff --git a/libs/ardour/ardour/port_insert.h b/libs/ardour/ardour/port_insert.h
index 55f91569d5..78ff09124b 100644
--- a/libs/ardour/ardour/port_insert.h
+++ b/libs/ardour/ardour/port_insert.h
@@ -42,7 +42,6 @@ class PortInsert : public IOProcessor
public:
PortInsert (Session&, Placement);
PortInsert (Session&, const XMLNode&);
- PortInsert (const PortInsert&);
~PortInsert ();
XMLNode& state(bool full);
@@ -64,6 +63,9 @@ class PortInsert : public IOProcessor
uint32_t bit_slot() const { return bitslot; }
private:
+ /* disallow copy construction */
+ PortInsert (const PortInsert&);
+
uint32_t bitslot;
};
diff --git a/libs/ardour/ardour/processor.h b/libs/ardour/ardour/processor.h
index 5a1011966c..83d6be0df9 100644
--- a/libs/ardour/ardour/processor.h
+++ b/libs/ardour/ardour/processor.h
@@ -53,8 +53,6 @@ class Processor : public SessionObject, public AutomatableControls, public Laten
virtual ~Processor() { }
- static boost::shared_ptr<Processor> clone (boost::shared_ptr<const Processor>);
-
uint32_t sort_key() const { return _sort_key; }
void set_sort_key (uint32_t key);
@@ -117,6 +115,10 @@ protected:
Placement _placement;
uint32_t _sort_key;
void* _gui; /* generic, we don't know or care what this is */
+
+private:
+ /* disallow copy construction */
+ Processor (Processor const &);
};
} // namespace ARDOUR
diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h
index cbf4910899..5e83bd2f1e 100644
--- a/libs/ardour/ardour/route.h
+++ b/libs/ardour/ardour/route.h
@@ -176,7 +176,6 @@ class Route : public IO
int add_processor (boost::shared_ptr<Processor>, ProcessorStreams* err = 0);
int add_processors (const ProcessorList&, ProcessorStreams* err = 0);
int remove_processor (boost::shared_ptr<Processor>, ProcessorStreams* err = 0);
- int copy_processors (const Route&, Placement, ProcessorStreams* err = 0);
int sort_processors (ProcessorStreams* err = 0);
void disable_processors (Placement);
void disable_processors ();
diff --git a/libs/ardour/ardour/send.h b/libs/ardour/ardour/send.h
index b65675dc2c..dc1cbb8209 100644
--- a/libs/ardour/ardour/send.h
+++ b/libs/ardour/ardour/send.h
@@ -36,7 +36,6 @@ class Send : public IOProcessor
public:
Send (Session&, Placement);
Send (Session&, const XMLNode&);
- Send (const Send&);
virtual ~Send ();
uint32_t bit_slot() const { return bitslot; }
@@ -65,6 +64,9 @@ class Send : public IOProcessor
static void make_unique (XMLNode &, Session &);
private:
+ /* disallow copy construction */
+ Send (const Send&);
+
bool _metering;
ChanCount expected_inputs;
uint32_t bitslot;