diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2007-10-11 22:07:47 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2007-10-11 22:07:47 +0000 |
| commit | f7f9d6fdc40248b190ec9c6e1a886261d55777ae (patch) | |
| tree | 080723e9dc35a66013b37acbafc67a6afa929302 /gtk2_ardour/option_editor.h | |
| parent | aa1f736a651376534acaa2268b65d42a3786fff7 (diff) | |
merge from 2.0-ongoing by hand, minus key binding editor
git-svn-id: svn://localhost/ardour2/trunk@2539 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/option_editor.h')
| -rw-r--r-- | gtk2_ardour/option_editor.h | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/gtk2_ardour/option_editor.h b/gtk2_ardour/option_editor.h index a234f1d752..82bb4db79b 100644 --- a/gtk2_ardour/option_editor.h +++ b/gtk2_ardour/option_editor.h @@ -45,7 +45,7 @@ class IOSelector; class GainMeter; class PannerUI; -class OptionEditor : public Gtk::Dialog +class OptionEditor : public ArdourDialog { public: OptionEditor (ARDOUR_UI&, PublicEditor&, Mixer_UI&); @@ -66,6 +66,7 @@ class OptionEditor : public Gtk::Dialog gint wm_close (GdkEventAny *); bool focus_out_event_handler (GdkEventFocus*, void (OptionEditor::*pmf)()); + void parameter_changed (const char* name); /* paths */ @@ -77,18 +78,32 @@ class OptionEditor : public Gtk::Dialog void remove_session_paths (); void raid_path_changed (); - /* fades */ + /* misc */ + + Gtk::VBox misc_packer; - Gtk::VBox fade_packer; Gtk::Adjustment short_xfade_adjustment; Gtk::HScale short_xfade_slider; Gtk::Adjustment destructo_xfade_adjustment; Gtk::HScale destructo_xfade_slider; - void setup_fade_options(); + void setup_misc_options(); + void short_xfade_adjustment_changed (); void destructo_xfade_adjustment_changed (); + Gtk::Adjustment history_depth; + Gtk::Adjustment saved_history_depth; + Gtk::SpinButton history_depth_spinner; + Gtk::SpinButton saved_history_depth_spinner; + Gtk::CheckButton limit_history_button; + Gtk::CheckButton save_history_button; + + void history_depth_changed(); + void saved_history_depth_changed(); + void save_history_toggled (); + void limit_history_toggled (); + /* Sync */ Gtk::VBox sync_packer; @@ -96,11 +111,13 @@ class OptionEditor : public Gtk::Dialog Gtk::ComboBoxText slave_type_combo; AudioClock smpte_offset_clock; Gtk::CheckButton smpte_offset_negative_button; + Gtk::CheckButton synced_timecode_button; void setup_sync_options (); void smpte_offset_chosen (); void smpte_offset_negative_clicked (); + void synced_timecode_toggled (); /* MIDI */ |