From b1b9bc8a3ee5bf8aabe8acc9d2894ab71961c751 Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Thu, 5 Jun 2014 18:53:40 +0200
Subject: [PATCH] Revert "frankenstein'ed fade+trim cursors"

This reverts commit 3b717da78378ebc7b97250a06fccf38e11cd3ace.
---
 gtk2_ardour/icons/fade_in_trim_cursor.png  | Bin 942 -> 0 bytes
 gtk2_ardour/icons/fade_out_trim_cursor.png | Bin 971 -> 0 bytes
 gtk2_ardour/mouse_cursors.cc               |   8 ++++----
 3 files changed, 4 insertions(+), 4 deletions(-)
 delete mode 100644 gtk2_ardour/icons/fade_in_trim_cursor.png
 delete mode 100644 gtk2_ardour/icons/fade_out_trim_cursor.png

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

literal 942
zcmV;f15x~mP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00004XF*Lt006O%
z3;baP000AJNkl<ZSi|j?O-N&B6o#Lh$;AvK304&Uz`3;y7P6=<hL8xQ*i{$7Vhbfy
z9B@&pZ5gGwa3e0tQ0Wg--3o<*LIq1Zir^-zMrsjCmHsFxRj34~CNn~4j3#dv#vs<}
zSg*+}`oiIIzw^QO-tRp>_rU)+8%7b&astl*LEskfRNgA{&zpe5dBr521>OLHhGF=<
zUhj=yFi1;F3ze0XR8&+H%(AR2CGsM0zq-0QH#j(`xw$zdlS!QgKqDg~Zo4IG13qbP
zZf+eI7@(`G3zy4PaBggD5RFDzT3R9=kCR9wNF)*@lSyK+7(k7kWZtW)s@k8KnNcp6
zlO!D+9B684N}ZjZs;#XR@CWcEa0hq|co}#Bcp9j+E2gglU$nNiYIAc_l9WoNG&VLS
z%d!M40^NXBjLb2CZ+m)rluoB5NzrIj_4V}vzRpWnRNM=NLIsJ&$H!%w=0o7sQq-{5
zEz2roPk(>EfFFQoN<pT&tgLKzd3jlqG(9~n;5VS6R26=tx3^c46pO{=@p#g}^Q9tl
z-QjRNSYKb4B!xmD0q>Wx|Gm}G(IH7%TU(RE;Yb4Ir6jbpu&^LW>g($h@L?&*+;BRb
z`>9k)xm->jk4HdbDTq`6p8+5Ed_GCi>guY1hrm0)HM<USoa4U+ybb&gybIiFYdb8y
zi;If@e*$B`&p^AKgz8W6y#)MZ7{<MDIP3=YfSW#_?>M1t%d!Xr0!_dIa6jKDFOB1I
zU;*C%S-;<(U0GSt?(VLDzkpvNk%%Ozy}ez)g5U2~DwWdw{Ja_(8Zy8>aQCvASDv@K
zz<ym_U1oN6R@>X#lBBJzE#+@$dtzcjkw`>MO-%x#e!pKkJ3EDaqobp8xm;=B0nl~P
zUy7s6-N45#m#chuc(|;)yPKMt8Vuvmoyla5B>D&3ZZ}@97t=HW*xTD99*;9LG{ofO
z<N@#_&<lKLM^Kj(k0aSfrfI&?*w}a*=mEaBTe8z|R#4wQA@^5T71aDo+W%@8MkX8%
z3rL?J1n{|KSqcOKSs-g?+Mib#9|1azP=0;QuEKcH*74?v^-t|?9pu08xLsuQwtW<L
z07&9+czi7KXT6^_*YhORp)8kRt}Bp4|B29X*^b&qvGK&U4&$8bEc!M54evtB%t9P(
Q8~^|S07*qoM6N<$f?RvECjbBd

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

literal 971
zcmV;+12p`JP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00004XF*Lt006O%
z3;baP000AmNkl<ZSi|j@-AiO;9LGOr*1>7<bwC~8kh6Btg;yI6(;(DR*Mni*48;Uq
zL>iH?c;StBwIyV3`UeDphJsKjhBw}%Mj<Yal#Q7oB;q<dB@8<+I^QllGi)~MzBqf9
z=m!rE&)a#v=lT79-{*S{{BP%*VbvMnci<inwd#971Xu*_07p*~khZtCiN#{M5{*V#
zU0r2yagp`)^|++(EpT4~KNk$qz`#Hmpz|yii)nUtR=vHws;;ii0N(&F7wUv+fW7AC
zW-2Qyal75P-EKS{4_>bqzu!+&Q&Vn1B9UNhY>c6yAvQKPegr-OzPoHtwZJvtMc_5y
z4d6py68NLGwpJY-9h#V!(9zM6Bq@{0XnJ~DRaI4K;De_f{3Z|rmQB;t$jFG|@wg;u
zXJ<#Pt*rvafamPU%r@Yw`uch;EiFls5{ZO5J3D0sz0)qrc-`rA{y922nsZ?w5D;+N
zP9A$6xYN_qlgmcaGzGkAC#Xu`x2dTqNz%&7ii(Si4}oesL0vB|FHdZ3ZAp^4y1E1m
z*nJJ%3<Ls_q|MDuIUJ6=c4b}GN*oSHEE0)GlG@wb1-xtbDSgu2-7QI)pPv`-gWZ6d
zDk>_J$z&9d$5m8Rlm@Qa4eHl$I4nu>dc6W(c|cWMXpV=FCTF$JqJZ@9@bC$xx3vMh
z1PlT116LjwkdbFh)`t16hAY5(mdJY{5{Urd^?CuWTkA$F9rfzt01|MVr~fLDwg6{O
z>;~|YVHmfA!C)DXJ~%i4pr)n<pbEe=P5gd;Gca%IscV-Kw5Jrn*TAvQ=Q|FE!#X@X
z6p(CeY?LIet*r?N17G-jKE>m4&CSiJp`jsVz1S_F<cYY(Dz|`iU0q#jW@bkF`}>ll
z-Q8UQsnXI?Ei5c(a&l6@0r0KQ=TkHq&CMGe9F)uDN&t6(x3ed1JR+bF@Ttq?D(Ua<
zFAjx5csw2q<K!`^REp*0<-7~a%F1YIX~F3{3BhDC$===`eSLk5kB=V#Ye1LdzwqgF
zk;{_6#}@x&%R{^DNo8%mpuP{hb82qEf;ykw0DdtHBNYq=1tjtTGEGx{zyH{xlS@nc
zvn)%De_0&%FF;m*<RW4$gnIlOc<WUEXXjiUdaxJ;0%lknoYnpZAn9btFboQn_PU^b
trWM&l9eUOPk#*Cf=pkEwSUoc?`x{0Y<NOP<THpWx002ovPDHLkV1nFgz$^d&

diff --git a/gtk2_ardour/mouse_cursors.cc b/gtk2_ardour/mouse_cursors.cc
index 232d06c1f3..9ccaf4de43 100644
--- a/gtk2_ardour/mouse_cursors.cc
+++ b/gtk2_ardour/mouse_cursors.cc
@@ -115,13 +115,13 @@ MouseCursors::MouseCursors ()
 	}
 
 	{
-		RefPtr<Pixbuf> p (::get_icon ("fade_in_trim_cursor"));
-		fade_trim_in = new Cursor (Display::get_default(), p, 0, 35);
+		RefPtr<Pixbuf> p (::get_icon ("fade_in_cursor"));
+		fade_trim_in = new Cursor (Display::get_default(), p, 0, 0);
 	}
 
 	{
-		RefPtr<Pixbuf> p (::get_icon ("fade_out_trim_cursor"));
-		fade_trim_out = new Cursor (Display::get_default(), p, 35, 35);
+		RefPtr<Pixbuf> p (::get_icon ("fade_out_cursor"));
+		fade_trim_out = new Cursor (Display::get_default(), p, 29, 0);
 	}
 
 	{