smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-18 12:46:32 +01:00
Code Issues Projects Releases Wiki Activity

add notification if Engine Rate changes and mismatches session's SR

Browse source
This commit is contained in:
Robin Gareus 2016-04-18 15:16:27 +02:00
parent 888614b714
commit b2149de37b
3 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
libs/ardour/ardour/session.h
View file

@ -726,6 +726,9 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop
*/ */
static PBD::Signal2<int, framecnt_t, framecnt_t> AskAboutSampleRateMismatch; static PBD::Signal2<int, framecnt_t, framecnt_t> AskAboutSampleRateMismatch;
/** non interactive message */
static PBD::Signal2<void, framecnt_t, framecnt_t> NotifyAboutSampleRateMismatch;
/** handlers should return !0 for use pending state, 0 for ignore it. /** handlers should return !0 for use pending state, 0 for ignore it.
*/ */
static PBD::Signal0<int> AskAboutPendingState; static PBD::Signal0<int> AskAboutPendingState;

4
libs/ardour/session.cc
View file

@ -131,6 +131,7 @@ PBD::Signal1<int,uint32_t> Session::AudioEngineSetupRequired;
PBD::Signal1<void,std::string> Session::Dialog; PBD::Signal1<void,std::string> Session::Dialog;
PBD::Signal0<int> Session::AskAboutPendingState; PBD::Signal0<int> Session::AskAboutPendingState;
PBD::Signal2<int, framecnt_t, framecnt_t> Session::AskAboutSampleRateMismatch; PBD::Signal2<int, framecnt_t, framecnt_t> Session::AskAboutSampleRateMismatch;
PBD::Signal2<void, framecnt_t, framecnt_t> Session::NotifyAboutSampleRateMismatch;
PBD::Signal0<void> Session::SendFeedback; PBD::Signal0<void> Session::SendFeedback;
PBD::Signal3<int,Session*,std::string,DataType> Session::MissingFile; PBD::Signal3<int,Session*,std::string,DataType> Session::MissingFile;
@ -2027,6 +2028,9 @@ Session::set_frame_rate (framecnt_t frames_per_second)
if (_base_frame_rate == 0) { if (_base_frame_rate == 0) {
_base_frame_rate = frames_per_second; _base_frame_rate = frames_per_second;
} }
else if (_base_frame_rate != frames_per_second && frames_per_second != _nominal_frame_rate) {
NotifyAboutSampleRateMismatch (_base_frame_rate, frames_per_second);
}
_nominal_frame_rate = frames_per_second; _nominal_frame_rate = frames_per_second;
sync_time_vars(); sync_time_vars();

5
libs/ardour/session_state.cc
View file

@ -1316,8 +1316,9 @@ Session::set_state (const XMLNode& node, int version)
_base_frame_rate = atoi (prop->value()); _base_frame_rate = atoi (prop->value());
_nominal_frame_rate = _base_frame_rate; _nominal_frame_rate = _base_frame_rate;
if (_nominal_frame_rate != _current_frame_rate) { assert (AudioEngine::instance()->running ());
boost::optional<int> r = AskAboutSampleRateMismatch (_nominal_frame_rate, _current_frame_rate); 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)) { if (r.get_value_or (0)) {
goto out; goto out;
} }