X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=input_mapping_dialog.h;h=3fa11e3fc63c63529d0c3ce73336001c34b52561;hb=26e1ec466d4730b6abc0e20201d704cfdf41a6eb;hp=90be52acffa8bb82dddea0d8ef891cd1c88cd3b6;hpb=c013fcb39c018410ce49333d5665f9bc682de1db;p=nageru

diff --git a/input_mapping_dialog.h b/input_mapping_dialog.h
index 90be52a..3fa11e3 100644
--- a/input_mapping_dialog.h
+++ b/input_mapping_dialog.h
@@ -6,31 +6,37 @@
 #include <vector>
 #include <sys/time.h>
 
+#include "audio_mixer.h"
 #include "mixer.h"
 
 namespace Ui {
 class InputMappingDialog;
 }  // namespace Ui
 
+class QComboBox;
+
 class InputMappingDialog : public QDialog
 {
 	Q_OBJECT
 
 public:
 	InputMappingDialog();
+	~InputMappingDialog();
 
 private:
 	void fill_ui_from_mapping(const InputMapping &mapping);
 	void fill_row_from_bus(unsigned row, const InputMapping::Bus &bus);
 	void setup_channel_choices_from_bus(unsigned row, const InputMapping::Bus &bus);
 	void cell_changed(int row, int column);
-	void card_selected(unsigned row, int index);
+	void card_selected(QComboBox *card_combo, unsigned row, int index);
 	void channel_selected(unsigned row, unsigned channel, int index);
 	void ok_clicked();
 	void cancel_clicked();
 	void add_clicked();
 	void remove_clicked();
 	void updown_clicked(int direction);
+	void save_clicked();
+	void load_clicked();
 	void update_button_state();
 
 	Ui::InputMappingDialog *ui;
@@ -41,7 +47,13 @@ private:
 	// held forever).
 	InputMapping old_mapping;
 
-	const std::vector<std::string> card_names;
+	// 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;
 };
 
 #endif  // !defined(_INPUT_MAPPING_DIALOG_H)