X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=input_mapping_dialog.h;h=d092a34cd5f12f71356a67f59956575de8e5ffca;hb=95c6bc9d8e340b02112f713389390102d547cc4c;hp=91246f563f05cddb5212f5737244297295d9959a;hpb=d7118c0e5e98ba5597e259018600ab712bf079a7;p=nageru

diff --git a/input_mapping_dialog.h b/input_mapping_dialog.h
index 91246f5..d092a34 100644
--- a/input_mapping_dialog.h
+++ b/input_mapping_dialog.h
@@ -12,6 +12,8 @@ namespace Ui {
 class InputMappingDialog;
 }  // namespace Ui
 
+class QComboBox;
+
 class InputMappingDialog : public QDialog
 {
 	Q_OBJECT
@@ -21,14 +23,17 @@ public:
 
 private:
 	void fill_ui_from_mapping(const InputMapping &mapping);
-	void fill_row_from_input(unsigned row, const InputMapping::Input &input);
-	void setup_channel_choices_from_input(unsigned row, const InputMapping::Input &input);
+	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 update_button_state();
 
 	Ui::InputMappingDialog *ui;
 	InputMapping mapping;  // Under edit. Will be committed on OK.
@@ -38,7 +43,7 @@ private:
 	// held forever).
 	InputMapping old_mapping;
 
-	const std::vector<std::string> card_names;
+	const std::map<DeviceSpec, DeviceInfo> devices;
 };
 
 #endif  // !defined(_INPUT_MAPPING_DIALOG_H)