Do not use the timing of dropped frames as part of the video master clock.

[nageru] / input_mapping_dialog.h

diff --git a/input_mapping_dialog.h b/input_mapping_dialog.h
index 0ca81d976866fbd3079015d5da9abdb0bc48e19c..3fa11e3fc63c63529d0c3ce73336001c34b52561 100644 (file)
--- a/input_mapping_dialog.h
+++ b/input_mapping_dialog.h
@@ -35,6 +35,8 @@ private:
        void add_clicked();
        void remove_clicked();
        void updown_clicked(int direction);
+       void save_clicked();
+       void load_clicked();
        void update_button_state();
 
        Ui::InputMappingDialog *ui;
@@ -45,8 +47,12 @@ private:
        // held forever).
        InputMapping old_mapping;
 
-       std::map<DeviceSpec, DeviceInfo> devices;
+       // One for each bus in the mapping. Edited along with the mapping,
+       // so that old volumes etc. are being kept in place for buses that
+       // existed before.
+       std::vector<AudioMixer::BusSettings> bus_settings;
 
+       std::map<DeviceSpec, DeviceInfo> devices;  // Needs no lock, accessed only on the UI thread.
        AudioMixer::state_changed_callback_t saved_callback;
 };