#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 "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;
const int PannerUI::pan_bar_height = 30;
-PannerUI::PannerUI (boost::shared_ptr<IO> io, Session& s)
- : _io (io),
- _session (s),
+PannerUI::PannerUI (Session& s)
+ : _session (s),
+ _current_nouts (-1),
hAdjustment(0.0, 0.0, 0.0),
vAdjustment(0.0, 0.0, 0.0),
panning_viewport(hAdjustment, vAdjustment),
{
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_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);
pack_start (pan_vbox, true, true);
panner = 0;
+ big_window = 0;
set_width(Narrow);
+}
+
+void
+PannerUI::set_panner (boost::shared_ptr<Panner> p)
+{
+ connections.clear ();
+
+ delete pan_astyle_menu;
+ pan_astyle_menu = 0;
+
+ delete pan_astate_menu;
+ pan_astate_menu = 0;
+
+ _panner = p;
+
+ 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 (!_panner) {
+ return;
+ }
+
+ connections.push_back (_panner->Changed.connect (mem_fun(*this, &PannerUI::panner_changed)));
+ connections.push_back (_panner->LinkStateChanged.connect (mem_fun(*this, &PannerUI::update_pan_linkage)));
+ connections.push_back (_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 (_panner.get(), &Panner::set_automation_state),
+ (AutoState) Off)));
+ pan_astate_menu->items().push_back (MenuElem (_("Play"), bind (
+ mem_fun (_panner.get(), &Panner::set_automation_state),
+ (AutoState) Play)));
+ pan_astate_menu->items().push_back (MenuElem (_("Write"), bind (
+ mem_fun (_panner.get(), &Panner::set_automation_state),
+ (AutoState) Write)));
+ pan_astate_menu->items().push_back (MenuElem (_("Touch"), bind (
+ 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;
}
}
{
ENSURE_GUI_THREAD(mem_fun(*this, &PannerUI::update_pan_linkage));
- bool x = _io->panner().linked();
+ bool x = _panner->linked();
bool bx = panning_link_button.get_active();
-
+
if (x != bx) {
ignore_toggle = true;
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;
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;
}
{
ENSURE_GUI_THREAD (mem_fun(*this, &PannerUI::panner_changed));
setup_pan ();
+ pan_changed (0);
}
void
void
PannerUI::setup_pan ()
{
- uint32_t nouts = _io->n_outputs ();
+ if (!_panner) {
+ return;
+ }
+
+ uint32_t nouts = _panner->nouts();
+
+ if (nouts == _current_nouts) {
+ return;
+ }
+
+ _current_nouts = nouts;
+
+ cout << "Setup pan for " << _panner->name() << endl;
if (nouts == 0 || nouts == 1) {
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<Adjustment*>::size_type asz;
- uint32_t npans = _io->panner().size();
+ uint32_t npans = _panner->npanners();
while (!pan_adjustments.empty()) {
delete pan_bars.back();
/* 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 = _panner->pan_control( asz)->get_value();
if (npans == 1) {
x = 0.5;
x = rx;
}
- pan_adjustments.push_back (new Adjustment (x, 0, 1.0, 0.05, 0.1));
- bc = new PannerBar (*pan_adjustments[asz], _io->panner()[asz]->control());
+ 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 )) );
/* 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));
+ _panner->pan_control( asz )->Changed.connect (bind (mem_fun(*this, &PannerUI::pan_value_changed), (uint32_t) asz));
bc->set_name ("PanSlider");
bc->set_shadow_type (Gtk::SHADOW_NONE);
-
- 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 (mem_fun (*ac, &AutomationControl::start_touch));
+ bc->StopGesture.connect (mem_fun (*ac, &AutomationControl::stop_touch));
+ }
char buf[64];
snprintf (buf, sizeof (buf), _("panner for channel %zu"), asz + 1);
} else {
- if (panner == 0) {
- panner = new Panner2d (_io->panner(), 61);
+ if (!panner) {
+ panner = new Panner2d (_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 (nouts);
+ if (big_window) {
+ big_window->reset (_panner->npanners());
+ }
panner->set_size_request (-1, 61);
/* and finally, add it to the panner frame */
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, 400, _panner->npanners());
+ }
+ big_window->show ();
+ return true;
+ }
+ break;
+
case 3:
if (pan_menu == 0) {
pan_menu = manage (new Menu);
/* 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));
/* set state first, connect second */
- bypass_menu_item->set_active (_io->panner().bypassed());
+ bypass_menu_item->set_active (_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 = _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()) {
+ switch (_panner->nouts()) {
case 0:
case 1:
/* relax */
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 (true);
}
- uint32_t nouts = _io->n_outputs();
+ uint32_t 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);
+ xpos = _panner->pan_control( which )->get_value();
/* add a kinda-sorta detent for the middle */
if (!Panner::equivalent (val, xpos)) {
- _io->panner()[which]->set_position (val);
+ _panner->streampanner(which).set_position (val);
/* XXX
the panner objects have no access to the session,
so do this here. ick.
{
ENSURE_GUI_THREAD (bind (mem_fun(*this, &PannerUI::pan_value_changed), which));
- if (_io->n_outputs() > 1 && which < _io->panner().size()) {
+ if (_panner->npanners() > 1 && 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;
float xpos, val;
if (only_if_aplay) {
- AutomationList& alist (_io->panner()[n]->automation());
+ boost::shared_ptr<AutomationList> alist (_panner->streampanner(n).pan_control()->alist());
- if (!alist.automation_playback()) {
+ 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)) {
}
void
-PannerUI::pan_printer (char *buf, uint32_t len, Adjustment* adj)
+PannerUI::update_pan_sensitive ()
{
- float val = adj->get_value();
+ bool sensitive = !(_panner->automation_state() & Play);
- 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);
-
- switch (_io->n_outputs()) {
+ switch (_panner->nouts()) {
case 0:
case 1:
break;
if (panner) {
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;
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;
}
}
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 (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"));
projects / ardour.git / blobdiff