Drop frames if the player runs too far behind.

[nageru] / clip_list.cpp

diff --git a/clip_list.cpp b/clip_list.cpp
index 373ef0fc1f6d6be3e682cab7ed7a6b3851c2bbf3..69a87aee64ef2e3a66b5665c89b0a65f41c5bb80 100644 (file)
--- a/clip_list.cpp
+++ b/clip_list.cpp
@@ -5,14 +5,14 @@
 #include <vector>
 
 #include "clip_list.h"
+#include "timebase.h"
 #include "ui_mainwindow.h"
 
 using namespace std;
 
 string pts_to_string(int64_t pts)
 {
-       // FIXME: This depends on a fixed timebase.
-       int64_t t = lrint((pts / 12800.0) * 1e3);  // In milliseconds.
+       int64_t t = lrint((pts / double(TIMEBASE)) * 1e3);  // In milliseconds.
        int ms = t % 1000;
        t /= 1000;
        int sec = t % 60;
@@ -28,8 +28,7 @@ string pts_to_string(int64_t pts)
 
 string duration_to_string(int64_t pts_diff)
 {
-       // FIXME: This depends on a fixed timebase.
-       int64_t t = lrint((pts_diff / 12800.0) * 1e3);  // In milliseconds.
+       int64_t t = lrint((pts_diff / double(TIMEBASE)) * 1e3);  // In milliseconds.
        int ms = t % 1000;
        t /= 1000;
        int sec = t % 60;
@@ -79,7 +78,7 @@ QVariant ClipList::data(const QModelIndex &parent, int role) const {
                }
        }
 
-       if (role != Qt::DisplayRole)
+       if (role != Qt::DisplayRole && role != Qt::EditRole)
                return QVariant();
 
        switch (Column(column)) {
@@ -130,8 +129,25 @@ QVariant PlayList::data(const QModelIndex &parent, int role) const {
                        return Qt::AlignLeft + Qt::AlignVCenter;
                }
        }
+       if (role == Qt::BackgroundRole) {
+               if (Column(column) == Column::PLAYING) {
+                       if (row == currently_playing_index) {
+                               // This only really works well for the first column, for whatever odd Qt reason.
+                               QLinearGradient grad(QPointF(0, 0), QPointF(1, 0));
+                               grad.setCoordinateMode(grad.QGradient::ObjectBoundingMode);
+                               grad.setColorAt(0.0f, QColor::fromRgbF(0.0f, 0.0f, 1.0f, 0.2f));
+                               grad.setColorAt(play_progress, QColor::fromRgbF(0.0f, 0.0f, 1.0f, 0.2f));
+                               grad.setColorAt(play_progress + 0.01f, QColor::fromRgbF(0.0f, 0.0f, 1.0f, 0.0f));
+                               return QBrush(grad);
+                       } else {
+                               return QVariant();
+                       }
+               } else {
+                       return QVariant();
+               }
+       }
 
-       if (role != Qt::DisplayRole)
+       if (role != Qt::DisplayRole && role != Qt::EditRole)
                return QVariant();
 
        switch (Column(column)) {
@@ -239,6 +255,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 +303,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;
        }
@@ -342,16 +370,21 @@ void PlayList::emit_data_changed(size_t row)
        emit dataChanged(index(row, 0), index(row, int(Column::NUM_COLUMNS)));
 }
 
-void PlayList::set_currently_playing(int index)
+void PlayList::set_currently_playing(int index, double progress)
 {
        int old_index = currently_playing_index;
+       int column = int(Column::PLAYING);
        if (index != old_index) {
                currently_playing_index = index;
+               play_progress = progress;
                if (old_index != -1) {
-                       emit_data_changed(old_index);
+                       emit dataChanged(this->index(old_index, column), this->index(old_index, column));
                }
                if (index != -1) {
-                       emit_data_changed(index);
+                       emit dataChanged(this->index(index, column), this->index(index, column));
                }
+       } else if (index != -1 && fabs(progress - play_progress) > 1e-3) {
+               play_progress = progress;
+               emit dataChanged(this->index(index, column), this->index(index, column));
        }
 }