diff options
| author | nick_m <mainsbridge@gmail.com> | 2016-05-18 23:11:42 +1000 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2016-05-27 23:38:16 +1000 |
| commit | e5ba2bc34c400a533b3578ebe722eef0183a3d68 (patch) | |
| tree | 2200725bbeceac11630ff8e56b538b554a944af1 | |
| parent | 058b78125828f28e387922f2f10260e82e156472 (diff) | |
Tempo ramps - rebase fixes
| -rw-r--r-- | libs/ardour/luabindings.cc | 4 | ||||
| -rw-r--r-- | libs/ardour/tempo.cc | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/libs/ardour/luabindings.cc b/libs/ardour/luabindings.cc index 6c687de56c..092a17fd55 100644 --- a/libs/ardour/luabindings.cc +++ b/libs/ardour/luabindings.cc @@ -832,8 +832,8 @@ LuaBindings::common (lua_State* L) .endClass () .beginClass <TempoMap> ("TempoMap") - .addFunction ("add_tempo", &TempoMap::add_tempo) - .addFunction ("add_meter", &TempoMap::add_meter) + //.addFunction ("add_tempo", &TempoMap::add_tempo) + //.addFunction ("add_meter", &TempoMap::add_meter) .endClass () .beginClass <ChanCount> ("ChanCount") diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc index 8c710ad180..07343e0a69 100644 --- a/libs/ardour/tempo.cc +++ b/libs/ardour/tempo.cc @@ -79,7 +79,7 @@ TempoSection::TempoSection (const XMLNode& node) , _active (true) , _locked_to_meter (false) { - const XMLProperty *prop; + XMLProperty const * prop; LocaleGuard lg; BBT_Time bbt; double pulse; @@ -456,9 +456,7 @@ MeterSection::MeterSection (const XMLNode& node) : MetricSection (0.0), Meter (TempoMap::default_meter()) { XMLProperty const * prop; - BBT_Time start; LocaleGuard lg; - const XMLProperty *prop; BBT_Time bbt; double pulse = 0.0; double beat = 0.0; |