diff --git a/mainwindow.cpp b/mainwindow.cpp index 0b19ee10a..689186fe1 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -46,7 +46,7 @@ QMainWindow* mainWindow; QTimer autorecovery_timer; QString config_dir; -QString appName = "Olive (October 2018 | Alpha)"; +QString appName = "Olive (November 2018 | Alpha)"; bool demoNoticeShown = false; void MainWindow::setup_layout() { @@ -62,8 +62,10 @@ void MainWindow::setup_layout() { addDockWidget(Qt::TopDockWidgetArea, panel_sequence_viewer); addDockWidget(Qt::BottomDockWidgetArea, panel_timeline); - // workaround for older versions of Qt + // workaround for older versions of Qt (but not too old) +#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) // adds compatibility with 5.5 resizeDocks({panel_project}, {40}, Qt::Horizontal); +#endif } MainWindow::MainWindow(QWidget *parent) : diff --git a/playback/cacher.cpp b/playback/cacher.cpp index 9a439ccbc..abcdaca8f 100644 --- a/playback/cacher.cpp +++ b/playback/cacher.cpp @@ -326,7 +326,7 @@ void cache_audio_worker(Clip* c, bool scrubbing, Clip* nest) { long buffer_timeline_out = get_buffer_offset_from_frame(c->sequence, timeline_out); audio_write_lock.lock(); while (c->frame_sample_index < nb_bytes - && c->audio_buffer_write < audio_ibuffer_read+audio_ibuffer_size-AUDIO_BUFFER_PADDING + && c->audio_buffer_write < audio_ibuffer_read+(audio_ibuffer_size>>1) && c->audio_buffer_write < buffer_timeline_out) { int upper_byte_index = (c->audio_buffer_write+1)%audio_ibuffer_size; int lower_byte_index = (c->audio_buffer_write)%audio_ibuffer_size;