mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-15 19:16:40 +01:00
merge from 2.0-ongoing by hand, minus key binding editor
git-svn-id: svn://localhost/ardour2/trunk@2539 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
aa1f736a65
commit
f7f9d6fdc4
134 changed files with 6894 additions and 2403 deletions
|
|
@ -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 */
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue