tweak b7e645ec6, use session start/end position

[ardour.git] / libs / ardour / engine_state_controller.cc

diff --git a/libs/ardour/engine_state_controller.cc b/libs/ardour/engine_state_controller.cc
index 991af4cf4ed0b88aa7b15d58d11f7e2e9278f343..67cdc7d086b329204eb52203773a949ae092e734 100644 (file)
--- a/libs/ardour/engine_state_controller.cc
+++ b/libs/ardour/engine_state_controller.cc
@@ -150,7 +150,7 @@ EngineStateController::_deserialize_and_load_engine_states ()
 
                XMLNode* state_node = *state_node_iter;
                StatePtr engine_state (new State);
-               XMLProperty* prop = NULL;
+               XMLProperty const * prop = NULL;
 
                if ((prop = state_node->property ("backend-name")) == 0) {
                        continue;
@@ -302,7 +302,7 @@ EngineStateController::_deserialize_and_load_midi_port_states ()
                        for (; input_state_node_iter != input_state_nodes.end (); ++input_state_node_iter) {
 
                                XMLNode* input_state_node = *input_state_node_iter;
-                               XMLProperty* prop = NULL;
+                               XMLProperty const * prop = NULL;
 
                                if (input_state_node->name () != "input") {
                                        continue;
@@ -341,7 +341,7 @@ EngineStateController::_deserialize_and_load_midi_port_states ()
                        for (; output_state_node_iter != output_state_nodes.end (); ++output_state_node_iter) {
 
                                XMLNode* output_state_node = *output_state_node_iter;
-                               XMLProperty* prop = NULL;
+                               XMLProperty const * prop = NULL;
 
                                if (output_state_node->name () != "output") {
                                        continue;
@@ -583,7 +583,7 @@ EngineStateController::_validate_current_device_state ()
        // if current is not found switch to default if is supported
        if (bs_iter == buffer_sizes.end ()) {
                bs_iter = std::find (buffer_sizes.begin (), buffer_sizes.end (), backend->default_buffer_size (_current_state->device_name));
-       
+
                if (bs_iter != buffer_sizes.end ()) {
                        _current_state->buffer_size = backend->default_buffer_size (_current_state->device_name);
                } else {
@@ -1423,7 +1423,7 @@ EngineStateController::_on_session_loaded ()
        // This is done during session construction
        // _session->reconnect_ltc_input ();
        // _session->reconnect_ltc_output ();
-       
+
        framecnt_t desired_sample_rate = _session->nominal_frame_rate ();
        if ( desired_sample_rate > 0 && set_new_sample_rate_in_controller (desired_sample_rate))
        {
@@ -1780,7 +1780,7 @@ bool
 EngineStateController::push_current_state_to_backend (bool start)
 {
        boost::shared_ptr<AudioBackend> backend = AudioEngine::instance ()->current_backend ();
-       
+
        if (!backend) {
                return false;
        }
@@ -1820,7 +1820,7 @@ EngineStateController::push_current_state_to_backend (bool start)
                        if (!result ) {
                                std::cout << "EngineStateController::Setting device sample rate " << _current_state->sample_rate << std::endl;
                                result = backend->set_sample_rate (_current_state->sample_rate);
-                               
+
                                if (result) {
                                        error << string_compose (_("Cannot set sample rate to %1"), get_current_sample_rate ()) << endmsg;
                                }