Make it possible to change the camera angle in the playlist.

diff --git a/clip_list.cpp b/clip_list.cpp
index 373ef0fc1f6d6be3e682cab7ed7a6b3851c2bbf3..3c9637258f60c8b002cee6b23321a318f9734972 100644 (file)
--- a/clip_list.cpp
+++ b/clip_list.cpp
@@ -239,6 +239,8 @@ Qt::ItemFlags PlayList::flags(const QModelIndex &index) const
 
        switch (Column(column)) {
        case Column::DESCRIPTION:
+       case Column::CAMERA:
+               return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEditable;
                return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEditable;
        default:
                return Qt::ItemIsEnabled | Qt::ItemIsSelectable;
@@ -285,6 +287,16 @@ bool PlayList::setData(const QModelIndex &index, const QVariant &value, int role
                clips[row].descriptions[clips[row].stream_idx] = value.toString().toStdString();
                emit_data_changed(row);
                return true;
+       case Column::CAMERA: {
+               bool ok;
+               int camera_idx = value.toInt(&ok);
+               if (!ok || camera_idx < 1 || camera_idx > NUM_CAMERAS) {
+                       return false;
+               }
+               clips[row].stream_idx = camera_idx - 1;
+               emit_data_changed(row);
+               return true;
+       }
        default:
                return false;
        }

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 134613380d1b2d9f56d0f1b4d1c4367a316daf45..3b8561fac7a32fa3a14217a85ff8ff890cac23cb 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -272,9 +272,14 @@ bool MainWindow::eventFilter(QObject *watched, QEvent *event)
        constexpr int dead_zone_pixels = 3;  // To avoid that simple clicks get misinterpreted.
        constexpr int scrub_sensitivity = 100;  // pts units per pixel.
        constexpr int wheel_sensitivity = 100;  // pts units per degree.
+       constexpr int camera_degrees_per_pixel = 15;  // One click of most mice.
 
        unsigned stream_idx = ui->preview_display->get_stream_idx();
 
+       if (event->type() != QEvent::Wheel) {
+               last_mousewheel_camera_row = -1;
+       }
+
        if (event->type() == QEvent::MouseButtonPress) {
                QMouseEvent *mouse = (QMouseEvent *)event;
 
@@ -370,16 +375,20 @@ bool MainWindow::eventFilter(QObject *watched, QEvent *event)
                QWheelEvent *wheel = (QWheelEvent *)event;
 
                QTableView *destination;
-               int in_column, out_column;
+               int in_column, out_column, camera_column;
                if (watched == ui->clip_list->viewport()) {
                        destination = ui->clip_list;
                        in_column = int(ClipList::Column::IN);
                        out_column = int(ClipList::Column::OUT);
+                       camera_column = -1;
+                       last_mousewheel_camera_row = -1;
                } else if (watched == ui->playlist->viewport()) {
                        destination = ui->playlist;
                        in_column = int(PlayList::Column::IN);
                        out_column = int(PlayList::Column::OUT);
+                       camera_column = int(PlayList::Column::CAMERA);
                } else {
+                       last_mousewheel_camera_row = -1;
                        return false;
                }
                int column = destination->columnAt(wheel->x());
@@ -392,6 +401,9 @@ bool MainWindow::eventFilter(QObject *watched, QEvent *event)
                        stream_idx = clip->stream_idx;
                }
 
+               if (column != camera_column) {
+                       last_mousewheel_camera_row = -1;
+               }
                if (column == in_column) {
                        int64_t pts = clip->pts_in + wheel->angleDelta().y() * wheel_sensitivity;
                        pts = std::max<int64_t>(pts, 0);
@@ -404,6 +416,21 @@ bool MainWindow::eventFilter(QObject *watched, QEvent *event)
                        pts = std::min(pts, current_pts);
                        clip->pts_out = pts;
                        preview_single_frame(pts, stream_idx, LAST_BEFORE);
+               } else if (column == camera_column) {
+                       int angle_degrees = wheel->angleDelta().y();
+                       if (last_mousewheel_camera_row == row) {
+                               angle_degrees += leftover_angle_degrees;
+                       }
+
+                       int stream_idx = clip->stream_idx + angle_degrees / camera_degrees_per_pixel;
+                       stream_idx = std::max(stream_idx, 0);
+                       stream_idx = std::min(stream_idx, NUM_CAMERAS - 1);
+                       clip->stream_idx = stream_idx;
+
+                       last_mousewheel_camera_row = row;
+                       leftover_angle_degrees = angle_degrees % camera_degrees_per_pixel;
+
+                       // Don't update the live view, that's rarely what the operator wants.
                }
        } else if (event->type() == QEvent::MouseButtonRelease) {
                scrubbing = false;

diff --git a/mainwindow.h b/mainwindow.h
index 8deca18b0712cc9ffd2e1ea8e9898070bdd33068..4801667b5f2f1175e01394aa820d45abc8ca9f31 100644 (file)
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -36,6 +36,10 @@ private:
        int scrub_row;
        int scrub_column;
 
+       // Used to keep track of small mouse wheel motions on the camera index in the playlist.
+       int last_mousewheel_camera_row = -1;
+       int leftover_angle_degrees = 0;
+
        void cue_in_clicked();
        void cue_out_clicked();
        void queue_clicked();