#include "pbd/undo.h"
#include "ardour/ardour.h"
-#include "ardour/automatable_controls.h"
+#include "ardour/automatable.h"
#include "ardour/gain.h"
#include "ardour/logcurve.h"
#include "ardour/region.h"
void connect_to_analysis_changed ();
void connect_to_header_position_offset_changed ();
- AutomatableControls _automatable;
+ Automatable _automatable;
boost::shared_ptr<AutomationList> _fade_in;
boost::shared_ptr<AutomationList> _fade_out;
+++ /dev/null
-/*
- 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__ */
-
#include "pbd/controllable.h"
#include "ardour/ardour.h"
-#include "ardour/automatable_controls.h"
#include "ardour/automation_control.h"
#include "ardour/bundle.h"
#include "ardour/chan_count.h"
/** Class to pan from some number of inputs to some number of outputs.
* This class has a number of StreamPanners, one for each input.
*/
-class Panner : public SessionObject, public AutomatableControls
+class Panner : public SessionObject, public Automatable
{
public:
struct Output {
#include "pbd/statefuldestructible.h"
-
#include "ardour/ardour.h"
-#include "ardour/automatable_controls.h"
#include "ardour/buffer_set.h"
#include "ardour/latent.h"
#include "ardour/session_object.h"
#include "ardour/types.h"
+#include "ardour/automatable.h"
class XMLNode;
/* A mixer strip element - plugin, send, meter, etc.
*/
-class Processor : public SessionObject, public AutomatableControls, public Latent
+class Processor : public SessionObject, public Automatable, public Latent
{
public:
static const std::string state_node_name;
#include "ardour/mute_master.h"
#include "ardour/route_group_member.h"
#include "ardour/graphnode.h"
+#include "ardour/automatable.h"
namespace ARDOUR {
class InternalReturn;
class MonitorProcessor;
-class Route : public SessionObject, public AutomatableControls, public RouteGroupMember, public GraphNode
+class Route : public SessionObject, public Automatable, public RouteGroupMember, public GraphNode
{
public:
Panner::Panner (string name, Session& s)
: SessionObject (s, name)
- , AutomatableControls (s)
+ , Automatable (s)
{
//set_name_old_auto (name);
set_name (name);
Processor::Processor(Session& session, const string& name)
: SessionObject(session, name)
- , AutomatableControls(session)
+ , Automatable (session)
, _pending_active(false)
, _active(false)
, _next_ab_is_active(false)
Route::Route (Session& sess, string name, Flag flg, DataType default_type)
: SessionObject (sess, name)
- , AutomatableControls (sess)
+ , Automatable (sess)
, GraphNode( sess.route_graph )
, _active (true)
, _initial_delay (0)