X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=futatabi%2Fclip_list.h;h=6bd0fbb1274f0cc2b4270270af4768f68bfd4301;hb=b44bf7cfce6a5aaffbcd1e37df39068a163438ad;hp=0768c76cdbc1acdb67c37032eddefd331dd2b358;hpb=f018e574d22638e49e9d01caafcfdb9cec173d32;p=nageru diff --git a/futatabi/clip_list.h b/futatabi/clip_list.h index 0768c76..6bd0fbb 100644 --- a/futatabi/clip_list.h +++ b/futatabi/clip_list.h @@ -79,12 +79,12 @@ 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 { - return (column >= int(Column::CAMERA_1) && column < int(Column::CAMERA_1) + num_cameras); + return (column >= int(Column::CAMERA_1) && column < int(Column::CAMERA_1) + int(num_cameras)); } signals: @@ -92,7 +92,7 @@ signals: private: std::vector clips; - size_t num_cameras = 1; + size_t num_cameras = 2; }; class PlayList : public QAbstractTableModel, public DataChangedReceiver { @@ -145,7 +145,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. { this->num_cameras = num_cameras; } @@ -160,7 +160,7 @@ private: int currently_playing_index = -1; double play_progress = 0.0; std::map current_progress; - size_t num_cameras = 1; + size_t num_cameras = 2; }; #endif // !defined (_CLIP_LIST_H)