X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=clip_list.cpp;h=14f083e91268984c043ac652cd74ff19b39cccc9;hb=3795723be95f2fe82f3c8b8b45b1a905b2c811fd;hp=09fe0348e3ff8dc81e7d8e301b7e00979c62743f;hpb=adfd9e9107cd0dd6136042d6d92d9e136982c704;p=nageru

diff --git a/clip_list.cpp b/clip_list.cpp
index 09fe034..14f083e 100644
--- a/clip_list.cpp
+++ b/clip_list.cpp
@@ -1,18 +1,18 @@
+#include "clip_list.h"
+
 #include "mainwindow.h"
+#include "timebase.h"
+#include "ui_mainwindow.h"
 
 #include <math.h>
 #include <string>
 #include <vector>
 
-#include "clip_list.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;
@@ -41,27 +40,36 @@ string duration_to_string(int64_t pts_diff)
 	return buf;
 }
 
-int ClipList::rowCount(const QModelIndex &parent) const {
-	if (parent.isValid()) return 0;
+int ClipList::rowCount(const QModelIndex &parent) const
+{
+	if (parent.isValid())
+		return 0;
 	return clips.size();
 }
 
-int PlayList::rowCount(const QModelIndex &parent) const {
-	if (parent.isValid()) return 0;
+int PlayList::rowCount(const QModelIndex &parent) const
+{
+	if (parent.isValid())
+		return 0;
 	return clips.size();
 }
 
-int ClipList::columnCount(const QModelIndex &parent) const {
-	if (parent.isValid()) return 0;
+int ClipList::columnCount(const QModelIndex &parent) const
+{
+	if (parent.isValid())
+		return 0;
 	return int(Column::NUM_COLUMNS);
 }
 
-int PlayList::columnCount(const QModelIndex &parent) const {
-	if (parent.isValid()) return 0;
+int PlayList::columnCount(const QModelIndex &parent) const
+{
+	if (parent.isValid())
+		return 0;
 	return int(Column::NUM_COLUMNS);
 }
 
-QVariant ClipList::data(const QModelIndex &parent, int role) const {
+QVariant ClipList::data(const QModelIndex &parent, int role) const
+{
 	if (!parent.isValid())
 		return QVariant();
 	const int row = parent.row(), column = parent.column();
@@ -109,7 +117,8 @@ QVariant ClipList::data(const QModelIndex &parent, int role) const {
 	}
 }
 
-QVariant PlayList::data(const QModelIndex &parent, int role) const {
+QVariant PlayList::data(const QModelIndex &parent, int role) const
+{
 	if (!parent.isValid())
 		return QVariant();
 	const int row = parent.row(), column = parent.column();
@@ -123,6 +132,7 @@ QVariant PlayList::data(const QModelIndex &parent, int role) const {
 		case Column::IN:
 		case Column::OUT:
 		case Column::DURATION:
+		case Column::FADE_TIME:
 			return Qt::AlignRight + Qt::AlignVCenter;
 		case Column::CAMERA:
 			return Qt::AlignCenter;
@@ -130,13 +140,35 @@ QVariant PlayList::data(const QModelIndex &parent, int role) const {
 			return Qt::AlignLeft + Qt::AlignVCenter;
 		}
 	}
+	if (role == Qt::BackgroundRole) {
+		if (Column(column) == Column::PLAYING) {
+			auto it = current_progress.find(row);
+			if (it != current_progress.end()) {
+				double play_progress = it->second;
+
+				// 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));
+				if (play_progress + 0.01f <= 1.0f) {
+					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 && role != Qt::EditRole)
 		return QVariant();
 
 	switch (Column(column)) {
 	case Column::PLAYING:
-		return (row == currently_playing_index) ? "→" : "";
+		return current_progress.count(row) ? "→" : "";
 	case Column::IN:
 		return QString::fromStdString(pts_to_string(clips[row].pts_in));
 	case Column::OUT:
@@ -155,12 +187,20 @@ QVariant PlayList::data(const QModelIndex &parent, int role) const {
 		return qlonglong(clips[row].stream_idx + 1);
 	case Column::DESCRIPTION:
 		return QString::fromStdString(clips[row].descriptions[clips[row].stream_idx]);
+	case Column::FADE_TIME: {
+		stringstream ss;
+		ss.imbue(locale("C"));
+		ss.precision(3);
+		ss << fixed << clips[row].fade_time_seconds;
+		return QString::fromStdString(ss.str());
+	}
 	default:
 		return "";
 	}
 }
 
-QVariant ClipList::headerData(int section, Qt::Orientation orientation, int role) const {
+QVariant ClipList::headerData(int section, Qt::Orientation orientation, int role) const
+{
 	if (role != Qt::DisplayRole)
 		return QVariant();
 	if (orientation != Qt::Horizontal)
@@ -186,7 +226,8 @@ QVariant ClipList::headerData(int section, Qt::Orientation orientation, int role
 	}
 }
 
-QVariant PlayList::headerData(int section, Qt::Orientation orientation, int role) const {
+QVariant PlayList::headerData(int section, Qt::Orientation orientation, int role) const
+{
 	if (role != Qt::DisplayRole)
 		return QVariant();
 	if (orientation != Qt::Horizontal)
@@ -205,6 +246,8 @@ QVariant PlayList::headerData(int section, Qt::Orientation orientation, int role
 		return "Camera";
 	case Column::DESCRIPTION:
 		return "Description";
+	case Column::FADE_TIME:
+		return "Fade time";
 	default:
 		return "";
 	}
@@ -240,6 +283,7 @@ Qt::ItemFlags PlayList::flags(const QModelIndex &index) const
 	switch (Column(column)) {
 	case Column::DESCRIPTION:
 	case Column::CAMERA:
+	case Column::FADE_TIME:
 		return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEditable;
 		return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEditable;
 	default:
@@ -297,6 +341,16 @@ bool PlayList::setData(const QModelIndex &index, const QVariant &value, int role
 		emit_data_changed(row);
 		return true;
 	}
+	case Column::FADE_TIME: {
+		bool ok;
+		double val = value.toDouble(&ok);
+		if (!ok || !(val >= 0.0)) {
+			return false;
+		}
+		clips[row].fade_time_seconds = val;
+		emit_data_changed(row);
+		return true;
+	}
 	default:
 		return false;
 	}
@@ -307,6 +361,7 @@ void ClipList::add_clip(const Clip &clip)
 	beginInsertRows(QModelIndex(), clips.size(), clips.size());
 	clips.push_back(clip);
 	endInsertRows();
+	emit any_content_changed();
 }
 
 void PlayList::add_clip(const Clip &clip)
@@ -314,6 +369,7 @@ void PlayList::add_clip(const Clip &clip)
 	beginInsertRows(QModelIndex(), clips.size(), clips.size());
 	clips.push_back(clip);
 	endInsertRows();
+	emit any_content_changed();
 }
 
 void PlayList::duplicate_clips(size_t first, size_t last)
@@ -321,6 +377,7 @@ void PlayList::duplicate_clips(size_t first, size_t last)
 	beginInsertRows(QModelIndex(), first, last);
 	clips.insert(clips.begin() + first, clips.begin() + first, clips.begin() + last + 1);
 	endInsertRows();
+	emit any_content_changed();
 }
 
 void PlayList::erase_clips(size_t first, size_t last)
@@ -328,6 +385,7 @@ void PlayList::erase_clips(size_t first, size_t last)
 	beginRemoveRows(QModelIndex(), first, last);
 	clips.erase(clips.begin() + first, clips.begin() + last + 1);
 	endRemoveRows();
+	emit any_content_changed();
 }
 
 void PlayList::move_clips(size_t first, size_t last, int delta)
@@ -336,34 +394,120 @@ void PlayList::move_clips(size_t first, size_t last, int delta)
 		beginMoveRows(QModelIndex(), first, last, QModelIndex(), first - 1);
 		rotate(clips.begin() + first - 1, clips.begin() + first, clips.begin() + last + 1);
 	} else {
-		beginMoveRows(QModelIndex(), first, last, QModelIndex(), first + (last-first+1) + 1);
+		beginMoveRows(QModelIndex(), first, last, QModelIndex(), first + (last - first + 1) + 1);
 		first = clips.size() - first - 1;
 		last = clips.size() - last - 1;
 		rotate(clips.rbegin() + last - 1, clips.rbegin() + last, clips.rbegin() + first + 1);
 	}
 	endMoveRows();
+	emit any_content_changed();
 }
 
 void ClipList::emit_data_changed(size_t row)
 {
 	emit dataChanged(index(row, 0), index(row, int(Column::NUM_COLUMNS)));
+	emit any_content_changed();
 }
 
 void PlayList::emit_data_changed(size_t row)
 {
 	emit dataChanged(index(row, 0), index(row, int(Column::NUM_COLUMNS)));
+	emit any_content_changed();
 }
 
-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));
+	}
+}
+
+void PlayList::set_progress(const map<size_t, double> &progress)
+{
+	const int column = int(Column::PLAYING);
+	map<size_t, double> old_progress = move(this->current_progress);
+	this->current_progress = progress;
+
+	for (auto it : old_progress) {
+		size_t index = it.first;
+		if (current_progress.count(index) == 0) {
+			emit dataChanged(this->index(index, column), this->index(index, column));
+		}
+	}
+	for (auto it : current_progress) {
+		size_t index = it.first;
+		emit dataChanged(this->index(index, column), this->index(index, column));
+	}
+}
+
+namespace {
+
+Clip deserialize_clip(const ClipProto &clip_proto)
+{
+	Clip clip;
+	clip.pts_in = clip_proto.pts_in();
+	clip.pts_out = clip_proto.pts_out();
+	for (int camera_idx = 0; camera_idx < min(clip_proto.description_size(), NUM_CAMERAS); ++camera_idx) {
+		clip.descriptions[camera_idx] = clip_proto.description(camera_idx);
+	}
+	clip.stream_idx = clip_proto.stream_idx();
+	clip.fade_time_seconds = clip_proto.fade_time_seconds();
+	return clip;
+}
+
+void serialize_clip(const Clip &clip, ClipProto *clip_proto)
+{
+	clip_proto->set_pts_in(clip.pts_in);
+	clip_proto->set_pts_out(clip.pts_out);
+	for (int camera_idx = 0; camera_idx < NUM_CAMERAS; ++camera_idx) {
+		*clip_proto->add_description() = clip.descriptions[camera_idx];
+	}
+	clip_proto->set_stream_idx(clip.stream_idx);
+	clip_proto->set_fade_time_seconds(clip.fade_time_seconds);
+}
+
+}  // namespace
+
+ClipList::ClipList(const ClipListProto &serialized)
+{
+	for (const ClipProto &clip_proto : serialized.clip()) {
+		clips.push_back(deserialize_clip(clip_proto));
+	}
+}
+
+ClipListProto ClipList::serialize() const
+{
+	ClipListProto ret;
+	for (const Clip &clip : clips) {
+		serialize_clip(clip, ret.add_clip());
+	}
+	return ret;
+}
+
+PlayList::PlayList(const ClipListProto &serialized)
+{
+	for (const ClipProto &clip_proto : serialized.clip()) {
+		clips.push_back(deserialize_clip(clip_proto));
+	}
+}
+
+ClipListProto PlayList::serialize() const
+{
+	ClipListProto ret;
+	for (const Clip &clip : clips) {
+		serialize_clip(clip, ret.add_clip());
 	}
+	return ret;
 }