From bcd511aa3fec59e1527c8b7ab80dabda4db1a6f9 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 25 Oct 2006 20:11:42 +0000 Subject: 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 --- libs/ardour/ardour/io.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'libs/ardour/ardour/io.h') 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; -- cgit v1.2.3