From ea165f4579e523c4ed6fa419874a76fdd4aba390 Mon Sep 17 00:00:00 2001 From: carlh Date: Wed, 20 Apr 2011 01:24:25 +0000 Subject: [PATCH] Remove unused NascentInfo::is_touch member. git-svn-id: http://subversion.ardour.org/svn/ardour2/ardour2/branches/3.0@9386 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/automation_list.cc | 4 ++-- libs/evoral/evoral/ControlList.hpp | 6 ++---- libs/evoral/src/ControlList.cpp | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/libs/ardour/automation_list.cc b/libs/ardour/automation_list.cc index 1cda99d76..b76fa0bb4 100644 --- a/libs/ardour/automation_list.cc +++ b/libs/ardour/automation_list.cc @@ -184,7 +184,7 @@ AutomationList::set_automation_state (AutoState s) if (_state == Write) { Glib::Mutex::Lock lm (ControlList::_lock); - nascent.push_back (new NascentInfo (false)); + nascent.push_back (new NascentInfo ()); } automation_state_changed (s); /* EMIT SIGNAL */ } @@ -204,7 +204,7 @@ AutomationList::start_touch (double when) { if (_state == Touch) { Glib::Mutex::Lock lm (ControlList::_lock); - nascent.push_back (new NascentInfo (true, when)); + nascent.push_back (new NascentInfo (when)); } g_atomic_int_set (&_touching, 1); diff --git a/libs/evoral/evoral/ControlList.hpp b/libs/evoral/evoral/ControlList.hpp index 65961d8fb..87f214a60 100644 --- a/libs/evoral/evoral/ControlList.hpp +++ b/libs/evoral/evoral/ControlList.hpp @@ -280,13 +280,11 @@ protected: struct NascentInfo { EventList events; - bool is_touch; double start_time; double end_time; - NascentInfo (bool touching, double start = -1.0) - : is_touch (touching) - , start_time (start) + NascentInfo (double start = -1.0) + : start_time (start) , end_time (-1.0) {} }; diff --git a/libs/evoral/src/ControlList.cpp b/libs/evoral/src/ControlList.cpp index 62a615e44..6e428144a 100644 --- a/libs/evoral/src/ControlList.cpp +++ b/libs/evoral/src/ControlList.cpp @@ -365,7 +365,7 @@ ControlList::merge_nascent (double when) nascent.clear (); if (writing()) { - nascent.push_back (new NascentInfo (false)); + nascent.push_back (new NascentInfo ()); } } -- 2.11.4.GIT