Call the done callback only when the entire playlist is done. Simplifies a fair amoun...

[nageru] / futatabi / clip_list.h

diff --git a/futatabi/clip_list.h b/futatabi/clip_list.h
index a42720b0d49be1c6b20c153f81b37ac13a09ee44..99fdf5316f1acdb87138ff6f69034662beb7a337 100644 (file)
--- a/futatabi/clip_list.h
+++ b/futatabi/clip_list.h
@@ -5,8 +5,8 @@
 #include "state.pb.h"
 
 #include <QAbstractTableModel>
-#include <stdint.h>
 #include <map>
+#include <stdint.h>
 #include <string>
 #include <vector>
 
@@ -79,7 +79,7 @@ public:
 
        ClipListProto serialize() const;
 
-       void change_num_cameras(size_t num_cameras);  // Defaults to 1. Cannot decrease.
+       void change_num_cameras(size_t num_cameras);  // Defaults to 2. Cannot decrease.
        void emit_data_changed(size_t row) override;
 
        bool is_camera_column(int column) const
@@ -92,7 +92,7 @@ signals:
 
 private:
        std::vector<Clip> clips;
-       size_t num_cameras = 1;
+       size_t num_cameras = 2;
 };
 
 class PlayList : public QAbstractTableModel, public DataChangedReceiver {
@@ -137,15 +137,11 @@ public:
        ClipProxy mutable_back() { return mutable_clip(size() - 1); }
        const Clip *back() const { return clip(size() - 1); }
 
-       // TODO: Move these out of PlayList.
-       void set_currently_playing(int index, double progress);  // -1 = none.
-       int get_currently_playing() const { return currently_playing_index; }
-
        void set_progress(const std::map<size_t, double> &progress);
 
        ClipListProto serialize() const;
 
-       void change_num_cameras(size_t num_cameras)  // Defaults to 1. Cannot decrease.
+       void change_num_cameras(size_t num_cameras)  // Defaults to 2. Cannot decrease.
        {
                this->num_cameras = num_cameras;
        }
@@ -157,10 +153,9 @@ signals:
 
 private:
        std::vector<Clip> clips;
-       int currently_playing_index = -1;
        double play_progress = 0.0;
        std::map<size_t, double> current_progress;
-       size_t num_cameras = 1;
+       size_t num_cameras = 2;
 };
 
 #endif  // !defined (_CLIP_LIST_H)