allow_y = false;
allow_target = false;
- panner->StateChanged.connect (state_connection, boost::bind (&Panner2d::handle_state_change, this), gui_context());
- panner->Changed.connect (change_connection, boost::bind (&Panner2d::handle_position_change, this), gui_context());
+ panner->StateChanged.connect (state_connection, invalidator (*this), boost::bind (&Panner2d::handle_state_change, this), gui_context());
+ panner->Changed.connect (change_connection, invalidator (*this), boost::bind (&Panner2d::handle_position_change, this), gui_context());
drag_target = 0;
set_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::POINTER_MOTION_MASK);
Panner2d::~Panner2d()
{
for (Targets::iterator i = targets.begin(); i != targets.end(); ++i) {
- delete i->second;
+ delete *i;
}
}
add_puck ("", 0.0, 0.0);
}
- while (pucks.size() > n_inputs) {
- pucks.erase (pucks.begin());
- }
+ if (pucks.size() > n_inputs) {
+ for (uint32_t i = pucks.size(); i < n_inputs; ++i) {
+ delete pucks[i];
+ }
+ pucks.resize (n_inputs);
+ }
+
for (Targets::iterator x = pucks.begin(); x != pucks.end(); ++x) {
- (*x).second->visible = false;
+ (*x)->visible = false;
}
switch (n_inputs) {
case 1:
pucks[0]->set_text ("");
- pucks[0]->x.set_value (0.0);
- pucks[0]->y.set_value (0.5);
- pucks[0]->visible = true;
break;
case 2:
pucks[0]->set_text ("R");
- pucks[0]->visible = true;
pucks[1]->set_text ("L");
- if (existing_pucks < 2) {
- pucks[1]->x.set_value (0.25f);
- pucks[1]->y.set_value (0.5f);
- }
- pucks[1]->visible = true;
break;
default:
char buf[64];
snprintf (buf, sizeof (buf), "%" PRIu32, i);
pucks[i]->set_text (buf);
-
- if (existing_pucks < i) {
- float x, y;
- panner->streampanner (i).get_position (x, y);
- pucks[i]->x.set_value (x);
- pucks[i]->y.set_value (y);
- }
-
- pucks[i]->visible = true;
}
break;
}
+ for (uint32_t i = existing_pucks; i < n_inputs; ++i) {
+ float x, y;
+ panner->streampanner (i).get_position (x, y);
+ pucks[i]->x.set_value (x);
+ pucks[i]->y.set_value (y);
+ pucks[i]->visible = true;
+ }
+
/* add all outputs */
while (targets.size() < panner->nouts()) {
add_target (0.0, 0.0);
}
- while (targets.size() > panner->nouts()) {
- targets.erase (targets.begin());
+ if (targets.size() > panner->nouts()) {
+ for (uint32_t i = panner->nouts(); i < targets.size(); ++i) {
+ delete targets[i];
+ }
+
+ targets.resize (panner->nouts ());
}
for (Targets::iterator x = targets.begin(); x != targets.end(); ++x) {
- (*x).second->visible = false;
+ (*x)->visible = false;
}
for (uint32_t n = 0; n < panner->nouts(); ++n) {
Panner2d::add_puck (const char* text, float x, float y)
{
Target* puck = new Target (x, y, text);
-
- pair<int,Target *> newpair;
- newpair.first = pucks.size();
- newpair.second = puck;
-
- pucks.insert (newpair);
+ pucks.push_back (puck);
puck->visible = true;
return 0;
int
Panner2d::add_target (float x, float y)
{
- Target *target = new Target (x, y, "");
-
- pair<int,Target *> newpair;
- newpair.first = targets.size();
- newpair.second = target;
-
- targets.insert (newpair);
+ Target* target = new Target (x, y, "");
+ targets.push_back (target);
target->visible = true;
queue_draw ();
- return newpair.first;
-}
-
-void
-Panner2d::drop_targets ()
-{
- for (Targets::iterator i = targets.begin(); i != targets.end(); ) {
-
- Targets::iterator tmp;
-
- tmp = i;
- ++tmp;
-
- delete i->second;
- targets.erase (i);
-
- i = tmp;
- }
-
- queue_draw ();
-}
-
-void
-Panner2d::remove_target (int which)
-{
- Targets::iterator i = targets.find (which);
-
- if (i != targets.end()) {
- delete i->second;
- targets.erase (i);
- queue_draw ();
- }
+ return targets.size() - 1;
}
void
queue_draw ();
}
-void
-Panner2d::move_target (int which, float x, float y)
-{
- Targets::iterator i = targets.find (which);
- Target *target;
-
- if (!allow_target) {
- return;
- }
-
- if (i != targets.end()) {
- target = i->second;
- target->x.set_value (x);
- target->y.set_value (y);
-
- queue_draw ();
- }
-}
-
void
Panner2d::move_puck (int which, float x, float y)
{
- Targets::iterator i = pucks.find (which);
- Target *target;
-
- if (i != pucks.end()) {
- target = i->second;
- target->x.set_value (x);
- target->y.set_value (y);
-
- queue_draw ();
- }
-}
-
-void
-Panner2d::show_puck (int which)
-{
- Targets::iterator i = pucks.find (which);
-
- if (i != pucks.end()) {
- Target* puck = i->second;
- if (!puck->visible) {
- puck->visible = true;
- queue_draw ();
- }
- }
-}
-
-void
-Panner2d::hide_puck (int which)
-{
- Targets::iterator i = pucks.find (which);
-
- if (i != pucks.end()) {
- Target* puck = i->second;
- if (!puck->visible) {
- puck->visible = false;
- queue_draw ();
- }
- }
-}
-
-void
-Panner2d::show_target (int which)
-{
- Targets::iterator i = targets.find (which);
- if (i != targets.end()) {
- if (!i->second->visible) {
- i->second->visible = true;
- queue_draw ();
- }
- }
-}
-
-void
-Panner2d::hide_target (int which)
-{
- Targets::iterator i = targets.find (which);
- if (i != targets.end()) {
- if (i->second->visible) {
- i->second->visible = false;
- queue_draw ();
- }
+ if (which >= int (targets.size())) {
+ return;
}
+
+ targets[which]->x.set_value (x);
+ targets[which]->y.set_value (y);
+ queue_draw ();
}
Panner2d::Target *
is_puck = false;
for (Targets::const_iterator i = targets.begin(); i != targets.end(); ++i, ++which) {
- candidate = i->second;
+ candidate = *i;
cx = candidate->x.get_value();
cy = candidate->y.get_value();
}
for (Targets::const_iterator i = pucks.begin(); i != pucks.end(); ++i, ++pwhich) {
- candidate = i->second;
+ candidate = *i;
cx = candidate->x.get_value();
cy = candidate->y.get_value();
for (Targets::iterator i = pucks.begin(); i != pucks.end(); ++i) {
- Target* puck = i->second;
+ Target* puck = *i;
if (puck->visible) {
/* redraw puck */
int n = 0;
for (Targets::iterator i = targets.begin(); i != targets.end(); ++i) {
- Target *target = i->second;
+ Target *target = *i;
char buf[256];
++n;
projects / ardour.git / blobdiff