From 14f4a42ab51d6b5765b52f92a0dbcf5356cb5489 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 26 Nov 2008 06:57:42 +0000 Subject: make send GUIs into ArdourDialogs; ensure that panner changes propagate into the GUI even when the number of panners is reduced git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@4259 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/panner_ui.cc | 5 ++--- gtk2_ardour/send_ui.cc | 8 +++----- gtk2_ardour/send_ui.h | 4 ++-- 3 files changed, 7 insertions(+), 10 deletions(-) (limited to 'gtk2_ardour') diff --git a/gtk2_ardour/panner_ui.cc b/gtk2_ardour/panner_ui.cc index 27e685d8cb..b06519d840 100644 --- a/gtk2_ardour/panner_ui.cc +++ b/gtk2_ardour/panner_ui.cc @@ -210,14 +210,12 @@ PannerUI::get_controllable() bool PannerUI::panning_link_button_press (GdkEventButton* ev) { - cerr << "link press\n"; return true; } bool PannerUI::panning_link_button_release (GdkEventButton* ev) { - cerr << "link release\n"; if (!ignore_toggle) { _io->panner().set_linked (!_io->panner().linked()); } @@ -244,7 +242,7 @@ PannerUI::update_pan_linkage () bool x = _io->panner().linked(); bool bx = panning_link_button.get_active(); - + if (x != bx) { ignore_toggle = true; @@ -313,6 +311,7 @@ PannerUI::panner_changed () { ENSURE_GUI_THREAD (mem_fun(*this, &PannerUI::panner_changed)); setup_pan (); + pan_changed (0); } void diff --git a/gtk2_ardour/send_ui.cc b/gtk2_ardour/send_ui.cc index ee97ae959c..939d3bba74 100644 --- a/gtk2_ardour/send_ui.cc +++ b/gtk2_ardour/send_ui.cc @@ -113,22 +113,20 @@ SendUI::fast_update () } SendUIWindow::SendUIWindow (boost::shared_ptr s, Session& ss) + : ArdourDialog (string("Ardour: send ") + s->name()) { ui = new SendUI (s, ss); - vpacker.set_border_width (5); - hpacker.pack_start (*ui, true, true); - vpacker.pack_start (hpacker); + get_vbox()->set_border_width (5); + get_vbox()->pack_start (hpacker); - add (vpacker); set_name ("SendUIWindow"); going_away_connection = s->GoingAway.connect (mem_fun (*this, &SendUIWindow::send_going_away)); signal_delete_event().connect (bind (ptr_fun (just_hide_it), reinterpret_cast (this))); - } SendUIWindow::~SendUIWindow () diff --git a/gtk2_ardour/send_ui.h b/gtk2_ardour/send_ui.h index 3d6e9c7fa9..3831841fa2 100644 --- a/gtk2_ardour/send_ui.h +++ b/gtk2_ardour/send_ui.h @@ -22,6 +22,7 @@ #include "gain_meter.h" #include "panner_ui.h" +#include "ardour_dialog.h" namespace ARDOUR { class Send; @@ -59,7 +60,7 @@ class SendUI : public Gtk::HBox void outs_changed (ARDOUR::IOChange, void*); }; -class SendUIWindow : public Gtk::Window +class SendUIWindow : public ArdourDialog { public: SendUIWindow(boost::shared_ptr, ARDOUR::Session&); @@ -68,7 +69,6 @@ class SendUIWindow : public Gtk::Window SendUI* ui; private: - Gtk::VBox vpacker; Gtk::HBox hpacker; void send_going_away (); -- cgit v1.2.3