From 856128688d9b5c84a724df724447f5803801c64d Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Fri, 19 Oct 2018 21:26:56 +1100 Subject: [PATCH] temporarily disabled unstable footage viewer audio monitor --- panels/viewer.cpp | 1 + playback/audio.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/panels/viewer.cpp b/panels/viewer.cpp index 9dca4c085..ff13285f8 100644 --- a/panels/viewer.cpp +++ b/panels/viewer.cpp @@ -211,6 +211,7 @@ void Viewer::play() { playing = true; set_playpause_icon(false); playback_updater.start(); + timer_update(); audio_thread->notifyReceiver(); } } diff --git a/playback/audio.cpp b/playback/audio.cpp index 4d6fcd163..d9be1fbde 100644 --- a/playback/audio.cpp +++ b/playback/audio.cpp @@ -136,11 +136,11 @@ int AudioSenderThread::send_audio_to_output(int offset, int max) { int audio_ibuffer_limit = audio_ibuffer_read + actual_write; // send samples to audio monitor cache - // TODO make this work for the footage viewer - /*Sequence* s = NULL; - if (panel_footage_viewer->playing) { + // TODO make this work for the footage viewer - currently, enabling it causes crash due to an ASSERT + Sequence* s = NULL; + /*if (panel_footage_viewer->playing) { s = panel_footage_viewer->seq; - } + }*/ if (panel_sequence_viewer->playing) { s = panel_sequence_viewer->seq; } @@ -169,7 +169,7 @@ int AudioSenderThread::send_audio_to_output(int offset, int max) { panel_timeline->ui->audio_monitor->sample_cache.append(samples); buffer_offset = next_buffer_offset; } - }*/ + } memset(audio_ibuffer+offset, 0, actual_write);