projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'waveview_caching_for_upstream' of https://github.com/nmains/ardour...
[ardour.git]
/
gtk2_ardour
/
ardour_ui.h
diff --git
a/gtk2_ardour/ardour_ui.h
b/gtk2_ardour/ardour_ui.h
index 99e864e7633a342fc0ecc2ef5e50f091f7632759..dfb2b72a1ebafee391e21c3a27256faf6ff496c6 100644
(file)
--- a/
gtk2_ardour/ardour_ui.h
+++ b/
gtk2_ardour/ardour_ui.h
@@
-38,7
+38,6
@@
#include "pbd/xml++.h"
#include "pbd/controllable.h"
#include "pbd/xml++.h"
#include "pbd/controllable.h"
-#include "pbd/system_exec.h"
#include <gtkmm/box.h>
#include <gtkmm/frame.h>
#include <gtkmm/label.h>
#include <gtkmm/box.h>
#include <gtkmm/frame.h>
#include <gtkmm/label.h>
@@
-64,6
+63,7
@@
#include "ardour/utils.h"
#include "ardour/plugin.h"
#include "ardour/session_handle.h"
#include "ardour/utils.h"
#include "ardour/plugin.h"
#include "ardour/session_handle.h"
+#include "ardour/system_exec.h"
#include "video_timeline.h"
#include "video_timeline.h"
@@
-174,6
+174,7
@@
class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
void new_midi_tracer_window ();
void toggle_editing_space();
void new_midi_tracer_window ();
void toggle_editing_space();
+ void toggle_mixer_space();
void toggle_keep_tearoffs();
Gtk::Tooltips& tooltips() { return _tooltips; }
void toggle_keep_tearoffs();
Gtk::Tooltips& tooltips() { return _tooltips; }
@@
-626,7
+627,7
@@
class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
static UIConfiguration *ui_config;
static UIConfiguration *ui_config;
-
PBD
::SystemExec *video_server_process;
+
ARDOUR
::SystemExec *video_server_process;
void handle_locations_change (ARDOUR::Location*);
void handle_locations_change (ARDOUR::Location*);
@@
-666,9
+667,12
@@
class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
void disk_speed_dialog_gone (int ignored_response, Gtk::MessageDialog*);
void disk_overrun_handler ();
void disk_underrun_handler ();
void disk_speed_dialog_gone (int ignored_response, Gtk::MessageDialog*);
void disk_overrun_handler ();
void disk_underrun_handler ();
+ void gui_idle_handler ();
void cancel_plugin_scan ();
void cancel_plugin_scan ();
- void plugin_scan_dialog (std::string type, std::string plugin);
+ void cancel_plugin_timeout ();
+ void plugin_scan_dialog (std::string type, std::string plugin, bool);
+ void plugin_scan_timeout (int);
void session_format_mismatch (std::string, std::string);
void session_format_mismatch (std::string, std::string);