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 6bd0fbb1274f0cc2b4270270af4768f68bfd4301..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>
 
@@ -137,10 +137,6 @@ 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;
@@ -157,7 +153,6 @@ 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 = 2;