smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-08 15:54:57 +01:00
Code Issues Projects Releases Wiki Activity

Move Stateful class declared in pbd/stateful.h into the PBD namespace

Browse source 
git-svn-id: svn://localhost/ardour2/trunk@2011 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Tim Mayberry 2007-06-17 00:47:33 +00:00
parent 0ce6fa247d
commit 4b95621853
11 changed files with 17 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gtk2_ardour/keyboard.h
View file

@ -34,7 +34,7 @@
using std::vector; using std::vector;
using std::string; using std::string;
class Keyboard : public sigc::trackable, Stateful class Keyboard : public sigc::trackable, PBD::Stateful
{ {
public: public:
Keyboard (); Keyboard ();

2
libs/ardour/ardour/bundle.h
View file

@ -36,7 +36,7 @@ namespace ARDOUR {
* JACK ports. * JACK ports.
*/ */
class Bundle : public Stateful, public sigc::trackable { class Bundle : public PBD::Stateful, public sigc::trackable {
public: public:
/** /**
* Bundle constructor. * Bundle constructor.

2
libs/ardour/ardour/configuration.h
View file

@ -36,7 +36,7 @@ class XMLNode;
namespace ARDOUR { namespace ARDOUR {
class Configuration : public Stateful class Configuration : public PBD::Stateful
{ {
public: public:
Configuration(); Configuration();

2
libs/ardour/ardour/control_protocol_manager.h
View file

@ -49,7 +49,7 @@ struct ControlProtocolInfo {
~ControlProtocolInfo() { if (state) { delete state; } } ~ControlProtocolInfo() { if (state) { delete state; } }
}; };
class ControlProtocolManager : public sigc::trackable, public Stateful class ControlProtocolManager : public sigc::trackable, public PBD::Stateful
{ {
public: public:
ControlProtocolManager (); ControlProtocolManager ();

2
libs/ardour/ardour/named_selection.h
View file

@ -33,7 +33,7 @@ namespace ARDOUR
class Session; class Session;
class Playlist; class Playlist;
struct NamedSelection : public Stateful struct NamedSelection : public PBD::Stateful
{ {
NamedSelection (std::string, std::list<boost::shared_ptr<Playlist> >&); NamedSelection (std::string, std::list<boost::shared_ptr<Playlist> >&);
NamedSelection (Session&, const XMLNode&); NamedSelection (Session&, const XMLNode&);

4
libs/ardour/ardour/panner.h
View file

@ -42,7 +42,7 @@ class Panner;
class BufferSet; class BufferSet;
class AudioBuffer; class AudioBuffer;
class StreamPanner : public sigc::trackable, public Stateful class StreamPanner : public sigc::trackable, public PBD::Stateful
{ {
public: public:
StreamPanner (Panner& p); StreamPanner (Panner& p);
@ -226,7 +226,7 @@ class Multi2dPanner : public StreamPanner
void update (); 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: public:
struct Output { struct Output {

2
libs/ardour/ardour/route_group.h
View file

@ -38,7 +38,7 @@ class Track;
class AudioTrack; class AudioTrack;
class Session; class Session;
class RouteGroup : public Stateful, public sigc::trackable { class RouteGroup : public PBD::Stateful, public sigc::trackable {
public: public:
enum Flag { enum Flag {
Relative = 0x1, Relative = 0x1,

4
libs/pbd/pbd/stateful.h
View file

@ -25,6 +25,8 @@
class XMLNode; class XMLNode;
namespace PBD {
class Stateful { class Stateful {
public: public:
Stateful(); Stateful();
@ -49,5 +51,7 @@ class Stateful {
PBD::ID _id; PBD::ID _id;
}; };
} // namespace PBD
#endif /* __pbd_stateful_h__ */ #endif /* __pbd_stateful_h__ */

4
libs/pbd/stateful.cc
View file

@ -26,7 +26,7 @@
#include "i18n.h" #include "i18n.h"
using namespace PBD; namespace PBD {
Stateful::Stateful () Stateful::Stateful ()
{ {
@ -134,3 +134,5 @@ Stateful::instant_xml (const string& str, const string& dir)
return 0; return 0;
} }
} // namespace PBD

2
libs/surfaces/control_protocol/control_protocol/control_protocol.h
View file

@ -34,7 +34,7 @@ namespace ARDOUR {
class Route; class Route;
class Session; class Session;
class ControlProtocol : public sigc::trackable, public Stateful, public BasicUI { class ControlProtocol : public sigc::trackable, public PBD::Stateful, public BasicUI {
public: public:
ControlProtocol (Session&, std::string name); ControlProtocol (Session&, std::string name);
virtual ~ControlProtocol(); virtual ~ControlProtocol();

2
libs/surfaces/generic_midi/midicontrollable.h
View file

@ -37,7 +37,7 @@ class Parser;
} }
class MIDIControllable : public Stateful class MIDIControllable : public PBD::Stateful
{ {
public: public:
MIDIControllable (MIDI::Port&, PBD::Controllable&, bool bistate = false); MIDIControllable (MIDI::Port&, PBD::Controllable&, bool bistate = false);