Tempo ramps - rebase fixes

diff --git a/libs/ardour/luabindings.cc b/libs/ardour/luabindings.cc
index 6c687de56cf20c10cef2e59ae5f08f7bf75b6781..092a17fd55dfefc12d5afbb8d1d1a7ed12eeb677 100644 (file)
--- 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 8c710ad180896a95f7284e9ffb050f37540dc119..07343e0a69e721ccfbbc849704c3f00a739ab77c 100644 (file)
--- 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;