allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

do not use PublicEditor::instance() in MainClock, since these obejcts can exist before the editor

Browse Source 
The AudioEngine on the other hand is created in the global libardour init method, so use that instead
This commit is contained in:
Paul Davis
2021-11-13 17:49:03 -07:00
parent 1532ebb38f
commit 710c5b9b78
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gtk2_ardour/main_clock.cc
View File

@@ -21,6 +21,9 @@
*/
#include "pbd/unwind.h"
#include "ardour/audioengine.h"
#include "ardour/session.h"
#include "ardour/tempo.h"
#include "actions.h"
@@ -113,7 +116,8 @@ MainClock::set (timepos_t const & when, bool force, timecnt_t const & /*offset*/
} else {
mode = UIConfiguration::instance().get_secondary_clock_delta_mode ();
}
if (!PublicEditor::instance().session()) {
if (!AudioEngine::instance()->session()) {
mode = NoDelta;
}
@@ -126,7 +130,7 @@ MainClock::set (timepos_t const & when, bool force, timecnt_t const & /*offset*/
break;
case DeltaOriginMarker:
{
Location* loc = PublicEditor::instance().session()->locations()->clock_origin_location ();
Location* loc = AudioEngine::instance()->session()->locations()->clock_origin_location ();
AudioClock::set (when, force, loc ? timecnt_t (loc->start()) : timecnt_t());
}
break;