diff options
Diffstat (limited to 'libs/ardour/ardour')
-rw-r--r-- | libs/ardour/ardour/audio_unit.h | 2 | ||||
-rw-r--r-- | libs/ardour/ardour/automation_event.h | 17 | ||||
-rw-r--r-- | libs/ardour/ardour/curve.h | 4 | ||||
-rw-r--r-- | libs/ardour/ardour/insert.h | 16 | ||||
-rw-r--r-- | libs/ardour/ardour/io.h | 17 | ||||
-rw-r--r-- | libs/ardour/ardour/ladspa_plugin.h | 3 | ||||
-rw-r--r-- | libs/ardour/ardour/location.h | 17 | ||||
-rw-r--r-- | libs/ardour/ardour/plugin.h | 3 | ||||
-rw-r--r-- | libs/ardour/ardour/plugin_state.h | 14 | ||||
-rw-r--r-- | libs/ardour/ardour/redirect.h | 13 | ||||
-rw-r--r-- | libs/ardour/ardour/route.h | 6 | ||||
-rw-r--r-- | libs/ardour/ardour/session.h | 1 | ||||
-rw-r--r-- | libs/ardour/ardour/state_manager.h | 56 | ||||
-rw-r--r-- | libs/ardour/ardour/tempo.h | 28 | ||||
-rw-r--r-- | libs/ardour/ardour/vst_plugin.h | 2 |
15 files changed, 0 insertions, 199 deletions
diff --git a/libs/ardour/ardour/audio_unit.h b/libs/ardour/ardour/audio_unit.h index aa7c34a2d2..d82425765d 100644 --- a/libs/ardour/ardour/audio_unit.h +++ b/libs/ardour/ardour/audio_unit.h @@ -66,8 +66,6 @@ class AUPlugin : public ARDOUR::Plugin int connect_and_run (vector<Sample*>& bufs, uint32_t maxbuf, int32_t& in, int32_t& out, nframes_t nframes, nframes_t offset); std::set<uint32_t> automatable() const; - void store_state (ARDOUR::PluginState&); - void restore_state (ARDOUR::PluginState&); string describe_parameter (uint32_t); string state_node_name () const { return "audiounit"; } void print_parameter (uint32_t, char*, uint32_t len) const; diff --git a/libs/ardour/ardour/automation_event.h b/libs/ardour/ardour/automation_event.h index e2940bc2e1..89823bc738 100644 --- a/libs/ardour/ardour/automation_event.h +++ b/libs/ardour/ardour/automation_event.h @@ -33,7 +33,6 @@ #include <pbd/statefuldestructible.h> #include <ardour/ardour.h> -#include <ardour/state_manager.h> namespace ARDOUR { @@ -153,10 +152,6 @@ class AutomationList : public PBD::StatefulDestructible sigc::signal<void,Change> StateChanged; -#ifdef STATE_MANAGER - UndoAction get_memento () const; -#endif - virtual void store_state (XMLNode& node) const; virtual void load_state (const XMLNode&); @@ -192,12 +187,6 @@ class AutomationList : public PBD::StatefulDestructible protected: - struct State : public ARDOUR::StateManager::State { - AutomationEventList events; - - State (std::string why) : ARDOUR::StateManager::State (why) {} - }; - AutomationEventList events; mutable Glib::Mutex lock; bool _frozen; @@ -246,15 +235,9 @@ class AutomationList : public PBD::StatefulDestructible virtual double unlocked_eval (double where); -#ifdef STATE_MANAGER - Change restore_state (StateManager::State&); - StateManager::State* state_factory (std::string why) const; -#endif - virtual ControlEvent* point_factory (double,double) const; virtual ControlEvent* point_factory (const ControlEvent&) const; - AutomationList* cut_copy_clear (double, double, int op); }; diff --git a/libs/ardour/ardour/curve.h b/libs/ardour/ardour/curve.h index 9de7d0ef48..97601e29ee 100644 --- a/libs/ardour/ardour/curve.h +++ b/libs/ardour/ardour/curve.h @@ -66,10 +66,6 @@ class Curve : public AutomationList ControlEvent* point_factory (double,double) const; ControlEvent* point_factory (const ControlEvent&) const; -#ifdef STATE_MANAGER - Change restore_state (StateManager::State&); -#endif - private: AutomationList::iterator last_bound; diff --git a/libs/ardour/ardour/insert.h b/libs/ardour/ardour/insert.h index 30378139ab..885cab4457 100644 --- a/libs/ardour/ardour/insert.h +++ b/libs/ardour/ardour/insert.h @@ -28,7 +28,6 @@ #include <sigc++/signal.h> #include <ardour/ardour.h> #include <ardour/redirect.h> -#include <ardour/plugin_state.h> #include <ardour/types.h> class XMLNode; @@ -87,15 +86,6 @@ class PortInsert : public Insert int32_t compute_output_streams (int32_t cnt) const; }; -struct PluginInsertState : public RedirectState -{ - PluginInsertState (std::string why) - : RedirectState (why) {} - ~PluginInsertState() {} - - PluginState plugin_state; -}; - class PluginInsert : public Insert { public: @@ -110,9 +100,6 @@ class PluginInsert : public Insert XMLNode& get_state(void); int set_state(const XMLNode&); - StateManager::State* state_factory (std::string why) const; - Change restore_state (StateManager::State&); - void run (vector<Sample *>& bufs, uint32_t nbufs, nframes_t nframes, nframes_t offset); void silence (nframes_t nframes, nframes_t offset); void activate (); @@ -158,9 +145,6 @@ class PluginInsert : public Insert void transport_stopped (nframes_t now); - protected: - void store_state (PluginInsertState&) const; - private: void parameter_changed (uint32_t, float); diff --git a/libs/ardour/ardour/io.h b/libs/ardour/ardour/io.h index cbac629593..e1ed7aef95 100644 --- a/libs/ardour/ardour/io.h +++ b/libs/ardour/ardour/io.h @@ -36,7 +36,6 @@ #include <ardour/ardour.h> #include <ardour/utils.h> -#include <ardour/state_manager.h> #include <ardour/curve.h> #include <ardour/types.h> #include <ardour/data_type.h> @@ -167,20 +166,11 @@ 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); - static int enable_connecting (void); - static int disable_ports (void); - static int enable_ports (void); - static int disable_panners (void); - static int reset_panners (void); static sigc::signal<int> PortsLegal; @@ -299,13 +289,6 @@ public: GainControllable _gain_control; - /* 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; diff --git a/libs/ardour/ardour/ladspa_plugin.h b/libs/ardour/ardour/ladspa_plugin.h index 291ff41dc8..aeac7f05c6 100644 --- a/libs/ardour/ardour/ladspa_plugin.h +++ b/libs/ardour/ardour/ladspa_plugin.h @@ -33,7 +33,6 @@ #include <jack/types.h> #include <ardour/ladspa.h> -#include <ardour/plugin_state.h> #include <ardour/plugin.h> #include <ardour/ladspa_plugin.h> @@ -84,8 +83,6 @@ class LadspaPlugin : public ARDOUR::Plugin void set_block_size (nframes_t nframes) {} int connect_and_run (vector<Sample*>& bufs, uint32_t maxbuf, int32_t& in, int32_t& out, nframes_t nframes, nframes_t offset); - void store_state (ARDOUR::PluginState&); - void restore_state (ARDOUR::PluginState&); string describe_parameter (uint32_t); string state_node_name() const { return "ladspa"; } void print_parameter (uint32_t, char*, uint32_t len) const; diff --git a/libs/ardour/ardour/location.h b/libs/ardour/ardour/location.h index e618f46dfe..94f70bb4e8 100644 --- a/libs/ardour/ardour/location.h +++ b/libs/ardour/ardour/location.h @@ -36,7 +36,6 @@ #include <pbd/statefuldestructible.h> #include <ardour/ardour.h> -#include <ardour/state_manager.h> using std::string; @@ -181,30 +180,14 @@ class Locations : public PBD::StatefulDestructible (obj.*method)(locations, arg); } -#ifdef STATE_MANAGER - UndoAction get_memento () const; -#endif - private: -#ifdef STATE_MANAGER - struct State : public ARDOUR::StateManager::State { - LocationList locations; - LocationList states; - - State (std::string why) : ARDOUR::StateManager::State (why) {} - }; -#endif LocationList locations; Location *current_location; mutable Glib::Mutex lock; int set_current_unlocked (Location *); void location_changed (Location*); -#ifdef STATE_MANAGER - Change restore_state (StateManager::State&); - StateManager::State* state_factory (std::string why) const; -#endif }; } // namespace ARDOUR diff --git a/libs/ardour/ardour/plugin.h b/libs/ardour/ardour/plugin.h index e0b2dfc12b..1521dd929d 100644 --- a/libs/ardour/ardour/plugin.h +++ b/libs/ardour/ardour/plugin.h @@ -29,7 +29,6 @@ #include <jack/types.h> #include <ardour/types.h> -#include <ardour/plugin_state.h> #include <ardour/cycles.h> #include <vector> @@ -120,8 +119,6 @@ class Plugin : public PBD::StatefulDestructible virtual int connect_and_run (vector<Sample*>& bufs, uint32_t maxbuf, int32_t& in, int32_t& out, nframes_t nframes, nframes_t offset) = 0; virtual std::set<uint32_t> automatable() const = 0; - virtual void store_state (ARDOUR::PluginState&) = 0; - virtual void restore_state (ARDOUR::PluginState&) = 0; virtual string describe_parameter (uint32_t) = 0; virtual string state_node_name() const = 0; virtual void print_parameter (uint32_t, char*, uint32_t len) const = 0; diff --git a/libs/ardour/ardour/plugin_state.h b/libs/ardour/ardour/plugin_state.h deleted file mode 100644 index bd499e2b90..0000000000 --- a/libs/ardour/ardour/plugin_state.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef __ardour_plugin_state_h__ -#define __ardour_plugin_state_h__ - -#include <map> - -namespace ARDOUR { - -struct PluginState { - std::map<uint32_t,float> parameters; -}; - -} - -#endif /* __ardour_plugin_state_h__ */ diff --git a/libs/ardour/ardour/redirect.h b/libs/ardour/ardour/redirect.h index 691e690b47..e60438f3ba 100644 --- a/libs/ardour/ardour/redirect.h +++ b/libs/ardour/ardour/redirect.h @@ -47,14 +47,6 @@ namespace ARDOUR { class Session; -struct RedirectState : public StateManager::State { - RedirectState (string why) - : StateManager::State (why) {} - ~RedirectState () {} - - bool active; -}; - class Redirect : public IO { public: @@ -99,9 +91,6 @@ class Redirect : public IO XMLNode& get_state (void); int set_state (const XMLNode&); - StateManager::State* state_factory (string why) const; - Change restore_state (StateManager::State&); - void *get_gui () const { return _gui; } void set_gui (void *p) { _gui = p; } @@ -137,8 +126,6 @@ class Redirect : public IO void can_automate (uint32_t); set<uint32_t> can_automate_list; - void store_state (RedirectState&) const; - virtual void automation_list_creation_callback (uint32_t, AutomationList&) {} private: diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h index af104bb6ea..c8b135fb6b 100644 --- a/libs/ardour/ardour/route.h +++ b/libs/ardour/ardour/route.h @@ -205,11 +205,6 @@ class Route : public IO sigc::signal<void,void*> SelectedChanged; - /* undo */ - - UndoAction get_memento() const; - void set_state (state_id_t); - int set_control_outs (const vector<std::string>& ports); IO* control_outs() { return _control_outs; } @@ -314,7 +309,6 @@ class Route : public IO void silence (nframes_t nframes, nframes_t offset); sigc::connection input_signal_connection; - state_id_t _current_state_id; uint32_t redirect_max_outs; uint32_t _remote_control_id; diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index da5a098aa0..cdc79164e6 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -162,7 +162,6 @@ class Session : public PBD::StatefulDestructible void* ptr; bool yes_or_no; SlaveSource slave; - Route* route; }; boost::shared_ptr<Region> region; diff --git a/libs/ardour/ardour/state_manager.h b/libs/ardour/ardour/state_manager.h deleted file mode 100644 index e123b2cb37..0000000000 --- a/libs/ardour/ardour/state_manager.h +++ /dev/null @@ -1,56 +0,0 @@ -#ifndef __ardour_state_manager_h__ -#define __ardour_state_manager_h__ - -#include <list> -#include <string> -#include <set> - -#include <sigc++/signal.h> - -#include <ardour/ardour.h> - -namespace ARDOUR { - -typedef uint32_t state_id_t; - -class StateManager : public virtual sigc::trackable -{ - public: - struct State { - std::string operation; - State (std::string why) : operation (why) {} - virtual ~State() {} - }; - - typedef std::list<State*> StateMap; - - StateManager (); - virtual ~StateManager (); - - virtual void drop_all_states (); - virtual void use_state (state_id_t); - virtual void save_state (std::string why); - - sigc::signal<void,Change> StateChanged; - - state_id_t _current_state_id; - - virtual bool should_save_state () const { return true; } - - static void prohibit_save (); - static void allow_save (const char* why, bool dosave); - - protected: - static bool _allow_save; - static sigc::signal<void,const char*> SaveAllowed; - - StateMap states; - - virtual Change restore_state (State&) = 0; - virtual State* state_factory (std::string why) const = 0; - virtual void send_state_changed (Change); -}; - -} // namespace ARDOUR - -#endif /* __ardour_state_manager_h__ */ diff --git a/libs/ardour/ardour/tempo.h b/libs/ardour/ardour/tempo.h index eaadcb1c99..f8751b5d2b 100644 --- a/libs/ardour/ardour/tempo.h +++ b/libs/ardour/ardour/tempo.h @@ -34,7 +34,6 @@ #include <sigc++/signal.h> #include <ardour/ardour.h> -#include <ardour/state_manager.h> class XMLNode; @@ -162,18 +161,6 @@ class TempoSection : public MetricSection, public Tempo { typedef list<MetricSection*> Metrics; -#ifdef STATE_MANAGER -class TempoMapState : public StateManager::State { - public: - TempoMapState (std::string why) - : StateManager::State (why) { - metrics = new Metrics; - } - - Metrics *metrics; -}; -#endif - class TempoMap : public PBD::StatefulDestructible { public: @@ -248,10 +235,6 @@ class TempoMap : public PBD::StatefulDestructible void dump (std::ostream&) const; void clear (); -#ifdef STATE_MANAGER - UndoAction get_memento() const; -#endif - /* this is a helper class that we use to be able to keep track of which meter *AND* tempo are in effect at a given point in time. @@ -315,17 +298,6 @@ class TempoMap : public PBD::StatefulDestructible int move_metric_section (MetricSection&, const BBT_Time& to); void do_insert (MetricSection* section); - -#ifdef STATE_MANAGER - Change restore_state (StateManager::State&); - StateManager::State* state_factory (std::string why) const; - - bool in_set_state; - - /* override state_manager::save_state so we can check in_set_state */ - - void save_state (std::string why); -#endif }; }; /* namespace ARDOUR */ diff --git a/libs/ardour/ardour/vst_plugin.h b/libs/ardour/ardour/vst_plugin.h index 7b8246868c..e7f09a8986 100644 --- a/libs/ardour/ardour/vst_plugin.h +++ b/libs/ardour/ardour/vst_plugin.h @@ -74,8 +74,6 @@ class VSTPlugin : public ARDOUR::Plugin void deactivate (); void set_block_size (nframes_t nframes); int connect_and_run (vector<Sample*>& bufs, uint32_t maxbuf, int32_t& in, int32_t& out, nframes_t nframes, nframes_t offset); - void store_state (ARDOUR::PluginState&); - void restore_state (ARDOUR::PluginState&); string describe_parameter (uint32_t); string state_node_name() const { return "vst"; } void print_parameter (uint32_t, char*, uint32_t len) const; |