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

switched to opengl widget and made shortcuts application context, fixes #400

Browse Source
This commit is contained in:
itsmattkc
2019-02-10 03:07:52 -08:00
parent 12487a0cb3
commit 85325cd7d3
7 changed files with 57 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
panels/viewer.cpp
+8 -7
View File
@@ -363,17 +363,18 @@ void Viewer::play(bool in_to_out) {
uncue_recording();
}
if (playback_speed == 0) {
playback_speed = 1;
}
bool seek_to_in = (seq->using_workarea && (config.loop || playing_in_to_out));
if (!is_recording_cued()
&& playback_speed > 0
&& (playing_in_to_out
|| seq->playhead >= seq->getEndFrame()
|| seq->playhead >= seq->getEndFrame()
|| (seek_to_in && seq->playhead >= seq->workarea_out))) {
seek(seek_to_in ? seq->workarea_in : 0);
}
if (playback_speed == 0) {
playback_speed = 1;
}
}
reset_all_audio();
if (is_recording_cued() && !start_recording()) {
@@ -781,7 +782,7 @@ void Viewer::timer_update() {
if (recording_start != recording_end && seq->playhead >= recording_end) {
pause();
}
} else {
} else if (playback_speed > 0) {
if (seq->playhead >= seq->getEndFrame()) {
pause();
}