diff options
| author | Robin Gareus <robin@gareus.org> | 2016-04-18 14:50:09 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2016-04-18 14:50:09 +0200 |
| commit | 888614b7144b8a5112d910c3875c681ec0eaa3c8 (patch) | |
| tree | 9335b258a81a50c4218accca4d03ff14da162e66 /libs/ardour/session_state.cc | |
| parent | 652468a34430cb1c7ef841dcc278e2cfb9806ea5 (diff) | |
never ever change sample-rate saved with the session after creation.
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 975b38eee9..6376f1ab0b 100644 --- a/libs/ardour/session_state.cc +++ b/libs/ardour/session_state.cc @@ -1046,7 +1046,7 @@ Session::state (bool full_state) if (full_state) { node->add_property ("name", _name); - snprintf (buf, sizeof (buf), "%" PRId64, _nominal_frame_rate); + snprintf (buf, sizeof (buf), "%" PRId64, _base_frame_rate); node->add_property ("sample-rate", buf); if (session_dirs.size() > 1) { @@ -1313,7 +1313,8 @@ Session::set_state (const XMLNode& node, int version) if ((prop = node.property (X_("sample-rate"))) != 0) { - _nominal_frame_rate = atoi (prop->value()); + _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); |