X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fpanner_ui.cc;h=3ffec0ab05bfbebcef55bc8e5d138e03f48517a4;hb=6001b8d28dd764bada8b9198a5f91e0a2f5251f6;hp=4ad59fb1ea5af10438850a1a1392428eeb47650f;hpb=45d3ec1437cf661533bc7750c623865def4424df;p=ardour.git diff --git a/gtk2_ardour/panner_ui.cc b/gtk2_ardour/panner_ui.cc index 4ad59fb1ea..3ffec0ab05 100644 --- a/gtk2_ardour/panner_ui.cc +++ b/gtk2_ardour/panner_ui.cc @@ -18,13 +18,13 @@ #include -#include -#include +#include "ardour/io.h" +#include "ardour/dB.h" #include #include #include -#include -#include +#include "midi++/manager.h" +#include "pbd/fastlog.h" #include "ardour_ui.h" #include "panner_ui.h" @@ -33,12 +33,13 @@ #include "panner.h" #include "gui_thread.h" -#include -#include -#include +#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; @@ -47,9 +48,8 @@ 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), @@ -61,6 +61,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"); @@ -84,22 +86,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 (_("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))); - - 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); @@ -139,32 +125,124 @@ PannerUI::PannerUI (boost::shared_ptr io, Session& s) pack_start (pan_vbox, true, true); panner = 0; + big_window = 0; set_width(Narrow); +} + +void +PannerUI::set_io (boost::shared_ptr io) +{ + if (io && !io->panner()) { + cerr << "PannerUI::set_io IO has no panners" << endl; + return; + } + + connections.clear (); + + delete pan_astyle_menu; + pan_astyle_menu = 0; + + delete pan_astate_menu; + pan_astate_menu = 0; + + _io = io; + + delete panner; + panner = 0; - _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)); + if (!_io) { + return; + } + + 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))); + + 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().get(), &Panner::set_automation_state), + (AutoState) Off))); + pan_astate_menu->items().push_back (MenuElem (_("Play"), bind ( + mem_fun (_io->panner().get(), &Panner::set_automation_state), + (AutoState) Play))); + pan_astate_menu->items().push_back (MenuElem (_("Write"), bind ( + mem_fun (_io->panner().get(), &Panner::set_automation_state), + (AutoState) Write))); + pan_astate_menu->items().push_back (MenuElem (_("Touch"), bind ( + mem_fun (_io->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 +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()); + _io->panner()->set_linked (!_io->panner()->linked()); } return true; } @@ -172,12 +250,12 @@ PannerUI::panning_link_button_release (GdkEventButton* ev) void PannerUI::panning_link_direction_clicked() { - switch (_io->panner().link_direction()) { + switch (_io->panner()->link_direction()) { case Panner::SameDirection: - _io->panner().set_link_direction (Panner::OppositeDirection); + _io->panner()->set_link_direction (Panner::OppositeDirection); break; default: - _io->panner().set_link_direction (Panner::SameDirection); + _io->panner()->set_link_direction (Panner::SameDirection); break; } } @@ -187,9 +265,9 @@ PannerUI::update_pan_linkage () { ENSURE_GUI_THREAD(mem_fun(*this, &PannerUI::update_pan_linkage)); - bool x = _io->panner().linked(); + bool x = _io->panner()->linked(); bool bx = panning_link_button.get_active(); - + if (x != bx) { ignore_toggle = true; @@ -199,7 +277,7 @@ PannerUI::update_pan_linkage () panning_link_direction_button.set_sensitive (x); - switch (_io->panner().link_direction()) { + switch (_io->panner()->link_direction()) { case Panner::SameDirection: panning_link_direction_button.set_image (*(manage (new Image (get_xpm ("forwardblarrow.xpm"))))); break; @@ -235,14 +313,11 @@ PannerUI::~PannerUI () 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; } @@ -251,6 +326,7 @@ PannerUI::panner_changed () { ENSURE_GUI_THREAD (mem_fun(*this, &PannerUI::panner_changed)); setup_pan (); + pan_changed (0); } void @@ -263,7 +339,11 @@ PannerUI::update_pan_state () void PannerUI::setup_pan () { - uint32_t nouts = _io->n_outputs (); + if (!_io || !_io->panner()) { + return; + } + + uint32_t nouts = _io->n_outputs ().n_audio(); if (nouts == 0 || nouts == 1) { @@ -284,7 +364,7 @@ PannerUI::setup_pan () } 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,7 +381,7 @@ PannerUI::setup_pan () /* 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 (rx); + rx = _io->panner()->pan_control( asz)->get_value(); if (npans == 1) { x = 0.5; @@ -314,13 +394,14 @@ PannerUI::setup_pan () } pan_adjustments.push_back (new Adjustment (x, 0, 1.0, 0.05, 0.1)); - bc = new PannerBar (*pan_adjustments[asz], _io->panner()[asz]->control()); + 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->set_name ("PanSlider"); @@ -355,14 +436,20 @@ PannerUI::setup_pan () } else { - if (panner == 0) { + if (!panner) { 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()); + 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 */ @@ -377,6 +464,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); @@ -405,7 +502,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)); @@ -414,42 +511,49 @@ PannerUI::build_pan_menu (uint32_t which) /* set state first, connect second */ - bypass_menu_item->set_active (_io->panner().bypassed()); + bypass_menu_item->set_active (_io->panner()->bypassed()); bypass_menu_item->signal_toggled().connect (mem_fun(*this, &PannerUI::pan_bypass_toggle)); - items.push_back (MenuElem (_("Reset"), mem_fun(*this, &PannerUI::pan_reset))); + items.push_back (MenuElem (_("Reset"), bind (mem_fun (*this, &PannerUI::pan_reset), which))); items.push_back (SeparatorElem()); - items.push_back (MenuElem (_("Reset all"))); + items.push_back (MenuElem (_("Reset all"), 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 = _io->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 && (_io->panner()->bypassed() != bypass_menu_item->get_active())) { + _io->panner()->set_bypassed (!_io->panner()->bypassed()); } } void -PannerUI::pan_reset () +PannerUI::pan_reset (uint32_t which) { + _io->panner()->reset_streampanner (which); +} + +void +PannerUI::pan_reset_all () +{ + _io->panner()->reset_to_default (); } void PannerUI::effective_pan_display () { - if (_io->panner().empty()) { + if (_io->panner()->empty()) { return; } - switch (_io->n_outputs()) { + switch (_io->n_outputs().n_audio()) { case 0: case 1: /* relax */ @@ -460,7 +564,7 @@ PannerUI::effective_pan_display () break; default: - //panner->move_puck (pan_value (v, right), 0.5); + //panner->move_puck (pan_value (v, right), 0.5); break; } } @@ -472,7 +576,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); @@ -486,7 +590,7 @@ PannerUI::pan_changed (void *src) panning_link_button.set_sensitive (true); } - uint32_t nouts = _io->n_outputs(); + uint32_t nouts = _io->n_outputs().n_audio(); switch (nouts) { case 0: @@ -495,6 +599,7 @@ PannerUI::pan_changed (void *src) break; case 2: + /* bring pan bar state up to date */ update_pan_bars (false); break; @@ -507,11 +612,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 */ @@ -528,7 +633,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. @@ -543,11 +648,11 @@ 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()) { + 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; @@ -573,14 +678,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)) { @@ -609,11 +714,11 @@ 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); + bool sensitive = !(_io->panner()->automation_state() & Play); - switch (_io->n_outputs()) { + switch (_io->n_outputs().n_audio()) { case 0: case 1: break; @@ -626,6 +731,9 @@ PannerUI::update_pan_sensitive () if (panner) { panner->set_sensitive (sensitive); } + if (big_window) { + big_window->set_sensitive (sensitive); + } break; } } @@ -641,7 +749,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; @@ -659,7 +770,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; @@ -674,10 +788,10 @@ 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(_io->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(_io->panner()->automation_style())); break; } } @@ -691,10 +805,10 @@ PannerUI::pan_automation_state_changed () switch (_width) { case Wide: - pan_automation_state_button.set_label (astate_string(_io->panner().automation_state())); + pan_automation_state_button.set_label (astate_string(_io->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(_io->panner()->automation_state())); break; } @@ -703,11 +817,11 @@ PannerUI::pan_automation_state_changed () here. */ - if (_io->panner().empty()) { + if (_io->panner()->empty()) { 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; @@ -722,7 +836,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)); } }