diff options
author | Carl Hetherington <carl@carlh.net> | 2009-02-27 23:26:52 +0000 |
---|---|---|
committer | Carl Hetherington <carl@carlh.net> | 2009-02-27 23:26:52 +0000 |
commit | 1f81c127fe2dc0f23142a95ad90671bf8f3486c6 (patch) | |
tree | e68240b9935c51f442e43c7133c473400cb44959 | |
parent | baf51996c4f152a0750c14a52f57ed1fcd04b8cc (diff) |
Remove some unused code.
git-svn-id: svn://localhost/ardour2/branches/3.0@4707 d708f5d6-7413-0410-9779-e7cbd77b26cf
-rw-r--r-- | gtk2_ardour/editor.cc | 9 | ||||
-rw-r--r-- | gtk2_ardour/editor.h | 4 | ||||
-rw-r--r-- | gtk2_ardour/region_gain_line.h | 2 | ||||
-rw-r--r-- | libs/ardour/ardour/midi_playlist.h | 1 | ||||
-rw-r--r-- | libs/ardour/ardour/midi_region.h | 2 | ||||
-rw-r--r-- | libs/ardour/ardour/track.h | 1 | ||||
-rw-r--r-- | libs/ardour/audio_track.cc | 12 | ||||
-rw-r--r-- | libs/ardour/midi_track.cc | 2 | ||||
-rw-r--r-- | libs/ardour/session_state.cc | 26 |
9 files changed, 1 insertions, 58 deletions
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 83a0d7428a..ee828c570a 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -3509,15 +3509,6 @@ Editor::State::~State () delete selection; } -UndoAction -Editor::get_memento () const -{ - State *state = new State (this); - - store_state (*state); - return bind (mem_fun (*(const_cast<Editor*>(this)), &Editor::restore_state), state); -} - void Editor::store_state (State& state) const { diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index 6edbffa529..3a04ab1dbf 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -2075,10 +2075,6 @@ public: void write_selection (); - /* history */ - - UndoAction get_memento() const; - XMLNode *before; /* used in *_reversible_command */ void begin_reversible_command (string cmd_name); diff --git a/gtk2_ardour/region_gain_line.h b/gtk2_ardour/region_gain_line.h index 6f446cabfc..dc24e6a5a6 100644 --- a/gtk2_ardour/region_gain_line.h +++ b/gtk2_ardour/region_gain_line.h @@ -45,8 +45,6 @@ class AudioRegionGainLine : public AutomationLine private: ARDOUR::Session& session; AudioRegionView& rv; - - UndoAction get_memento(); }; diff --git a/libs/ardour/ardour/midi_playlist.h b/libs/ardour/ardour/midi_playlist.h index cd1b44ae95..ad66d7c1d6 100644 --- a/libs/ardour/ardour/midi_playlist.h +++ b/libs/ardour/ardour/midi_playlist.h @@ -51,7 +51,6 @@ public: nframes_t start, nframes_t cnt, uint32_t chan_n=0); int set_state (const XMLNode&); - UndoAction get_memento() const; bool destroy_region (boost::shared_ptr<Region>); diff --git a/libs/ardour/ardour/midi_region.h b/libs/ardour/ardour/midi_region.h index 6ad3f44169..34ce562852 100644 --- a/libs/ardour/ardour/midi_region.h +++ b/libs/ardour/ardour/midi_region.h @@ -90,8 +90,6 @@ class MidiRegion : public Region int exportme (ARDOUR::Session&, ARDOUR::ExportSpecification&); - UndoAction get_memento() const; - boost::shared_ptr<MidiModel> model() { return midi_source()->model(); } boost::shared_ptr<const MidiModel> model() const { return midi_source()->model(); } diff --git a/libs/ardour/ardour/track.h b/libs/ardour/ardour/track.h index 40a266b50a..b11073a99f 100644 --- a/libs/ardour/ardour/track.h +++ b/libs/ardour/ardour/track.h @@ -111,7 +111,6 @@ class Track : public Route XMLNode state; boost::shared_ptr<Processor> processor; PBD::ID id; - UndoAction memento; }; struct FreezeRecord { diff --git a/libs/ardour/audio_track.cc b/libs/ardour/audio_track.cc index bfabeb7e17..bd3402bd0e 100644 --- a/libs/ardour/audio_track.cc +++ b/libs/ardour/audio_track.cc @@ -359,8 +359,6 @@ AudioTrack::set_state_part_two () if ((fnode = find_named_node (*pending_state, X_("freeze-info"))) != 0) { - - _freeze_record.have_mementos = false; _freeze_record.state = Frozen; for (vector<FreezeRecordProcessorInfo*>::iterator i = _freeze_record.processor_info.begin(); i != _freeze_record.processor_info.end(); ++i) { @@ -862,7 +860,6 @@ AudioTrack::freeze (InterThreadInfo& itt) } _freeze_record.processor_info.clear (); - _freeze_record.have_mementos = true; { Glib::RWLock::ReaderLock lm (_processor_lock); @@ -927,14 +924,7 @@ AudioTrack::unfreeze () if (_freeze_record.playlist) { audio_diskstream()->use_playlist (_freeze_record.playlist); - if (_freeze_record.have_mementos) { - - for (vector<FreezeRecordProcessorInfo*>::iterator i = _freeze_record.processor_info.begin(); i != _freeze_record.processor_info.end(); ++i) { - (*i)->memento (); - } - - } else { - + { Glib::RWLock::ReaderLock lm (_processor_lock); // should this be a write lock? jlc for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) { for (vector<FreezeRecordProcessorInfo*>::iterator ii = _freeze_record.processor_info.begin(); ii != _freeze_record.processor_info.end(); ++ii) { diff --git a/libs/ardour/midi_track.cc b/libs/ardour/midi_track.cc index 2df20ee547..ad8281c1bc 100644 --- a/libs/ardour/midi_track.cc +++ b/libs/ardour/midi_track.cc @@ -285,8 +285,6 @@ MidiTrack::set_state_part_two () if ((fnode = find_named_node (*pending_state, X_("freeze-info"))) != 0) { - - _freeze_record.have_mementos = false; _freeze_record.state = Frozen; for (vector<FreezeRecordProcessorInfo*>::iterator i = _freeze_record.processor_info.begin(); i != _freeze_record.processor_info.end(); ++i) { diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc index e04333a2fa..1439d0ef1c 100644 --- a/libs/ardour/session_state.cc +++ b/libs/ardour/session_state.cc @@ -2360,32 +2360,6 @@ Session::set_global_record_enable (GlobalRouteBooleanState s, void* src) set_global_route_boolean (s, &Route::set_record_enable, src); } -#if 0 -UndoAction -Session::global_mute_memento (void* src) -{ - return sigc::bind (mem_fun (*this, &Session::set_global_mute), get_global_route_boolean (&Route::muted), src); -} - -UndoAction -Session::global_metering_memento (void* src) -{ - return sigc::bind (mem_fun (*this, &Session::set_global_route_metering), get_global_route_metering (), src); -} - -UndoAction -Session::global_solo_memento (void* src) -{ - return sigc::bind (mem_fun (*this, &Session::set_global_solo), get_global_route_boolean (&Route::soloed), src); -} - -UndoAction -Session::global_record_enable_memento (void* src) -{ - return sigc::bind (mem_fun (*this, &Session::set_global_record_enable), get_global_route_boolean (&Route::record_enabled), src); -} -#endif - static bool accept_all_non_peak_files (const string& path, void *arg) { |