Blink the lock light if dragging the speed slider when locked.

[nageru] / futatabi / mainwindow.cpp

diff --git a/futatabi/mainwindow.cpp b/futatabi/mainwindow.cpp
index c69f67a17ad0cc43ab209b0b7c07ad4f8d2360c5..23a286b0530ba4304d3e8b070424b6d26d1941d7 100644 (file)
--- a/futatabi/mainwindow.cpp
+++ b/futatabi/mainwindow.cpp
@@ -182,6 +182,7 @@ MainWindow::MainWindow()
        ui->stop_btn->setEnabled(false);
 
        connect(ui->speed_slider, &QAbstractSlider::valueChanged, this, &MainWindow::speed_slider_changed);
+       connect(ui->speed_lock_btn, &QPushButton::clicked, this, &MainWindow::speed_lock_clicked);
 
        connect(ui->playlist_duplicate_btn, &QPushButton::clicked, this, &MainWindow::playlist_duplicate);
 
@@ -221,6 +222,10 @@ MainWindow::MainWindow()
        connect(defer_timeout, &QTimer::timeout, this, &MainWindow::defer_timer_expired);
        ui->undo_action->setEnabled(true);
 
+       lock_blink_timeout = new QTimer(this);
+       lock_blink_timeout->setSingleShot(true);
+       connect(lock_blink_timeout, &QTimer::timeout, this, &MainWindow::lock_blink_timer_expired);
+
        connect(ui->clip_list->selectionModel(), &QItemSelectionModel::currentChanged,
                this, &MainWindow::clip_list_selection_changed);
        enable_or_disable_queue_button();
@@ -591,6 +596,11 @@ void MainWindow::save_settings()
        db.store_settings(settings);
 }
 
+void MainWindow::lock_blink_timer_expired()
+{
+       midi_mapper.set_locked(MIDIMapper::LightState(ui->speed_lock_btn->isChecked()));  // Presumably On, or the timer should have been canceled.
+}
+
 void MainWindow::play_clicked()
 {
        if (playlist_clips->empty())
@@ -629,10 +639,19 @@ void MainWindow::stop_clicked()
 void MainWindow::speed_slider_changed(int percent)
 {
        float speed = percent / 100.0f;
-       ui->speed_label->setText(QString::fromStdString(to_string(percent) + "%"));
+       ui->speed_lock_btn->setText(QString::fromStdString(" " + to_string(percent) + "%"));
        live_player->set_master_speed(speed);
 }
 
+void MainWindow::speed_lock_clicked()
+{
+       // TODO: Make for a less abrupt transition if we're not already at 100%.
+       ui->speed_slider->setValue(100);  // Also actually sets the master speed and updates the label.
+       ui->speed_slider->setEnabled(!ui->speed_lock_btn->isChecked());
+       midi_mapper.set_locked(MIDIMapper::LightState(ui->speed_lock_btn->isChecked()));
+       lock_blink_timeout->stop();
+}
+
 void MainWindow::live_player_done()
 {
        playlist_selection_changed();
@@ -1200,6 +1219,14 @@ void MainWindow::play()
        });
 }
 
+void MainWindow::toggle_lock()
+{
+       post_to_main_thread([this] {
+               ui->speed_lock_btn->setChecked(!ui->speed_lock_btn->isChecked());
+               speed_lock_clicked();
+       });
+}
+
 void MainWindow::jog(int delta)
 {
        post_to_main_thread([this, delta] {
@@ -1239,14 +1266,20 @@ void MainWindow::set_master_speed(float speed)
        speed = min(max(speed, 0.1f), 2.0f);
 
        post_to_main_thread([this, speed] {
+               if (ui->speed_lock_btn->isChecked()) {
+                       midi_mapper.set_locked(MIDIMapper::Blinking);
+                       lock_blink_timeout->start(1000);
+                       return;
+               }
+
                int percent = lrintf(speed * 100.0f);
                ui->speed_slider->blockSignals(true);
                ui->speed_slider->setValue(percent);
                ui->speed_slider->blockSignals(false);
-               ui->speed_label->setText(QString::fromStdString(to_string(percent) + "%"));
-       });
+               ui->speed_lock_btn->setText(QString::fromStdString(" " + to_string(percent) + "%"));
 
-       live_player->set_master_speed(speed);
+               live_player->set_master_speed(speed);
+       });
 }
 
 void MainWindow::cue_in()