Remove stub class.
git-svn-id: svn://localhost/ardour2/branches/3.0@7407 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
c45d19494f
commit
b75977920e
|
@ -27,7 +27,7 @@
|
|||
#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"
|
||||
|
@ -233,7 +233,7 @@ class AudioRegion : public Region
|
|||
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;
|
||||
|
|
|
@ -1,37 +0,0 @@
|
|||
/*
|
||||
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__ */
|
||||
|
|
@ -33,7 +33,6 @@
|
|||
#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"
|
||||
|
|
|
@ -199,7 +199,7 @@ class Multi2dPanner : public StreamPanner
|
|||
/** 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 {
|
||||
|
|
|
@ -26,13 +26,12 @@
|
|||
|
||||
#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;
|
||||
|
||||
|
@ -43,7 +42,7 @@ class Route;
|
|||
|
||||
/* 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;
|
||||
|
|
|
@ -44,6 +44,7 @@
|
|||
#include "ardour/mute_master.h"
|
||||
#include "ardour/route_group_member.h"
|
||||
#include "ardour/graphnode.h"
|
||||
#include "ardour/automatable.h"
|
||||
|
||||
namespace ARDOUR {
|
||||
|
||||
|
@ -57,7 +58,7 @@ class Send;
|
|||
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:
|
||||
|
||||
|
|
|
@ -767,7 +767,7 @@ Multi2dPanner::set_state (const XMLNode& node, int /*version*/)
|
|||
|
||||
Panner::Panner (string name, Session& s)
|
||||
: SessionObject (s, name)
|
||||
, AutomatableControls (s)
|
||||
, Automatable (s)
|
||||
{
|
||||
//set_name_old_auto (name);
|
||||
set_name (name);
|
||||
|
|
|
@ -61,7 +61,7 @@ const string Processor::state_node_name = "Processor";
|
|||
|
||||
Processor::Processor(Session& session, const string& name)
|
||||
: SessionObject(session, name)
|
||||
, AutomatableControls(session)
|
||||
, Automatable (session)
|
||||
, _pending_active(false)
|
||||
, _active(false)
|
||||
, _next_ab_is_active(false)
|
||||
|
|
|
@ -72,7 +72,7 @@ PBD::Signal0<void> Route::RemoteControlIDChange;
|
|||
|
||||
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)
|
||||
|
|
Loading…
Reference in New Issue
Block a user