Fix problems with summary when the session start marker is not at zero (#2924)

[ardour.git] / gtk2_ardour / ardour_ui.h

diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h
index eb161d8e2d35dbf475deee285e9fcb01ad049355..a05cca96bd7ce4557a140c6e3fbfd82a34c687c1 100644 (file)
--- a/gtk2_ardour/ardour_ui.h
+++ b/gtk2_ardour/ardour_ui.h
@@ -59,40 +59,42 @@
 #include <gtkmm2ext/stateful_button.h>
 #include <gtkmm2ext/bindable_button.h>
 #include "ardour/ardour.h"
-#include "ardour/session.h"
 #include "ardour/types.h"
+#include "ardour/utils.h"
 
 #include "audio_clock.h"
 #include "ardour_dialog.h"
 #include "editing.h"
 #include "ui_config.h"
 
+class About;
+class AddRouteDialog;
+class ArdourStartup;
 class AudioClock;
-class PublicEditor;
-class Keyboard;
-class RCOptionEditor;
-class SessionOptionEditor;
+class BundleManager;
+class ConnectionEditor;
 class KeyEditor;
+class Keyboard;
+class LocationUIWindow;
 class Mixer_UI;
-class ConnectionEditor;
+class PublicEditor;
+class RCOptionEditor;
 class RouteParams_UI;
-class About;
+class SessionOptionEditor;
 class Splash;
-class AddRouteDialog;
-class LocationUI;
 class ThemeManager;
-class BundleManager;
-class ArdourStartup;
 
 namespace Gtkmm2ext {
        class TearOff;
 }
 
 namespace ARDOUR {
-       class Route;
-       class Port;
-       class IO;
        class ControlProtocolInfo;
+       class IO;
+       class Port;
+       class Route;
+       class RouteGroup;
+       class Location;
 }
 
 extern sigc::signal<void>  ColorsChanged;
@@ -104,7 +106,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI
        ARDOUR_UI (int *argcp, char **argvp[]);
        ~ARDOUR_UI();
 
-       void run_startup (bool should_be_new);
+       bool run_startup (bool should_be_new);
 
        void show ();
        bool shown() { return shown_flag; }
@@ -140,7 +142,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI
                _will_create_new_session_automatically = yn;
        }
 
-       int get_session_parameters (bool should_be_new = false);
+       int get_session_parameters (bool quit_on_cancel, bool should_be_new = false);
        void parse_cmdline_path (const Glib::ustring& cmdline_path, Glib::ustring& session_name, Glib::ustring& session_path, bool& existing_session);
        int  load_cmdline_session (const Glib::ustring& session_name, const Glib::ustring& session_path, bool& existing_session);
        int  build_session_from_nsd (const Glib::ustring& session_name, const Glib::ustring& session_path);
@@ -200,11 +202,11 @@ class ARDOUR_UI : public Gtkmm2ext::UI
        void add_route (Gtk::Window* float_window);
 
        void session_add_audio_track (int input_channels, int32_t output_channels, ARDOUR::TrackMode mode, ARDOUR::RouteGroup* route_group, uint32_t how_many) {
-               session_add_audio_route (true, input_channels, output_channels, mode, route_group, how_many);
+               session_add_audio_route (true, false, input_channels, output_channels, mode, route_group, how_many);
        }
 
-       void session_add_audio_bus (int input_channels, int32_t output_channels, ARDOUR::RouteGroup* route_group, uint32_t how_many) {
-               session_add_audio_route (false, input_channels, output_channels, ARDOUR::Normal, route_group, how_many);
+       void session_add_audio_bus (bool aux,  int input_channels, int32_t output_channels, ARDOUR::RouteGroup* route_group, uint32_t how_many) {
+               session_add_audio_route (false, aux, input_channels, output_channels, ARDOUR::Normal, route_group, how_many);
        }
 
        void session_add_midi_track (ARDOUR::RouteGroup* route_group, uint32_t how_many) {
@@ -239,6 +241,8 @@ class ARDOUR_UI : public Gtkmm2ext::UI
        bool ignore_dual_punch;
        void toggle_punch_in ();
        void toggle_punch_out ();
+       void show_loop_punch_ruler_and_disallow_hide ();
+       void reenable_hide_loop_punch_ruler_if_appropriate ();
        void toggle_auto_return ();
        void toggle_click ();
 
@@ -278,7 +282,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI
        void update_autosave();
        sigc::connection _autosave_connection;
 
-       void queue_transport_change ();
        void map_transport_state ();
        int32_t do_engine_start ();
 
@@ -382,9 +385,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI
        BindableButton play_selection_button;
        BindableButton rec_button;
 
-       Gtk::ComboBoxText sync_option_combo;
-
-       void sync_option_changed ();
+       void toggle_external_sync ();
        void toggle_time_master ();
        void toggle_video_sync ();
 
@@ -424,6 +425,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI
        Gtkmm2ext::StatefulToggleButton auto_input_button;
        Gtkmm2ext::StatefulToggleButton click_button;
        Gtkmm2ext::StatefulToggleButton time_master_button;
+       Gtkmm2ext::StatefulToggleButton sync_button;
 
        Gtk::ToggleButton auditioning_alert_button;
        Gtk::ToggleButton solo_alert_button;
@@ -431,6 +433,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI
        Gtk::VBox alert_box;
 
        void solo_blink (bool);
+       void sync_blink (bool);
        void audition_blink (bool);
 
        void soloing_changed (bool);
@@ -525,7 +528,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI
        void edit_metadata ();
        void import_metadata ();
 
-       void session_add_audio_route (bool disk, int32_t input_channels, int32_t output_channels, ARDOUR::TrackMode mode, ARDOUR::RouteGroup *, uint32_t how_many);
+       void session_add_audio_route (bool disk, bool aux, int32_t input_channels, int32_t output_channels, ARDOUR::TrackMode mode, ARDOUR::RouteGroup *, uint32_t how_many);
        void session_add_midi_route (bool disk, ARDOUR::RouteGroup *, uint32_t how_many);
 
        void set_transport_sensitivity (bool);
@@ -544,11 +547,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI
        void transport_forward (int option);
        void transport_rewind (int option);
        void transport_loop ();
-
-       void transport_rolling ();
-       void transport_rewinding ();
-       void transport_forwarding ();
-       void transport_stopped ();
+       void toggle_roll (bool with_abort, bool roll_out_of_bounded_mode);
 
        bool _session_is_new;
        void connect_to_session (ARDOUR::Session *);
@@ -573,9 +572,9 @@ class ARDOUR_UI : public Gtkmm2ext::UI
        BundleManager *bundle_manager;
        void create_bundle_manager ();
 
-       LocationUI *location_ui;
-       int         create_location_ui ();
-       void        handle_locations_change (ARDOUR::Location*);
+       LocationUIWindow *location_ui;
+       int               create_location_ui ();
+       void              handle_locations_change (ARDOUR::Location*);
 
        static UIConfiguration *ui_config;
        ThemeManager *theme_manager;
@@ -616,8 +615,8 @@ class ARDOUR_UI : public Gtkmm2ext::UI
 
        Gtk::MenuItem *cleanup_item;
 
-       void display_cleanup_results (ARDOUR::Session::cleanup_report& rep, const gchar* list_title,
-                                     const std::string& plural_msg, const std::string& singular_msg);
+       void display_cleanup_results (ARDOUR::CleanupReport& rep, const gchar* list_title,
+                                     const std::string& plural_msg, const std::string& singular_msg);
        void cleanup ();
        void flush_trash ();
 
@@ -672,7 +671,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI
 
        void toggle_use_osc ();
 
-       void mtc_port_changed ();
        void parameter_changed (std::string);
 
        bool first_idle ();
@@ -684,7 +682,8 @@ class ARDOUR_UI : public Gtkmm2ext::UI
        void audioengine_setup ();
 
        void display_message (const char *prefix, gint prefix_len,
-                             Glib::RefPtr<Gtk::TextBuffer::Tag> ptag, Glib::RefPtr<Gtk::TextBuffer::Tag> mtag, const char *msg);
+                       Glib::RefPtr<Gtk::TextBuffer::Tag> ptag, Glib::RefPtr<Gtk::TextBuffer::Tag> mtag,
+                       const char *msg);
        Gtk::Label status_bar_label;
        Gtk::ToggleButton error_log_button;