diff options
Diffstat (limited to 'libs/ardour/ardour')
-rw-r--r-- | libs/ardour/ardour/bundle.h | 2 | ||||
-rw-r--r-- | libs/ardour/ardour/configuration.h | 2 | ||||
-rw-r--r-- | libs/ardour/ardour/control_protocol_manager.h | 2 | ||||
-rw-r--r-- | libs/ardour/ardour/named_selection.h | 2 | ||||
-rw-r--r-- | libs/ardour/ardour/panner.h | 4 | ||||
-rw-r--r-- | libs/ardour/ardour/route_group.h | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/libs/ardour/ardour/bundle.h b/libs/ardour/ardour/bundle.h index 69b8fe1d10..1ed285a118 100644 --- a/libs/ardour/ardour/bundle.h +++ b/libs/ardour/ardour/bundle.h @@ -36,7 +36,7 @@ namespace ARDOUR { * JACK ports. */ -class Bundle : public Stateful, public sigc::trackable { +class Bundle : public PBD::Stateful, public sigc::trackable { public: /** * Bundle constructor. diff --git a/libs/ardour/ardour/configuration.h b/libs/ardour/ardour/configuration.h index 07d4bb8db3..c63af0a4cf 100644 --- a/libs/ardour/ardour/configuration.h +++ b/libs/ardour/ardour/configuration.h @@ -36,7 +36,7 @@ class XMLNode; namespace ARDOUR { -class Configuration : public Stateful +class Configuration : public PBD::Stateful { public: Configuration(); diff --git a/libs/ardour/ardour/control_protocol_manager.h b/libs/ardour/ardour/control_protocol_manager.h index 73d9b21579..e8dc0bf22c 100644 --- a/libs/ardour/ardour/control_protocol_manager.h +++ b/libs/ardour/ardour/control_protocol_manager.h @@ -49,7 +49,7 @@ struct ControlProtocolInfo { ~ControlProtocolInfo() { if (state) { delete state; } } }; - class ControlProtocolManager : public sigc::trackable, public Stateful + class ControlProtocolManager : public sigc::trackable, public PBD::Stateful { public: ControlProtocolManager (); diff --git a/libs/ardour/ardour/named_selection.h b/libs/ardour/ardour/named_selection.h index 7636099e1f..39ab524d4f 100644 --- a/libs/ardour/ardour/named_selection.h +++ b/libs/ardour/ardour/named_selection.h @@ -33,7 +33,7 @@ namespace ARDOUR class Session; class Playlist; -struct NamedSelection : public Stateful +struct NamedSelection : public PBD::Stateful { NamedSelection (std::string, std::list<boost::shared_ptr<Playlist> >&); NamedSelection (Session&, const XMLNode&); diff --git a/libs/ardour/ardour/panner.h b/libs/ardour/ardour/panner.h index 9d6a7e7fb6..0e5ab68525 100644 --- a/libs/ardour/ardour/panner.h +++ b/libs/ardour/ardour/panner.h @@ -42,7 +42,7 @@ class Panner; class BufferSet; class AudioBuffer; -class StreamPanner : public sigc::trackable, public Stateful +class StreamPanner : public sigc::trackable, public PBD::Stateful { public: StreamPanner (Panner& p); @@ -226,7 +226,7 @@ class Multi2dPanner : public StreamPanner void update (); }; -class Panner : public std::vector<StreamPanner*>, public Stateful, public sigc::trackable +class Panner : public std::vector<StreamPanner*>, public PBD::Stateful, public sigc::trackable { public: struct Output { diff --git a/libs/ardour/ardour/route_group.h b/libs/ardour/ardour/route_group.h index 55448df45b..ae16394289 100644 --- a/libs/ardour/ardour/route_group.h +++ b/libs/ardour/ardour/route_group.h @@ -38,7 +38,7 @@ class Track; class AudioTrack; class Session; -class RouteGroup : public Stateful, public sigc::trackable { +class RouteGroup : public PBD::Stateful, public sigc::trackable { public: enum Flag { Relative = 0x1, |