diff options
Diffstat (limited to 'libs/ardour/ardour')
-rw-r--r-- | libs/ardour/ardour/audioregion.h | 3 | ||||
-rw-r--r-- | libs/ardour/ardour/automatable.h | 29 | ||||
-rw-r--r-- | libs/ardour/ardour/automatable_controls.h | 37 | ||||
-rw-r--r-- | libs/ardour/ardour/automatable_sequence.h | 42 | ||||
-rw-r--r-- | libs/ardour/ardour/io.h | 14 | ||||
-rw-r--r-- | libs/ardour/ardour/midi_model.h | 2 | ||||
-rw-r--r-- | libs/ardour/ardour/processor.h | 4 | ||||
-rw-r--r-- | libs/ardour/ardour/route.h | 5 |
8 files changed, 100 insertions, 36 deletions
diff --git a/libs/ardour/ardour/audioregion.h b/libs/ardour/ardour/audioregion.h index 5ebe22e312..fb54a3c6bc 100644 --- a/libs/ardour/ardour/audioregion.h +++ b/libs/ardour/ardour/audioregion.h @@ -27,9 +27,10 @@ #include <pbd/undo.h> #include <ardour/ardour.h> -#include <ardour/region.h> +#include <ardour/automatable_controls.h> #include <ardour/gain.h> #include <ardour/logcurve.h> +#include <ardour/region.h> class XMLNode; diff --git a/libs/ardour/ardour/automatable.h b/libs/ardour/ardour/automatable.h index 98ab28d12d..61a94d469b 100644 --- a/libs/ardour/ardour/automatable.h +++ b/libs/ardour/ardour/automatable.h @@ -20,12 +20,14 @@ #ifndef __ardour_automatable_h__ #define __ardour_automatable_h__ -#include <set> #include <map> +#include <set> +#include <string> #include <boost/shared_ptr.hpp> -#include <ardour/event_type_map.h> #include <evoral/ControlSet.hpp> -#include <evoral/Sequence.hpp> +#include <ardour/types.h> + +class XMLNode; namespace ARDOUR { @@ -58,7 +60,7 @@ public: virtual void automation_snapshot(nframes_t now, bool force); virtual void transport_stopped(nframes_t now); - virtual string describe_parameter(Evoral::Parameter param); + virtual std::string describe_parameter(Evoral::Parameter param); AutoState get_parameter_automation_state (Evoral::Parameter param, bool lock = true); virtual void set_parameter_automation_state (Evoral::Parameter param, AutoState); @@ -113,25 +115,6 @@ public: }; -/** Contains notes and controllers */ -template<typename T> -class AutomatableSequence : public Automatable, public Evoral::Sequence<T> { -public: - AutomatableSequence(Session& s, size_t size) - : Evoral::ControlSet() - , Automatable(s) - , Evoral::Sequence<T>(EventTypeMap::instance()) - {} -}; - - -/** Contains only controllers */ -class AutomatableControls : public Automatable { -public: - AutomatableControls(Session& s) : Evoral::ControlSet(), Automatable(s) {} -}; - - } // namespace ARDOUR #endif /* __ardour_automatable_h__ */ diff --git a/libs/ardour/ardour/automatable_controls.h b/libs/ardour/ardour/automatable_controls.h new file mode 100644 index 0000000000..39633c0133 --- /dev/null +++ b/libs/ardour/ardour/automatable_controls.h @@ -0,0 +1,37 @@ +/* + Copyright (C) 2009 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 + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +*/ + +#ifndef __ardour_automatable_controls_h__ +#define __ardour_automatable_controls_h__ + +#include <evoral/ControlSet.hpp> +#include <ardour/automatable.h> + +namespace ARDOUR { + +/** Contains only controllers */ +class AutomatableControls : public Automatable { +public: + AutomatableControls(Session& s) : Evoral::ControlSet(), Automatable(s) {} +}; + +} // namespace ARDOUR + +#endif /* __ardour_automatable_controls_h__ */ + diff --git a/libs/ardour/ardour/automatable_sequence.h b/libs/ardour/ardour/automatable_sequence.h new file mode 100644 index 0000000000..9259234f81 --- /dev/null +++ b/libs/ardour/ardour/automatable_sequence.h @@ -0,0 +1,42 @@ +/* + Copyright (C) 2009 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 + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +*/ + +#ifndef __ardour_automatable_sequence_h__ +#define __ardour_automatable_sequence_h__ + +#include <evoral/Sequence.hpp> +#include <ardour/automatable.h> + +namespace ARDOUR { + +/** Contains notes and controllers */ +template<typename T> +class AutomatableSequence : public Automatable, public Evoral::Sequence<T> { +public: + AutomatableSequence(Session& s, size_t size) + : Evoral::ControlSet() + , Automatable(s) + , Evoral::Sequence<T>(EventTypeMap::instance()) + {} +}; + +} // namespace ARDOUR + +#endif /* __ardour_automatable_sequence_h__ */ + diff --git a/libs/ardour/ardour/io.h b/libs/ardour/ardour/io.h index c5f90bcd90..3ba56708ac 100644 --- a/libs/ardour/ardour/io.h +++ b/libs/ardour/ardour/io.h @@ -34,16 +34,16 @@ #include <pbd/controllable.h> #include <ardour/ardour.h> -#include <ardour/automatable.h> -#include <ardour/utils.h> -#include <ardour/types.h> -#include <ardour/data_type.h> -#include <ardour/port_set.h> +#include <ardour/automatable_controls.h> +#include <ardour/automation_control.h> +#include <ardour/bundle.h> #include <ardour/chan_count.h> +#include <ardour/data_type.h> #include <ardour/latent.h> -#include <ardour/automation_control.h> +#include <ardour/port_set.h> #include <ardour/session_object.h> -#include <ardour/bundle.h> +#include <ardour/types.h> +#include <ardour/utils.h> using std::string; using std::vector; diff --git a/libs/ardour/ardour/midi_model.h b/libs/ardour/ardour/midi_model.h index fb881ae127..16d972c3cc 100644 --- a/libs/ardour/ardour/midi_model.h +++ b/libs/ardour/ardour/midi_model.h @@ -30,7 +30,7 @@ #include <ardour/types.h> #include <ardour/midi_buffer.h> #include <ardour/midi_ring_buffer.h> -#include <ardour/automatable.h> +#include <ardour/automatable_sequence.h> #include <ardour/types.h> #include <evoral/Note.hpp> #include <evoral/Sequence.hpp> diff --git a/libs/ardour/ardour/processor.h b/libs/ardour/ardour/processor.h index 83d6be0df9..430e281bfc 100644 --- a/libs/ardour/ardour/processor.h +++ b/libs/ardour/ardour/processor.h @@ -28,12 +28,12 @@ #include <sigc++/signal.h> -#include <ardour/types.h> #include <ardour/ardour.h> +#include <ardour/automatable_controls.h> #include <ardour/buffer_set.h> -#include <ardour/automatable.h> #include <ardour/latent.h> #include <ardour/session_object.h> +#include <ardour/types.h> class XMLNode; diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h index 5e83bd2f1e..98b7fa0d64 100644 --- a/libs/ardour/ardour/route.h +++ b/libs/ardour/ardour/route.h @@ -21,16 +21,17 @@ #define __ardour_route_h__ #include <cmath> +#include <cstring> #include <list> -#include <set> #include <map> +#include <set> #include <string> #include <boost/shared_ptr.hpp> #include <boost/weak_ptr.hpp> -#include <pbd/fastlog.h> #include <glibmm/thread.h> +#include <pbd/fastlog.h> #include <pbd/xml++.h> #include <pbd/undo.h> #include <pbd/stateful.h> |