Remove redundant view <-> model value mapping stuff from AudioRegionGainLine.

[ardour.git] / gtk2_ardour / option_editor.h

diff --git a/gtk2_ardour/option_editor.h b/gtk2_ardour/option_editor.h
index e607a9bbb4154547ae1af5a0a7d1a81aa22e4c9a..a234f1d7522be2a5fe2d204ef4ee54dc465a4649 100644 (file)
--- a/gtk2_ardour/option_editor.h
+++ b/gtk2_ardour/option_editor.h
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #ifndef __gtk_ardour_option_editor_h__
@@ -70,58 +69,36 @@ class OptionEditor : public Gtk::Dialog
 
        /* paths */
 
-       Gtk::Table              path_table;
-       Gtk::Entry              session_raid_entry;
-       Gtk::ComboBoxText       native_format_combo;
-
-       struct SoundFilePathColumns : public Gtk::TreeModel::ColumnRecord {
-           public:
-                 SoundFilePathColumns() { add (paths); }
-                 Gtk::TreeModelColumn<std::string> paths;
-                           
-       };
-
-       SoundFilePathColumns sfdb_path_columns;
-       Glib::RefPtr<Gtk::ListStore> sfdb_paths;
-       Gtk::TreeView sfdb_path_view;
+       Gtk::Table      path_table;
+       Gtk::Entry      session_raid_entry;
 
        void setup_path_options();
        void add_session_paths ();
        void remove_session_paths ();
-       void native_format_chosen ();
        void raid_path_changed ();
 
        /* fades */
 
        Gtk::VBox        fade_packer;
-       Gtk::CheckButton auto_xfade_button;
-       Gtk::CheckButton xfade_active_button;
-       Gtk::Label       layer_mode_label;
-       Gtk::ComboBoxText layer_mode_combo;
-       Gtk::Label       xfade_model_label;
-       Gtk::ComboBoxText xfade_model_combo;
        Gtk::Adjustment  short_xfade_adjustment;
        Gtk::HScale      short_xfade_slider;
+       Gtk::Adjustment  destructo_xfade_adjustment;
+       Gtk::HScale      destructo_xfade_slider;
 
-       void auto_xfade_clicked ();
-       void xfade_active_clicked ();
-       void layer_mode_chosen ();
-       void xfade_model_chosen ();
        void setup_fade_options();
        void short_xfade_adjustment_changed ();
+       void destructo_xfade_adjustment_changed ();
 
        /* Sync */
 
        Gtk::VBox sync_packer;
 
        Gtk::ComboBoxText slave_type_combo;
-       Gtk::ComboBoxText smpte_fps_combo;
        AudioClock smpte_offset_clock;
        Gtk::CheckButton smpte_offset_negative_button;
 
        void setup_sync_options ();
 
-       void smpte_fps_chosen ();
        void smpte_offset_chosen ();
        void smpte_offset_negative_clicked ();
 
@@ -133,13 +110,29 @@ class OptionEditor : public Gtk::Dialog
        Gtk::RadioButton::Group mmc_button_group;
        Gtk::RadioButton::Group midi_button_group;
 
-       gint port_online_toggled (GdkEventButton*,MIDI::Port*,Gtk::ToggleButton*);
-       gint port_trace_in_toggled (GdkEventButton*,MIDI::Port*,Gtk::ToggleButton*);
-       gint port_trace_out_toggled (GdkEventButton*,MIDI::Port*,Gtk::ToggleButton*);
+       Gtk::Table      midi_port_table;
+       std::vector<Gtk::Widget*> midi_port_table_widgets;
+       Gtk::Adjustment mmc_receive_device_id_adjustment;
+       Gtk::SpinButton mmc_receive_device_id_spinner;
+       Gtk::Adjustment mmc_send_device_id_adjustment;
+       Gtk::SpinButton mmc_send_device_id_spinner;
+       Gtk::Button     add_midi_port_button;
+
+       void add_midi_port ();
+       void remove_midi_port (MIDI::Port*);
+       void redisplay_midi_ports ();
+
+       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*);
-       void mtc_port_chosen (MIDI::Port*,Gtk::RadioButton*);
-       void midi_port_chosen (MIDI::Port*,Gtk::RadioButton*);
+       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*);
+       bool port_removable (MIDI::Port*);
+
+       void mmc_receive_device_id_adjusted ();
+       void mmc_send_device_id_adjusted ();
 
        void map_port_online (MIDI::Port*, Gtk::ToggleButton*);