Support audio-only FFmpeg inputs. Somewhat wonky, though.

[nageru] / input_mapping_dialog.h

diff --git a/input_mapping_dialog.h b/input_mapping_dialog.h
index 0ca81d976866fbd3079015d5da9abdb0bc48e19c..640644e3898ce9cca25fc950bf9e350477c1b17b 100644 (file)
--- a/input_mapping_dialog.h
+++ b/input_mapping_dialog.h
@@ -2,12 +2,14 @@
 #define _INPUT_MAPPING_DIALOG_H
 
 #include <QDialog>
-#include <string>
+#include <QString>
+#include <map>
 #include <vector>
-#include <sys/time.h>
 
 #include "audio_mixer.h"
-#include "mixer.h"
+#include "input_mapping.h"
+
+class QObject;
 
 namespace Ui {
 class InputMappingDialog;
@@ -35,6 +37,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 +49,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;
 };