smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-07 15:25:01 +01:00
Code Issues Projects Releases Wiki Activity

remove a bunch of junk from panner_ui (at least, it seems like junk)

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@8475 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2011-01-07 20:28:43 +00:00
parent 7d252dbbb9
commit 669247a4c4
2 changed files with 16 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

114
gtk2_ardour/panner_ui.cc
View file

@ -59,7 +59,6 @@ PannerUI::PannerUI (Session* s)
, panning_link_button (_("link")) , panning_link_button (_("link"))
, pan_automation_style_button ("") , pan_automation_style_button ("")
, pan_automation_state_button ("") , pan_automation_state_button ("")
, _bar_spinner_active (false)
{ {
set_session (s); set_session (s);
@ -303,10 +302,6 @@ PannerUI::set_width (Width w)
PannerUI::~PannerUI () PannerUI::~PannerUI ()
{ {
for (vector<Adjustment*>::iterator i = pan_adjustments.begin(); i != pan_adjustments.end(); ++i) {
delete (*i);
}
for (vector<MonoPanner*>::iterator i = pan_bars.begin(); i != pan_bars.end(); ++i) { for (vector<MonoPanner*>::iterator i = pan_bars.begin(); i != pan_bars.end(); ++i) {
delete (*i); delete (*i);
} }
@ -354,8 +349,6 @@ PannerUI::panner_changed (void* src)
break; break;
case 2: case 2:
/* bring pan bar state up to date */
update_pan_bars (false);
break; break;
default: default:
@ -385,11 +378,6 @@ PannerUI::setup_pan ()
return; return;
} }
_pan_control_connections.drop_connections ();
for (uint32_t i = 0; i < _panner->npanners(); ++i) {
connect_to_pan_control (i);
}
_current_nouts = nouts; _current_nouts = nouts;
_current_npans = npans; _current_npans = npans;
@ -402,11 +390,9 @@ PannerUI::setup_pan ()
if (nouts == 0 || nouts == 1) { if (nouts == 0 || nouts == 1) {
while (!pan_adjustments.empty()) { while (!pan_bars.empty()) {
delete pan_bars.back(); delete pan_bars.back();
pan_bars.pop_back (); pan_bars.pop_back ();
delete pan_adjustments.back();
pan_adjustments.pop_back ();
} }
/* stick something into the panning viewport so that it redraws */ /* stick something into the panning viewport so that it redraws */
@ -416,13 +402,11 @@ PannerUI::setup_pan ()
} else if (nouts == 2) { } else if (nouts == 2) {
vector<Adjustment*>::size_type asz; vector<Adjustment*>::size_type p;
while (!pan_adjustments.empty()) { while (!pan_bars.empty()) {
delete pan_bars.back(); delete pan_bars.back();
pan_bars.pop_back (); pan_bars.pop_back ();
delete pan_adjustments.back();
pan_adjustments.pop_back ();
} }
if (npans == 2) { if (npans == 2) {
@ -438,34 +422,28 @@ PannerUI::setup_pan ()
/* N-in/2out - just use a set of single-channel panners */ /* N-in/2out - just use a set of single-channel panners */
while ((asz = pan_adjustments.size()) < npans) { while ((p = pan_bars.size()) < npans) {
float x, rx; float x, rx;
MonoPanner* mp; MonoPanner* mp;
/* initialize adjustment with 0.0 (L) or 1.0 (R) for the first and second panners, /* 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 */ which serves as a default, otherwise use current value
*/
rx = _panner->pan_control( asz)->get_value(); rx = _panner->pan_control (p)->get_value();
if (npans == 1) { if (npans == 1) {
x = 0.5; x = 0.5;
} else if (asz == 0) { } else if (p == 0) {
x = 0.0; x = 0.0;
} else if (asz == 1) { } else if (p == 1) {
x = 1.0; x = 1.0;
} else { } else {
x = rx; x = rx;
} }
pan_adjustments.push_back (new Adjustment (x, 0, 1.0, 0.005, 0.05)); mp = new MonoPanner (_panner->pan_control (p));
mp = new MonoPanner (_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 (sigc::bind (sigc::mem_fun(*this, &PannerUI::pan_adjustment_changed), (uint32_t) asz));
boost::shared_ptr<AutomationControl> ac = _panner->pan_control (asz);
#if 0 #if 0
if (asz) { if (asz) {
@ -476,7 +454,7 @@ PannerUI::setup_pan ()
} }
#endif #endif
mp->signal_button_release_event().connect mp->signal_button_release_event().connect
(sigc::bind (sigc::mem_fun(*this, &PannerUI::pan_button_event), (uint32_t) asz)); (sigc::bind (sigc::mem_fun(*this, &PannerUI::pan_button_event), (uint32_t) p));
mp->set_size_request (-1, pan_bar_height); mp->set_size_request (-1, pan_bar_height);
@ -637,7 +615,7 @@ PannerUI::effective_pan_display ()
switch (_panner->nouts()) { switch (_panner->nouts()) {
case 0: case 0:
case 1: case 1:
/* relax */ /* relax: no panning */
break; break;
case 2: case 2:
@ -650,70 +628,22 @@ PannerUI::effective_pan_display ()
} }
} }
void
PannerUI::pan_adjustment_changed (uint32_t which)
{
if (!in_pan_update && which < _panner->npanners()) {
float val = pan_adjustments[which]->get_value ();
float const xpos = _panner->pan_control(which)->get_value();
/* add a kinda-sorta detent for the middle */
if (val != 0.5 && Panner::equivalent (val, 0.5)) {
/* this is going to be reentrant, so just
return after it.
*/
in_pan_update = true;
pan_adjustments[which]->set_value (0.5);
in_pan_update = false;
return;
}
if (!Panner::equivalent (val, xpos)) {
_panner->pan_control(which)->set_value (val);
/* XXX
the panner objects have no access to the session,
so do this here. ick.
*/
_session->set_dirty();
}
}
}
void
PannerUI::pan_value_changed (uint32_t which)
{
ENSURE_GUI_THREAD (*this, &PannerUI::pan_value_changed, which)
if (twod_panner) {
in_pan_update = true;
twod_panner->move_puck (which, _panner->streampanner(which).get_position());
in_pan_update = false;
}
}
void void
PannerUI::update_pan_bars (bool only_if_aplay) PannerUI::update_pan_bars (bool only_if_aplay)
{ {
uint32_t n; uint32_t n;
vector<Adjustment*>::iterator i;
in_pan_update = true; in_pan_update = true;
#if 0
/* this runs during automation playback, and moves the bar controllers /* this runs during automation playback, and moves the bar controllers
and/or pucks around. and/or pucks around.
*/ */
for (i = pan_adjustments.begin(), n = 0; i != pan_adjustments.end(); ++i, ++n) { for (i = pan_bars.begin(), n = 0; i != pan_bars.end(); ++i, ++n) {
if (only_if_aplay) { if (only_if_aplay) {
boost::shared_ptr<AutomationList> alist (_panner->streampanner(n).pan_control()->alist()); boost::shared_ptr<AutomationList> alist (_panner->streampanner(n).pan_control()->alist());
if (!alist->automation_playback()) { if (!alist->automation_playback()) {
continue; continue;
} }
@ -727,6 +657,7 @@ PannerUI::update_pan_bars (bool only_if_aplay)
(*i)->set_value (BaseStereoPanner::azimuth_to_lr_fract (model.azi)); (*i)->set_value (BaseStereoPanner::azimuth_to_lr_fract (model.azi));
} }
} }
#endif
in_pan_update = false; in_pan_update = false;
} }
@ -924,21 +855,6 @@ PannerUI::set_mono (bool yn)
update_pan_sensitive (); update_pan_sensitive ();
} }
void
PannerUI::connect_to_pan_control (uint32_t i)
{
_panner->pan_control(i)->Changed.connect (
_pan_control_connections, invalidator (*this), boost::bind (&PannerUI::pan_value_changed, this, i), gui_context ()
);
}
void
PannerUI::bar_spinner_activate (bool a)
{
_bar_spinner_active = a;
}
void void
PannerUI::show_width () PannerUI::show_width ()
{ {

11
gtk2_ardour/panner_ui.h
View file

@ -137,13 +137,10 @@ class PannerUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr
void panning_link_direction_clicked (); void panning_link_direction_clicked ();
std::vector<Gtk::Adjustment*> pan_adjustments;
//std::vector<PannerBar*> pan_bars;
std::vector<MonoPanner*> pan_bars; std::vector<MonoPanner*> pan_bars;
void pan_adjustment_changed (uint32_t which);
void pan_value_changed (uint32_t which); void pan_value_changed (uint32_t which);
void update_pan_bars (bool only_if_aplay); void update_pan_bars (bool);
void update_pan_linkage (); void update_pan_linkage ();
void update_pan_state (); void update_pan_state ();
void build_astate_menu (); void build_astate_menu ();
@ -159,8 +156,6 @@ class PannerUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr
bool pan_button_event (GdkEventButton*, uint32_t which); bool pan_button_event (GdkEventButton*, uint32_t which);
void connect_to_pan_control (uint32_t);
Gtk::Menu* pan_menu; Gtk::Menu* pan_menu;
Gtk::CheckMenuItem* bypass_menu_item; Gtk::CheckMenuItem* bypass_menu_item;
void build_pan_menu (uint32_t which); void build_pan_menu (uint32_t which);
@ -185,10 +180,6 @@ class PannerUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr
void start_touch (boost::weak_ptr<ARDOUR::AutomationControl>); void start_touch (boost::weak_ptr<ARDOUR::AutomationControl>);
void stop_touch (boost::weak_ptr<ARDOUR::AutomationControl>); void stop_touch (boost::weak_ptr<ARDOUR::AutomationControl>);
void bar_spinner_activate (bool);
/** true if any of our PannerBars are currently using a SpinButton to modify value */
bool _bar_spinner_active;
}; };
#endif /* __ardour_gtk_panner_ui_h__ */ #endif /* __ardour_gtk_panner_ui_h__ */