corrected some viewer behavior when pressing play after the end of a sequence
This commit is contained in:
@@ -343,9 +343,12 @@ void MainWindow::editMenu_About_To_Be_Shown() {
|
||||
|
||||
void MainWindow::setup_menus() {
|
||||
QMenuBar* menuBar = new QMenuBar(this);
|
||||
|
||||
/*
|
||||
menuBar->setStyle(QStyleFactory::create("windowsvista"));
|
||||
menuBar->setPalette(menuBar->style()->standardPalette());
|
||||
menuBar->setStyleSheet("");
|
||||
*/
|
||||
|
||||
setMenuBar(menuBar);
|
||||
|
||||
|
||||
+6
-5
@@ -390,24 +390,25 @@ void Viewer::play(bool in_to_out) {
|
||||
uncue_recording();
|
||||
}
|
||||
|
||||
if (playback_speed == 0) {
|
||||
playback_speed = 1;
|
||||
}
|
||||
|
||||
bool seek_to_in = (seq->using_workarea && (olive::CurrentConfig.loop || playing_in_to_out));
|
||||
if (!is_recording_cued()
|
||||
&& playback_speed > 0
|
||||
&& playback_speed >= 0
|
||||
&& (playing_in_to_out
|
||||
|| seq->playhead >= sequence_end_frame
|
||||
|| (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()) {
|
||||
qCritical() << "Failed to record audio";
|
||||
return;
|
||||
}
|
||||
|
||||
playhead_start = seq->playhead;
|
||||
playing = true;
|
||||
just_played_ = true;
|
||||
|
||||
@@ -266,9 +266,12 @@ QMenu* MenuHelper::create_submenu(QMenuBar* parent,
|
||||
const QObject *receiver,
|
||||
const char *member) {
|
||||
QMenu* menu = new QMenu(parent);
|
||||
|
||||
/*
|
||||
menu->setStyle(QStyleFactory::create("windowsvista"));
|
||||
menu->setPalette(menu->style()->standardPalette());
|
||||
menu->setStyleSheet("");
|
||||
*/
|
||||
|
||||
parent->addMenu(menu);
|
||||
|
||||
@@ -281,9 +284,12 @@ QMenu* MenuHelper::create_submenu(QMenuBar* parent,
|
||||
|
||||
QMenu* MenuHelper::create_submenu(QMenu* parent) {
|
||||
QMenu* menu = new QMenu(parent);
|
||||
|
||||
/*
|
||||
menu->setStyle(QStyleFactory::create("windowsvista"));
|
||||
menu->setPalette(menu->style()->standardPalette());
|
||||
menu->setStyleSheet("");
|
||||
*/
|
||||
|
||||
parent->addMenu(menu);
|
||||
return menu;
|
||||
|
||||
Reference in New Issue
Block a user