ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Remove unused Session::curves.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@4633 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2009-02-19 01:24:34 +00:00
parent 6b8c6128cb
commit 067faeca62
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libs/ardour/ardour/session.h
View File

@ -1447,13 +1447,13 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
uint32_t audio_dstream_buffer_size;
uint32_t midi_dstream_buffer_size;
int load_diskstreams (const XMLNode&);
int load_diskstreams (const XMLNode&);
/* routes stuff */
SerializedRCUManager<RouteList> routes;
void add_routes (RouteList&, bool save);
void add_routes (RouteList&, bool save);
uint32_t destructive_index;
boost::shared_ptr<Route> XMLRouteFactory (const XMLNode&);
@ -1532,7 +1532,6 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
NamedSelection *XMLNamedSelectionFactory (const XMLNode&);
/* CURVES and AUTOMATION LISTS */
std::map<PBD::ID, Evoral::Curve*> curves;
std::map<PBD::ID, AutomationList*> automation_lists;
/* DEFAULT FADE CURVES */

2
libs/ardour/audioregion.cc
View File

@ -493,7 +493,7 @@ AudioRegion::_read_at (const SourceList& srcs, nframes_t limit,
}
}
/* Regular gain curves and scaling */
/* Regular gain curves and scaling */
if ((rops & ReadOpsOwnAutomation) && envelope_active()) {
_envelope->curve().get_vector (internal_offset, internal_offset + to_read, gain_buffer, to_read);

9
libs/ardour/session_command.cc
View File

@ -74,8 +74,7 @@ Session::memento_command_factory(XMLNode *n)
child = before;
}
if (!child)
{
if (!child) {
error << _("Tried to reconstitute a MementoCommand with no contents, failing. id=") << id.to_s() << endmsg;
return 0;
}
@ -105,8 +104,10 @@ Session::memento_command_factory(XMLNode *n)
} else if (obj_T == typeid (Route).name() || obj_T == typeid (AudioTrack).name() || obj_T == typeid(MidiTrack).name()) {
return new MementoCommand<Route>(*route_by_id(id), before, after);
} else if (obj_T == typeid (Evoral::Curve).name() || obj_T == typeid (AutomationList).name()) {
if (automation_lists.count(id))
return new MementoCommand<AutomationList>(*automation_lists[id], before, after);
std::map<PBD::ID, AutomationList*>::iterator i = automation_lists.find(id);
if (i != automation_lists.end()) {
return new MementoCommand<AutomationList>(*i->second, before, after);
}
} else if (registry.count(id)) { // For Editor and AutomationLine which are off-limits here
return new MementoCommand<PBD::StatefulThingWithGoingAway>(*registry[id], before, after);
}