ardour/livetrax
13
0
Fork 0
Code

Remove unused NascentInfo::is_touch member.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@9386 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2011-04-20 01:24:25 +00:00
parent ee697bef96
commit d22cd939a3
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/ardour/automation_list.cc
View File

@ -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);

6
libs/evoral/evoral/ControlList.hpp
View File

@ -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)
{}
};

2
libs/evoral/src/ControlList.cpp
View File

@ -365,7 +365,7 @@ ControlList::merge_nascent (double when)
nascent.clear ();
if (writing()) {
nascent.push_back (new NascentInfo (false));
nascent.push_back (new NascentInfo ());
}
}