From dd2d07f22707ac607c9469e474bed0ce6984e56c Mon Sep 17 00:00:00 2001
From: Peter Nelson <peter@fuzzle.org>
Date: Mon, 4 Feb 2013 08:27:53 +0000
Subject: [PATCH] Clean up container names

---
 ptap/ptapui.cpp | 66 ++++++++++++++++++++++++-------------------------
 1 file changed, 32 insertions(+), 34 deletions(-)

diff --git a/ptap/ptapui.cpp b/ptap/ptapui.cpp
index fa02178..c25124e 100644
--- a/ptap/ptapui.cpp
+++ b/ptap/ptapui.cpp
@@ -90,20 +90,20 @@ void PTapUI::InitWidgets()
 		c1->h = 16;
 		c->Pack(c1);
 
-		Container *c11 = new HBox();
-		c11->h = -1;
-		c11->padding = padding;
-		c->Pack(c11);
+		Container *c_strip = new HBox();
+		c_strip->h = -1;
+		c_strip->padding = padding;
+		c->Pack(c_strip);
 
-		Container *c2 = new HBox();
-		if (i >= TAPS) c2->colour = Colour(1, 1, 1, 0.15f);
-		c2->w = slide_w * TAPS;
-		c11->Pack(c2);
+		Container *c_taps = new HBox();
+		if (i >= TAPS) c_taps->colour = Colour(1, 1, 1, 0.15f);
+		c_taps->w = slide_w * TAPS;
+		c_strip->Pack(c_taps);
 
-		Container *c3 = new HBox();
-		if (i >= TAPS) c3->colour = Colour(1, 1, 1, 0.15f);
-		c3->w = slide_w * 2;
-		c11->Pack(c3);
+		Container *c_ins = new HBox();
+		if (i >= TAPS) c_ins->colour = Colour(1, 1, 1, 0.15f);
+		c_ins->w = slide_w * 2;
+		c_strip->Pack(c_ins);
 
 		if (i < TAPS) {
 			snprintf(tmp, sizeof tmp, "Tap %d", i + 1);
@@ -125,7 +125,7 @@ void PTapUI::InitWidgets()
 			slider->min = -1.f;
 			slider->max = 1.f;
 			slider->port = (i * 10) + 4 + j;
-			c2->Pack(slider);
+			c_taps->Pack(slider);
 		}
 
 		for (int j = 0; j < 2; j++) {
@@ -137,31 +137,29 @@ void PTapUI::InitWidgets()
 			slider->min = -1.f;
 			slider->max = 1.f;
 			slider->port = (i * 10) + 4 + TAPS + j;
-			c3->Pack(slider);
+			c_ins->Pack(slider);
 		}
 
-		for (int j = 0; j < 1; j++) {
-			Slider *slider = new VSlider();
-			strncpy(slider->group, tmp, sizeof slider->group);
-			strncpy(slider->label, "Gain", sizeof slider->label);
-			slider->big = i >= TAPS;
-			slider->colour = Colour(1, .2f, .2f, 1);
-			slider->w = slide_w;
-			slider->min = -1.f;
-			slider->max = 1.f;
-			slider->port = (i * 10) + 4 + TAPS + 2 + j;
-			c11->Pack(slider);
-		}
+		Slider *gain = new VSlider();
+		strncpy(gain->group, tmp, sizeof gain->group);
+		strncpy(gain->label, "Gain", sizeof gain->label);
+		gain->big = i >= TAPS;
+		gain->colour = Colour(1, .2f, .2f, 1);
+		gain->w = slide_w;
+		gain->min = -1.f;
+		gain->max = 1.f;
+		gain->port = (i * 10) + 4 + TAPS + 2;
+		c_strip->Pack(gain);
 
 		if (i < TAPS) {
-			Knob *k = new Knob();
-			strncpy(k->group, tmp, sizeof k->group);
-			strncpy(k->label, "Delay", sizeof k->label);
-			k->w = -1;
-			k->min = 0.f;
-			k->max = 10.f;
-			k->port = (i * 10) + 4 + 9;
-			c11->Pack(k);
+			Knob *delay = new Knob();
+			strncpy(delay->group, tmp, sizeof delay->group);
+			strncpy(delay->label, "Delay", sizeof delay->label);
+			delay->w = -1;
+			delay->min = 0.f;
+			delay->max = 10.f;
+			delay->port = (i * 10) + 4 + TAPS + 3;
+			c_strip->Pack(delay);
 		}
 
 		this->widget->Pack(c);