X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fpanner_ui.cc;h=728dfcbcfe246b66abf359ab4e92c67f07782b88;hb=23e7641a9bfa22db4e776dada6a98c55a40f9792;hp=250f1e146e894e58ca618aabf7bccd319c64d1d3;hpb=cbdf686e391bc2e7b93f37a5d3fa9197cb178078;p=ardour.git diff --git a/gtk2_ardour/panner_ui.cc b/gtk2_ardour/panner_ui.cc index 250f1e146e..728dfcbcfe 100644 --- a/gtk2_ardour/panner_ui.cc +++ b/gtk2_ardour/panner_ui.cc @@ -30,6 +30,7 @@ #include "panner_ui.h" #include "panner2d.h" #include "utils.h" +#include "panner.h" #include "gui_thread.h" #include @@ -44,10 +45,10 @@ using namespace Gtkmm2ext; using namespace Gtk; using namespace sigc; +const int PannerUI::pan_bar_height = 30; -PannerUI::PannerUI (boost::shared_ptr io, Session& s) - : _io (io), - _session (s), +PannerUI::PannerUI (Session& s) + : _session (s), hAdjustment(0.0, 0.0, 0.0), vAdjustment(0.0, 0.0, 0.0), panning_viewport(hAdjustment, vAdjustment), @@ -59,6 +60,8 @@ PannerUI::PannerUI (boost::shared_ptr io, 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"); @@ -71,8 +74,7 @@ PannerUI::PannerUI (boost::shared_ptr io, Session& s) //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_size_request (-1, 61); panning_viewport.set_name (X_("BaseFrame")); ARDOUR_UI::instance()->tooltips().set_tip (panning_link_button, @@ -83,22 +85,6 @@ PannerUI::PannerUI (boost::shared_ptr io, Session& s) 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); @@ -131,37 +117,116 @@ PannerUI::PannerUI (boost::shared_ptr io, Session& s) 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; + big_window = 0; set_width(Narrow); - - _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)); +} + +void +PannerUI::set_io (boost::shared_ptr io) +{ + connections.clear (); + + delete pan_astyle_menu; + pan_astyle_menu = 0; + + delete pan_astate_menu; + pan_astate_menu = 0; + + _io = io; + + connections.push_back (_io->panner().Changed.connect (mem_fun(*this, &PannerUI::panner_changed))); + connections.push_back (_io->panner().LinkStateChanged.connect (mem_fun(*this, &PannerUI::update_pan_linkage))); + connections.push_back (_io->panner().StateChanged.connect (mem_fun(*this, &PannerUI::update_pan_state))); + + delete panner; + panner = 0; + + setup_pan (); pan_changed (0); update_pan_sensitive (); update_pan_linkage (); pan_automation_state_changed (); + +#if WHERE_DOES_THIS_LIVE + pan_bar_packer.show(); + panning_viewport.show(); + panning_up.show(); + panning_up_arrow.show(); + panning_down.show(); + panning_down_arrow.show(); + pan_vbox.show(); + panning_link_button.show(); + panning_link_direction_button.show(); + panning_link_box.show(); + pan_automation_style_button.show(); + pan_automation_state_button.show(); + show(); +#endif +} + +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"), + 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))); + +} + +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 +PannerUI::get_controllable() +{ + return pan_bars[0]->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()); } @@ -188,7 +253,7 @@ PannerUI::update_pan_linkage () bool x = _io->panner().linked(); bool bx = panning_link_button.get_active(); - + if (x != bx) { ignore_toggle = true; @@ -213,23 +278,9 @@ PannerUI::set_width (Width w) { switch (w) { case Wide: - panning_viewport.set_size_request (61, 61); - if (panner) { - panner->set_size_request (61, 61); - } - for (vector::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::iterator i = pan_bars.begin(); i != pan_bars.end(); ++i) { - (*i)->set_size_request (31, 15); - } panning_link_button.set_label (_("L")); break; } @@ -244,18 +295,15 @@ PannerUI::~PannerUI () 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); } - if (panner) { - delete panner; - } - - if (pan_menu) { - delete pan_menu; - } - + delete panner; + delete big_window; + delete pan_menu; + delete pan_astyle_menu; + delete pan_astate_menu; } @@ -264,6 +312,7 @@ PannerUI::panner_changed () { ENSURE_GUI_THREAD (mem_fun(*this, &PannerUI::panner_changed)); setup_pan (); + pan_changed (0); } void @@ -276,7 +325,7 @@ PannerUI::update_pan_state () void PannerUI::setup_pan () { - uint32_t nouts = _io->n_outputs ().get(ARDOUR::DataType::AUDIO); + uint32_t nouts = _io->n_outputs ().n_audio(); if (nouts == 0 || nouts == 1) { @@ -287,10 +336,17 @@ PannerUI::setup_pan () pan_adjustments.pop_back (); } + /* 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::size_type asz; - uint32_t npans = _io->panner().size(); + uint32_t npans = _io->panner().npanners(); while (!pan_adjustments.empty()) { delete pan_bars.back(); @@ -301,25 +357,37 @@ PannerUI::setup_pan () while ((asz = pan_adjustments.size()) < npans) { - float x; - BarController* bc; + float x, rx; + PannerBar* bc; + + /* 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 */ - /* initialize adjustment with current value of panner */ + rx = _io->panner().pan_control( asz)->get_value(); - _io->panner()[asz]->get_position (x); + 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.05, 0.1)); + bc = new PannerBar (*pan_adjustments[asz], + boost::static_pointer_cast( _io->panner().pan_control( 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 (bind (mem_fun(*this, &PannerUI::pan_adjustment_changed), (uint32_t) asz)); - _io->panner()[asz]->Changed.connect (bind (mem_fun(*this, &PannerUI::pan_value_changed), (uint32_t) asz)); + _io->panner().pan_control( asz )->Changed.connect (bind (mem_fun(*this, &PannerUI::pan_value_changed), (uint32_t) 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)); @@ -331,17 +399,10 @@ PannerUI::setup_pan () bc->event_widget().signal_button_release_event().connect (bind (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, @@ -357,26 +418,22 @@ PannerUI::setup_pan () } else { - int w = 0; - - switch (_width) { - case Wide: - w = 61; - break; - case Narrow: - w = 31; - break; - } - if (panner == 0) { - panner = new Panner2d (_io->panner(), w, 61); + panner = new Panner2d (_io->panner(), 61); panner->set_name ("MixerPanZone"); panner->show (); + + + panner->signal_button_press_event().connect + (bind (mem_fun(*this, &PannerUI::pan_button_event), (uint32_t) 0), false); } update_pan_sensitive (); - panner->reset (_io->n_inputs().get(ARDOUR::DataType::AUDIO)); - panner->set_size_request (w, 61); + panner->reset (_io->n_inputs().n_audio()); + if (big_window) { + big_window->reset (_io->n_inputs().n_audio()); + } + panner->set_size_request (-1, 61); /* and finally, add it to the panner frame */ @@ -390,6 +447,16 @@ bool PannerUI::pan_button_event (GdkEventButton* ev, uint32_t which) { switch (ev->button) { + case 1: + if (panner && ev->type == GDK_2BUTTON_PRESS) { + if (!big_window) { + big_window = new Panner2dWindow (panner->get_panner(), 400, _io->n_inputs().n_audio()); + } + big_window->show (); + return true; + } + break; + case 3: if (pan_menu == 0) { pan_menu = manage (new Menu); @@ -418,7 +485,7 @@ PannerUI::build_pan_menu (uint32_t which) /* set state first, connect second */ - (dynamic_cast (&items.back()))->set_active (_io->panner()[which]->muted()); + (dynamic_cast (&items.back()))->set_active (_io->panner().streampanner(which).muted()); (dynamic_cast (&items.back()))->signal_toggled().connect (bind (mem_fun(*this, &PannerUI::pan_mute), which)); @@ -438,8 +505,8 @@ PannerUI::build_pan_menu (uint32_t which) void PannerUI::pan_mute (uint32_t which) { - StreamPanner* sp = _io->panner()[which]; - sp->set_muted (!sp->muted()); + StreamPanner& sp = _io->panner().streampanner(which); + sp.set_muted (!sp.muted()); } void @@ -462,7 +529,7 @@ PannerUI::effective_pan_display () return; } - switch (_io->n_outputs().get(ARDOUR::DataType::AUDIO)) { + switch (_io->n_outputs().n_audio()) { case 0: case 1: /* relax */ @@ -485,7 +552,7 @@ PannerUI::pan_changed (void *src) return; } - switch (_io->panner().size()) { + switch (_io->panner().npanners()) { case 0: panning_link_direction_button.set_sensitive (false); panning_link_button.set_sensitive (false); @@ -499,7 +566,7 @@ PannerUI::pan_changed (void *src) panning_link_button.set_sensitive (true); } - uint32_t nouts = _io->n_outputs().get(ARDOUR::DataType::AUDIO); + uint32_t nouts = _io->n_outputs().n_audio(); switch (nouts) { case 0: @@ -508,6 +575,7 @@ PannerUI::pan_changed (void *src) break; case 2: + /* bring pan bar state up to date */ update_pan_bars (false); break; @@ -520,11 +588,11 @@ PannerUI::pan_changed (void *src) void PannerUI::pan_adjustment_changed (uint32_t which) { - if (!in_pan_update && which < _io->panner().size()) { + if (!in_pan_update && which < _io->panner().npanners()) { float xpos; float val = pan_adjustments[which]->get_value (); - _io->panner()[which]->get_position (xpos); + xpos = _io->panner().pan_control( which )->get_value(); /* add a kinda-sorta detent for the middle */ @@ -541,7 +609,7 @@ PannerUI::pan_adjustment_changed (uint32_t which) if (!Panner::equivalent (val, xpos)) { - _io->panner()[which]->set_position (val); + _io->panner().streampanner(which).set_position (val); /* XXX the panner objects have no access to the session, so do this here. ick. @@ -556,11 +624,11 @@ PannerUI::pan_value_changed (uint32_t which) { ENSURE_GUI_THREAD (bind (mem_fun(*this, &PannerUI::pan_value_changed), which)); - if (_io->n_outputs().get(ARDOUR::DataType::AUDIO) > 1 && which < _io->panner().size()) { + if (_io->n_outputs().n_audio() > 1 && which < _io->panner().npanners()) { float xpos; float val = pan_adjustments[which]->get_value (); - _io->panner()[which]->get_position (xpos); + _io->panner().streampanner(which).get_position (xpos); if (!Panner::equivalent (val, xpos)) { in_pan_update = true; @@ -586,14 +654,14 @@ PannerUI::update_pan_bars (bool only_if_aplay) float xpos, val; if (only_if_aplay) { - AutomationList& alist (_io->panner()[n]->automation()); + boost::shared_ptr alist (_io->panner().streampanner(n).pan_control()->alist()); - if (!alist.automation_playback()) { + if (!alist->automation_playback()) { continue; } } - _io->panner()[n]->get_effective_position (xpos); + _io->panner().streampanner(n).get_effective_position (xpos); val = (*i)->get_value (); if (!Panner::equivalent (val, xpos)) { @@ -622,16 +690,16 @@ PannerUI::pan_printer (char *buf, uint32_t len, Adjustment* adj) } void -PannerUI::update_pan_sensitive () +PannerUI::update_pan_sensitive () { bool sensitive = !(_io->panner().automation_state() & Play); - switch (_io->n_outputs().get(ARDOUR::DataType::AUDIO)) { + switch (_io->n_outputs().n_audio()) { case 0: case 1: break; case 2: - for (vector::iterator i = pan_bars.begin(); i != pan_bars.end(); ++i) { + for (vector::iterator i = pan_bars.begin(); i != pan_bars.end(); ++i) { (*i)->set_sensitive (sensitive); } break; @@ -639,6 +707,9 @@ PannerUI::update_pan_sensitive () if (panner) { panner->set_sensitive (sensitive); } + if (big_window) { + big_window->set_sensitive (sensitive); + } break; } } @@ -654,7 +725,10 @@ PannerUI::pan_automation_state_button_event (GdkEventButton *ev) 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; @@ -672,7 +746,10 @@ PannerUI::pan_automation_style_button_event (GdkEventButton *ev) 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; @@ -720,7 +797,7 @@ PannerUI::pan_automation_state_changed () return; } - x = (_io->panner().front()->automation().automation_state() != Off); + x = (_io->panner().streampanner(0).pan_control()->alist()->automation_state() != Off); if (pan_automation_state_button.get_active() != x) { ignore_toggle = true; @@ -735,7 +812,7 @@ PannerUI::pan_automation_state_changed () pan_watching.disconnect(); if (x) { - pan_watching = ARDOUR_UI::RapidScreenUpdate.connect (mem_fun (*this, &PannerUI::effective_pan_display)); + pan_watching = ARDOUR_UI::RapidScreenUpdate.connect (mem_fun (*this, &PannerUI::effective_pan_display)); } } @@ -758,7 +835,7 @@ PannerUI::_astate_string (AutoState state, bool shrt) switch (state) { case Off: - sstr = (shrt ? "O" : _("O")); + sstr = (shrt ? "M" : _("M")); break; case Play: sstr = (shrt ? "P" : _("P"));