fixes for crossfade views, crossfades and undo/redo. added default crossfade settings...

[ardour.git] / gtk2_ardour / ardour_ui.h

diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h
index ebb5c7683860e5e0bd078f8386dabb41dddb58e6..4b03352bb6518edc9fc4d78d114254deaa2b1b7a 100644 (file)
--- a/gtk2_ardour/ardour_ui.h
+++ b/gtk2_ardour/ardour_ui.h
@@ -112,11 +112,11 @@ class ARDOUR_UI : public Gtkmm2ext::UI
        int build_session (const string & path, const string & snapshot, 
                           uint32_t ctl_chns, 
                           uint32_t master_chns,
-                          ARDOUR::Session::AutoConnectOption input_connect,
-                          ARDOUR::Session::AutoConnectOption output_connect,
+                          ARDOUR::AutoConnectOption input_connect,
+                          ARDOUR::AutoConnectOption output_connect,
                           uint32_t nphysin,
                           uint32_t nphysout,
-                          jack_nframes_t initial_length);
+                          nframes_t initial_length);
        bool session_is_new() const { return _session_is_new; }
 
        ARDOUR::Session* the_session() { return session; }
@@ -159,7 +159,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI
        static sigc::signal<void,bool> Blink;
        static sigc::signal<void>      RapidScreenUpdate;
        static sigc::signal<void>      SuperRapidScreenUpdate;
-       static sigc::signal<void,jack_nframes_t> Clock;
+       static sigc::signal<void,nframes_t> Clock;
 
        /* this is a helper function to centralize the (complex) logic for
           blinking rec-enable buttons.
@@ -179,7 +179,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI
        void save_ardour_state ();
        gboolean configure_handler (GdkEventConfigure* conf);
 
-       void do_transport_locate (jack_nframes_t position);
+       void do_transport_locate (nframes_t position);
        void halt_on_xrun_message ();
 
        AudioClock primary_clock;
@@ -193,8 +193,8 @@ class ARDOUR_UI : public Gtkmm2ext::UI
                session_add_audio_route (true, input_channels, output_channels, mode, how_many);
        }
 
-       void session_add_audio_bus (int input_channels, int32_t output_channels) {
-               session_add_audio_route (false, input_channels, output_channels, ARDOUR::Normal, 1);
+       void session_add_audio_bus (int input_channels, int32_t output_channels, uint32_t how_many) {
+               session_add_audio_route (false, input_channels, output_channels, ARDOUR::Normal, how_many);
        }
 
        void session_add_midi_track ();
@@ -371,16 +371,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI
 
        void sync_option_changed ();
        void toggle_time_master ();
-
-       enum ShuttleBehaviour {
-               Sprung,
-               Wheel
-       };
-
-       enum ShuttleUnits {
-               Percentage,
-               Semitones
-       };
+       void toggle_video_sync ();
 
        Gtk::DrawingArea  shuttle_box;
        Gtk::EventBox     speed_display_box;
@@ -389,8 +380,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI
        Gtk::ComboBoxText shuttle_style_button;
        Gtk::Menu*        shuttle_unit_menu;
        Gtk::Menu*        shuttle_style_menu;
-       ShuttleBehaviour  shuttle_behaviour;
-       ShuttleUnits      shuttle_units;
        float             shuttle_max_speed;
        Gtk::Menu*        shuttle_context_menu;
 
@@ -398,8 +387,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI
        void show_shuttle_context_menu ();
        void shuttle_style_changed();
        void shuttle_unit_clicked ();
-       void set_shuttle_behaviour (ShuttleBehaviour);
-       void set_shuttle_units (ShuttleUnits);
        void set_shuttle_max_speed (float);
        void update_speed_display ();
        float last_speed_displayed;
@@ -510,7 +497,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI
 
        Gtk::Label   sample_rate_label;
        Gtk::EventBox sample_rate_box;
-       void update_sample_rate (jack_nframes_t);
+       void update_sample_rate (nframes_t);
 
        gint every_second ();
        gint every_point_one_seconds ();
@@ -524,7 +511,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI
 
        bool _will_create_new_session_automatically;
 
-       NewSessionDialog* m_new_session_dialog;
+       NewSessionDialog* new_session_dialog;
        
        void open_session ();
        void open_recent_session ();
@@ -564,7 +551,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI
        void we_have_dependents ();
        void setup_keybindings ();
        void setup_session_options ();
-       void setup_config_options ();
        
        guint32  last_key_press_time;
 
@@ -638,8 +624,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI
        struct timeval last_peak_grab;
        struct timeval last_shuttle_request;
 
-       void delete_sources_in_the_right_thread (list<ARDOUR::Source*>*);
-
        void editor_display_control_changed (Editing::DisplayControl c);
 
        bool have_disk_overrun_displayed;
@@ -654,7 +638,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI
        
        void disconnect_from_jack ();
        void reconnect_to_jack ();
-       void set_jack_buffer_size (jack_nframes_t);
+       void set_jack_buffer_size (nframes_t);
 
        Gtk::MenuItem* jack_disconnect_item;
        Gtk::MenuItem* jack_reconnect_item;
@@ -669,22 +653,17 @@ class ARDOUR_UI : public Gtkmm2ext::UI
 
        std::vector<std::string> positional_sync_strings;
 
-       void toggle_config_state (const char* group, const char* action, void (ARDOUR::Configuration::*set)(bool));
-       void toggle_session_state (const char* group, const char* action, void (ARDOUR::Session::*set)(bool), bool (ARDOUR::Session::*get)(void) const);
-       void toggle_session_state (const char* group, const char* action, sigc::slot<void> theSlot);
        void toggle_send_midi_feedback ();
        void toggle_use_mmc ();
        void toggle_send_mmc ();
        void toggle_use_midi_control();
        void toggle_send_mtc ();
 
-       void toggle_AutoConnectNewTrackInputsToHardware();
-       void toggle_AutoConnectNewTrackOutputsToHardware();
-       void toggle_AutoConnectNewTrackOutputsToMaster();
-       void toggle_ManuallyConnectNewTrackOutputs();
-       void toggle_UseHardwareMonitoring();
-       void toggle_UseSoftwareMonitoring();
-       void toggle_UseExternalMonitoring();
+       void set_input_auto_connect (ARDOUR::AutoConnectOption);
+       void set_output_auto_connect (ARDOUR::AutoConnectOption);
+       void set_solo_model (ARDOUR::SoloModel);
+       void set_monitor_model (ARDOUR::MonitorModel);
+
        void toggle_StopPluginsWithTransport();
        void toggle_DoNotRunPluginsWhileRecording();
        void toggle_VerifyRemoveLastCapture();
@@ -693,16 +672,24 @@ class ARDOUR_UI : public Gtkmm2ext::UI
        void toggle_GainReduceFastTransport();
        void toggle_LatchedSolo();
        void toggle_SoloViaBus();
-       void toggle_AutomaticallyCreateCrossfades();
-       void toggle_UnmuteNewFullCrossfades();
        void toggle_LatchedRecordEnable ();
 
        void mtc_port_changed ();
-       void map_some_session_state (const char* group, const char* action, bool (ARDOUR::Session::*get)() const);
-       void queue_session_control_changed (ARDOUR::Session::ControlType t);
-       void session_control_changed (ARDOUR::Session::ControlType t);
+       void map_solo_model ();
+       void map_monitor_model ();
+       void map_file_header_format ();
+       void map_file_data_format ();
+       void map_input_auto_connect ();
+       void map_output_auto_connect ();
+       void parameter_changed (const char*);
+
+       void set_meter_hold (ARDOUR::MeterHold);
+       void set_meter_falloff (ARDOUR::MeterFalloff);
+       void map_meter_hold ();
+       void map_meter_falloff ();
 
        void toggle_control_protocol (ARDOUR::ControlProtocolInfo*);
+       void toggle_control_protocol_feedback (ARDOUR::ControlProtocolInfo*, const char* group_name, const char* action_name);
 };
 
 #endif /* __ardour_gui_h__ */