first pass hiding/rearrangement of UI elements related to trx

[ardour.git] / gtk2_ardour / ardour_ui_dialogs.cc

diff --git a/gtk2_ardour/ardour_ui_dialogs.cc b/gtk2_ardour/ardour_ui_dialogs.cc
index bca762569fa269cef640157399b0c23f57916404..35dbe3cfc9702da1038bfecdd915b22a2c0ef022 100644 (file)
--- a/gtk2_ardour/ardour_ui_dialogs.cc
+++ b/gtk2_ardour/ardour_ui_dialogs.cc
@@ -23,9 +23,10 @@
    This is to cut down on the compile times.  It also helps with my sanity.
 */
 
-#include "ardour/session.h"
 #include "ardour/audioengine.h"
 #include "ardour/automation_watch.h"
+#include "ardour/profile.h"
+#include "ardour/session.h"
 
 #ifdef interface
 #undef interface
@@ -72,7 +73,6 @@ ARDOUR_UI::set_session (Session *s)
 {
        SessionHandlePtr::set_session (s);
 
-
        if (!_session) {
                WM::Manager::instance().set_session (s);
                /* Session option editor cannot exist across change-of-session */
@@ -165,10 +165,6 @@ ARDOUR_UI::set_session (Session *s)
        _session->locations()->removed.connect (_session_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::handle_locations_change, this, _1), gui_context());
        _session->config.ParameterChanged.connect (_session_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::session_parameter_changed, this, _1), gui_context ());
 
-#ifdef HAVE_JACK_SESSION
-       engine->JackSessionEvent.connect (*_session, MISSING_INVALIDATOR, boost::bind (&Session::jack_session_event, _session, _1), gui_context());
-#endif
-
        /* Clocks are on by default after we are connected to a session, so show that here.
        */
 
@@ -194,6 +190,11 @@ ARDOUR_UI::set_session (Session *s)
 
        update_format ();
 
+       if (meter_box.get_parent()) {
+               transport_tearoff_hbox.remove (meter_box);
+               transport_tearoff_hbox.remove (editor_meter_peak_display);
+       }
+
        if (editor_meter) {
                meter_box.remove(*editor_meter);
                delete editor_meter;
@@ -201,14 +202,24 @@ ARDOUR_UI::set_session (Session *s)
                editor_meter_peak_display.hide();
        }
 
-       if (_session && _session->master_out()) {
-               editor_meter = new LevelMeterHBox(_session);
-               editor_meter->set_meter (_session->master_out()->shared_peak_meter().get());
-               editor_meter->clear_meters();
-               editor_meter->set_type (_session->master_out()->meter_type());
-               editor_meter->setup_meters (30, 12, 6);
-               editor_meter->show();
-               meter_box.pack_start(*editor_meter);
+       if (meter_box.get_parent()) {
+               transport_tearoff_hbox.remove (meter_box);
+               transport_tearoff_hbox.remove (editor_meter_peak_display);
+       }
+
+       if (_session && 
+           _session->master_out() && 
+           _session->master_out()->n_outputs().n(DataType::AUDIO) > 0) {
+
+               if (!ARDOUR::Profile->get_trx()) {
+                       editor_meter = new LevelMeterHBox(_session);
+                       editor_meter->set_meter (_session->master_out()->shared_peak_meter().get());
+                       editor_meter->clear_meters();
+                       editor_meter->set_type (_session->master_out()->meter_type());
+                       editor_meter->setup_meters (30, 12, 6);
+                       editor_meter->show();
+                       meter_box.pack_start(*editor_meter);
+               }
 
                ArdourMeter::ResetAllPeakDisplays.connect (sigc::mem_fun(*this, &ARDOUR_UI::reset_peak_display));
                ArdourMeter::ResetRoutePeakDisplays.connect (sigc::mem_fun(*this, &ARDOUR_UI::reset_route_peak_display));
@@ -223,15 +234,13 @@ ARDOUR_UI::set_session (Session *s)
                editor_meter_max_peak = -INFINITY;
                editor_meter_peak_display.signal_button_release_event().connect (sigc::mem_fun(*this, &ARDOUR_UI::editor_meter_peak_button_release), false);
 
-               if (Config->get_show_editor_meter()) {
+               if (Config->get_show_editor_meter() && !ARDOUR::Profile->get_trx()) {
+                       transport_tearoff_hbox.pack_start (meter_box, false, false);
+                       transport_tearoff_hbox.pack_start (editor_meter_peak_display, false, false);
                        meter_box.show();
                        editor_meter_peak_display.show();
-               } else {
-                       meter_box.hide();
-                       editor_meter_peak_display.hide();
                }
        }
-
 }
 
 int
@@ -283,7 +292,10 @@ ARDOUR_UI::unload_session (bool hide_stuff)
        rec_button.set_sensitive (false);
 
        WM::Manager::instance().set_session ((ARDOUR::Session*) 0);
-       ARDOUR_UI::instance()->video_timeline->close_session();
+
+       if (ARDOUR_UI::instance()->video_timeline) {
+               ARDOUR_UI::instance()->video_timeline->close_session();
+       }
 
        stop_blinking ();
        stop_clocking ();
@@ -340,7 +352,7 @@ ARDOUR_UI::goto_mixer_window ()
                screen = Gdk::Screen::get_default();
        }
        
-       if (screen && screen->get_height() < 700) {
+       if (g_getenv ("ARDOUR_LOVES_STUPID_TINY_SCREENS") == 0 && screen && screen->get_height() < 700) {
                Gtk::MessageDialog msg (_("This screen is not tall enough to display the mixer window"));
                msg.run ();
                return;
@@ -565,3 +577,18 @@ ARDOUR_UI::editor_meter_peak_button_release (GdkEventButton* ev)
        }
        return true;
 }
+
+void
+ARDOUR_UI::toggle_mixer_space()
+{
+       Glib::RefPtr<Action> act = ActionManager::get_action ("Common", "ToggleMaximalMixer");
+
+       if (act) {
+               Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
+               if (tact->get_active()) {
+                       mixer->maximise_mixer_space ();
+               } else {
+                       mixer->restore_mixer_space ();
+               }
+       }
+}