From 067faeca624577faa20718eb1bc4ef40fb768c2a Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Thu, 19 Feb 2009 01:24:34 +0000
Subject: Remove unused Session::curves.

git-svn-id: svn://localhost/ardour2/branches/3.0@4633 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 libs/ardour/ardour/session.h   | 5 ++---
 libs/ardour/audioregion.cc     | 2 +-
 libs/ardour/session_command.cc | 9 +++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'libs/ardour')

diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index 82e88b994c..23155c7ab1 100644
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -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 */
diff --git a/libs/ardour/audioregion.cc b/libs/ardour/audioregion.cc
index 56d341d227..1559827b42 100644
--- a/libs/ardour/audioregion.cc
+++ b/libs/ardour/audioregion.cc
@@ -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);
diff --git a/libs/ardour/session_command.cc b/libs/ardour/session_command.cc
index bda3475a30..bb51d51c43 100644
--- a/libs/ardour/session_command.cc
+++ b/libs/ardour/session_command.cc
@@ -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);
     }
-- 
cgit v1.2.3