smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-07 15:25:01 +01:00
Code Issues Projects Releases Wiki Activity

Tempo ramps - rebase fixes

Browse source
This commit is contained in:
nick_m 2016-05-18 23:11:42 +10:00
parent 058b781258
commit e5ba2bc34c
2 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libs/ardour/luabindings.cc
View file

@ -832,8 +832,8 @@ LuaBindings::common (lua_State* L)
.endClass () .endClass ()
.beginClass <TempoMap> ("TempoMap") .beginClass <TempoMap> ("TempoMap")
.addFunction ("add_tempo", &TempoMap::add_tempo) //.addFunction ("add_tempo", &TempoMap::add_tempo)
.addFunction ("add_meter", &TempoMap::add_meter) //.addFunction ("add_meter", &TempoMap::add_meter)
.endClass () .endClass ()
.beginClass <ChanCount> ("ChanCount") .beginClass <ChanCount> ("ChanCount")

4
libs/ardour/tempo.cc
View file

@ -79,7 +79,7 @@ TempoSection::TempoSection (const XMLNode& node)
, _active (true) , _active (true)
, _locked_to_meter (false) , _locked_to_meter (false)
{ {
const XMLProperty *prop; XMLProperty const * prop;
LocaleGuard lg; LocaleGuard lg;
BBT_Time bbt; BBT_Time bbt;
double pulse; double pulse;
@ -456,9 +456,7 @@ MeterSection::MeterSection (const XMLNode& node)
: MetricSection (0.0), Meter (TempoMap::default_meter()) : MetricSection (0.0), Meter (TempoMap::default_meter())
{ {
XMLProperty const * prop; XMLProperty const * prop;
BBT_Time start;
LocaleGuard lg; LocaleGuard lg;
const XMLProperty *prop;
BBT_Time bbt; BBT_Time bbt;
double pulse = 0.0; double pulse = 0.0;
double beat = 0.0; double beat = 0.0;