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 1331d3126efee35f14fff43c51973988cfb0fdfd..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__
@@ -33,8 +32,6 @@
 #include <gtkmm/radiobutton.h>
 #include <gtkmm/comboboxtext.h>
 
-#include <gtkmm2ext/pathlist.h>
-
 #include <ardour/session.h>
 
 #include "ardour_dialog.h"
@@ -75,13 +72,10 @@ class OptionEditor : public Gtk::Dialog
        Gtk::Table      path_table;
        Gtk::Entry      session_raid_entry;
 
-       Gtkmm2ext::PathList sfdb_path_view;
-
        void setup_path_options();
        void add_session_paths ();
        void remove_session_paths ();
        void raid_path_changed ();
-       void sfdb_paths_changed ();
 
        /* fades */
 
@@ -100,13 +94,11 @@ class OptionEditor : public Gtk::Dialog
        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 ();
 
@@ -118,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*);