Split ClipList and PlayList.

[nageru] / clip_list.h

diff --git a/clip_list.h b/clip_list.h
index 9ca6e63799896f32cc5312a3e72a0c48704abf38..e97f04f56ed91759f9110a127be88dbc2b09632c 100644 (file)
--- a/clip_list.h
+++ b/clip_list.h
@@ -14,18 +14,37 @@ struct Clip {
        unsigned stream_idx = 0;  // For the playlist only.
 };
 
-// FIXME: This should be split into a separate clip list and play list model.
-class ClipList : public QAbstractTableModel {
+class DataChangedReceiver {
+public:
+       virtual void emit_data_changed(size_t row) = 0;
+};
+
+// Like a smart pointer to a Clip, but emits dataChanged when it goes out of scope.
+struct ClipProxy {
+public:
+       ClipProxy(Clip &clip, DataChangedReceiver *clip_list, size_t row)
+               : clip(clip), clip_list(clip_list), row(row) {}
+       ~ClipProxy() {
+               if (clip_list != nullptr) {
+                       clip_list->emit_data_changed(row);
+               }
+       }
+       Clip *operator->() { return &clip; }
+       Clip &operator*() { return clip; }
+
+private:
+       Clip &clip;
+       DataChangedReceiver *clip_list;
+       size_t row;
+};
+
+class ClipList : public QAbstractTableModel, public DataChangedReceiver {
        Q_OBJECT
 
 public:
-       enum class ListDisplay {
-               CLIP_LIST,
-               PLAY_LIST
-       };
-       ClipList(ListDisplay display_type) : display_type(display_type) {}
+       ClipList() {}
 
-       enum class ClipListColumn {
+       enum class Column {
                IN,
                OUT,
                DURATION,
@@ -35,7 +54,35 @@ public:
                CAMERA_4,
                NUM_COLUMNS
        };
-       enum class PlayListColumn {
+
+       int rowCount(const QModelIndex &parent) const override;
+       int columnCount(const QModelIndex &parent) const override;
+       QVariant data(const QModelIndex &parent, int role) const override;
+       QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
+
+       void add_clip(const Clip &clip);
+       size_t size() const { return clips.size(); }
+       bool empty() const { return clips.empty(); }
+
+       ClipProxy clip(size_t index) { return ClipProxy(clips[index], this, index); }
+       const Clip *clip(size_t index) const { return &clips[index]; }
+
+       ClipProxy back() { return clip(size() - 1); }
+       const Clip *back() const { return clip(size() - 1); }
+
+       void emit_data_changed(size_t row) override;
+
+private:
+       std::vector<Clip> clips;
+};
+
+class PlayList : public QAbstractTableModel, public DataChangedReceiver {
+       Q_OBJECT
+
+public:
+       PlayList() {}
+
+       enum class Column {
                PLAYING,
                IN,
                OUT,
@@ -54,39 +101,19 @@ public:
        size_t size() const { return clips.size(); }
        bool empty() const { return clips.empty(); }
 
-       // Like a smart pointer to a Clip, but emits dataChanged when it goes out of scope.
-       struct ClipProxy {
-       public:
-               ClipProxy(Clip &clip, ClipList *clip_list, size_t row)
-                       : clip(clip), clip_list(clip_list), row(row) {}
-               ~ClipProxy() {
-                       if (clip_list != nullptr) {
-                               clip_list->emit_data_changed(row);
-                       }
-               }
-               Clip *operator->() { return &clip; }
-               Clip &operator*() { return clip; }
-
-       private:
-               Clip &clip;
-               ClipList *clip_list;
-               size_t row;
-       };
-
        ClipProxy clip(size_t index) { return ClipProxy(clips[index], this, index); }
        const Clip *clip(size_t index) const { return &clips[index]; }
 
        ClipProxy back() { return clip(size() - 1); }
        const Clip *back() const { return clip(size() - 1); }
 
-       void set_currently_playing(int index);  // -1 = none. Only makes sense for the playlist.
+       void set_currently_playing(int index);  // -1 = none.
        int get_currently_playing() const { return currently_playing_index; }
 
-       void emit_data_changed(size_t row);
+       void emit_data_changed(size_t row) override;
 
 private:
        std::vector<Clip> clips;
-       ListDisplay display_type;
        int currently_playing_index = -1;
 };