X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fpanner_ui.cc;h=af207c20c13a6a43cb0fbcf8c77a2e9f7bdeba1b;hb=1b0b7849eea034f8809dea31419159724386c2db;hp=42d6684c94da43fbdd15f12272eabd3e69144104;hpb=1ff30dcecb7df24125bb53fbcf0129fe5f1803a0;p=ardour.git diff --git a/gtk2_ardour/panner_ui.cc b/gtk2_ardour/panner_ui.cc index 42d6684c94..af207c20c1 100644 --- a/gtk2_ardour/panner_ui.cc +++ b/gtk2_ardour/panner_ui.cc @@ -29,13 +29,14 @@ #include "panner_ui.h" #include "panner2d.h" #include "utils.h" -#include "panner.h" #include "gui_thread.h" #include "stereo_panner.h" +#include "mono_panner.h" #include "ardour/delivery.h" #include "ardour/session.h" #include "ardour/panner.h" +#include "ardour/pannable.h" #include "ardour/route.h" #include "i18n.h" @@ -46,20 +47,13 @@ using namespace PBD; using namespace Gtkmm2ext; using namespace Gtk; -const int PannerUI::pan_bar_height = 20; +const int PannerUI::pan_bar_height = 40; 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")) + , _current_nins (-1) , pan_automation_style_button ("") , pan_automation_state_button ("") - , _bar_spinner_active (false) { set_session (s); @@ -81,52 +75,13 @@ PannerUI::PannerUI (Session* s) //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); - panning_viewport.set_name (X_("BaseFrame")); - - ARDOUR_UI::instance()->set_tip (panning_link_button, - _("panning link control")); - 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); 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_box.pack_start (panning_link_button, true, true); - panning_link_box.pack_start (panning_link_direction_button, true, true); - panning_link_box.pack_start (pan_automation_state_button, true, true); - - /* the pixmap will be reset at some point, but the key thing is that - we need a pixmap in the button just to get started. - */ - panning_link_direction_button.add (*(manage (new Image (get_xpm("forwardblarrow.xpm"))))); - - panning_link_direction_button.signal_clicked().connect - (sigc::mem_fun(*this, &PannerUI::panning_link_direction_clicked)); - - panning_link_button.signal_button_press_event().connect - (sigc::mem_fun(*this, &PannerUI::panning_link_button_press), false); - panning_link_button.signal_button_release_event().connect - (sigc::mem_fun(*this, &PannerUI::panning_link_button_release), false); - - panning_up.set_border_width (3); - panning_down.set_border_width (3); - panning_up.add (panning_up_arrow); - panning_down.add (panning_down_arrow); - panning_up.set_name (X_("PanScrollerBase")); - panning_down.set_name (X_("PanScrollerBase")); - panning_up_arrow.set_name (X_("PanScrollerArrow")); - panning_down_arrow.set_name (X_("PanScrollerArrow")); - 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, true); twod_panner = 0; @@ -151,18 +106,26 @@ PannerUI::set_panner (boost::shared_ptr p) delete twod_panner; twod_panner = 0; + delete _stereo_panner; + _stereo_panner = 0; + if (!_panner) { return; } _panner->Changed.connect (connections, invalidator (*this), boost::bind (&PannerUI::panner_changed, this, 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()); + /* new panner object, force complete reset of panner GUI + */ + + _current_nouts = 0; + _current_nins = 0; + panner_changed (0); update_pan_sensitive (); - update_pan_linkage (); pan_automation_state_changed (); + } void @@ -211,64 +174,10 @@ PannerUI::build_astyle_menu () boost::shared_ptr PannerUI::get_controllable() { + assert (!pan_bars.empty()); return pan_bars[0]->get_controllable(); } -bool -PannerUI::panning_link_button_press (GdkEventButton*) -{ - return true; -} - -bool -PannerUI::panning_link_button_release (GdkEventButton*) -{ - if (!ignore_toggle) { - _panner->set_linked (!_panner->linked()); - } - return true; -} - -void -PannerUI::panning_link_direction_clicked() -{ - switch (_panner->link_direction()) { - case Panner::SameDirection: - _panner->set_link_direction (Panner::OppositeDirection); - break; - default: - _panner->set_link_direction (Panner::SameDirection); - break; - } -} - -void -PannerUI::update_pan_linkage () -{ - 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 (_panner->link_direction()) { - case Panner::SameDirection: - panning_link_direction_button.set_image (*(manage (new Image (get_xpm ("forwardblarrow.xpm"))))); - break; - default: - panning_link_direction_button.set_image (*(manage (new Image (get_xpm("revdblarrow.xpm"))))); - break; - } -} - void PannerUI::on_size_allocate (Allocation& a) { @@ -278,26 +187,12 @@ PannerUI::on_size_allocate (Allocation& a) void PannerUI::set_width (Width w) { - switch (w) { - case Wide: - panning_link_button.set_label (_("link")); - break; - case Narrow: - panning_link_button.set_label (_("L")); - break; - } - _width = w; } - PannerUI::~PannerUI () { - for (vector::iterator i = pan_adjustments.begin(); i != pan_adjustments.end(); ++i) { - delete (*i); - } - - for (vector::iterator i = pan_bars.begin(); i != pan_bars.end(); ++i) { + for (vector::iterator i = pan_bars.begin(); i != pan_bars.end(); ++i) { delete (*i); } @@ -313,52 +208,13 @@ PannerUI::~PannerUI () void PannerUI::panner_changed (void* src) { - ENSURE_GUI_THREAD (*this, &PannerUI::panner_changed) - setup_pan (); - - if (src == this) { - return; - } - - switch (_panner->npanners()) { - case 0: - panning_link_direction_button.set_sensitive (false); - panning_link_button.set_sensitive (false); - return; - case 1: - panning_link_direction_button.set_sensitive (false); - panning_link_button.set_sensitive (false); - break; - default: - panning_link_direction_button.set_sensitive (_panner->linked ()); - panning_link_button.set_sensitive (true); - } - - uint32_t const nouts = _panner->nouts(); - - switch (nouts) { - case 0: - case 1: - /* relax */ - break; - - case 2: - /* bring pan bar state up to date */ - update_pan_bars (false); - break; - - default: - // panner->move_puck (pan_value (pans[0], pans[1]), 0.5); - break; - } } void PannerUI::update_pan_state () { /* currently nothing to do */ - // ENSURE_GUI_THREAD (*this, &PannerUI::update_panner_state) } void @@ -366,163 +222,106 @@ PannerUI::setup_pan () { if (!_panner) { return; - } + } + uint32_t const nouts = _panner->out().n_audio(); + uint32_t const nins = _panner->in().n_audio(); - uint32_t const nouts = _panner->nouts(); - uint32_t const npans = _panner->npanners(); - - if (int32_t (nouts) == _current_nouts && int32_t (npans) == _current_npans) { + if (int32_t (nouts) == _current_nouts && int32_t (nins) == _current_nins) { 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; + container_clear (pan_vbox); + delete twod_panner; + twod_panner = 0; + delete _stereo_panner; + _stereo_panner = 0; + if (nouts == 0 || nouts == 1) { - while (!pan_adjustments.empty()) { - delete pan_bars.back(); - pan_bars.pop_back (); - delete pan_adjustments.back(); - pan_adjustments.pop_back (); - } - - delete twod_panner; - twod_panner = 0; + delete _stereo_panner; + delete twod_panner; /* 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 (); + pan_vbox.pack_start (*eb, false, false); } else if (nouts == 2) { - vector::size_type asz; - - while (!pan_adjustments.empty()) { - delete pan_bars.back(); - pan_bars.pop_back (); - delete pan_adjustments.back(); - pan_adjustments.pop_back (); - } - - delete twod_panner; - twod_panner = 0; - - while ((asz = pan_adjustments.size()) < npans) { + if (nins == 2) { - float x, rx; - PannerBar* bc; + /* add integrated 2in/2out panner GUI */ - /* 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 */ + boost::shared_ptr pannable = _panner->pannable(); - rx = _panner->pan_control( asz)->get_value(); + _stereo_panner = new StereoPanner (_panner); + _stereo_panner->set_size_request (-1, pan_bar_height); + pan_vbox.pack_start (*_stereo_panner, false, false); - if (npans == 1) { - x = 0.5; - } else if (asz == 0) { - x = 0.0; - } else if (asz == 1) { - x = 1.0; - } else { - x = rx; - } + boost::shared_ptr ac; - pan_adjustments.push_back (new Adjustment (x, 0, 1.0, 0.005, 0.05)); - bc = new PannerBar (*pan_adjustments[asz], - boost::static_pointer_cast( _panner->pan_control( asz )) ); + ac = pannable->pan_azimuth_control; + _stereo_panner->StartPositionGesture.connect (sigc::bind (sigc::mem_fun (*this, &PannerUI::start_touch), + boost::weak_ptr (ac))); + _stereo_panner->StopPositionGesture.connect (sigc::bind (sigc::mem_fun (*this, &PannerUI::stop_touch), + boost::weak_ptr(ac))); - /* 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); + ac = pannable->pan_width_control; + _stereo_panner->StartWidthGesture.connect (sigc::bind (sigc::mem_fun (*this, &PannerUI::start_touch), + boost::weak_ptr (ac))); + _stereo_panner->StopWidthGesture.connect (sigc::bind (sigc::mem_fun (*this, &PannerUI::stop_touch), + boost::weak_ptr(ac))); - bc->set_name ("PanSlider"); - bc->set_shadow_type (Gtk::SHADOW_NONE); - - boost::shared_ptr ac = _panner->pan_control (asz); - - if (asz) { - bc->StartGesture.connect (sigc::bind (sigc::mem_fun (*this, &PannerUI::start_touch), + } else if (nins == 1) { + /* 1-in/2out */ + + MonoPanner* mp; + boost::shared_ptr pannable = _panner->pannable(); + boost::shared_ptr ac = pannable->pan_azimuth_control; + + mp = new MonoPanner (ac); + + mp->StartGesture.connect (sigc::bind (sigc::mem_fun (*this, &PannerUI::start_touch), boost::weak_ptr (ac))); - bc->StopGesture.connect (sigc::bind (sigc::mem_fun (*this, &PannerUI::stop_touch), - boost::weak_ptr(ac))); - } - - char buf[64]; - 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 - (sigc::bind (sigc::mem_fun(*this, &PannerUI::pan_button_event), (uint32_t) asz)); - - bc->set_size_request (-1, pan_bar_height); - bc->SpinnerActive.connect (sigc::mem_fun (*this, &PannerUI::bar_spinner_activate)); + mp->StopGesture.connect (sigc::bind (sigc::mem_fun (*this, &PannerUI::stop_touch), + boost::weak_ptr(ac))); + + mp->signal_button_release_event().connect (sigc::mem_fun(*this, &PannerUI::pan_button_event)); + + mp->set_size_request (-1, pan_bar_height); + + update_pan_sensitive (); + pan_vbox.pack_start (*mp, false, false); - pan_bars.push_back (bc); - pan_bar_packer.pack_start (*bc, false, false); - } - - /* now that we actually have the pan bars, - set their sensitivity based on current - automation state. - */ - - update_pan_sensitive (); - - panning_viewport.remove (); - panning_viewport.add (pan_bar_packer); - panning_viewport.show_all (); - - if (npans == 2) { - /* add position and width controls */ - if (_stereo_panner == 0) { - _stereo_panner = new StereoPanner (_panner->direction_control(), - _panner->width_control()); - poswidth_box.pack_start (*_stereo_panner, true, true); - } - pan_vbox.pack_start (poswidth_box, false, false); - poswidth_box.show_all (); - cerr << "Packed poswidth and mde it visible\n"; } else { - if (_stereo_panner) { - pan_vbox.remove (poswidth_box); - cerr << "Hid poswidth\n"; - } + warning << string_compose (_("No panner user interface is currently available for %1-in/2out tracks/busses"), + nins) << endmsg; } + } else { if (!twod_panner) { twod_panner = new Panner2d (_panner, 61); twod_panner->set_name ("MixerPanZone"); twod_panner->show (); - - twod_panner->signal_button_press_event().connect - (sigc::bind (sigc::mem_fun(*this, &PannerUI::pan_button_event), (uint32_t) 0), false); + twod_panner->signal_button_press_event().connect (sigc::mem_fun(*this, &PannerUI::pan_button_event), false); } update_pan_sensitive (); - twod_panner->reset (npans); + twod_panner->reset (nins); if (big_window) { - big_window->reset (npans); + big_window->reset (nins); } twod_panner->set_size_request (-1, 61); /* and finally, add it to the panner frame */ - panning_viewport.remove (); - panning_viewport.add (*twod_panner); - panning_viewport.show_all (); + pan_vbox.pack_start (*twod_panner, false, false); } + + pan_vbox.show_all (); } void @@ -546,13 +345,13 @@ PannerUI::stop_touch (boost::weak_ptr wac) } bool -PannerUI::pan_button_event (GdkEventButton* ev, uint32_t which) +PannerUI::pan_button_event (GdkEventButton* ev) { 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 = new Panner2dWindow (_panner, 400, _panner->in().n_audio()); } big_window->show (); return true; @@ -564,7 +363,7 @@ PannerUI::pan_button_event (GdkEventButton* ev, uint32_t which) pan_menu = manage (new Menu); pan_menu->set_name ("ArdourContextMenu"); } - build_pan_menu (which); + build_pan_menu (); pan_menu->popup (1, ev->time); return true; break; @@ -576,21 +375,13 @@ PannerUI::pan_button_event (GdkEventButton* ev, uint32_t which) } void -PannerUI::build_pan_menu (uint32_t which) +PannerUI::build_pan_menu () { using namespace Menu_Helpers; MenuList& items (pan_menu->items()); items.clear (); - items.push_back (CheckMenuElem (_("Mute"))); - - /* set state first, connect second */ - - (dynamic_cast (&items.back()))->set_active (_panner->streampanner(which).muted()); - (dynamic_cast (&items.back()))->signal_toggled().connect - (sigc::bind (sigc::mem_fun(*this, &PannerUI::pan_mute), which)); - items.push_back (CheckMenuElem (_("Bypass"), sigc::mem_fun(*this, &PannerUI::pan_bypass_toggle))); bypass_menu_item = static_cast (&items.back()); @@ -599,16 +390,7 @@ PannerUI::build_pan_menu (uint32_t which) 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"), sigc::bind (sigc::mem_fun (*this, &PannerUI::pan_reset), which))); - items.push_back (SeparatorElem()); - items.push_back (MenuElem (_("Reset all"), sigc::mem_fun (*this, &PannerUI::pan_reset_all))); -} - -void -PannerUI::pan_mute (uint32_t which) -{ - StreamPanner& sp = _panner->streampanner(which); - sp.set_muted (!sp.muted()); + items.push_back (MenuElem (_("Reset"), sigc::mem_fun (*this, &PannerUI::pan_reset))); } void @@ -620,154 +402,36 @@ PannerUI::pan_bypass_toggle () } void -PannerUI::pan_reset (uint32_t which) -{ - _panner->reset_streampanner (which); -} - -void -PannerUI::pan_reset_all () +PannerUI::pan_reset () { - _panner->reset_to_default (); + _panner->reset (); } void PannerUI::effective_pan_display () { - if (_panner->empty()) { - return; - } - - switch (_panner->nouts()) { - case 0: - case 1: - /* relax */ - break; - - case 2: - update_pan_bars (true); - break; - - default: - //panner->move_puck (pan_value (v, right), 0.5); - break; - } -} - -void -PannerUI::pan_adjustment_changed (uint32_t which) -{ - if (!in_pan_update && which < _panner->npanners()) { - - float val = pan_adjustments[which]->get_value (); - 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 - return after it. - */ - - in_pan_update = true; - pan_adjustments[which]->set_value (0.5); - in_pan_update = false; - return; - } - - if (!Panner::equivalent (val, xpos)) { - - _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(); - } - } -} - -void -PannerUI::pan_value_changed (uint32_t which) -{ - ENSURE_GUI_THREAD (*this, &PannerUI::pan_value_changed, which) - - if (twod_panner) { - - in_pan_update = true; - twod_panner->move_puck (which, _panner->streampanner(which).get_position()); - in_pan_update = false; - - } else if (_panner->npanners() > 0 && which < _panner->npanners()) { - AngularVector model = _panner->streampanner(which).get_position(); - double fract = pan_adjustments[which]->get_value(); - AngularVector view (BaseStereoPanner::lr_fract_to_azimuth (fract), 0.0); - - if (!Panner::equivalent (model, view)) { - in_pan_update = true; - pan_adjustments[which]->set_value (BaseStereoPanner::azimuth_to_lr_fract (model.azi)); - in_pan_update = false; - } - } -} - -void -PannerUI::update_pan_bars (bool only_if_aplay) -{ - uint32_t n; - vector::iterator i; - - in_pan_update = true; - - /* this runs during automation playback, and moves the bar controllers - and/or pucks around. - */ - - for (i = pan_adjustments.begin(), n = 0; i != pan_adjustments.end(); ++i, ++n) { - - if (only_if_aplay) { - boost::shared_ptr alist (_panner->streampanner(n).pan_control()->alist()); - - if (!alist->automation_playback()) { - continue; - } - } - - AngularVector model = _panner->streampanner(n).get_effective_position(); - double fract = (*i)->get_value(); - AngularVector view (BaseStereoPanner::lr_fract_to_azimuth (fract), 0.0); - - if (!Panner::equivalent (model, view)) { - (*i)->set_value (BaseStereoPanner::azimuth_to_lr_fract (model.azi)); - } + if (_stereo_panner) { + _stereo_panner->queue_draw (); + } else if (twod_panner) { + twod_panner->queue_draw (); + } else { + for (vector::iterator i = pan_bars.begin(); i != pan_bars.end(); ++i) { + (*i)->queue_draw (); + } } - - in_pan_update = false; } void PannerUI::update_pan_sensitive () { - bool const sensitive = !(_panner->mono()) && !(_panner->automation_state() & Play); + bool const sensitive = !(_panner->pannable()->automation_state() & Play); - switch (_panner->nouts()) { - case 0: - case 1: - break; - case 2: - for (vector::iterator i = pan_bars.begin(); i != pan_bars.end(); ++i) { - (*i)->set_sensitive (sensitive); - } - break; - default: - if (twod_panner) { - twod_panner->set_sensitive (sensitive); - } - if (big_window) { - big_window->set_sensitive (sensitive); - } - break; - } +#ifdef PANNER_HACKS + pan_vbox.set_sensitive (sensitive); +#endif + if (big_window) { + big_window->set_sensitive (sensitive); + } } gint @@ -831,42 +495,31 @@ PannerUI::pan_automation_style_changed () void PannerUI::pan_automation_state_changed () { - ENSURE_GUI_THREAD (*this, &PannerUI::pan_automation_state_changed) - - bool x; + boost::shared_ptr pannable (_panner->pannable()); switch (_width) { case Wide: - pan_automation_state_button.set_label (astate_string(_panner->automation_state())); + pan_automation_state_button.set_label (astate_string(pannable->automation_state())); break; case Narrow: - pan_automation_state_button.set_label (short_astate_string(_panner->automation_state())); + pan_automation_state_button.set_label (short_astate_string(pannable->automation_state())); break; } - /* when creating a new session, we get to create busses (and - sometimes tracks) with no outputs by the time they get - here. - */ - - if (_panner->empty()) { - return; - } - - x = (_panner->streampanner(0).pan_control()->alist()->automation_state() != Off); - + bool x = (pannable->automation_state() != Off); + if (pan_automation_state_button.get_active() != x) { - ignore_toggle = true; + ignore_toggle = true; pan_automation_state_button.set_active (x); ignore_toggle = false; } update_pan_sensitive (); - + /* start watching automation so that things move */ - + pan_watching.disconnect(); - + if (x) { pan_watching = ARDOUR_UI::RapidScreenUpdate.connect (sigc::mem_fun (*this, &PannerUI::effective_pan_display)); } @@ -931,28 +584,6 @@ PannerUI::_astyle_string (AutoStyle style, bool shrt) } } -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 () - ); -} - -void -PannerUI::bar_spinner_activate (bool a) -{ - _bar_spinner_active = a; -} - void PannerUI::show_width () {