Allow symlinked frame files. Useful for testing.

[nageru] / mainwindow.h

diff --git a/mainwindow.h b/mainwindow.h
index 103dd8379a962ee3ac5f558602359c34adf752d6..7f8c57ac805a79928573a01e76e17e5916ab8d39 100644 (file)
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -5,10 +5,13 @@
 #include "db.h"
 #include "state.pb.h"
 
+#include <mutex>
 #include <QLabel>
 #include <QMainWindow>
 #include <stdbool.h>
 #include <sys/types.h>
+#include <string>
+#include <utility>
 
 namespace Ui {
 class MainWindow;
@@ -22,6 +25,9 @@ class MainWindow : public QMainWindow {
 public:
        MainWindow();
 
+       // HTTP callback. TODO: Does perhaps not belong to MainWindow?
+       std::pair<std::string, std::string> get_queue_status() const;
+
 //private:
        Ui::MainWindow *ui;
 
@@ -60,6 +66,9 @@ private:
        bool currently_deferring_model_changes = false;
        std::string current_change_id;
 
+       mutable std::mutex queue_status_mu;
+       std::string queue_status;  // Under queue_status_mu.
+
        void cue_in_clicked();
        void cue_out_clicked();
        void queue_clicked();
@@ -67,8 +76,9 @@ private:
        void preview_angle_clicked(unsigned stream_idx);
        void play_clicked();
        void live_player_clip_done();
-       Clip live_player_get_next_clip();
-       void live_player_clip_progress(double played_this_clip, double total_length);
+       std::pair<Clip, size_t> live_player_get_next_clip();
+       void live_player_clip_progress(const std::map<size_t, double> &progress);
+       void set_output_status(const std::string &status);
        void playlist_duplicate();
        void playlist_remove();
        void playlist_move(int delta);