diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2006-10-25 20:11:42 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2006-10-25 20:11:42 +0000 |
| commit | bcd511aa3fec59e1527c8b7ab80dabda4db1a6f9 (patch) | |
| tree | 0e704409baaaa22a43b918adc126c76990208f5f /libs/ardour/ardour/io.h | |
| parent | 1b39adc4ce8566fd731cf433094b1faf4fe63205 (diff) | |
fixes for endemic (compiler?) issues with virtual inheritance of sigc::trackable. NOTE: automation list undo/redo no longer operational, fix to follow
git-svn-id: svn://localhost/ardour2/trunk@1007 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour/io.h')
| -rw-r--r-- | libs/ardour/ardour/io.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libs/ardour/ardour/io.h b/libs/ardour/ardour/io.h index 96ae75f298..cbac629593 100644 --- a/libs/ardour/ardour/io.h +++ b/libs/ardour/ardour/io.h @@ -59,7 +59,7 @@ class Panner; * An IO can contain ports of varying types, making routes/inserts/etc with * varied combinations of types (eg MIDI and audio) possible. */ -class IO : public PBD::StatefulDestructible, public ARDOUR::StateManager +class IO : public PBD::StatefulDestructible { public: @@ -167,8 +167,9 @@ virtual ~IO(); XMLNode& get_state (void); int set_state (const XMLNode&); +#ifdef STATE_MANAGER virtual UndoAction get_memento() const; - +#endif static int disable_connecting (void); @@ -300,8 +301,10 @@ public: /* state management */ +#ifdef STATE_MANAGER Change restore_state (State&); StateManager::State* state_factory (std::string why) const; +#endif AutoState _gain_automation_state; AutoStyle _gain_automation_style; |