projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
resolve merge with master (?)
[ardour.git]
/
gtk2_ardour
/
ardour_ui.h
diff --git
a/gtk2_ardour/ardour_ui.h
b/gtk2_ardour/ardour_ui.h
index 7a8a0193f1c5636bc9c2b0d3e93b29de80f32857..f11611821f785c606bb3e22c3c0ca09ee58dc86d 100644
(file)
--- a/
gtk2_ardour/ardour_ui.h
+++ b/
gtk2_ardour/ardour_ui.h
@@
-72,7
+72,6
@@
#include "ardour_window.h"
#include "editing.h"
#include "meterbridge.h"
#include "ardour_window.h"
#include "editing.h"
#include "meterbridge.h"
-#include "nsm.h"
#include "ui_config.h"
#include "enums.h"
#include "visibility_group.h"
#include "ui_config.h"
#include "enums.h"
#include "visibility_group.h"
@@
-83,13
+82,13
@@
class AddRouteDialog;
class AddVideoDialog;
class VideoTimeLine;
class SystemExec;
class AddVideoDialog;
class VideoTimeLine;
class SystemExec;
-class ArdourStartup;
class ArdourKeyboard;
class AudioClock;
class BigClockWindow;
class BundleManager;
class ButtonJoiner;
class ConnectionEditor;
class ArdourKeyboard;
class AudioClock;
class BigClockWindow;
class BundleManager;
class ButtonJoiner;
class ConnectionEditor;
+class EngineControl;
class KeyEditor;
class LocationUIWindow;
class MainClock;
class KeyEditor;
class LocationUIWindow;
class MainClock;
@@
-97,6
+96,7
@@
class Mixer_UI;
class PublicEditor;
class RCOptionEditor;
class RouteParams_UI;
class PublicEditor;
class RCOptionEditor;
class RouteParams_UI;
+class SessionDialog;
class SessionOptionEditor;
class ShuttleControl;
class Splash;
class SessionOptionEditor;
class ShuttleControl;
class Splash;
@@
-104,6
+104,8
@@
class SpeakerDialog;
class ThemeManager;
class TimeInfoBox;
class MidiTracer;
class ThemeManager;
class TimeInfoBox;
class MidiTracer;
+class NSM_Client;
+class LevelMeterHBox;
class GlobalPortMatrixWindow;
class GUIObjectState;
class GlobalPortMatrixWindow;
class GUIObjectState;
@@
-151,7
+153,7
@@
class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
bool get_smart_mode () const;
int get_session_parameters (bool quit_on_cancel, bool should_be_new = false, std::string load_template = "");
bool get_smart_mode () const;
int get_session_parameters (bool quit_on_cancel, bool should_be_new = false, std::string load_template = "");
-
int build_session_from_nsd (
const std::string& session_name, const std::string& session_path);
+
int build_session_from_dialog (SessionDialog&,
const std::string& session_name, const std::string& session_path);
bool ask_about_loading_existing_session (const std::string& session_path);
/// @return true if session was successfully unloaded.
bool ask_about_loading_existing_session (const std::string& session_path);
/// @return true if session was successfully unloaded.
@@
-263,7
+265,7
@@
class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
session_add_midi_route (false);
}*/
session_add_midi_route (false);
}*/
-
int create
_engine ();
+
void attach_to
_engine ();
void post_engine ();
gint exit_on_main_window_close (GdkEventAny *);
void post_engine ();
gint exit_on_main_window_close (GdkEventAny *);
@@
-281,8
+283,15
@@
class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
void get_process_buffers ();
void drop_process_buffers ();
void get_process_buffers ();
void drop_process_buffers ();
+ void reset_peak_display ();
+ void reset_route_peak_display (ARDOUR::Route*);
+ void reset_group_peak_display (ARDOUR::RouteGroup*);
+
const std::string& announce_string() const { return _announce_string; }
const std::string& announce_string() const { return _announce_string; }
+ int disconnect_from_engine ();
+ int reconnect_to_engine ();
+
protected:
friend class PublicEditor;
protected:
friend class PublicEditor;
@@
-297,19
+306,17
@@
class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
void reenable_hide_loop_punch_ruler_if_appropriate ();
void toggle_auto_return ();
void toggle_click ();
void reenable_hide_loop_punch_ruler_if_appropriate ();
void toggle_auto_return ();
void toggle_click ();
-
+ void toggle_audio_midi_setup ();
void toggle_session_auto_loop ();
void toggle_session_auto_loop ();
-
void toggle_rc_options_window ();
void toggle_session_options_window ();
private:
void toggle_rc_options_window ();
void toggle_session_options_window ();
private:
- ArdourStartup* _startup;
- ARDOUR::AudioEngine *engine;
- Gtk::Tooltips _tooltips;
+ Gtk::Tooltips _tooltips;
NSM_Client *nsm;
NSM_Client *nsm;
- bool _was_dirty;
- bool _mixer_on_top;
+ bool _was_dirty;
+ bool _mixer_on_top;
+ bool first_time_engine_run;
void goto_editor_window ();
void goto_mixer_window ();
void goto_editor_window ();
void goto_mixer_window ();
@@
-323,8
+330,7
@@
class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
static ARDOUR_UI *theArdourUI;
static ARDOUR_UI *theArdourUI;
- void startup ();
- void shutdown ();
+ int starting ();
int ask_about_saving_session (const std::vector<std::string>& actions);
int ask_about_saving_session (const std::vector<std::string>& actions);
@@
-444,6
+450,11
@@
class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
ArdourButton feedback_alert_button;
Gtk::VBox alert_box;
ArdourButton feedback_alert_button;
Gtk::VBox alert_box;
+ Gtk::VBox meter_box;
+ LevelMeterHBox * editor_meter;
+ float editor_meter_max_peak;
+ ArdourButton editor_meter_peak_display;
+ bool editor_meter_peak_button_release (GdkEventButton*);
void solo_blink (bool);
void sync_blink (bool);
void solo_blink (bool);
void sync_blink (bool);
@@
-571,6
+582,7
@@
class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
void snapshot_session (bool switch_to_it);
void rename_session ();
void snapshot_session (bool switch_to_it);
void rename_session ();
+ void setup_order_hint ();
Mixer_UI *mixer;
int create_mixer ();
Mixer_UI *mixer;
int create_mixer ();
@@
-590,6
+602,7
@@
class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
WM::Proxy<About> about;
WM::Proxy<LocationUIWindow> location_ui;
WM::Proxy<RouteParams_UI> route_params;
WM::Proxy<About> about;
WM::Proxy<LocationUIWindow> location_ui;
WM::Proxy<RouteParams_UI> route_params;
+ WM::Proxy<EngineControl> audio_midi_setup;
/* Windows/Dialogs that require a creator method */
/* Windows/Dialogs that require a creator method */
@@
-657,10
+670,6
@@
class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
int pending_state_dialog ();
int sr_mismatch_dialog (ARDOUR::framecnt_t, ARDOUR::framecnt_t);
int pending_state_dialog ();
int sr_mismatch_dialog (ARDOUR::framecnt_t, ARDOUR::framecnt_t);
- void disconnect_from_jack ();
- void reconnect_to_jack ();
- void set_jack_buffer_size (ARDOUR::pframes_t);
-
Gtk::MenuItem* jack_disconnect_item;
Gtk::MenuItem* jack_reconnect_item;
Gtk::Menu* jack_bufsize_menu;
Gtk::MenuItem* jack_disconnect_item;
Gtk::MenuItem* jack_reconnect_item;
Gtk::Menu* jack_bufsize_menu;
@@
-684,7
+693,6
@@
class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
bool first_idle ();
bool first_idle ();
- void no_memory_warning ();
void check_memory_locking ();
bool check_audioengine();
void check_memory_locking ();
bool check_audioengine();
@@
-700,6
+708,7
@@
class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
void loading_message (const std::string& msg);
PBD::ScopedConnectionList forever_connections;
void loading_message (const std::string& msg);
PBD::ScopedConnectionList forever_connections;
+ PBD::ScopedConnection halt_connection;
void step_edit_status_change (bool);
void step_edit_status_change (bool);
@@
-736,6
+745,8
@@
class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
std::string _announce_string;
void check_announcements ();
std::string _announce_string;
void check_announcements ();
+
+ int do_audio_midi_setup (uint32_t);
};
#endif /* __ardour_gui_h__ */
};
#endif /* __ardour_gui_h__ */