Fix LV2UI_Request_Parameter Feature URI

[ardour.git] / gtk2_ardour / editor.cc

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 2120f5e44c0295678bb3f79334beac3c1d7ab7ef..bd006e13fbd4039bdc4fb5740523dd817996c4cf 100644 (file)
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -2578,7 +2578,7 @@ Editor::set_state (const XMLNode& node, int version)
                }
        }
 
-       return LuaInstance::instance()->set_state(node);
+       return 0;
 }
 
 XMLNode&
@@ -2646,8 +2646,6 @@ Editor::get_state ()
 
        node->set_property ("nudge-clock-value", nudge_clock->current_duration());
 
-       node->add_child_nocopy (LuaInstance::instance()->get_action_state());
-       node->add_child_nocopy (LuaInstance::instance()->get_hook_state());
        node->add_child_nocopy (_locations->get_state ());
 
        return *node;
@@ -4171,6 +4169,8 @@ Editor::get_grid_beat_divisions(samplepos_t position)
        case GridTypeBeatDiv4:   return 4;
        case GridTypeBeatDiv3:   return 3;
        case GridTypeBeatDiv2:   return 2;
+       case GridTypeBeat:       return 1;
+       case GridTypeBar:        return 1;
 
        case GridTypeNone:       return 0;
        case GridTypeTimecode:   return 0;
@@ -5940,7 +5940,7 @@ Editor::super_rapid_screen_update ()
                _last_update_time = 0;
        }
 
-       if (!_session->transport_rolling ()) {
+       if (!_session->transport_rolling () || _session->is_auditioning ()) {
                /* Do not interpolate the playhead position; just set it */
                _last_update_time = 0;
        }