remove UUIDs as implemention of PBD::ID, use static counter (not finished - counter...

[ardour.git] / gtk2_ardour / option_editor.h

diff --git a/gtk2_ardour/option_editor.h b/gtk2_ardour/option_editor.h
index cf70e65a36968e98eca1e097de53793fb6873d25..b9690b02e2d07572fd862df7c84ecda4b5036c37 100644 (file)
--- a/gtk2_ardour/option_editor.h
+++ b/gtk2_ardour/option_editor.h
@@ -72,7 +72,6 @@ class OptionEditor : public Gtk::Dialog
 
        Gtk::Table              path_table;
        Gtk::Entry              session_raid_entry;
-       Gtk::ComboBoxText       native_format_combo;
 
        struct SoundFilePathColumns : public Gtk::TreeModel::ColumnRecord {
            public:
@@ -88,27 +87,19 @@ class OptionEditor : public Gtk::Dialog
        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 */
 
@@ -137,9 +128,9 @@ class OptionEditor : public Gtk::Dialog
        gint port_trace_in_toggled (GdkEventButton*,MIDI::Port*,Gtk::ToggleButton*);
        gint port_trace_out_toggled (GdkEventButton*,MIDI::Port*,Gtk::ToggleButton*);
        
-       bool mmc_port_chosen (GdkEventButton*,MIDI::Port*,Gtk::RadioButton*);
-       bool mtc_port_chosen (GdkEventButton*,MIDI::Port*,Gtk::RadioButton*);
-       bool midi_port_chosen (GdkEventButton*,MIDI::Port*,Gtk::RadioButton*);
+       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 map_port_online (MIDI::Port*, Gtk::ToggleButton*);