Make the preview light blink and be solid like the play light is.

diff --git a/futatabi/behringer_cmd_pl1.midimapping b/futatabi/behringer_cmd_pl1.midimapping
index a3a2c64fb48b18d2e67f056ccfc848ae02b8efb1..44e478aee6f39b8ce9430b697d0cf1f4d1319311 100644 (file)
--- a/futatabi/behringer_cmd_pl1.midimapping
+++ b/futatabi/behringer_cmd_pl1.midimapping
@@ -36,7 +36,8 @@ cue_out_enabled: { note_number: 33 }
 # Preview is mapped to Scratch. It doesn't really feel right,
 # but it's also unclear where else it would be.
 preview: { note_number: 27 }
-preview_enabled: { note_number: 27 }
+preview_playing: { note_number: 27 }
+preview_ready: { note_number: 27  velocity: 2 }
 
 # The slider (pitch bend) is mapped to master speed.
 master_speed: { controller_number: 128 }

diff --git a/futatabi/futatabi_midi_mapping.proto b/futatabi/futatabi_midi_mapping.proto
index 38430fcb183ba2df8c8742d5a1f8931594e23ccd..d29a23de76d30bf25d8c12801d2412c7cfba7c6d 100644 (file)
--- a/futatabi/futatabi_midi_mapping.proto
+++ b/futatabi/futatabi_midi_mapping.proto
@@ -35,7 +35,8 @@ message MIDIMappingProto {
        // Buttons.
        optional MIDIButtonProto preview = 18;
        optional int32 preview_bank = 19;
-       optional MIDILightProto preview_enabled = 20;
+       optional MIDILightProto preview_playing = 41;
+       optional MIDILightProto preview_ready = 20;
 
        optional MIDIButtonProto queue = 21;
        optional int32 queue_bank = 22;

diff --git a/futatabi/mainwindow.cpp b/futatabi/mainwindow.cpp
index 11419c75b7c6dcc7c27b5110326cae09895ca6ac..189102b88cdf63e8659e8c1fe7e75de5ab95510a 100644 (file)
--- a/futatabi/mainwindow.cpp
+++ b/futatabi/mainwindow.cpp
@@ -203,6 +203,12 @@ MainWindow::MainWindow()
        playlist_selection_changed();  // First time set-up.
 
        preview_player.reset(new Player(ui->preview_display, Player::NO_STREAM_OUTPUT));
+       preview_player->set_done_callback([this] {
+               post_to_main_thread([this] {
+                       preview_player_done();
+               });
+       });
+
        live_player.reset(new Player(ui->live_display, Player::HTTPD_STREAM_OUTPUT));
        live_player->set_done_callback([this] {
                post_to_main_thread([this] {
@@ -393,6 +399,8 @@ void MainWindow::preview_clicked()
                        QModelIndex index = selected->currentIndex();
                        const Clip &clip = *playlist_clips->clip(index.row());
                        preview_player->play(clip);
+                       preview_playing = true;
+                       enable_or_disable_preview_button();
                        return;
                }
        }
@@ -403,6 +411,8 @@ void MainWindow::preview_clicked()
        QItemSelectionModel *selected = ui->clip_list->selectionModel();
        if (!selected->hasSelection()) {
                preview_player->play(*cliplist_clips->back());
+               preview_playing = true;
+               enable_or_disable_preview_button();
                return;
        }
 
@@ -414,6 +424,8 @@ void MainWindow::preview_clicked()
                clip.stream_idx = ui->preview_display->get_stream_idx();
        }
        preview_player->play(clip);
+       preview_playing = true;
+       enable_or_disable_preview_button();
 }
 
 void MainWindow::preview_angle_clicked(unsigned stream_idx)
@@ -647,6 +659,12 @@ void MainWindow::speed_lock_clicked()
        lock_blink_timeout->stop();
 }
 
+void MainWindow::preview_player_done()
+{
+       preview_playing = false;
+       enable_or_disable_preview_button();
+}
+
 void MainWindow::live_player_done()
 {
        playlist_clips->set_progress({});
@@ -1132,14 +1150,18 @@ void MainWindow::enable_or_disable_preview_button()
                QItemSelectionModel *selected = ui->playlist->selectionModel();
                if (selected->hasSelection()) {
                        ui->preview_btn->setEnabled(true);
-                       midi_mapper.set_preview_enabled(true);
+                       midi_mapper.set_preview_enabled(preview_playing ? MIDIMapper::On : MIDIMapper::Blinking);
                        return;
                }
        }
 
        // TODO: Perhaps only enable this if something is actually selected.
        ui->preview_btn->setEnabled(!cliplist_clips->empty());
-       midi_mapper.set_preview_enabled(!cliplist_clips->empty());
+       if (preview_playing) {
+               midi_mapper.set_preview_enabled(MIDIMapper::On);
+       } else {
+               midi_mapper.set_preview_enabled(cliplist_clips->empty() ? MIDIMapper::Off : MIDIMapper::Blinking);
+       }
 }
 
 void MainWindow::enable_or_disable_queue_button()

diff --git a/futatabi/mainwindow.h b/futatabi/mainwindow.h
index d88babaa689bd9ec73dfc62f3d570185950ead4a..028c91be26ddb7b81e1bd946c38b76f9a8346ec1 100644 (file)
--- a/futatabi/mainwindow.h
+++ b/futatabi/mainwindow.h
@@ -59,6 +59,7 @@ private:
 
        QLabel *disk_free_label;
        std::unique_ptr<Player> preview_player, live_player;
+       bool preview_playing = false;
        DB db;
        unsigned num_cameras;
 
@@ -136,6 +137,7 @@ private:
        void stop_clicked();
        void speed_slider_changed(int percent);
        void speed_lock_clicked();
+       void preview_player_done();
        void live_player_done();
        void live_player_clip_progress(const std::map<uint64_t, double> &progress, double time_remaining);
        void set_output_status(const std::string &status);

diff --git a/futatabi/midi_mapper.cpp b/futatabi/midi_mapper.cpp
index 63b21e44fa7c6fb53c089caa89d4a42686a51cd4..3d1f6ec0401e14a5d01ba775a639434ca6a172a3 100644 (file)
--- a/futatabi/midi_mapper.cpp
+++ b/futatabi/midi_mapper.cpp
@@ -222,8 +222,10 @@ void MIDIMapper::update_lights_lock_held()
        if (current_controller_bank == 4) {
                activate_mapped_light(*mapping_proto, MIDIMappingProto::kBank5IsSelectedFieldNumber, &active_lights);
        }
-       if (preview_enabled_light) {
-               activate_mapped_light(*mapping_proto, MIDIMappingProto::kPreviewEnabledFieldNumber, &active_lights);
+       if (preview_enabled_light == On) {  // Playing.
+               activate_mapped_light(*mapping_proto, MIDIMappingProto::kPreviewPlayingFieldNumber, &active_lights);
+       } else if (preview_enabled_light == Blinking) {  // Preview ready.
+               activate_mapped_light(*mapping_proto, MIDIMappingProto::kPreviewReadyFieldNumber, &active_lights);
        }
        if (queue_enabled_light) {
                activate_mapped_light(*mapping_proto, MIDIMappingProto::kQueueEnabledFieldNumber, &active_lights);

diff --git a/futatabi/midi_mapper.h b/futatabi/midi_mapper.h
index 2240e70ce7e55854028b40d885201388935f9bb2..c1d6639858d1c697795692e05f16d6883a5263db 100644 (file)
--- a/futatabi/midi_mapper.h
+++ b/futatabi/midi_mapper.h
@@ -63,7 +63,7 @@ public:
 
        void refresh_lights();
 
-       void set_preview_enabled(bool enabled) {
+       void set_preview_enabled(LightState enabled) {
                preview_enabled_light = enabled;
                refresh_lights();
        }
@@ -106,7 +106,7 @@ private:
        int num_controller_banks;  // Under <mu>.
        std::atomic<int> current_controller_bank{0};
 
-       std::atomic<bool> preview_enabled_light{false};
+       std::atomic<LightState> preview_enabled_light{Off};
        std::atomic<bool> queue_enabled_light{false};
        std::atomic<LightState> play_enabled_light{Off};
        std::atomic<LightState> locked_light{On};