Some refactoring of the player code, and begin working on the playlist.

[nageru] / mainwindow.cpp

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 1a5953d2ded019cbdf23f3484083834ba4a75b6e..aba38db9f734a202f87a9aa6aa4f2c280ee81916 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -13,7 +13,7 @@ using namespace std;
 
 MainWindow *global_mainwindow = nullptr;
 extern int64_t current_pts;
-ClipList *clips;
+ClipList *cliplist_clips, *playlist_clips;
 
 MainWindow::MainWindow()
        : ui(new Ui::MainWindow)
@@ -21,46 +21,89 @@ MainWindow::MainWindow()
        global_mainwindow = this;
        ui->setupUi(this);
 
-       clips = new ClipList;
-       ui->clip_list->setModel(clips);
+       cliplist_clips = new ClipList(ClipList::ListDisplay::CLIP_LIST);
+       ui->clip_list->setModel(cliplist_clips);
+
+       playlist_clips = new ClipList(ClipList::ListDisplay::PLAY_LIST);
+       ui->playlist->setModel(playlist_clips);
 
-       // TODO: Make these into buttons.
        // TODO: These are too big for lambdas.
        QShortcut *cue_in = new QShortcut(QKeySequence(Qt::Key_A), this);
-       connect(cue_in, &QShortcut::activated, []{
-               if (!clips->empty() && clips->back()->pts_out < 0) {
-                       clips->back()->pts_in = current_pts;
+       connect(cue_in, &QShortcut::activated, ui->cue_in_btn, &QPushButton::click);
+       connect(ui->cue_in_btn, &QPushButton::clicked, []{
+               if (!cliplist_clips->empty() && cliplist_clips->back()->pts_out < 0) {
+                       cliplist_clips->back()->pts_in = current_pts;
                        return;
                }
                Clip clip;
                clip.pts_in = current_pts;
-               clips->add_clip(clip);
+               cliplist_clips->add_clip(clip);
        });
 
        QShortcut *cue_out = new QShortcut(QKeySequence(Qt::Key_S), this);
-       connect(cue_out, &QShortcut::activated, []{
-               if (!clips->empty()) {
-                       clips->back()->pts_out = current_pts;
+       connect(cue_out, &QShortcut::activated, ui->cue_out_btn, &QPushButton::click);
+       connect(ui->cue_out_btn, &QPushButton::clicked, []{
+               if (!cliplist_clips->empty()) {
+                       cliplist_clips->back()->pts_out = current_pts;
                        // TODO: select the row in the clip list?
                }
        });
 
-       QShortcut *preview_shortcut = new QShortcut(QKeySequence(Qt::Key_W), this);
-       connect(preview_shortcut, &QShortcut::activated, this, &MainWindow::preview_clicked);
+       QShortcut *queue = new QShortcut(QKeySequence(Qt::Key_Q), this);
+       connect(queue, &QShortcut::activated, ui->queue_btn, &QPushButton::click);
+       connect(ui->queue_btn, &QPushButton::clicked, this, &MainWindow::queue_clicked);
+
+       QShortcut *preview = new QShortcut(QKeySequence(Qt::Key_W), this);
+       connect(preview, &QShortcut::activated, ui->preview_btn, &QPushButton::click);
+       connect(ui->preview_btn, &QPushButton::clicked, this, &MainWindow::preview_clicked);
+
+       QShortcut *play = new QShortcut(QKeySequence(Qt::Key_Space), this);
+       connect(play, &QShortcut::activated, ui->play_btn, &QPushButton::click);
+       connect(ui->play_btn, &QPushButton::clicked, this, &MainWindow::play_clicked);
+
+       preview_player = new Player(ui->preview_display);
+}
+
+void MainWindow::queue_clicked()
+{
+       QItemSelectionModel *selected = ui->clip_list->selectionModel();
+       if (!selected->hasSelection()) {
+               Clip clip = *cliplist_clips->back();
+               clip.stream_idx = 0;
+               playlist_clips->add_clip(clip);
+               return;
+       }
+
+       QModelIndex index = selected->currentIndex();
+       if (index.column() >= int(ClipList::ClipListColumn::CAMERA_1) &&
+           index.column() <= int(ClipList::ClipListColumn::CAMERA_4)) {
+               Clip clip = *cliplist_clips->clip(index.row());
+               clip.stream_idx = index.column() - int(ClipList::ClipListColumn::CAMERA_1);
+               playlist_clips->add_clip(clip);
+       }
 }
 
 void MainWindow::preview_clicked()
 {
        QItemSelectionModel *selected = ui->clip_list->selectionModel();
        if (!selected->hasSelection()) {
-               play_clip(*clips->back(), 0);
+               preview_player->play_clip(*cliplist_clips->back(), 0);
                return;
        }
 
        QModelIndex index = selected->currentIndex();
-       if (index.column() >= ClipList::Column::CAMERA_1 &&
-           index.column() <= ClipList::Column::CAMERA_4) {
-               unsigned stream_idx = index.column() - ClipList::Column::CAMERA_1;
-               play_clip(*clips->clip(index.row()), stream_idx);
+       if (index.column() >= int(ClipList::ClipListColumn::CAMERA_1) &&
+           index.column() <= int(ClipList::ClipListColumn::CAMERA_4)) {
+               unsigned stream_idx = index.column() - int(ClipList::ClipListColumn::CAMERA_1);
+               preview_player->play_clip(*cliplist_clips->clip(index.row()), stream_idx);
+       }
+}
+
+void MainWindow::play_clicked()
+{
+       QItemSelectionModel *selected = ui->playlist->selectionModel();
+       if (!selected->hasSelection()) {
+               ui->playlist->selectRow(0);
+               return;
        }
 }