From 724eda62fcde1127353ac6d87011e28c2df8136d Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Tue, 21 Nov 2006 21:35:51 +0000
Subject: [PATCH] "treadmill" design for new faders

git-svn-id: svn://localhost/ardour2/trunk@1150 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 gtk2_ardour/gain_meter.cc               |  23 ++---------------------
 gtk2_ardour/icons/fader_belt.png        | Bin 0 -> 568 bytes
 gtk2_ardour/icons/gain_fader_base.png   | Bin 359 -> 0 bytes
 gtk2_ardour/icons/gain_fader_handle.png | Bin 354 -> 0 bytes
 4 files changed, 2 insertions(+), 21 deletions(-)
 create mode 100644 gtk2_ardour/icons/fader_belt.png
 delete mode 100644 gtk2_ardour/icons/gain_fader_base.png
 delete mode 100644 gtk2_ardour/icons/gain_fader_handle.png

diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc
index aaa1368eea..fad0becd54 100644
--- a/gtk2_ardour/gain_meter.cc
+++ b/gtk2_ardour/gain_meter.cc
@@ -62,26 +62,7 @@ map<string,Glib::RefPtr<Gdk::Pixmap> > GainMeter::metric_pixmaps;
 int
 GainMeter::setup_slider_pix ()
 {
-#if 0
-	string path = ARDOUR::find_data_file("vslider02_slider.xpm", "pixmaps");
-	if (path.empty()) {
-		error << _("cannot find images for fader slider") << endmsg;
-		return -1;
-	}
-	slider = Gdk::Pixbuf::create_from_file (path);
-#endif
-	slider = ::get_icon ("gain_fader_handle");
-	
-#if 0
-	path = ARDOUR::find_data_file("vslider02_rail.xpm", "pixmaps");
-	if (path.empty()) {
-		error << _("cannot find images for fader rail") << endmsg;
-		return -1;
-	}
-	rail = Gdk::Pixbuf::create_from_file (path);
-#endif
-	rail = ::get_icon ("gain_fader_base");
-
+	slider = ::get_icon ("fader_belt");
 	return 0;
 }
 
@@ -103,7 +84,7 @@ GainMeter::GainMeter (boost::shared_ptr<IO> io, Session& s)
 	ignore_toggle = false;
 	meter_menu = 0;
 	
-	gain_slider = manage (new VSliderController (slider, rail,
+	gain_slider = manage (new VSliderController (slider,
 						     &gain_adjustment,
 						     _io->gain_control(),
 						     false));
diff --git a/gtk2_ardour/icons/fader_belt.png b/gtk2_ardour/icons/fader_belt.png
new file mode 100644
index 0000000000000000000000000000000000000000..292a966f30a02894b2d9abbd26fa563ed7723cfb
GIT binary patch
literal 568
zcmeAS@N?(olHy`uVBq!ia0vp^!VC<IUpSb6tN@lqQ6R-x;1OBOz`zZZ;1*_Nm^DWN
zD9B#o>FdgVjayV$OnraYz1=_|*%H@?66gHf+|;}h2Ir#G#FEq$h4Rdj426)4R0VfW
z-+=cis(C=u*Lk`)hE&{od%@99I#9s%VzgK>PoDJVwr#3Y6yNEz`KGLFafvv|khJUe
zmWf756XGSeJY`+bvnYDA{@>+R>mR*)cRH~`(P(mHso%nS+mOx03tqRon(AKo-d<_S
zx~r@q=)v>;c4Gx)<;FYj`Be_=tM@jVw60#+_{2JE0Z$cAfdecO&7OPS%v*I+BxCpU
zpMR7V=FVUJ)79zv->5VCmVR=R9atDwf0bfd@mfkDVtp2qQrK!Kg~v0Pw`N^k6}mcX
zZ4?=dZ}r#fa?a)D*?qlxnL|TG)tEcL>sf@R_av1mf1DK?YwG|1{Wy2>M<K=uxAVV;
zcY8nh`1|_nr#cD0EB42PrQ~eq55Io(<%Z?+4DIq}t1&m7eeTQVusQSCec#Ilib6`K
zUT%95p?Rxrfr{sCzU1?<))QJ2w%-mmV*a$lmn`SPJo!6+YdxdiGzZUDQ5?3wC}!|<
L^>bP0l+XkKTOIjz

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/icons/gain_fader_base.png b/gtk2_ardour/icons/gain_fader_base.png
deleted file mode 100644
index f8f59ffc0d659ef7ae8b4cb91ccbf66364db0143..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 359
zcmeAS@N?(olHy`uVBq!ia0vp^!a)3sg9%8UseFAANO2Z;L>4nJa04Z{g&7%U&5-~K
zvX^-Jy0Ty678Nj565p@J0Thxgag8W(&d<$F%`0JWE=o--Nlj5G&n(GM2+2rQaQE~L
zc%P!02UK|1)5S3)<KEkIyM37hMO-h|>S{4?_eUqnx$ffjQY=Za`;_8wEg{?Lfo#)4
zmP2#rpI>$O;nQD#MH#FXs=su2&*|X7uXy3Jv${jy@$0+}febV4{B|F&e(>k#HhDR&
zWuG%8wk=uqvUdCZO?iwP64x?)xDv(H^|8{2am&WFFRw{SYXw|o+`)W;YxU1v7o2B2
zPrVxVthJ=;^iwx~u20{Wg{_U+nss$m=xTBpf8*ckFH>b@NbPXf0eY0d)78&qol`;+
E0PMw))&Kwi

diff --git a/gtk2_ardour/icons/gain_fader_handle.png b/gtk2_ardour/icons/gain_fader_handle.png
deleted file mode 100644
index b86172f8d9cbcfe150bb46d7f348d7717c7628b6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 354
zcmeAS@N?(olHy`uVBq!ia0vp^!a)3sg9%8UseFAANO2Z;L>4nJa04Z{g&7%U&5-~K
zvX^-Jy0Ty678Nk$-IFIB2o#bnag8W(&d<$F%`0JWE=o--Nlj5G&n(GM2+2rQaQE~L
zc%P!02UK{&)5S3)<KEkI2LlfW@VH)F&BH3tk$I>rFtaHvGR>Le-^U3d6Q&<6=hRuh
z<zmK?%H@5>&+osz)XC!oZ@-<o15+i-s`)BcUVhoitR>3vwfd*sp8ZVT*8GR<Ht0M*
zyn%nqx6g)qHikCD%CFX#@l29S;<(^~8OtX&t;&>Q47x49hvDVIl-T^*y>agqMQ?re
z3tF;OT2!lL(Kes0Syxwut`1upMGoWb|IGPITf%Sdub%lC=tl-mS3j3^P6<r_@>Gz;