Remove now-deprecated non-zero page size in Adjustments used for SpinButtons;

[ardour.git] / gtk2_ardour / option_editor.h

diff --git a/gtk2_ardour/option_editor.h b/gtk2_ardour/option_editor.h
index 82bb4db79b048703d4939f4bb4f9347685e6e820..1aff7f2bcf74b1d93cae5171ba7416d4f84f2553 100644 (file)
--- a/gtk2_ardour/option_editor.h
+++ b/gtk2_ardour/option_editor.h
@@ -1,5 +1,8 @@
+#ifndef __gtk_ardour_option_editor_h__
+#define __gtk_ardour_option_editor_h__
+
 /*
-    Copyright (C) 2001 Paul Davis 
+    Copyright (C) 2001 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,8 +20,7 @@
 
 */
 
-#ifndef __gtk_ardour_option_editor_h__
-#define __gtk_ardour_option_editor_h__
+#include <vector>
 
 #include <gtkmm/notebook.h>
 #include <gtkmm/checkbutton.h>
@@ -126,6 +128,7 @@ class OptionEditor : public ArdourDialog
        Gtk::RadioButton::Group mtc_button_group;
        Gtk::RadioButton::Group mmc_button_group;
        Gtk::RadioButton::Group midi_button_group;
+       Gtk::RadioButton::Group midi_clock_button_group;
 
        Gtk::Table      midi_port_table;
        std::vector<Gtk::Widget*> midi_port_table_widgets;
@@ -134,6 +137,8 @@ class OptionEditor : public ArdourDialog
        Gtk::Adjustment mmc_send_device_id_adjustment;
        Gtk::SpinButton mmc_send_device_id_spinner;
        Gtk::Button     add_midi_port_button;
+       Gtk::Adjustment initial_program_change_adjustment;
+       Gtk::SpinButton initial_program_change_spinner;
 
        void add_midi_port ();
        void remove_midi_port (MIDI::Port*);
@@ -142,15 +147,18 @@ class OptionEditor : public ArdourDialog
        void port_online_toggled (MIDI::Port*,Gtk::ToggleButton*);
        void port_trace_in_toggled (MIDI::Port*,Gtk::ToggleButton*);
        void port_trace_out_toggled (MIDI::Port*,Gtk::ToggleButton*);
-       
+
        void mmc_port_chosen (MIDI::Port*,Gtk::RadioButton*, Gtk::Button*);
        void mtc_port_chosen (MIDI::Port*,Gtk::RadioButton*, Gtk::Button*);
        void midi_port_chosen (MIDI::Port*,Gtk::RadioButton*, Gtk::Button*);
+       void midi_clock_port_chosen (MIDI::Port*,Gtk::RadioButton*, Gtk::Button*);
        bool port_removable (MIDI::Port*);
 
        void mmc_receive_device_id_adjusted ();
        void mmc_send_device_id_adjusted ();
 
+       void initial_program_change_adjusted ();
+
        void map_port_online (MIDI::Port*, Gtk::ToggleButton*);
 
        void setup_midi_options();
@@ -158,7 +166,8 @@ class OptionEditor : public ArdourDialog
        enum PortIndex {
                MtcIndex = 0,
                MmcIndex = 1,
-               MidiIndex = 2
+               MidiIndex = 2,
+               MidiClockIndex = 3
        };
 
        std::map<MIDI::Port*,std::vector<Gtk::RadioButton*> > port_toggle_buttons;
@@ -168,6 +177,8 @@ class OptionEditor : public ArdourDialog
        IOSelector*   click_io_selector;
        GainMeter* click_gpm;
        PannerUI*     click_panner;
+       bool          first_click_setup;
+       Gtk::HBox     click_hpacker;
        Gtk::VBox     click_packer;
        Gtk::Table    click_table;
        Gtk::Entry    click_path_entry;
@@ -183,7 +194,7 @@ class OptionEditor : public ArdourDialog
 
        void click_browse_clicked ();
        void click_emphasis_browse_clicked ();
-       
+
        void click_sound_changed ();
        void click_emphasis_sound_changed ();
 
@@ -203,6 +214,7 @@ class OptionEditor : public ArdourDialog
        /* keyboard/mouse */
 
        Gtk::Table keyboard_mouse_table;
+       Gtk::ComboBoxText keyboard_layout_selector;
        Gtk::ComboBoxText edit_modifier_combo;
        Gtk::ComboBoxText delete_modifier_combo;
        Gtk::ComboBoxText snap_modifier_combo;
@@ -211,12 +223,15 @@ class OptionEditor : public ArdourDialog
        Gtk::Adjustment edit_button_adjustment;
        Gtk::SpinButton edit_button_spin;
 
+       std::map<std::string,std::string> bindings_files;
+
        void setup_keyboard_options ();
        void delete_modifier_chosen ();
        void edit_modifier_chosen ();
        void snap_modifier_chosen ();
        void edit_button_changed ();
        void delete_button_changed ();
+       void bindings_changed ();
 
        void fixup_combo_size (Gtk::ComboBoxText&, std::vector<std::string>& strings);
 };