corrected some viewer behavior when pressing play after the end of a sequence

This commit is contained in:
itsmattkc
2019-02-26 11:19:23 -08:00
parent 1ae3b877a1
commit a24b90c99e
3 changed files with 15 additions and 5 deletions
+3
View File
@@ -343,9 +343,12 @@ void MainWindow::editMenu_About_To_Be_Shown() {
void MainWindow::setup_menus() { void MainWindow::setup_menus() {
QMenuBar* menuBar = new QMenuBar(this); QMenuBar* menuBar = new QMenuBar(this);
/*
menuBar->setStyle(QStyleFactory::create("windowsvista")); menuBar->setStyle(QStyleFactory::create("windowsvista"));
menuBar->setPalette(menuBar->style()->standardPalette()); menuBar->setPalette(menuBar->style()->standardPalette());
menuBar->setStyleSheet(""); menuBar->setStyleSheet("");
*/
setMenuBar(menuBar); setMenuBar(menuBar);
+6 -5
View File
@@ -390,24 +390,25 @@ void Viewer::play(bool in_to_out) {
uncue_recording(); uncue_recording();
} }
if (playback_speed == 0) {
playback_speed = 1;
}
bool seek_to_in = (seq->using_workarea && (olive::CurrentConfig.loop || playing_in_to_out)); bool seek_to_in = (seq->using_workarea && (olive::CurrentConfig.loop || playing_in_to_out));
if (!is_recording_cued() if (!is_recording_cued()
&& playback_speed > 0 && playback_speed >= 0
&& (playing_in_to_out && (playing_in_to_out
|| seq->playhead >= sequence_end_frame || seq->playhead >= sequence_end_frame
|| (seek_to_in && seq->playhead >= seq->workarea_out))) { || (seek_to_in && seq->playhead >= seq->workarea_out))) {
seek(seek_to_in ? seq->workarea_in : 0); seek(seek_to_in ? seq->workarea_in : 0);
} }
if (playback_speed == 0) {
playback_speed = 1;
}
reset_all_audio(); reset_all_audio();
if (is_recording_cued() && !start_recording()) { if (is_recording_cued() && !start_recording()) {
qCritical() << "Failed to record audio"; qCritical() << "Failed to record audio";
return; return;
} }
playhead_start = seq->playhead; playhead_start = seq->playhead;
playing = true; playing = true;
just_played_ = true; just_played_ = true;
+6
View File
@@ -266,9 +266,12 @@ QMenu* MenuHelper::create_submenu(QMenuBar* parent,
const QObject *receiver, const QObject *receiver,
const char *member) { const char *member) {
QMenu* menu = new QMenu(parent); QMenu* menu = new QMenu(parent);
/*
menu->setStyle(QStyleFactory::create("windowsvista")); menu->setStyle(QStyleFactory::create("windowsvista"));
menu->setPalette(menu->style()->standardPalette()); menu->setPalette(menu->style()->standardPalette());
menu->setStyleSheet(""); menu->setStyleSheet("");
*/
parent->addMenu(menu); parent->addMenu(menu);
@@ -281,9 +284,12 @@ QMenu* MenuHelper::create_submenu(QMenuBar* parent,
QMenu* MenuHelper::create_submenu(QMenu* parent) { QMenu* MenuHelper::create_submenu(QMenu* parent) {
QMenu* menu = new QMenu(parent); QMenu* menu = new QMenu(parent);
/*
menu->setStyle(QStyleFactory::create("windowsvista")); menu->setStyle(QStyleFactory::create("windowsvista"));
menu->setPalette(menu->style()->standardPalette()); menu->setPalette(menu->style()->standardPalette());
menu->setStyleSheet(""); menu->setStyleSheet("");
*/
parent->addMenu(menu); parent->addMenu(menu);
return menu; return menu;