Remove unused NascentInfo::is_touch member.

git-svn-id: svn://localhost/ardour2/branches/3.0@9386 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/libs/ardour/automation_list.cc b/libs/ardour/automation_list.cc
index 1cda99d76391e18c3dc3002492d690eb0881dd56..b76fa0bb4bc6e2108b98f931de8aafa39493c4ed 100644 (file)
--- 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 65961d8fb12dece0b9c36979a07950ee55509df7..87f214a60155d8ab703347e017f7b19f665b11b9 100644 (file)
--- 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 62a615e44d17b28c595e1dd62c92f03dfebe5336..6e428144a99cf88b98b5c6cd951d7e2627f79ca5 100644 (file)
--- 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 ());
                 }
         }