#include "panner_ui.h"
#include "panner2d.h"
#include "utils.h"
+#include "panner.h"
#include "gui_thread.h"
#include <ardour/session.h>
using namespace Gtk;
using namespace sigc;
+const int PannerUI::pan_bar_height = 30;
PannerUI::PannerUI (boost::shared_ptr<IO> io, Session& s)
: _io (io),
//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,
pan_automation_state_button.unset_flags (Gtk::CAN_FOCUS);
using namespace Menu_Helpers;
- pan_astate_menu.items().push_back (MenuElem (_("Off"),
+ 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)));
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;
{
switch (w) {
case Wide:
- panning_viewport.set_size_request (61, 61);
- if (panner) {
- panner->set_size_request (61, 61);
- }
- for (vector<BarController*>::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<BarController*>::iterator i = pan_bars.begin(); i != pan_bars.end(); ++i) {
- (*i)->set_size_request (31, 15);
- }
panning_link_button.set_label (_("L"));
break;
}
delete (*i);
}
- for (vector<BarController*>::iterator i = pan_bars.begin(); i != pan_bars.end(); ++i) {
+ for (vector<PannerBar*>::iterator i = pan_bars.begin(); i != pan_bars.end(); ++i) {
delete (*i);
}
void
PannerUI::setup_pan ()
{
- uint32_t nouts = _io->n_outputs ();
+ uint32_t nouts = _io->n_outputs ().n_audio();
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;
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 */
+ _io->panner()[asz]->get_position (rx);
- _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], _io->panner()[asz]->control());
+
+ /* 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));
- 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));
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,
} 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 ();
}
update_pan_sensitive ();
- panner->reset (_io->n_inputs());
- panner->set_size_request (w, 61);
+ panner->reset (_io->n_inputs().n_audio());
+ panner->set_size_request (-1, 61);
/* and finally, add it to the panner frame */
return;
}
- switch (_io->n_outputs()) {
+ switch (_io->n_outputs().n_audio()) {
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;
}
}
panning_link_button.set_sensitive (true);
}
- uint32_t nouts = _io->n_outputs();
+ uint32_t nouts = _io->n_outputs().n_audio();
switch (nouts) {
case 0:
{
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().size()) {
float xpos;
float val = pan_adjustments[which]->get_value ();
{
bool sensitive = !(_io->panner().automation_state() & Play);
- switch (_io->n_outputs()) {
+ switch (_io->n_outputs().n_audio()) {
case 0:
case 1:
break;
case 2:
- for (vector<BarController*>::iterator i = pan_bars.begin(); i != pan_bars.end(); ++i) {
+ for (vector<PannerBar*>::iterator i = pan_bars.begin(); i != pan_bars.end(); ++i) {
(*i)->set_sensitive (sensitive);
}
break;
switch (state) {
case Off:
- sstr = (shrt ? "O" : _("O"));
+ sstr = (shrt ? "M" : _("M"));
break;
case Play:
sstr = (shrt ? "P" : _("P"));
projects / ardour.git / blobdiff