From 80f3360f2b3bbe8230bdf96d4de9682d8a4d86f6 Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Thu, 20 Dec 2018 00:22:34 +0100 Subject: [PATCH 1/1] Default to two cameras instead of one, since otherwise, the UI looks pretty borked. --- futatabi/clip_list.h | 8 ++++---- futatabi/mainwindow.cpp | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/futatabi/clip_list.h b/futatabi/clip_list.h index a42720b..6bd0fbb 100644 --- a/futatabi/clip_list.h +++ b/futatabi/clip_list.h @@ -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 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) diff --git a/futatabi/mainwindow.cpp b/futatabi/mainwindow.cpp index 212c5c4..38a50df 100644 --- a/futatabi/mainwindow.cpp +++ b/futatabi/mainwindow.cpp @@ -181,11 +181,11 @@ MainWindow::MainWindow() this, &MainWindow::clip_list_selection_changed); // Find out how many cameras we have in the existing frames; - // if none, we start with a single camera. - num_cameras = 1; + // if none, we start with two cameras. + num_cameras = 2; { lock_guard lock(frame_mu); - for (size_t stream_idx = 1; stream_idx < MAX_STREAMS; ++stream_idx) { + for (size_t stream_idx = 2; stream_idx < MAX_STREAMS; ++stream_idx) { if (!frames[stream_idx].empty()) { num_cameras = stream_idx + 1; } -- 2.39.2