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),
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 (_("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);
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> 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<PBD::Controllable>
+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());
}
bool x = _io->panner().linked();
bool bx = panning_link_button.get_active();
-
+
if (x != bx) {
ignore_toggle = true;
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
} else if (nouts == 2) {
vector<Adjustment*>::size_type asz;
- uint32_t npans = _io->panner().size();
+ uint32_t npans = _io->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 = _io->panner().pan_control( asz)->get_value();
if (npans == 1) {
x = 0.5;
}
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<PBD::Controllable>( _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");
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().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 */
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);
/* set state first, connect second */
- (dynamic_cast<CheckMenuItem*> (&items.back()))->set_active (_io->panner()[which]->muted());
+ (dynamic_cast<CheckMenuItem*> (&items.back()))->set_active (_io->panner().streampanner(which).muted());
(dynamic_cast<CheckMenuItem*> (&items.back()))->signal_toggled().connect
(bind (mem_fun(*this, &PannerUI::pan_mute), 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
return;
}
- switch (_io->panner().size()) {
+ switch (_io->panner().npanners()) {
case 0:
panning_link_direction_button.set_sensitive (false);
panning_link_button.set_sensitive (false);
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 < _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 */
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.
{
ENSURE_GUI_THREAD (bind (mem_fun(*this, &PannerUI::pan_value_changed), which));
- if (_io->n_outputs().n_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;
float xpos, val;
if (only_if_aplay) {
- boost::shared_ptr<AutomationList> alist (_io->panner()[n]->automation());
+ boost::shared_ptr<AutomationList> alist (_io->panner().streampanner(n).pan_control()->alist());
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)) {
}
void
-PannerUI::update_pan_sensitive ()
+PannerUI::update_pan_sensitive ()
{
bool sensitive = !(_io->panner().automation_state() & Play);
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;
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;
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));
}
}
projects / ardour.git / blobdiff