Fix #396

nshurtz · nshurtz · commit f6bae0415df0 · 2025-12-04T10:25:07.000-06:00
Correct bad merge conflict resolution in worker_impl.cpp
diff --git a/kotlin/src/main/cpp/src/models/worker_impl.cpp b/kotlin/src/main/cpp/src/models/worker_impl.cpp
@@ -53,7 +53,7 @@ void WorkerImpl::start(jobject ktRenderer,
     m_lastFrameTime = frameTime;
     m_isStarted = true;
     // Conditional from CMake on whether to include miniaudio
-#ifdef WITH_AUDIO
+#ifdef WITH_RIVE_AUDIO
     if (auto engine = rive::AudioEngine::RuntimeEngine(false))
     {
         engine->start();

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ void WorkerImpl::start(jobject ktRenderer,`
`53`	`53`	`m_lastFrameTime = frameTime;`
`54`	`54`	`m_isStarted = true;`
`55`	`55`	`// Conditional from CMake on whether to include miniaudio`
`56`		`-#ifdef WITH_AUDIO`
	`56`	`+#ifdef WITH_RIVE_AUDIO`
`57`	`57`	`if (auto engine = rive::AudioEngine::RuntimeEngine(false))`
`58`	`58`	`{`
`59`	`59`	`engine->start();`