oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added compatibility with qt5.5

Browse Source
This commit is contained in:
itsmattkc
2018-11-08 23:02:45 +11:00
parent adf667bb69
commit ef1720a1ab
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mainwindow.cpp
+4 -2
View File
@@ -46,7 +46,7 @@ QMainWindow* mainWindow;
QTimer autorecovery_timer; QTimer autorecovery_timer;
QString config_dir; QString config_dir;
QString appName = "Olive (October 2018 | Alpha)"; QString appName = "Olive (November 2018 | Alpha)";
bool demoNoticeShown = false; bool demoNoticeShown = false;
void MainWindow::setup_layout() { void MainWindow::setup_layout() {
@@ -62,8 +62,10 @@ void MainWindow::setup_layout() {
addDockWidget(Qt::TopDockWidgetArea, panel_sequence_viewer); addDockWidget(Qt::TopDockWidgetArea, panel_sequence_viewer);
addDockWidget(Qt::BottomDockWidgetArea, panel_timeline); 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); resizeDocks({panel_project}, {40}, Qt::Horizontal);
#endif
} }
MainWindow::MainWindow(QWidget *parent) : MainWindow::MainWindow(QWidget *parent) :
playback/cacher.cpp
+1 -1
View File
@@ -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); long buffer_timeline_out = get_buffer_offset_from_frame(c->sequence, timeline_out);
audio_write_lock.lock(); audio_write_lock.lock();
while (c->frame_sample_index < nb_bytes 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) { && c->audio_buffer_write < buffer_timeline_out) {
int upper_byte_index = (c->audio_buffer_write+1)%audio_ibuffer_size; int upper_byte_index = (c->audio_buffer_write+1)%audio_ibuffer_size;
int lower_byte_index = (c->audio_buffer_write)%audio_ibuffer_size; int lower_byte_index = (c->audio_buffer_write)%audio_ibuffer_size;