major design changes: use glib event loop for MIDI thread/UI; rework design of BaseUI...

[ardour.git] / gtk2_ardour / ardour_ui.cc

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 4ca94f1cd49fab92d9eba3349417a051ca588e28..a4675f4a212b92384e42a211b8bfaf5f4ecf21ce 100644 (file)
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -44,13 +44,13 @@
 #include "pbd/memento_command.h"
 #include "pbd/file_utils.h"
 
-#include <gtkmm2ext/gtk_ui.h>
-#include <gtkmm2ext/utils.h>
-#include <gtkmm2ext/click_box.h>
-#include <gtkmm2ext/fastmeter.h>
-#include <gtkmm2ext/stop_signal.h>
-#include <gtkmm2ext/popup.h>
-#include <gtkmm2ext/window_title.h>
+#include "gtkmm2ext/gtk_ui.h"
+#include "gtkmm2ext/utils.h"
+#include "gtkmm2ext/click_box.h"
+#include "gtkmm2ext/fastmeter.h"
+#include "gtkmm2ext/stop_signal.h"
+#include "gtkmm2ext/popup.h"
+#include "gtkmm2ext/window_title.h"
 
 #include "midi++/manager.h"
 
@@ -95,6 +95,7 @@ typedef uint64_t microseconds_t;
 #include "route_time_axis.h"
 #include "startup.h"
 #include "engine_dialog.h"
+#include "processor_box.h"
 
 #include "i18n.h"
 
@@ -114,12 +115,12 @@ sigc::signal<void,nframes_t, bool, nframes_t> ARDOUR_UI::Clock;
 
 ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
 
-       : Gtkmm2ext::UI (X_("Ardour"), argcp, argvp),
+       : Gtkmm2ext::UI (X_("gui"), argcp, argvp),
 
-         primary_clock (X_("primary"), false, X_("TransportClockDisplay"), true, false, true),
-         secondary_clock (X_("secondary"), false, X_("SecondaryClockDisplay"), true, false, true),
-         preroll_clock (X_("preroll"), false, X_("PreRollClock"), true, true),
-         postroll_clock (X_("postroll"), false, X_("PostRollClock"), true, true),
+         primary_clock (X_("primary"), false, X_("TransportClockDisplay"), true, true, false, true),
+         secondary_clock (X_("secondary"), false, X_("SecondaryClockDisplay"), true, true, false, true),
+         preroll_clock (X_("preroll"), false, X_("PreRollClock"), true, false, true),
+         postroll_clock (X_("postroll"), false, X_("PostRollClock"), true, false, true),
 
          /* preroll stuff */
 
@@ -128,7 +129,7 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
 
          /* big clock */
 
-         big_clock (X_("bigclock"), false, "BigClockNonRecording", true, false, true),
+         big_clock (X_("bigclock"), false, "BigClockNonRecording", true, true, false, true),
 
          /* transport */
 
@@ -262,6 +263,8 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
 
                GainMeter::setup_slider_pix ();
                RouteTimeAxisView::setup_slider_pix ();
+               SendProcessorEntry::setup_slider_pix ();
+               SessionEvent::create_per_thread_pool ("GUI", 512);
 
        } catch (failed_constructor& err) {
                error << _("could not initialize Ardour.") << endmsg;
@@ -271,7 +274,12 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
 
        /* we like keyboards */
 
-       keyboard = new Keyboard;
+       keyboard = new ArdourKeyboard;
+
+       XMLNode* node = ARDOUR_UI::instance()->keyboard_settings();
+       if (node) {
+               keyboard->set_state (*node, Stateful::loading_state_version);
+       }
 
        reset_dpi();
 
@@ -294,11 +302,14 @@ ARDOUR_UI::run_startup (bool should_be_new)
 
        main().run();
 
-       /* we don't return here until the startup assistant is finished */
-
        _startup->hide ();
 
-       return _startup->applying ();
+       switch (_startup->response()) {
+       case RESPONSE_OK:
+               return true;
+       default:
+               return false;
+       }
 }
 
 int
@@ -773,7 +784,15 @@ If you still wish to quit, please use the\n\n\
                        }
                }
 
-               session->set_deletion_in_progress ();
+               second_connection.disconnect ();
+               point_one_second_connection.disconnect ();
+               point_oh_five_second_connection.disconnect ();
+               point_zero_one_second_connection.disconnect();
+               
+               // session->set_deletion_in_progress ();
+               session->remove_pending_capture_state ();
+               delete session;
+               session = 0;
        }
 
        ArdourDialog::close_all_dialogs ();
@@ -1380,13 +1399,12 @@ ARDOUR_UI::transport_goto_start ()
        if (session) {
                session->goto_start();
 
-
                /* force displayed area in editor to start no matter
                   what "follow playhead" setting is.
                */
 
                if (editor) {
-                       editor->reset_x_origin (session->current_start_frame());
+                       editor->center_screen (session->current_start_frame ());
                }
        }
 }
@@ -1431,7 +1449,7 @@ ARDOUR_UI::transport_goto_wallclock ()
                */
 
                if (editor) {
-                       editor->reset_x_origin (frames - (editor->current_page_frames()/2));
+                       editor->center_screen (frames);
                }
        }
 }
@@ -1440,7 +1458,7 @@ void
 ARDOUR_UI::transport_goto_end ()
 {
        if (session) {
-               nframes_t frame = session->current_end_frame();
+               nframes_t const frame = session->current_end_frame();
                session->request_locate (frame);
 
                /* force displayed area in editor to start no matter
@@ -1448,7 +1466,7 @@ ARDOUR_UI::transport_goto_end ()
                */
 
                if (editor) {
-                       editor->reset_x_origin (frame);
+                       editor->center_screen (frame);
                }
        }
 }