You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
- $Id$
*/
#include <limits.h>
-#include <ardour/io.h>
-#include <ardour/dB.h>
+#include "ardour/io.h"
+#include "ardour/dB.h"
#include <gtkmm2ext/utils.h>
-#include <gtkmm2ext/stop_signal.h>
#include <gtkmm2ext/barcontroller.h>
-#include <midi++/manager.h>
-#include <pbd/fastlog.h>
+#include "midi++/manager.h"
+#include "pbd/fastlog.h"
#include "ardour_ui.h"
#include "panner_ui.h"
#include "panner2d.h"
#include "utils.h"
+#include "panner.h"
#include "gui_thread.h"
-#include <ardour/session.h>
-#include <ardour/panner.h>
-#include <ardour/route.h>
+#include "ardour/delivery.h"
+#include "ardour/session.h"
+#include "ardour/panner.h"
+#include "ardour/route.h"
#include "i18n.h"
+using namespace std;
using namespace ARDOUR;
using namespace PBD;
using namespace Gtkmm2ext;
using namespace Gtk;
-using namespace sigc;
+const int PannerUI::pan_bar_height = 30;
-PannerUI::PannerUI (boost::shared_ptr<IO> io, Session& s)
- : _io (io),
- _session (s),
- hAdjustment(0.0, 0.0, 0.0),
- vAdjustment(0.0, 0.0, 0.0),
- panning_viewport(hAdjustment, vAdjustment),
- panning_up_arrow (Gtk::ARROW_UP, Gtk::SHADOW_OUT),
- panning_down_arrow (Gtk::ARROW_DOWN, Gtk::SHADOW_OUT),
- panning_link_button (_("link")),
- pan_automation_style_button (""),
- pan_automation_state_button ("")
+PannerUI::PannerUI (Session* s)
+ : _current_nouts (-1)
+ , _current_npans (-1)
+ , hAdjustment(0.0, 0.0, 0.0)
+ , vAdjustment(0.0, 0.0, 0.0)
+ , panning_viewport(hAdjustment, vAdjustment)
+ , panning_up_arrow (Gtk::ARROW_UP, Gtk::SHADOW_OUT)
+ , panning_down_arrow (Gtk::ARROW_DOWN, Gtk::SHADOW_OUT)
+ , panning_link_button (_("link"))
+ , pan_automation_style_button ("")
+ , pan_automation_state_button ("")
{
+ set_session (s);
+
ignore_toggle = false;
pan_menu = 0;
+ pan_astate_menu = 0;
+ pan_astyle_menu = 0;
in_pan_update = false;
pan_automation_style_button.set_name ("MixerAutomationModeButton");
pan_automation_state_button.set_name ("MixerAutomationPlaybackButton");
- ARDOUR_UI::instance()->tooltips().set_tip (pan_automation_state_button, _("Pan automation mode"));
- ARDOUR_UI::instance()->tooltips().set_tip (pan_automation_style_button, _("Pan automation type"));
+ ARDOUR_UI::instance()->set_tip (pan_automation_state_button, _("Pan automation mode"));
+ ARDOUR_UI::instance()->set_tip (pan_automation_style_button, _("Pan automation type"));
//set_size_request_to_display_given_text (pan_automation_state_button, X_("O"), 2, 2);
//set_size_request_to_display_given_text (pan_automation_style_button, X_("0"), 2, 2);
- pan_bar_packer.set_size_request (-1, 61);
- panning_viewport.set_size_request (61, 61);
-
panning_viewport.set_name (X_("BaseFrame"));
- ARDOUR_UI::instance()->tooltips().set_tip (panning_link_button,
+ ARDOUR_UI::instance()->set_tip (panning_link_button,
_("panning link control"));
- ARDOUR_UI::instance()->tooltips().set_tip (panning_link_direction_button,
+ ARDOUR_UI::instance()->set_tip (panning_link_direction_button,
_("panning link direction"));
pan_automation_style_button.unset_flags (Gtk::CAN_FOCUS);
pan_automation_state_button.unset_flags (Gtk::CAN_FOCUS);
- using namespace Menu_Helpers;
- pan_astate_menu.items().push_back (MenuElem (_("Off"),
- bind (mem_fun (_io->panner(), &Panner::set_automation_state), (AutoState) Off)));
- pan_astate_menu.items().push_back (MenuElem (_("Play"),
- bind (mem_fun (_io->panner(), &Panner::set_automation_state), (AutoState) Play)));
- pan_astate_menu.items().push_back (MenuElem (_("Write"),
- bind (mem_fun (_io->panner(), &Panner::set_automation_state), (AutoState) Write)));
- pan_astate_menu.items().push_back (MenuElem (_("Touch"),
- bind (mem_fun (_io->panner(), &Panner::set_automation_state), (AutoState) Touch)));
-
- pan_astyle_menu.items().push_back (MenuElem (_("Trim")));
- pan_astyle_menu.items().push_back (MenuElem (_("Abs")));
-
- pan_astate_menu.set_name ("ArdourContextMenu");
- pan_astyle_menu.set_name ("ArdourContextMenu");
-
- pan_automation_style_button.signal_button_press_event().connect (mem_fun(*this, &PannerUI::pan_automation_style_button_event), false);
- pan_automation_state_button.signal_button_press_event().connect (mem_fun(*this, &PannerUI::pan_automation_state_button_event), false);
+ pan_automation_style_button.signal_button_press_event().connect (sigc::mem_fun(*this, &PannerUI::pan_automation_style_button_event), false);
+ pan_automation_state_button.signal_button_press_event().connect (sigc::mem_fun(*this, &PannerUI::pan_automation_state_button_event), false);
panning_link_button.set_name (X_("PanningLinkButton"));
panning_link_direction_button.set_name (X_("PanningLinkDirectionButton"));
panning_link_direction_button.add (*(manage (new Image (get_xpm("forwardblarrow.xpm")))));
panning_link_direction_button.signal_clicked().connect
- (mem_fun(*this, &PannerUI::panning_link_direction_clicked));
+ (sigc::mem_fun(*this, &PannerUI::panning_link_direction_clicked));
panning_link_button.signal_button_press_event().connect
- (mem_fun(*this, &PannerUI::panning_link_button_press), false);
+ (sigc::mem_fun(*this, &PannerUI::panning_link_button_press), false);
panning_link_button.signal_button_release_event().connect
- (mem_fun(*this, &PannerUI::panning_link_button_release), false);
+ (sigc::mem_fun(*this, &PannerUI::panning_link_button_release), false);
panning_up.set_border_width (3);
panning_down.set_border_width (3);
panning_up_arrow.set_name (X_("PanScrollerArrow"));
panning_down_arrow.set_name (X_("PanScrollerArrow"));
- pan_vbox.set_spacing (4);
+ pan_vbox.set_spacing (2);
pan_vbox.pack_start (panning_viewport, Gtk::PACK_SHRINK);
pan_vbox.pack_start (panning_link_box, Gtk::PACK_SHRINK);
- pack_start (pan_vbox, true, false);
+ pack_start (pan_vbox, true, true);
- panner = 0;
+ twod_panner = 0;
+ big_window = 0;
set_width(Narrow);
+}
+
+void
+PannerUI::set_panner (boost::shared_ptr<Panner> p)
+{
+ connections.drop_connections ();
+
+ delete pan_astyle_menu;
+ pan_astyle_menu = 0;
+
+ delete pan_astate_menu;
+ pan_astate_menu = 0;
+
+ _panner = p;
+
+ delete twod_panner;
+ twod_panner = 0;
+
+ if (!_panner) {
+ return;
+ }
- _io->panner().Changed.connect (mem_fun(*this, &PannerUI::panner_changed));
- _io->panner().LinkStateChanged.connect (mem_fun(*this, &PannerUI::update_pan_linkage));
- _io->panner().StateChanged.connect (mem_fun(*this, &PannerUI::update_pan_state));
+ _panner->Changed.connect (connections, invalidator (*this), boost::bind (&PannerUI::panner_changed, this), gui_context());
+ _panner->LinkStateChanged.connect (connections, invalidator (*this), boost::bind (&PannerUI::update_pan_linkage, this), gui_context());
+ _panner->StateChanged.connect (connections, invalidator (*this), boost::bind (&PannerUI::update_pan_state, this), gui_context());
+
+ setup_pan ();
pan_changed (0);
update_pan_sensitive ();
pan_automation_state_changed ();
}
+void
+PannerUI::build_astate_menu ()
+{
+ using namespace Menu_Helpers;
+
+ if (pan_astate_menu == 0) {
+ pan_astate_menu = new Menu;
+ pan_astate_menu->set_name ("ArdourContextMenu");
+ } else {
+ pan_astate_menu->items().clear ();
+ }
+
+ pan_astate_menu->items().push_back (MenuElem (_("Manual"), sigc::bind (
+ sigc::mem_fun (_panner.get(), &Panner::set_automation_state),
+ (AutoState) Off)));
+ pan_astate_menu->items().push_back (MenuElem (_("Play"), sigc::bind (
+ sigc::mem_fun (_panner.get(), &Panner::set_automation_state),
+ (AutoState) Play)));
+ pan_astate_menu->items().push_back (MenuElem (_("Write"), sigc::bind (
+ sigc::mem_fun (_panner.get(), &Panner::set_automation_state),
+ (AutoState) Write)));
+ pan_astate_menu->items().push_back (MenuElem (_("Touch"), sigc::bind (
+ sigc::mem_fun (_panner.get(), &Panner::set_automation_state),
+ (AutoState) Touch)));
+
+}
+
+void
+PannerUI::build_astyle_menu ()
+{
+ using namespace Menu_Helpers;
+
+ if (pan_astyle_menu == 0) {
+ pan_astyle_menu = new Menu;
+ pan_astyle_menu->set_name ("ArdourContextMenu");
+ } else {
+ pan_astyle_menu->items().clear();
+ }
+
+ pan_astyle_menu->items().push_back (MenuElem (_("Trim")));
+ pan_astyle_menu->items().push_back (MenuElem (_("Abs")));
+}
+
+boost::shared_ptr<PBD::Controllable>
+PannerUI::get_controllable()
+{
+ return pan_bars[0]->get_controllable();
+}
+
bool
-PannerUI::panning_link_button_press (GdkEventButton* ev)
+PannerUI::panning_link_button_press (GdkEventButton*)
{
- cerr << "link press\n";
return true;
}
bool
-PannerUI::panning_link_button_release (GdkEventButton* ev)
+PannerUI::panning_link_button_release (GdkEventButton*)
{
- cerr << "link release\n";
if (!ignore_toggle) {
- _io->panner().set_linked (!_io->panner().linked());
+ _panner->set_linked (!_panner->linked());
}
return true;
}
void
PannerUI::panning_link_direction_clicked()
{
- switch (_io->panner().link_direction()) {
+ switch (_panner->link_direction()) {
case Panner::SameDirection:
- _io->panner().set_link_direction (Panner::OppositeDirection);
+ _panner->set_link_direction (Panner::OppositeDirection);
break;
default:
- _io->panner().set_link_direction (Panner::SameDirection);
+ _panner->set_link_direction (Panner::SameDirection);
break;
}
}
void
PannerUI::update_pan_linkage ()
{
- ENSURE_GUI_THREAD(mem_fun(*this, &PannerUI::update_pan_linkage));
-
- bool x = _io->panner().linked();
- bool bx = panning_link_button.get_active();
-
+ ENSURE_GUI_THREAD (*this, &PannerUI::update_pan_linkage)
+
+ bool const x = _panner->linked();
+ bool const bx = panning_link_button.get_active();
+
if (x != bx) {
-
+
ignore_toggle = true;
panning_link_button.set_active (x);
ignore_toggle = false;
panning_link_direction_button.set_sensitive (x);
- switch (_io->panner().link_direction()) {
+ switch (_panner->link_direction()) {
case Panner::SameDirection:
panning_link_direction_button.set_image (*(manage (new Image (get_xpm ("forwardblarrow.xpm")))));
break;
{
switch (w) {
case Wide:
- panning_viewport.set_size_request (61, 61);
- if (panner) {
- panner->set_size_request (61, 61);
- }
- for (vector<BarController*>::iterator i = pan_bars.begin(); i != pan_bars.end(); ++i) {
- (*i)->set_size_request (61, 15);
- }
panning_link_button.set_label (_("link"));
break;
case Narrow:
- panning_viewport.set_size_request (31, 61);
- if (panner) {
- panner->set_size_request (31, 61);
- }
- for (vector<BarController*>::iterator i = pan_bars.begin(); i != pan_bars.end(); ++i) {
- (*i)->set_size_request (31, 15);
- }
panning_link_button.set_label (_("L"));
break;
}
for (vector<Adjustment*>::iterator i = pan_adjustments.begin(); i != pan_adjustments.end(); ++i) {
delete (*i);
}
-
- for (vector<BarController*>::iterator i = pan_bars.begin(); i != pan_bars.end(); ++i) {
- delete (*i);
- }
-
- if (panner) {
- delete panner;
- }
- if (pan_menu) {
- delete pan_menu;
+ for (vector<PannerBar*>::iterator i = pan_bars.begin(); i != pan_bars.end(); ++i) {
+ delete (*i);
}
+ delete twod_panner;
+ delete big_window;
+ delete pan_menu;
+ delete pan_astyle_menu;
+ delete pan_astate_menu;
}
void
PannerUI::panner_changed ()
{
- ENSURE_GUI_THREAD (mem_fun(*this, &PannerUI::panner_changed));
+ ENSURE_GUI_THREAD (*this, &PannerUI::panner_changed)
setup_pan ();
+ pan_changed (0);
}
void
PannerUI::update_pan_state ()
{
/* currently nothing to do */
- // ENSURE_GUI_THREAD (mem_fun(*this, &PannerUI::update_panner_state));
+ // ENSURE_GUI_THREAD (*this, &PannerUI::update_panner_state)
}
void
PannerUI::setup_pan ()
{
- uint32_t nouts = _io->n_outputs ();
+ if (!_panner) {
+ return;
+ }
+
+ uint32_t const nouts = _panner->nouts();
+ uint32_t const npans = _panner->npanners();
+
+ if (int32_t (nouts) == _current_nouts && int32_t (npans) == _current_npans) {
+ return;
+ }
+
+ _pan_control_connections.drop_connections ();
+ for (uint32_t i = 0; i < _panner->npanners(); ++i) {
+ connect_to_pan_control (i);
+ }
+
+ _current_nouts = nouts;
+ _current_npans = npans;
if (nouts == 0 || nouts == 1) {
pan_adjustments.pop_back ();
}
+ delete twod_panner;
+ twod_panner = 0;
+
+ /* stick something into the panning viewport so that it redraws */
+
+ EventBox* eb = manage (new EventBox());
+ panning_viewport.remove ();
+ panning_viewport.add (*eb);
+ panning_viewport.show_all ();
+
} else if (nouts == 2) {
vector<Adjustment*>::size_type asz;
- uint32_t npans = _io->panner().size();
while (!pan_adjustments.empty()) {
delete pan_bars.back();
pan_adjustments.pop_back ();
}
+ delete twod_panner;
+ twod_panner = 0;
+
while ((asz = pan_adjustments.size()) < npans) {
- float x;
- BarController* bc;
+ float x, rx;
+ PannerBar* bc;
- /* initialize adjustment with current value of panner */
+ /* initialize adjustment with 0.0 (L) or 1.0 (R) for the first and second panners,
+ which serves as a default, otherwise use current value */
- _io->panner()[asz]->get_position (x);
+ rx = _panner->pan_control( asz)->get_value();
- pan_adjustments.push_back (new Adjustment (x, 0, 1.0, 0.05, 0.1));
- pan_adjustments.back()->signal_value_changed().connect (bind (mem_fun(*this, &PannerUI::pan_adjustment_changed), (uint32_t) asz));
+ if (npans == 1) {
+ x = 0.5;
+ } else if (asz == 0) {
+ x = 0.0;
+ } else if (asz == 1) {
+ x = 1.0;
+ } else {
+ x = rx;
+ }
+
+ pan_adjustments.push_back (new Adjustment (x, 0, 1.0, 0.005, 0.05));
+ bc = new PannerBar (*pan_adjustments[asz],
+ boost::static_pointer_cast<PBD::Controllable>( _panner->pan_control( asz )) );
- _io->panner()[asz]->Changed.connect (bind (mem_fun(*this, &PannerUI::pan_value_changed), (uint32_t) asz));
+ /* now set adjustment with current value of panner, then connect the signals */
+ pan_adjustments.back()->set_value(rx);
+ pan_adjustments.back()->signal_value_changed().connect (sigc::bind (sigc::mem_fun(*this, &PannerUI::pan_adjustment_changed), (uint32_t) asz));
+ connect_to_pan_control (asz);
- bc = new BarController (*pan_adjustments[asz],
- _io->panner()[asz]->control(),
- bind (mem_fun(*this, &PannerUI::pan_printer), pan_adjustments[asz]));
-
bc->set_name ("PanSlider");
bc->set_shadow_type (Gtk::SHADOW_NONE);
- bc->set_style (BarController::Line);
- bc->StartGesture.connect (bind (mem_fun (*_io, &IO::start_pan_touch), (uint32_t) asz));
- bc->StopGesture.connect (bind (mem_fun (*_io, &IO::end_pan_touch), (uint32_t) asz));
+ boost::shared_ptr<AutomationControl> ac = _panner->pan_control (asz);
+
+ if (asz) {
+ bc->StartGesture.connect (sigc::bind (sigc::mem_fun (*this, &PannerUI::start_touch),
+ boost::weak_ptr<AutomationControl> (ac)));
+ bc->StopGesture.connect (sigc::bind (sigc::mem_fun (*this, &PannerUI::stop_touch),
+ boost::weak_ptr<AutomationControl>(ac)));
+ }
char buf[64];
-#ifdef __APPLE__
- snprintf (buf, sizeof (buf), _("panner for channel %lu"), asz + 1);
-#else
- snprintf (buf, sizeof (buf), _("panner for channel %u"), asz + 1);
-#endif
- ARDOUR_UI::instance()->tooltips().set_tip (bc->event_widget(), buf);
+ snprintf (buf, sizeof (buf), _("panner for channel %zu"), asz + 1);
+ ARDOUR_UI::instance()->set_tip (bc->event_widget(), buf);
bc->event_widget().signal_button_release_event().connect
- (bind (mem_fun(*this, &PannerUI::pan_button_event), (uint32_t) asz));
+ (sigc::bind (sigc::mem_fun(*this, &PannerUI::pan_button_event), (uint32_t) asz));
- pan_bars.push_back (bc);
- switch (_width) {
- case Wide:
- pan_bars.back()->set_size_request (61, 15);
- break;
- case Narrow:
- pan_bars.back()->set_size_request (31, 15);
- break;
- }
+ bc->set_size_request (-1, pan_bar_height);
- pan_bar_packer.pack_start (*pan_bars.back(), false, false);
+ pan_bars.push_back (bc);
+ pan_bar_packer.pack_start (*bc, false, false);
}
/* now that we actually have the pan bars,
} else {
- int w = 0;
+ if (!twod_panner) {
+ twod_panner = new Panner2d (_panner, 61);
+ twod_panner->set_name ("MixerPanZone");
+ twod_panner->show ();
- switch (_width) {
- case Wide:
- w = 61;
- break;
- case Narrow:
- w = 31;
- break;
+ twod_panner->signal_button_press_event().connect
+ (sigc::bind (sigc::mem_fun(*this, &PannerUI::pan_button_event), (uint32_t) 0), false);
}
- if (panner == 0) {
- panner = new Panner2d (_io->panner(), w, 61);
- panner->set_name ("MixerPanZone");
- panner->show ();
- }
-
update_pan_sensitive ();
- panner->reset (_io->n_inputs());
- panner->set_size_request (w, 61);
+ twod_panner->reset (npans);
+ if (big_window) {
+ big_window->reset (npans);
+ }
+ twod_panner->set_size_request (-1, 61);
/* and finally, add it to the panner frame */
panning_viewport.remove ();
- panning_viewport.add (*panner);
+ panning_viewport.add (*twod_panner);
panning_viewport.show_all ();
}
}
+void
+PannerUI::start_touch (boost::weak_ptr<AutomationControl> wac)
+{
+ boost::shared_ptr<AutomationControl> ac = wac.lock();
+ if (!ac) {
+ return;
+ }
+ ac->start_touch (ac->session().transport_frame());
+}
+
+void
+PannerUI::stop_touch (boost::weak_ptr<AutomationControl> wac)
+{
+ boost::shared_ptr<AutomationControl> ac = wac.lock();
+ if (!ac) {
+ return;
+ }
+ ac->stop_touch (false, ac->session().transport_frame());
+}
+
bool
PannerUI::pan_button_event (GdkEventButton* ev, uint32_t which)
{
switch (ev->button) {
+ case 1:
+ if (twod_panner && ev->type == GDK_2BUTTON_PRESS) {
+ if (!big_window) {
+ big_window = new Panner2dWindow (_panner, 400, _panner->npanners());
+ }
+ big_window->show ();
+ return true;
+ }
+ break;
+
case 3:
if (pan_menu == 0) {
pan_menu = manage (new Menu);
items.clear ();
items.push_back (CheckMenuElem (_("Mute")));
-
+
/* set state first, connect second */
- (dynamic_cast<CheckMenuItem*> (&items.back()))->set_active (_io->panner()[which]->muted());
+ (dynamic_cast<CheckMenuItem*> (&items.back()))->set_active (_panner->streampanner(which).muted());
(dynamic_cast<CheckMenuItem*> (&items.back()))->signal_toggled().connect
- (bind (mem_fun(*this, &PannerUI::pan_mute), which));
+ (sigc::bind (sigc::mem_fun(*this, &PannerUI::pan_mute), which));
- items.push_back (CheckMenuElem (_("Bypass"), mem_fun(*this, &PannerUI::pan_bypass_toggle)));
+ items.push_back (CheckMenuElem (_("Bypass"), sigc::mem_fun(*this, &PannerUI::pan_bypass_toggle)));
bypass_menu_item = static_cast<CheckMenuItem*> (&items.back());
/* set state first, connect second */
- bypass_menu_item->set_active (_io->panner().bypassed());
- bypass_menu_item->signal_toggled().connect (mem_fun(*this, &PannerUI::pan_bypass_toggle));
+ bypass_menu_item->set_active (_panner->bypassed());
+ bypass_menu_item->signal_toggled().connect (sigc::mem_fun(*this, &PannerUI::pan_bypass_toggle));
- items.push_back (MenuElem (_("Reset"), mem_fun(*this, &PannerUI::pan_reset)));
+ items.push_back (MenuElem (_("Reset"), sigc::bind (sigc::mem_fun (*this, &PannerUI::pan_reset), which)));
items.push_back (SeparatorElem());
- items.push_back (MenuElem (_("Reset all")));
+ items.push_back (MenuElem (_("Reset all"), sigc::mem_fun (*this, &PannerUI::pan_reset_all)));
}
void
PannerUI::pan_mute (uint32_t which)
{
- StreamPanner* sp = _io->panner()[which];
- sp->set_muted (!sp->muted());
+ StreamPanner& sp = _panner->streampanner(which);
+ sp.set_muted (!sp.muted());
}
void
PannerUI::pan_bypass_toggle ()
{
- if (bypass_menu_item && (_io->panner().bypassed() != bypass_menu_item->get_active())) {
- _io->panner().set_bypassed (!_io->panner().bypassed());
+ if (bypass_menu_item && (_panner->bypassed() != bypass_menu_item->get_active())) {
+ _panner->set_bypassed (!_panner->bypassed());
}
}
void
-PannerUI::pan_reset ()
+PannerUI::pan_reset (uint32_t which)
+{
+ _panner->reset_streampanner (which);
+}
+
+void
+PannerUI::pan_reset_all ()
{
+ _panner->reset_to_default ();
}
void
PannerUI::effective_pan_display ()
{
- if (_io->panner().empty()) {
+ if (_panner->empty()) {
return;
}
- switch (_io->n_outputs()) {
- case 0:
+ switch (_panner->nouts()) {
+ case 0:
case 1:
/* relax */
break;
break;
default:
- //panner->move_puck (pan_value (v, right), 0.5);
+ //panner->move_puck (pan_value (v, right), 0.5);
break;
}
}
return;
}
- switch (_io->panner().size()) {
+ switch (_panner->npanners()) {
case 0:
panning_link_direction_button.set_sensitive (false);
panning_link_button.set_sensitive (false);
panning_link_button.set_sensitive (false);
break;
default:
- panning_link_direction_button.set_sensitive (true);
+ panning_link_direction_button.set_sensitive (_panner->linked ());
panning_link_button.set_sensitive (true);
}
- uint32_t nouts = _io->n_outputs();
+ uint32_t const nouts = _panner->nouts();
switch (nouts) {
case 0:
break;
case 2:
+ /* bring pan bar state up to date */
update_pan_bars (false);
break;
void
PannerUI::pan_adjustment_changed (uint32_t which)
{
- if (!in_pan_update && which < _io->panner().size()) {
+ if (!in_pan_update && which < _panner->npanners()) {
- float xpos;
float val = pan_adjustments[which]->get_value ();
- _io->panner()[which]->get_position (xpos);
+ float const xpos = _panner->pan_control(which)->get_value();
/* add a kinda-sorta detent for the middle */
-
+
if (val != 0.5 && Panner::equivalent (val, 0.5)) {
- /* this is going to be reentrant, so just
+ /* this is going to be reentrant, so just
return after it.
*/
in_pan_update = false;
return;
}
-
+
if (!Panner::equivalent (val, xpos)) {
- _io->panner()[which]->set_position (val);
- /* XXX
+ _panner->pan_control(which)->set_value (val);
+ /* XXX
the panner objects have no access to the session,
so do this here. ick.
*/
- _session.set_dirty();
+ _session->set_dirty();
}
}
}
void
PannerUI::pan_value_changed (uint32_t which)
{
- ENSURE_GUI_THREAD (bind (mem_fun(*this, &PannerUI::pan_value_changed), which));
-
- if (_io->n_outputs() > 1 && which < _io->panner().size()) {
+ ENSURE_GUI_THREAD (*this, &PannerUI::pan_value_changed, which)
+
+ if (twod_panner) {
+
+ float x;
+ float y;
+ _panner->streampanner(which).get_position (x, y);
+
+ in_pan_update = true;
+ twod_panner->move_puck (which, x, y);
+ in_pan_update = false;
+
+ } else if (_panner->npanners() > 0 && which < _panner->npanners()) {
float xpos;
float val = pan_adjustments[which]->get_value ();
- _io->panner()[which]->get_position (xpos);
+ _panner->streampanner(which).get_position (xpos);
if (!Panner::equivalent (val, xpos)) {
in_pan_update = true;
in_pan_update = false;
}
}
-}
+}
void
PannerUI::update_pan_bars (bool only_if_aplay)
float xpos, val;
if (only_if_aplay) {
- AutomationList& alist (_io->panner()[n]->automation());
-
- if (!alist.automation_playback()) {
+ boost::shared_ptr<AutomationList> alist (_panner->streampanner(n).pan_control()->alist());
+
+ if (!alist->automation_playback()) {
continue;
}
}
- _io->panner()[n]->get_effective_position (xpos);
+ _panner->streampanner(n).get_effective_position (xpos);
val = (*i)->get_value ();
-
+
if (!Panner::equivalent (val, xpos)) {
(*i)->set_value (xpos);
}
in_pan_update = false;
}
-void
-PannerUI::pan_printer (char *buf, uint32_t len, Adjustment* adj)
-{
- float val = adj->get_value();
-
- if (val == 0.0f) {
- snprintf (buf, len, X_("L"));
- } else if (val == 1.0f) {
- snprintf (buf, len, X_("R"));
- } else if (Panner::equivalent (val, 0.5f)) {
- snprintf (buf, len, X_("C"));
- } else {
- /* don't print anything */
- buf[0] = '\0';
- }
-}
-
void
PannerUI::update_pan_sensitive ()
{
- bool sensitive = !(_io->panner().automation_state() & Play);
+ bool const sensitive = !(_panner->mono()) && !(_panner->automation_state() & Play);
- switch (_io->n_outputs()) {
+ switch (_panner->nouts()) {
case 0:
case 1:
break;
case 2:
- for (vector<BarController*>::iterator i = pan_bars.begin(); i != pan_bars.end(); ++i) {
+ for (vector<PannerBar*>::iterator i = pan_bars.begin(); i != pan_bars.end(); ++i) {
(*i)->set_sensitive (sensitive);
}
break;
default:
- if (panner) {
- panner->set_sensitive (sensitive);
+ if (twod_panner) {
+ twod_panner->set_sensitive (sensitive);
+ }
+ if (big_window) {
+ big_window->set_sensitive (sensitive);
}
break;
}
switch (ev->button) {
case 1:
- pan_astate_menu.popup (1, ev->time);
+ if (pan_astate_menu == 0) {
+ build_astate_menu ();
+ }
+ pan_astate_menu->popup (1, ev->time);
break;
default:
break;
switch (ev->button) {
case 1:
- pan_astyle_menu.popup (1, ev->time);
+ if (pan_astyle_menu == 0) {
+ build_astyle_menu ();
+ }
+ pan_astyle_menu->popup (1, ev->time);
break;
default:
break;
void
PannerUI::pan_automation_style_changed ()
{
- ENSURE_GUI_THREAD(mem_fun(*this, &PannerUI::pan_automation_style_changed));
-
+ ENSURE_GUI_THREAD (*this, &PannerUI::pan_automation_style_changed)
+
switch (_width) {
case Wide:
- pan_automation_style_button.set_label (astyle_string(_io->panner().automation_style()));
+ pan_automation_style_button.set_label (astyle_string(_panner->automation_style()));
break;
case Narrow:
- pan_automation_style_button.set_label (short_astyle_string(_io->panner().automation_style()));
+ pan_automation_style_button.set_label (short_astyle_string(_panner->automation_style()));
break;
}
}
void
PannerUI::pan_automation_state_changed ()
{
- ENSURE_GUI_THREAD(mem_fun(*this, &PannerUI::pan_automation_state_changed));
-
+ ENSURE_GUI_THREAD (*this, &PannerUI::pan_automation_state_changed)
+
bool x;
switch (_width) {
case Wide:
- pan_automation_state_button.set_label (astate_string(_io->panner().automation_state()));
+ pan_automation_state_button.set_label (astate_string(_panner->automation_state()));
break;
case Narrow:
- pan_automation_state_button.set_label (short_astate_string(_io->panner().automation_state()));
+ pan_automation_state_button.set_label (short_astate_string(_panner->automation_state()));
break;
}
here.
*/
- if (_io->panner().empty()) {
+ if (_panner->empty()) {
return;
}
- x = (_io->panner().front()->automation().automation_state() != Off);
+ x = (_panner->streampanner(0).pan_control()->alist()->automation_state() != Off);
if (pan_automation_state_button.get_active() != x) {
ignore_toggle = true;
pan_watching.disconnect();
if (x) {
- pan_watching = ARDOUR_UI::RapidScreenUpdate.connect (mem_fun (*this, &PannerUI::effective_pan_display));
+ pan_watching = ARDOUR_UI::RapidScreenUpdate.connect (sigc::mem_fun (*this, &PannerUI::effective_pan_display));
}
}
switch (state) {
case Off:
- sstr = (shrt ? "O" : _("O"));
+ sstr = (shrt ? "M" : _("M"));
break;
case Play:
sstr = (shrt ? "P" : _("P"));
return (shrt ? _("Abs") : _("Abs"));
}
}
+
+void
+PannerUI::set_mono (bool yn)
+{
+ _panner->set_mono (yn);
+ update_pan_sensitive ();
+}
+
+
+void
+PannerUI::connect_to_pan_control (uint32_t i)
+{
+ _panner->pan_control(i)->Changed.connect (
+ _pan_control_connections, invalidator (*this), boost::bind (&PannerUI::pan_value_changed, this, i), gui_context ()
+ );
+}
projects / ardour.git / blobdiff