#include <vector>
+#include <gtkmm/treemodelfilter.h>
+
#include "pbd/convert.h"
#include "ardour/audioengine.h"
#include "add_video_dialog.h"
#include "ardour_ui.h"
#include "big_clock_window.h"
+#include "big_transport_window.h"
#include "bundle_manager.h"
#include "global_port_matrix.h"
#include "gui_object.h"
#include "midi_tracer.h"
#include "mini_timeline.h"
#include "mixer_ui.h"
+#include "plugin_dspload_window.h"
#include "public_editor.h"
#include "processor_box.h"
#include "rc_option_editor.h"
#include "speaker_dialog.h"
#include "splash.h"
#include "sfdb_ui.h"
-#include "theme_manager.h"
#include "time_info_box.h"
#include "timers.h"
+#include "transport_masters_dialog.h"
#include "pbd/i18n.h"
using namespace Glib;
using namespace Gtk;
using namespace Gtkmm2ext;
+using namespace ArdourWidgets;
void
ARDOUR_UI::set_session (Session *s)
{
SessionHandlePtr::set_session (s);
+ transport_ctrl.set_session (s);
+
+ if (big_transport_window) {
+ big_transport_window->set_session (s);
+ }
+
if (!_session) {
WM::Manager::instance().set_session (s);
/* Session option editor cannot exist across change-of-session */
secondary_clock->set_session (s);
big_clock->set_session (s);
video_timeline->set_session (s);
+ lua_script_window->set_session (s);
+ plugin_dsp_load_window->set_session (s);
+ transport_masters_window->set_session (s);
+ rc_option_editor->set_session (s);
/* sensitize menu bar options that are now valid */
ActionManager::set_sensitive (ActionManager::range_sensitive_actions, false);
}
- if (!_session->monitor_out()) {
- Glib::RefPtr<Action> act = ActionManager::get_action (X_("options"), X_("SoloViaBus"));
- if (act) {
- act->set_sensitive (false);
- }
- }
-
/* allow wastebasket flush again */
Glib::RefPtr<Action> act = ActionManager::get_action (X_("Main"), X_("FlushWastebasket"));
ActionManager::set_sensitive (ActionManager::time_selection_sensitive_actions, false);
ActionManager::set_sensitive (ActionManager::track_selection_sensitive_actions, false);
+ ActionManager::set_sensitive (ActionManager::route_selection_sensitive_actions, false);
+ ActionManager::set_sensitive (ActionManager::bus_selection_sensitive_actions, false);
+ ActionManager::set_sensitive (ActionManager::vca_selection_sensitive_actions, false);
+ ActionManager::set_sensitive (ActionManager::stripable_selection_sensitive_actions, false);
ActionManager::set_sensitive (ActionManager::line_selection_sensitive_actions, false);
ActionManager::set_sensitive (ActionManager::point_selection_sensitive_actions, false);
ActionManager::set_sensitive (ActionManager::playlist_selection_sensitive_actions, false);
- rec_button.set_sensitive (true);
-
solo_alert_button.set_active (_session->soloing());
setup_session_options ();
blink_connection = Timers::blink_connect (sigc::mem_fun(*this, &ARDOUR_UI::blink_handler));
_session->SaveSessionRequested.connect (_session_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::save_session_at_its_request, this, _1), gui_context());
+ _session->StateSaved.connect (_session_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::update_title, this), gui_context());
_session->RecordStateChanged.connect (_session_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::record_state_changed, this), gui_context());
- _session->StepEditStatusChange.connect (_session_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::step_edit_status_change, this, _1), gui_context());
_session->TransportStateChange.connect (_session_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::map_transport_state, this), gui_context());
_session->DirtyChanged.connect (_session_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::session_dirty_changed, this), gui_context());
update_format ();
- if (meter_box.get_parent()) {
- transport_hbox.remove (meter_box);
- transport_hbox.remove (editor_meter_peak_display);
+ if (editor_meter_table.get_parent()) {
+ transport_hbox.remove (editor_meter_table);
}
if (editor_meter) {
- meter_box.remove(*editor_meter);
+ editor_meter_table.remove(*editor_meter);
delete editor_meter;
editor_meter = 0;
editor_meter_peak_display.hide();
}
- if (meter_box.get_parent()) {
- transport_hbox.remove (meter_box);
- transport_hbox.remove (editor_meter_peak_display);
+ if (editor_meter_table.get_parent()) {
+ transport_hbox.remove (editor_meter_table);
}
if (_session &&
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->set_meter_type (_session->master_out()->meter_type());
editor_meter->setup_meters (30, 10, 6);
editor_meter->show();
- meter_box.pack_start(*editor_meter);
+ editor_meter->ButtonPress.connect_same_thread (editor_meter_connection, boost::bind (&ARDOUR_UI::editor_meter_button_press, this, _1));
+
+ editor_meter_table.set_spacings(3);
+ editor_meter_table.attach(*editor_meter, 0,1, 0,1, FILL, FILL);
+ editor_meter_table.attach(editor_meter_peak_display, 0,1, 1,2, FILL, EXPAND|FILL);
+
+ editor_meter->show();
+ editor_meter_peak_display.show();
}
ArdourMeter::ResetAllPeakDisplays.connect (sigc::mem_fun(*this, &ARDOUR_UI::reset_peak_display));
editor_meter_peak_display.set_name ("meterbridge peakindicator");
editor_meter_peak_display.unset_flags (Gtk::CAN_FOCUS);
- editor_meter_peak_display.set_size_request (std::max(9.f, rintf(8.f * UIConfiguration::instance().get_ui_scale())), -1);
+ editor_meter_peak_display.set_size_request (-1, std::max(6.f, rintf(5.f * UIConfiguration::instance().get_ui_scale())) );
editor_meter_peak_display.set_corner_radius (3.0);
editor_meter_max_peak = -INFINITY;
}
if (hide_stuff) {
+ close_all_dialogs ();
editor->hide ();
mixer->hide ();
meterbridge->hide ();
fps_connection.disconnect();
if (editor_meter) {
- meter_box.remove(*editor_meter);
+ editor_meter_table.remove(*editor_meter);
delete editor_meter;
editor_meter = 0;
editor_meter_peak_display.hide();
ActionManager::set_sensitive (ActionManager::session_sensitive_actions, false);
- rec_button.set_sensitive (false);
-
WM::Manager::instance().set_session ((ARDOUR::Session*) 0);
if (ARDOUR_UI::instance()->video_timeline) {
blink_connection.disconnect ();
- delete _session;
+ ARDOUR::Session* session_to_delete = _session;
_session = 0;
+ delete session_to_delete;
- session_loaded = false;
-
- update_buffer_load ();
update_title ();
return 0;
}
for (std::vector<std::string>::iterator s = insensitive_action_names.begin(); s != insensitive_action_names.end(); ++s) {
- action = ActionManager::get_action (X_("Common"), (*s).c_str());
+ action = ActionManager::get_action (X_("Common"), (*s).c_str(), false);
if (action) {
action->set_sensitive (false);
}
}
for (std::vector<std::string>::iterator s = sensitive_action_names.begin(); s != sensitive_action_names.end(); ++s) {
- action = ActionManager::get_action (X_("Common"), (*s).c_str());
+ action = ActionManager::get_action (X_("Common"), (*s).c_str(), false);
if (action) {
action->set_sensitive (true);
}
return new BigClockWindow (*big_clock);
}
+BigTransportWindow*
+ARDOUR_UI::create_big_transport_window ()
+{
+ BigTransportWindow* btw = new BigTransportWindow ();
+ btw->set_session (_session);
+ return btw;
+}
+
void
ARDOUR_UI::handle_locations_change (Location *)
{
if (big_clock_window) {
big_clock_window->set_transient_for (*editor->own_window());
}
+ if (big_transport_window) {
+ big_transport_window->set_transient_for (*editor->own_window());
+ }
}
} else if (object == mixer) {
if (big_clock_window) {
big_clock_window->set_transient_for (*mixer->own_window());
}
+ if (big_transport_window) {
+ big_transport_window->set_transient_for (*mixer->own_window());
+ }
}
}
}
}
}
-
-void
-ARDOUR_UI::toggle_mixer_list()
-{
- Glib::RefPtr<Action> act = ActionManager::get_action ("Common", "ToggleMixerList");
-
- if (act) {
- Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
- mixer->show_mixer_list (tact->get_active());
- }
-}
-
-void
-ARDOUR_UI::toggle_monitor_section_visibility ()
-{
- Glib::RefPtr<Action> act = ActionManager::get_action ("Common", "ToggleMonitorSection");
-
- if (act) {
- Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
- mixer->show_monitor_section (tact->get_active());
- }
-}
projects / ardour.git / blobdiff