mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-08 15:54:57 +01:00
Move Stateful class declared in pbd/stateful.h into the PBD namespace
git-svn-id: svn://localhost/ardour2/trunk@2011 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
0ce6fa247d
commit
4b95621853
11 changed files with 17 additions and 11 deletions
|
|
@ -34,7 +34,7 @@
|
|||
using std::vector;
|
||||
using std::string;
|
||||
|
||||
class Keyboard : public sigc::trackable, Stateful
|
||||
class Keyboard : public sigc::trackable, PBD::Stateful
|
||||
{
|
||||
public:
|
||||
Keyboard ();
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ class XMLNode;
|
|||
|
||||
namespace ARDOUR {
|
||||
|
||||
class Configuration : public Stateful
|
||||
class Configuration : public PBD::Stateful
|
||||
{
|
||||
public:
|
||||
Configuration();
|
||||
|
|
|
|||
|
|
@ -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 ();
|
||||
|
|
|
|||
|
|
@ -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&);
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -25,6 +25,8 @@
|
|||
|
||||
class XMLNode;
|
||||
|
||||
namespace PBD {
|
||||
|
||||
class Stateful {
|
||||
public:
|
||||
Stateful();
|
||||
|
|
@ -49,5 +51,7 @@ class Stateful {
|
|||
PBD::ID _id;
|
||||
};
|
||||
|
||||
} // namespace PBD
|
||||
|
||||
#endif /* __pbd_stateful_h__ */
|
||||
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
|
||||
#include "i18n.h"
|
||||
|
||||
using namespace PBD;
|
||||
namespace PBD {
|
||||
|
||||
Stateful::Stateful ()
|
||||
{
|
||||
|
|
@ -134,3 +134,5 @@ Stateful::instant_xml (const string& str, const string& dir)
|
|||
|
||||
return 0;
|
||||
}
|
||||
|
||||
} // namespace PBD
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ namespace ARDOUR {
|
|||
class Route;
|
||||
class Session;
|
||||
|
||||
class ControlProtocol : public sigc::trackable, public Stateful, public BasicUI {
|
||||
class ControlProtocol : public sigc::trackable, public PBD::Stateful, public BasicUI {
|
||||
public:
|
||||
ControlProtocol (Session&, std::string name);
|
||||
virtual ~ControlProtocol();
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ class Parser;
|
|||
|
||||
}
|
||||
|
||||
class MIDIControllable : public Stateful
|
||||
class MIDIControllable : public PBD::Stateful
|
||||
{
|
||||
public:
|
||||
MIDIControllable (MIDI::Port&, PBD::Controllable&, bool bistate = false);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue