Remove some unused code.

git-svn-id: svn://localhost/ardour2/branches/3.0@4707 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2009-02-27 23:26:52 +00:00
parent baf51996c4
commit 1f81c127fe
9 changed files with 1 additions and 58 deletions

View file

@ -3509,15 +3509,6 @@ Editor::State::~State ()
delete selection; 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 void
Editor::store_state (State& state) const Editor::store_state (State& state) const
{ {

View file

@ -2075,10 +2075,6 @@ public:
void write_selection (); void write_selection ();
/* history */
UndoAction get_memento() const;
XMLNode *before; /* used in *_reversible_command */ XMLNode *before; /* used in *_reversible_command */
void begin_reversible_command (string cmd_name); void begin_reversible_command (string cmd_name);

View file

@ -45,8 +45,6 @@ class AudioRegionGainLine : public AutomationLine
private: private:
ARDOUR::Session& session; ARDOUR::Session& session;
AudioRegionView& rv; AudioRegionView& rv;
UndoAction get_memento();
}; };

View file

@ -51,7 +51,6 @@ public:
nframes_t start, nframes_t cnt, uint32_t chan_n=0); nframes_t start, nframes_t cnt, uint32_t chan_n=0);
int set_state (const XMLNode&); int set_state (const XMLNode&);
UndoAction get_memento() const;
bool destroy_region (boost::shared_ptr<Region>); bool destroy_region (boost::shared_ptr<Region>);

View file

@ -90,8 +90,6 @@ class MidiRegion : public Region
int exportme (ARDOUR::Session&, ARDOUR::ExportSpecification&); int exportme (ARDOUR::Session&, ARDOUR::ExportSpecification&);
UndoAction get_memento() const;
boost::shared_ptr<MidiModel> model() { return midi_source()->model(); } boost::shared_ptr<MidiModel> model() { return midi_source()->model(); }
boost::shared_ptr<const MidiModel> model() const { return midi_source()->model(); } boost::shared_ptr<const MidiModel> model() const { return midi_source()->model(); }

View file

@ -111,7 +111,6 @@ class Track : public Route
XMLNode state; XMLNode state;
boost::shared_ptr<Processor> processor; boost::shared_ptr<Processor> processor;
PBD::ID id; PBD::ID id;
UndoAction memento;
}; };
struct FreezeRecord { struct FreezeRecord {

View file

@ -359,8 +359,6 @@ AudioTrack::set_state_part_two ()
if ((fnode = find_named_node (*pending_state, X_("freeze-info"))) != 0) { if ((fnode = find_named_node (*pending_state, X_("freeze-info"))) != 0) {
_freeze_record.have_mementos = false;
_freeze_record.state = Frozen; _freeze_record.state = Frozen;
for (vector<FreezeRecordProcessorInfo*>::iterator i = _freeze_record.processor_info.begin(); i != _freeze_record.processor_info.end(); ++i) { 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.processor_info.clear ();
_freeze_record.have_mementos = true;
{ {
Glib::RWLock::ReaderLock lm (_processor_lock); Glib::RWLock::ReaderLock lm (_processor_lock);
@ -927,14 +924,7 @@ AudioTrack::unfreeze ()
if (_freeze_record.playlist) { if (_freeze_record.playlist) {
audio_diskstream()->use_playlist (_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 Glib::RWLock::ReaderLock lm (_processor_lock); // should this be a write lock? jlc
for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) { 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) { for (vector<FreezeRecordProcessorInfo*>::iterator ii = _freeze_record.processor_info.begin(); ii != _freeze_record.processor_info.end(); ++ii) {

View file

@ -285,8 +285,6 @@ MidiTrack::set_state_part_two ()
if ((fnode = find_named_node (*pending_state, X_("freeze-info"))) != 0) { if ((fnode = find_named_node (*pending_state, X_("freeze-info"))) != 0) {
_freeze_record.have_mementos = false;
_freeze_record.state = Frozen; _freeze_record.state = Frozen;
for (vector<FreezeRecordProcessorInfo*>::iterator i = _freeze_record.processor_info.begin(); i != _freeze_record.processor_info.end(); ++i) { for (vector<FreezeRecordProcessorInfo*>::iterator i = _freeze_record.processor_info.begin(); i != _freeze_record.processor_info.end(); ++i) {

View file

@ -2360,32 +2360,6 @@ Session::set_global_record_enable (GlobalRouteBooleanState s, void* src)
set_global_route_boolean (s, &Route::set_record_enable, 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 static bool
accept_all_non_peak_files (const string& path, void *arg) accept_all_non_peak_files (const string& path, void *arg)
{ {