X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Foption_editor.h;h=7754b0555dc747b9e25dc23f616c84199800a424;hb=1315ee3dff1e4966ab28bd47e81b5f003cac6e40;hp=68407246e04f272ad25ac8538abf0e7eb7abd1c0;hpb=f8f84973309fd44de4b693f3fe85551395024c10;p=ardour.git

diff --git a/gtk2_ardour/option_editor.h b/gtk2_ardour/option_editor.h
index 68407246e0..7754b0555d 100644
--- 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,8 +72,6 @@ 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 ();
@@ -99,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 ();
 
@@ -117,14 +110,19 @@ 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::Adjustment mmc_device_id_adjustment;
+	Gtk::SpinButton mmc_device_id_spinner;
+
+	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_device_id_adjusted ();
+
 	void map_port_online (MIDI::Port*, Gtk::ToggleButton*);
 
 	void setup_midi_options();