merged with master

2019-03-21 17:22:36 +11:00
parent 262e93460f 1da4a315f8
commit dd06230c04
46 changed files with 943 additions and 320 deletions
@@ -244,7 +244,7 @@ void ViewerWidget::frame_update() {
    }

    // render the audio
-    compose_audio(viewer, viewer->seq.get(), viewer->get_playback_speed(), viewer->WaitingForPlayWake());
+    olive::rendering::compose_audio(viewer, viewer->seq.get(), viewer->get_playback_speed(), viewer->WaitingForPlayWake());
  }
 }