Fix some jerkiness when playing back with no interpolation.

[nageru] / futatabi / mainwindow.h

diff --git a/futatabi/mainwindow.h b/futatabi/mainwindow.h
index d88babaa689bd9ec73dfc62f3d570185950ead4a..592309ab6208a72d0e396c5de2e83db749657ca1 100644 (file)
--- a/futatabi/mainwindow.h
+++ b/futatabi/mainwindow.h
@@ -4,6 +4,7 @@
 #include "clip_list.h"
 #include "db.h"
 #include "midi_mapper.h"
+#include "player.h"
 #include "state.pb.h"
 
 #include <QLabel>
@@ -43,6 +44,7 @@ public:
        void preview() override;
        void queue() override;
        void play() override;
+       void next() override;
        void toggle_lock() override;
        void jog(int delta) override;
        void switch_camera(unsigned camera_idx) override;
@@ -59,6 +61,7 @@ private:
 
        QLabel *disk_free_label;
        std::unique_ptr<Player> preview_player, live_player;
+       bool preview_playing = false;
        DB db;
        unsigned num_cameras;
 
@@ -117,6 +120,7 @@ private:
                QFrame *frame;
                JPEGFrameView *display;
                QPushButton *preview_btn;
+               bool hidden = false;
        };
        std::vector<FrameAndDisplay> displays;
 
@@ -127,17 +131,20 @@ private:
        MIDIMapper midi_mapper;
 
        void change_num_cameras();
+       void relayout_displays();
        void cue_in_clicked();
        void cue_out_clicked();
        void queue_clicked();
        void preview_clicked();
        void preview_angle_clicked(unsigned stream_idx);
        void play_clicked();
+       void next_clicked();
        void stop_clicked();
        void speed_slider_changed(int percent);
        void speed_lock_clicked();
+       void preview_player_done();
        void live_player_done();
-       void live_player_clip_progress(const std::map<uint64_t, double> &progress, double time_remaining);
+       void live_player_clip_progress(const std::map<uint64_t, double> &progress, TimeRemaining time_remaining);
        void set_output_status(const std::string &status);
        void playlist_duplicate();
        void playlist_remove();
@@ -166,6 +173,7 @@ private:
        bool eventFilter(QObject *watched, QEvent *event) override;
 
        void report_disk_space(off_t free_bytes, double estimated_seconds_left);
+       void midi_mapping_triggered();
        void exit_triggered();
        void export_cliplist_clip_multitrack_triggered();
        void export_playlist_clip_interpolated_triggered();
@@ -174,7 +182,9 @@ private:
        void undo_triggered();
        void redo_triggered();
        void quality_toggled(int quality, bool checked);
-       void padding_toggled(double seconds, bool checked);
+       void in_padding_toggled(double seconds, bool checked);
+       void out_padding_toggled(double seconds, bool checked);
+       void hide_camera_toggled(unsigned camera_idx, bool checked);
 
        void highlight_camera_input(int stream_idx);
        void enable_or_disable_preview_button();