summaryrefslogtreecommitdiff
path: root/gtk2_ardour
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2008-11-26 06:57:42 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2008-11-26 06:57:42 +0000
commit14f4a42ab51d6b5765b52f92a0dbcf5356cb5489 (patch)
tree5ed4c9d463ca2d1fb459fb02cb78d0f8a2cb5722 /gtk2_ardour
parent35b218b527ecc60c16767690ca4a1d86481a8e3e (diff)
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
Diffstat (limited to 'gtk2_ardour')
-rw-r--r--gtk2_ardour/panner_ui.cc5
-rw-r--r--gtk2_ardour/send_ui.cc8
-rw-r--r--gtk2_ardour/send_ui.h4
3 files changed, 7 insertions, 10 deletions
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<Send> 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<Window *> (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::Send>, ARDOUR::Session&);
@@ -68,7 +69,6 @@ class SendUIWindow : public Gtk::Window
SendUI* ui;
private:
- Gtk::VBox vpacker;
Gtk::HBox hpacker;
void send_going_away ();