diff options
| author | Robin Gareus <robin@gareus.org> | 2016-04-18 15:16:27 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2016-04-18 15:16:27 +0200 |
| commit | b2149de37b8a55fb69d1da65ea321d93e40e5e7c (patch) | |
| tree | c15cd8897c3b4cf80a088057c8e7971c88756256 /libs/ardour/session_state.cc | |
| parent | 888614b7144b8a5112d910c3875c681ec0eaa3c8 (diff) | |
add notification if Engine Rate changes and mismatches session's SR
Diffstat (limited to 'libs/ardour/session_state.cc')
| -rw-r--r-- | libs/ardour/session_state.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc index 6376f1ab0b..95eb36c07f 100644 --- a/libs/ardour/session_state.cc +++ b/libs/ardour/session_state.cc @@ -1316,8 +1316,9 @@ Session::set_state (const XMLNode& node, int version) _base_frame_rate = atoi (prop->value()); _nominal_frame_rate = _base_frame_rate; - if (_nominal_frame_rate != _current_frame_rate) { - boost::optional<int> r = AskAboutSampleRateMismatch (_nominal_frame_rate, _current_frame_rate); + assert (AudioEngine::instance()->running ()); + if (_base_frame_rate != AudioEngine::instance()->sample_rate ()) { + boost::optional<int> r = AskAboutSampleRateMismatch (_base_frame_rate, _current_frame_rate); if (r.get_value_or (0)) { goto out; } |