From eae83763fb607ac0b7381ec06ce2b2e595def7ea Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Sun, 25 Feb 2007 20:53:55 +0000
Subject: [PATCH] new crossfade editor button icons from thorsten; ignore
 loop+range markers when looking for next/previous locations

git-svn-id: svn://localhost/ardour2/trunk@1506 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 gtk2_ardour/crossfade_edit.cc                 |  34 +++++++++++-------
 gtk2_ardour/crossfade_edit.h                  |   5 ++-
 gtk2_ardour/icons/crossfade_in_constant.png   | Bin 0 -> 693 bytes
 gtk2_ardour/icons/crossfade_in_dipped.png     | Bin 0 -> 667 bytes
 gtk2_ardour/icons/crossfade_in_fast-cut.png   | Bin 0 -> 686 bytes
 gtk2_ardour/icons/crossfade_in_slow-cut.png   | Bin 0 -> 723 bytes
 gtk2_ardour/icons/crossfade_in_slow-fade.png  | Bin 0 -> 730 bytes
 gtk2_ardour/icons/crossfade_in_transition.png | Bin 0 -> 692 bytes
 gtk2_ardour/icons/crossfade_out_constant.png  | Bin 0 -> 720 bytes
 gtk2_ardour/icons/crossfade_out_dipped.png    | Bin 0 -> 831 bytes
 gtk2_ardour/icons/crossfade_out_fast-cut.png  | Bin 0 -> 737 bytes
 gtk2_ardour/icons/crossfade_out_slow-cut.png  | Bin 0 -> 770 bytes
 gtk2_ardour/icons/crossfade_out_slow-fade.png | Bin 0 -> 798 bytes
 .../icons/crossfade_out_transition.png        | Bin 0 -> 737 bytes
 libs/ardour/ardour/location.h                 |   8 ++---
 libs/ardour/location.cc                       |  20 ++++++++---
 16 files changed, 44 insertions(+), 23 deletions(-)
 create mode 100644 gtk2_ardour/icons/crossfade_in_constant.png
 create mode 100644 gtk2_ardour/icons/crossfade_in_dipped.png
 create mode 100644 gtk2_ardour/icons/crossfade_in_fast-cut.png
 create mode 100644 gtk2_ardour/icons/crossfade_in_slow-cut.png
 create mode 100644 gtk2_ardour/icons/crossfade_in_slow-fade.png
 create mode 100644 gtk2_ardour/icons/crossfade_in_transition.png
 create mode 100644 gtk2_ardour/icons/crossfade_out_constant.png
 create mode 100644 gtk2_ardour/icons/crossfade_out_dipped.png
 create mode 100644 gtk2_ardour/icons/crossfade_out_fast-cut.png
 create mode 100644 gtk2_ardour/icons/crossfade_out_slow-cut.png
 create mode 100644 gtk2_ardour/icons/crossfade_out_slow-fade.png
 create mode 100644 gtk2_ardour/icons/crossfade_out_transition.png

diff --git a/gtk2_ardour/crossfade_edit.cc b/gtk2_ardour/crossfade_edit.cc
index 0940f91b4f..a69383c7ee 100644
--- a/gtk2_ardour/crossfade_edit.cc
+++ b/gtk2_ardour/crossfade_edit.cc
@@ -193,7 +193,7 @@ CrossfadeEditor::CrossfadeEditor (Session& s, boost::shared_ptr<Crossfade> xf, d
 
 	for (list<Preset*>::iterator i = fade_in_presets->begin(); i != fade_in_presets->end(); ++i) {
 
-		pxmap = manage (new Image (get_xpm((*i)->xpm)));
+		pxmap = manage (new Image (::get_icon ((*i)->image_name)));
 		pbutton = manage (new Button);
 		pbutton->add (*pxmap);
 		pbutton->set_name ("CrossfadeEditButton");
@@ -214,7 +214,7 @@ CrossfadeEditor::CrossfadeEditor (Session& s, boost::shared_ptr<Crossfade> xf, d
 
 	for (list<Preset*>::iterator i = fade_out_presets->begin(); i != fade_out_presets->end(); ++i) {
 
-		pxmap = manage (new Image (get_xpm((*i)->xpm)));
+		pxmap = manage (new Image (::get_icon ((*i)->image_name)));
 		pbutton = manage (new Button);
 		pbutton->add (*pxmap);
 		pbutton->set_name ("CrossfadeEditButton");
@@ -831,7 +831,8 @@ CrossfadeEditor::build_presets ()
 	fade_out_presets = new Presets;
 
 	/* FADE OUT */
-	p = new Preset ("hiin.xpm");
+	// p = new Preset ("hiin.xpm");
+	p = new Preset ("crossfade_in_fast-cut");
 	p->push_back (PresetPoint (0, 0));
 	p->push_back (PresetPoint (0.0207373, 0.197222));
 	p->push_back (PresetPoint (0.0645161, 0.525));
@@ -842,7 +843,8 @@ CrossfadeEditor::build_presets ()
 	p->push_back (PresetPoint (1, 1));
 	fade_in_presets->push_back (p);
 	
-	p = new Preset ("loin.xpm");
+	// p = new Preset ("loin.xpm");
+	p = new Preset ("crossfade_in_transition");
 	p->push_back (PresetPoint (0, 0));
 	p->push_back (PresetPoint (0.389401, 0.0333333));
 	p->push_back (PresetPoint (0.629032, 0.0861111));
@@ -852,7 +854,8 @@ CrossfadeEditor::build_presets ()
 	p->push_back (PresetPoint (1, 1));
 	fade_in_presets->push_back (p);
 
-	p = new Preset ("regin.xpm");
+	// p = new Preset ("regin.xpm");
+	p = new Preset ("crossfade_in_constant");
 	p->push_back (PresetPoint (0, 0));
 	p->push_back (PresetPoint (0.0737327, 0.308333));
 	p->push_back (PresetPoint (0.246544, 0.658333));
@@ -862,7 +865,8 @@ CrossfadeEditor::build_presets ()
 	p->push_back (PresetPoint (1, 1));
 	fade_in_presets->push_back (p);
 
-	p = new Preset ("regin2.xpm");
+	// p = new Preset ("regin2.xpm");
+	p = new Preset ("crossfade_in_slow-cut");
 	p->push_back (PresetPoint (0, 0));
 	p->push_back (PresetPoint (0.304147, 0.0694444));
 	p->push_back (PresetPoint (0.529954, 0.152778));
@@ -872,14 +876,16 @@ CrossfadeEditor::build_presets ()
 	p->push_back (PresetPoint (1, 1));
 	fade_in_presets->push_back (p);
 
-	p = new Preset ("linin.xpm");
+	// p = new Preset ("linin.xpm");
+	p = new Preset ("crossfade_in_dipped");
 	p->push_back (PresetPoint (0, 0));
 	p->push_back (PresetPoint (1, 1));
 	fade_in_presets->push_back (p);
 
 	/* FADE OUT */
 
-	p = new Preset ("hiout.xpm");
+	// p = new Preset ("hiout.xpm");
+	p = new Preset ("crossfade_out_fast-cut");
 	p->push_back (PresetPoint (0, 1));
 	p->push_back (PresetPoint (0.305556, 1));
 	p->push_back (PresetPoint (0.548611, 0.991736));
@@ -889,7 +895,8 @@ CrossfadeEditor::build_presets ()
 	p->push_back (PresetPoint (1, 0));
 	fade_out_presets->push_back (p);
 	
-	p = new Preset ("regout.xpm");
+	// p = new Preset ("regout.xpm");
+	p = new Preset ("crossfade_out_constant");
 	p->push_back (PresetPoint (0, 1));
 	p->push_back (PresetPoint (0.228111, 0.988889));
 	p->push_back (PresetPoint (0.347926, 0.972222));
@@ -899,7 +906,8 @@ CrossfadeEditor::build_presets ()
 	p->push_back (PresetPoint (1, 0));
 	fade_out_presets->push_back (p);
 
-	p = new Preset ("loout.xpm");
+	// p = new Preset ("loout.xpm");
+	p = new Preset ("crossfade_out_transition");
 	p->push_back (PresetPoint (0, 1));
 	p->push_back (PresetPoint (0.023041, 0.697222));
 	p->push_back (PresetPoint (0.0553,   0.483333));
@@ -909,7 +917,8 @@ CrossfadeEditor::build_presets ()
 	p->push_back (PresetPoint (1, 0));
 	fade_out_presets->push_back (p);
 
-	p = new Preset ("regout2.xpm");
+	// p = new Preset ("regout2.xpm");
+	p = new Preset ("crossfade_out_slow-fade");
 	p->push_back (PresetPoint (0, 1));
 	p->push_back (PresetPoint (0.080645, 0.730556));
 	p->push_back (PresetPoint (0.277778, 0.289256));
@@ -918,7 +927,8 @@ CrossfadeEditor::build_presets ()
 	p->push_back (PresetPoint (1, 0));
 	fade_out_presets->push_back (p);
 
-	p = new Preset ("linout.xpm");
+	// p = new Preset ("linout.xpm");
+	p = new Preset ("crossfade_out_dipped");
 	p->push_back (PresetPoint (0, 1));
 	p->push_back (PresetPoint (1, 0));
 	fade_out_presets->push_back (p);
diff --git a/gtk2_ardour/crossfade_edit.h b/gtk2_ardour/crossfade_edit.h
index 3c9a6a13c1..4f2a617d92 100644
--- a/gtk2_ardour/crossfade_edit.h
+++ b/gtk2_ardour/crossfade_edit.h
@@ -43,10 +43,9 @@ class CrossfadeEditor : public ArdourDialog
 	};
 	
 	struct Preset : public list<PresetPoint> {
-	    string xpm;
+	    const char* image_name;
 	    
-	    Preset (string x)
-		    : xpm (x) {}
+	    Preset (const char* x) : image_name (x) {}
 	};
 	
 	typedef list<Preset*> Presets;
diff --git a/gtk2_ardour/icons/crossfade_in_constant.png b/gtk2_ardour/icons/crossfade_in_constant.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce7d48032e570fb1b3bd7c616fb103ac08c03a93
GIT binary patch
literal 693
zcmV;m0!safP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00004XF*Lt006O%
z3;baP00009a7bBm000i0000ie0d@9-fdBvi2XskIMF-Xj6b~~m$)1w00000PbVXQn
zLvL+uWo~o;Lvm$dbY)~9cWHEJAV*0}P*;Ht7XSbPA4x<(R7l6IR84CWQ4~FQ-gFu>
z$;-#otV|aX)as^I1y}BCn+%#t3c3=M8mpm2$X2^4Gz+1)@$aaJAFCP+rE2X$N{S^$
zVvW_9=fcU5=3{1F^ulG{%zeD`&bj9fVem)*h_<~80CfQ0t*issQwKaeN@FLlYpaj*
zLS@YQ)&Q_(WzqlU<Ev`!>gz!O2!QFkzcQ!4uc*O|&z&^|0H{erRRDtkoKqL`Da9W&
z_|tVzcU=Gwg8mXyq@_7AHqFdSX7t5Yuftm`?2;^lN#9Z-tCz~8ef`mIkFZjj!C97D
zG%3gpUfSt*^DYKn0V0TxPO7Q&%*c~XkZ|04fPq(urVkY!&FdSxG*sL7<TN7k%-{^W
zyO2_NIL1q5x0|;lvRSwRgz4Dvq?*p8qtCb8q@gw-yAN&>P5B-aZt3egq*d!OgXqac
z6Kp<bDm)zH#j=c*Ee667fKwuoR4->{90sai53Dsgx@c;6c{Lk&w@ca=DQUW*7lYF*
zd&gt}9^-GNrEwiJKaRvNs_EG)#<NXOQ^@{hJEiIZNDVJPyczgVQ9KTmOQR10jI+7h
zCL4*3hKk$xU(o{4DRDH(X0K%o_kog%mWz_w(#j1<*Ldo=0wBWf<<B$Ya6GiO{qHAs
zG+PA#fBe*i(92H^QkZCSm~iNwT@%7y{sQpR%HNGzWxs_M0Wi_yCZhk8_FOjs>{<EE
bde;5`4i}z?TgOm$00000NkvXXu0mjfndUOd

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/icons/crossfade_in_dipped.png b/gtk2_ardour/icons/crossfade_in_dipped.png
new file mode 100644
index 0000000000000000000000000000000000000000..667e9d9c069d6f6543989ea15cec6e7cba7e97be
GIT binary patch
literal 667
zcmV;M0%ZM(P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00004XF*Lt006O%
z3;baP00009a7bBm000i0000ie0d@9-fdBvi2XskIMF-Xj6c02kAJ$dU0000PbVXQn
zLvL+uWo~o;Lvm$dbY)~9cWHEJAV*0}P*;Ht7XSbP1xZ9fR7l5TW}ppVfiak9V7MZ4
zRh<rR%QP(p1_oAYTVTNCALzvF;^E2jhg*i)J}_nS^7dvcD031!e2<ai<>&v@w7`nV
z$1jnkq&iGw{~bp5*I)lLFfdXr4vd+6{9;&(D>KCR-(h5b_YES-$cP%-WCBYjcaJF6
zqKXXB{dXAI-hW4yqd15x8Ex&u*edF?MGxPDxttLy#|UGykR2?30dcHF<>|tQ?=iB!
z{)*yiD2r?hESTIqqFM7x(?$2+VPt>%4V#+(7&(q;!+reXSW7B1L=NA_WjJzBkz@hH
z<;9g5A_wm=a=iY6&tQ^$0C9OyMTW>>oQ9*u0VDDGK%dFWJC?PiGDGCp14fQlU+}4A
z#98X$0OpKl7NM-gRT;uZ?lW?{_)N$#|IsbN=L0h)ch6Y1uKpsC;}4lQ2^&sQDl%bo
zaExLtugwxYaF>z&%~w*BGTu~V#%N&~##YywCvx;YsfIHm7}z7(gvs4Aj<u`5NaWZ9
zMvj+X$Sp?TalwRUcmhjxeU`|fd&ER2F+TYZ3nE=cN2gfU@>)s_|Bq$~BMSoq12=O@
zx+!y1e2(z(htzU8oW;Vxz`($%XYI##^6?*z7hnJVXJkf=EJjAW83|494+F#hzYGiv
z|9-!F{v9UB&A`B5h{XVM*k2eJ7`{R2FANL}9{>V3n)t8(k~IJT002ovPDHLkV1lcj
BB2WMT

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/icons/crossfade_in_fast-cut.png b/gtk2_ardour/icons/crossfade_in_fast-cut.png
new file mode 100644
index 0000000000000000000000000000000000000000..a55dab560ae0abcd3f55c4dcec9124d8b3b204e1
GIT binary patch
literal 686
zcmV;f0#W^mP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00004XF*Lt006O%
z3;baP00009a7bBm000i0000ie0d@9-fdBvi2XskIMF-Xj6b~>6N4azd0000PbVXQn
zLvL+uWo~o;Lvm$dbY)~9cWHEJAV*0}P*;Ht7XSbP7)eAyR7l6IR84CWQ4~G*&3nlh
z(`wQ#w4IO?#E+(0wW1QCil7uVx(h;G2|@*-78ey)ZruBCl)BWdAZQgt>7qhfC^6|I
zX%fe|E;{2!n2%)Qfy)fs$2s@h``#t=jv)X?oPP;`y7CO5*%c=BNM4|+<2UrhCnY<V
znP4f1Gyw((^qay0@Sd1IfU&yg-PgC(#rfB=2l6wbc<YXO^mrk;x<QGR&k&Xk*fxmW
z+8K@zF@Zot#6ndat3gm0H?FFs<%Q8VYou?O{wJ9MR|X6wFaU@UfvMQiaxt-94JP*n
zg$u;v1<cHx8~(W2D=9m~Zu0^KhQzhvw5oSVHah)O&VS#qAb}BmcJ6{+-bO@(&LB-j
zCL7;sL?h>L2WcyvOvEb9s1AaMOt}dInjo!ZMIsJu5uG}HRGIB4<nE9I9cW}^vU0l}
zWw4G22Rhg%jGQ6OR^;0g<{+gGW)I2!Th!eue+TwxDy?ce7!=+DW8*nHsVh}$MSf%y
zAP^I?7q7&=xBjf-C<?nX_7pg#3YX66<r)ppf8Sk1Q0hGL`ICFsDue7G&uvNouFI#-
zO8Qn)^tnNOU$O+C0Dva*C$#$yN^)}ga_Yq={09&K$OAVYChPNax7%a;pT{>%Yvk3J
zj@AJ~NRO(xtH^)y)^4x`!2VGw@3;x2-My!NuDm>qZ|lPzR{dJwb*AA&-T7930me$8
U7$95HqyPW_07*qoM6N<$f?bj)V*mgE

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/icons/crossfade_in_slow-cut.png b/gtk2_ardour/icons/crossfade_in_slow-cut.png
new file mode 100644
index 0000000000000000000000000000000000000000..fe76c3bc8920726a8ea173af305eb70b860b4916
GIT binary patch
literal 723
zcmV;^0xbQBP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00004XF*Lt006O%
z3;baP00009a7bBm000i0000ie0d@9-fdBvi2XskIMF-Xj6b~^5xf*Ce0000PbVXQn
zLvL+uWo~o;Lvm$dbY)~9cWHEJAV*0}P*;Ht7XSbPJxN4CR7l62R?lk_K@|Sp>|}Sd
zwIL;1Q51_cY0#z!NujMqFCrzaKd>}K#G7bDL_xgx2YB`9$%B7|UiBa%3MxWG1T7{I
zt-sQAlQv~{JT#g$*=A?@U>SCJ`@Z?UdGGBbY|Rn?A^^B&&jnBiU;}8hR+|(9>j37o
zOP6!T?83YgwR8{x1PEXiz*`b{1K^!m{PL<=n18_)0rL92`!{%UG!uPYg1%&fTmc9H
z5+FeUKm>vyFs<4_F~|;Sg=;yU9L?-}Tm*AOm&1k}t$juW08BDCgJER(-1&vrvroRk
zJs9MLlLa`)uiwfUzgL<5tFf7nXdfTcKAD`w_3Vl1Z6B7D(@h3|C^eRH`^}J9S?=lA
z!A2Tjhc<I&+$>i?qNktmfG9~cq#vF*5-wK*nR@O)fdS`3&aPP0__iV|J9)qY0W>yq
zD$8qYq&1zOz{2k}2w=B1ada%;a(!w*z7F<<lBu*=smTBcpC<qywtd7I=(i;Grw$f@
zt-{nUTs&!hT_JLXN^J?*G)?iT<CEdVpDKa>1s9_CC0mrvoEC$Fd#qAbB|STP(x&Y?
zYh1aR@B8>eMIPaoO@0javgzEchz}<s#fpmd{}tHZwUfalrN__m+jp+Uo__{gcU7Bb
zS3lwaz#lxc+^0{bSoYXC?Z8N3;AM%z<z;Nax;iQc0E#E_+Wz6YR;d<_JbG`3YHMxf
z<;Q{sKy_^V{F}}1iw*DRtTl@C^*B+Gxvg=f-dY;~>_0|3s2TP91|a|d002ovPDHLk
FV1h0cIF|qb

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/icons/crossfade_in_slow-fade.png b/gtk2_ardour/icons/crossfade_in_slow-fade.png
new file mode 100644
index 0000000000000000000000000000000000000000..a105967da18447ce2c18e66a24f61576db86489c
GIT binary patch
literal 730
zcmV<00ww*4P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00004XF*Lt006O%
z3;baP00009a7bBm000i0000ie0d@9-fdBvi2XskIMF-Xj6b~~3j6u%Y0000PbVXQn
zLvL+uWo~o;Lvm$dbY)~9cWHEJAV*0}P*;Ht7XSbPL`g(JR7l6IRZC10Q4~Gz&6^pg
zl%ZG}K*cUvAQ~e{qgEtBXdy(6sVR+t;L5}V8Vn{T*oDHvwF|c{T)TDQ!niYO*sxI)
z?ZT9Z5)@k+=?D9JE}R;aewb-*@-lbw?woVanfD=RTrdC~+A{-S7eJCU0GI-B<5<_Q
zG<(-6cAqTfTFnvD+vsxQ&QzGy3Em7~Qhe~xPe(>QrfB@V5{a!y+v}iNNC{1j(U3vN
zl=Adhh}t^rZ7){yES>v1$qD7CgMb3?$&a5*vlg4(_VObL|ASku&`5a1nYn<_d!n!H
z^`{be#ZL5w6-SN^2-hb9hr?0Oe6d^&*}Js###!^?qnpxNoXGKXC17q;K@&OMH<atO
zA6MUPmYe5$GDAPvCEuPOH%Goh_?53_4JqY%6o|y(9OOL?r#Z4!sfO2M(J66y?uscI
zCqlMRtCo~V4oW~^Y3(O2ms|bttroDRfa|iz!EVir$+0wLscf}6gBy*pbIdz-xw(4x
zhBsQf5S+axW{T|4R;u9y1gd&TxH|4@dGl2lFgYN>MHae$Ly7N7@{g1rT*5i8Nzg;R
zqXA)H&|_I%*Xs<gwM;vS!#OG5TL@aiQNl7gJ;3|!(f{8sQ16JJg%*RBl}$m}_-VxY
ze*hT(iMY>q(V=0VaHijn&UUwTX$_{&2_x3*KdzPMuNDecbzay`C!4<PDC*K`ffPAF
z#d3XBxL$Z3KpsE=Kp_{~$do>103-lb08TA0CzsdooCDa=Mp7Gz-*6zN)1&*_GXMYp
M07*qoM6N<$f>mile*gdg

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/icons/crossfade_in_transition.png b/gtk2_ardour/icons/crossfade_in_transition.png
new file mode 100644
index 0000000000000000000000000000000000000000..482e8a63bd090a27e34f8b45adb8f8dca4209abe
GIT binary patch
literal 692
zcmV;l0!#ggP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00004XF*Lt006O%
z3;baP00009a7bBm000i0000ie0d@9-fdBvi2XskIMF-Xj6c05gksrMq0000PbVXQn
zLvL+uWo~o;Lvm$dbY)~9cWHEJAV*0}P*;Ht7XSbP9!W$&R7l62l~HTcP!z}i=jOIa
zmo>$X3WCZYZgiq8Q`s0g_F$oNIEvx~VHADXP*hN1KKMO+Q4stZK8YasBzq_mQR{TL
zO|4yP*GA2n_+YIutVwPHhlHDZ|G#tYIrm&bxaSA}#WiLDFkIH85aOH_FF)j07K;F!
z>$d@vI<^vf{pn@>>f8$+0<e!~PNd^+DolIz#W_w613-~FfG~iATpvEFlqz6myZ0<6
z{doz?CzC@v16p6S()5`~p#Tv!J#$j78pPU`xANaW1ObDQiK%1CdfiLhc9<|g$8b8M
ztbgzI-*!hK0w8ueH^qpgXwC47fE*wpz#*2K9`9SLd7T~GDJ}}g^3k!$*oQ6u(h0Fe
z8aqFilPqw#+Ja96<V;6UKvphXoKfF?4Kla0O%%9_h;)6z8a%LHeZLi`7(}-yBVD_B
zRxMY_vo-Wcv>!mC^hll^A3GIa*%a}<8-*WWoZnu$6n|GGZkQt8+qUhWWSz|x=B1%@
zRx53YwnX0?Xh`k75V>(@Vc_{Hu^mfPyqkmF?t^~x$BW8?$9L7W23I~e!d$6ch#N49
zR4T9Be{@U!#gmEUk72}Z=Yiv$56<#uCfRJ^oOC#IT`hm3#Bv!F&h!5-Z~%xtdA4NB
z{9bHhn-Wh~&1lU47<aeee=gegZeITY@DqRupl#MR4QJhQ03!hQ1PH&^cpE?qK(k{l
a0FB?_@0m~ecXQ1E0000<MNUMnLSTZANGLu4

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/icons/crossfade_out_constant.png b/gtk2_ardour/icons/crossfade_out_constant.png
new file mode 100644
index 0000000000000000000000000000000000000000..602ba806c54811b7b659c1692fdbc7d07f04ebbf
GIT binary patch
literal 720
zcmV;>0x$iEP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00004XF*Lt006O%
z3;baP00009a7bBm000i0000ie0d@9-fdBvi2XskIMF-Xj6b~~cDNB2?0000PbVXQn
zLvL+uWo~o;Lvm$dbY)~9cWHEJAV*0}P*;Ht7XSbPI!Q!9R7l6ImCI`rQ5431cV^Ny
zZD!1)&B_#vP!-=#T)D62fu@o!+^RL!7K_lWc2jIXQTzkk_>YJb-3U?|MQO-FN(v=f
zf~ILruA3Vj(}c{#d~le1FAU%LzI)EO0?>dVzzYnj@B)IrC;@r8fB|U!XRnU^JaOOx
za2z<P!T=DzYPFr2+mGeP+!ICQnt)(_+Y>0{P-+^P3xM+2i1Fj$(o`iKTLWGK(hY$I
zKwYBk)}#vTVXYR?2F;K$H=h8`yH%js)}qPxKZn7$1@z?Aq&R#e1_Zk$knQC6ZEa)b
zieg|Pn*qjqp<s^^E4P6#t&l!DmjurBQ~`jHF#I}?kw{Gt865`#jtPViEwgThr(DJS
zyeYid7t=t@je<t@!nSV-D_2Cb{9%3OegZh_l%V0iY<CBCtAfh~j8r-$#ty{+zneP{
zPGt9euV8-K5Cf00cYrGn2qaAkI>K5}R!z?)fioQlM6>T5i5d-PTuV=gXfzI3oh)kp
zzq3`}Dwtn3MgQXSOgpREHJWp)R*UF9E39YkC4tkO6i7D;07P99dXvXUO<rez<g$8C
zT9&D#OL)pvd}}4GfAQ%pAmQW=Tw~wLI{I*URG+$=1WxswKu8EJ7tkkfq($^#Ts_18
z^ud3lQB{2lOE-ad^DLs9D%xY!hjsMONJM`ye-Q{60K4T<)$j#tz>bP4P`6E5TPe4l
zC~722g73bHt;o?!Wp$_lrt-|EzC$f~#Od08_Wn1b9-oGVzy9$60000<MNUMnLSTY#
C{58V>

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/icons/crossfade_out_dipped.png b/gtk2_ardour/icons/crossfade_out_dipped.png
new file mode 100644
index 0000000000000000000000000000000000000000..3f1e84c485c1a8e856510c53e2141d5576419ca5
GIT binary patch
literal 831
zcmV-F1Hk-=P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00004XF*Lt006O%
z3;baP00009a7bBm000i0000ie0d@9-fdBvi2XskIMF-Xj6c02XpawL=0000PbVXQn
zLvL+uWo~o;Lvm$dbY)~9cWHEJAV*0}P*;Ht7XSbPsYygZR7l6QluJ(&VHAenGc%o1
z#YB|0KwN+;-53+7NL*=HXt=6T1Y=^N3xZ2ckQl<o-{221UgAb>iN-`U#)MF4i3x3K
z>6Mhu%r`Tg&qW!ir6n!YFFBcSG08LUbIu$9AOHdY3IE}U0OV7z-(1LF?QG$T^DY3H
zdIAIhXf#ir6MJvo5{7Qy0C2h92}JkB-gZ|?ZDS(?-Bvu>#Mjm|0Fk-@ntXj74mIEE
zjAgy**wA&JjGyJJ{xpD%;{pneB?16AQwqGZ0or;#HEsZ~-o0f2mg<q9ok(Z{;1xB~
z<BVm!+UQ^xkA@8%3}gU=j+dY?s$}1tDFyDubxORPdBzmg<csqF@b%~ky86zOAhZJT
z?3Pzj49KY*vB&qic`9jg|4J0V=8>CBg3toMYXbm4%IR>%vZRglck)=o;K4w;R$aw_
zw&DbP4pjqkS|#>y*vAubgRlCNwLr=xuv6?eDyKt^=ZF;=uho*I0JzfMK}4;kivEEp
zI^<-I*x0a-C#z3VZoyHdmm9Wr(EQ~OC0<O88&;lMAKt3~epR8Uzk`U%_Ta!5?dWi%
z6k_)WI<1vu1>w*(fN(W{mctYkAIFXkIinJL@}P%rMsywwBq~9qYSfg~70tpu7o_;)
z^n}hdlh4gs0KS(^aK<-aH`!BeiYn?-49F>k*rU7MmVY^mP$*NHL<As}D5@H;H^OO^
zw5OvzJQCJ<FtAm;>LmdDD2hsTH7~4F;?>NA3BdaF5w<R=WYM7rSkrMuvv4o0Q(|&@
zLf2WI&wgeAeisz&|7f0C6&)Dij7IF?9UmOh692KZDgc179akZU76dU5K{6po1_Vhz
zq?lct#NyH#qB*Vk+lJ}7bZyY~E&(_VpmDcO>^^w~ZMEEg{snD?IjHj7l)3-_002ov
JPDHLkV1lOVY{UQn

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/icons/crossfade_out_fast-cut.png b/gtk2_ardour/icons/crossfade_out_fast-cut.png
new file mode 100644
index 0000000000000000000000000000000000000000..33eaafe7b3589524ef6e26551843af725afb9694
GIT binary patch
literal 737
zcmV<70v`Q|P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00004XF*Lt006O%
z3;baP00009a7bBm000i0000ie0d@9-fdBvi2XskIMF-Xj6b~;o(u+2T0000PbVXQn
zLvL+uWo~o;Lvm$dbY)~9cWHEJAV*0}P*;Ht7XSbPOG!jQR7l6ImcdUGK@`S+Z+5pd
zr6MgoD3nlx31~4Q7$IoTm`I3*n-cy36R(``=tbkj1JT4p6K`I;8T}KC7rkLLa<E1Y
zDj{g8Kxw=Cyll0gc9+F3nY_tNGT*%Y-uq?+uz-C)V#g4+LxGw<e-D%h0UNN}=O3Tk
z9PAxN$g9WzaLnHWRRmOB52<--J}wo?^S7Spn}z4V%P<6_Ka?FUEC{M1>fc-y#GeX+
zF?hC-ja;hNyZ7LF_0H{f@7dD|@VXg+0l@Rr)I5x<h^Hc+A`0Ru;wi>eOx4BStkU*w
znaqoVIJ0xt=*mt2PB6ir-@7T|UrHpFzDsO&ZVDI(Lr@n{{1}L~w_jm+c!ZXgv9JW8
z4+pT<D>y$YVlGY{_p7ieff51n&uhfTCr<+%%?UIbNz2MQlI`vR(*ITDI%2CE)Y8dB
z7y^w#WR+`R8IjzfY?utBp^`$wDQzJqhWY~tRCimZzp80%tFD6;MuS}oZI{ZJY%UAz
z57Ho#&~|AH=U~raAQjYTk>C_J@iM7&(+p$}&E^!#c*(d!XIJi@1gaW215t>5D`Upb
zUI1c2UL?^hqbSbUxl_QAAUBPaN^4;i^7%m=XLRQ!_teRa&Kh6YF!qg`)4-+1bN1v#
zjYz%vggtuZynXlnv>eS3`7fPg0d}%)<baiE>qJZju`-D1Kn#d+w-527RbQ*s_l%31
zSSotezMg)axpFlzd3iZq$t;Th@V5i4K+=z`fB9u0pxb}1XS>&|iOEIx(ZlLbBOJVZ
TX3ib!00000NkvXXu0mjfhZRN$

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/icons/crossfade_out_slow-cut.png b/gtk2_ardour/icons/crossfade_out_slow-cut.png
new file mode 100644
index 0000000000000000000000000000000000000000..fd6260228e4688ff47cb5c93e87248696d479886
GIT binary patch
literal 770
zcmV+d1O5DoP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00004XF*Lt006O%
z3;baP00009a7bBm000i0000ie0d@9-fdBvi2XskIMF-Xj6b~>r@!wfG0000PbVXQn
zLvL+uWo~o;Lvm$dbY)~9cWHEJAV*0}P*;Ht7XSbPY)M2xR7l5_md#64Q53*`_q{it
zHkD19g;EffrDMey*~jE2Li{Qa3@IsUQ4v8AZTcVDw2ElaqD@G<h}H#eTS#akg`jDP
z={$8DAM@U6^8}sAnfneL4)<{%zjMw#=bozo1E}&f=G(aceM1U>4NMSFEWp_HayXSg
z){q8TL~#OWRS-o05zM8Wv;N`Tu>1PeN8ml+1Obp7w@n!z6$Ax>5|k(uN+E{Asi}%A
z^$*=BG@oj69^W^Cx4HlWKzX8!f`{RH7_Oi^!Egnm;9)v0u^F3vpT@A7TH4He54wQn
zKmbr1Yqfc?Wuq%3M}A`U4_+e@$rPPYCBPPn_*x?2#Wf;JdBb}6qzgD66rd$LCgure
zE_DKpK>_lgXi6kHXX7QJA(d)PmD^V?MQXbg0Vsj!Oct~I%4wh`XapNt*0b15mhj2;
z^S~ipfRwACVu}1&!QG$Sjb-TqN-`qleli^wYk6H6-MtyW4AKYaMiQN~G21V+0ta+c
zRIC*M%Y>RzY2cs^Koxnfw9cVA5huC#Xpk}$-G)=15dFQP%<Ds!foNHPh!jJ#K(VR6
zSm!#<0;wQ<fNr_Qr?W_HZM{mj_4z}pVv3YbnQl%~Vsb%6?mij-GL@<*aKi!Y9GgQL
z4<9i)yLy0zlAZyK>N9-}3aJC?fLh;Lx>1DeHSz;JY46*p%j~aJV0z2Q)V)c!zng6K
ze4RBHpTBtOPJT~#Up`kE7du7@cW&k^0B3$`Eu5@(fIN@`$!ZUF-?jLU1w!*HhTT#(
zn7eiRDyI1ic%wEwTVlS(eH&yL6&J;-|HSeB0d&>LYf%kn&j0`b07*qoM6N<$f<tmd
A?*IS*

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/icons/crossfade_out_slow-fade.png b/gtk2_ardour/icons/crossfade_out_slow-fade.png
new file mode 100644
index 0000000000000000000000000000000000000000..d752879bec95e8bd425707e18e34d52283fa07b3
GIT binary patch
literal 798
zcmV+(1L6FMP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00004XF*Lt006O%
z3;baP00009a7bBm000i0000ie0d@9-fdBvi2XskIMF-Xj6b~{kr-GAs0000PbVXQn
zLvL+uWo~o;Lvm$dbY)~9cWHEJAV*0}P*;Ht7XSbPh)G02R7l6QmfuU0VHC$d&--I@
zw&`@`bY?0Wj(#bO(n2y&L`=*;ks>2V0+qtMijcbKE)WX3>ZYqM`UAS?N)WsVya__H
ztOZli)CtzM+~%Hcrfj+Ce$;`N7vA@IpU*kZ`JQuL0jPi(C;&`A6j+Ym^EM4ot<PS2
zg7vj$^o?Kc$d?%<{9=5b1>Xel9*E@wPyyB9?sA#EYj!;lb%=_}203`MU#Y6Dj!jOO
zfX_fUSAYUQEGE@Z6w}fsrPDsj-_8g_Q%i^G)tiS1aUC$`2S_%l1tZwseL^cfQf++x
zatP>2vo<FH07Amy$*-vH;|==oXdlp;FF@>h8I4go<wfnk+J~dE8L;I8kf}gMe~`lO
zeqnw*ehWC88$j-Eo(S5tqL0f&+||cKeZxiIP%aUO1kd*zmAVzhGWP@H-Fv-&C*LEI
zsTP{&R*`j1mvFjT06klPOyzk}6ya?Oy?&t&jdlU2vIIzxF3Cx`m|a15JWW_j&L8B^
zzJ->yaRtH{*Mo|7d$<E|=2d9v%rd)z*4A+eO>6uwfP&QkdMKu;BX_O<_KW}`OGxpD
zMbz%z9*T-O5BgjIkW#W=9sF&^wE!mnZ-e$=Yyh~BsZ3=yQCO#asLd^{N?Us$Q1?$%
zl%%Lo1lyEX==UFu2&d~BP?2_`l{9wO2tj!~X?CD269MQyw@@P6N_cRfSuXjE()%q4
zEGCZGL_kG+<FYs;BZV0@Lg=B0x^<)XoZ5N$1hq9*qR}-L7eYG~Y^WM|(rB<bn&K_s
zBybvpmTnfMYVcAKY}VOi;HV|ET~cUP*EgSrdfLZCJPK?4*ToE2;+NQO7^Qf&g9`)m
cz&a5A19ecg0skt}bN~PV07*qoM6N<$f?6M55C8xG

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/icons/crossfade_out_transition.png b/gtk2_ardour/icons/crossfade_out_transition.png
new file mode 100644
index 0000000000000000000000000000000000000000..a48e645fbd15c62fc2cb6864e688828e5d43a287
GIT binary patch
literal 737
zcmV<70v`Q|P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00004XF*Lt006O%
z3;baP00009a7bBm000i0000ie0d@9-fdBvi2XskIMF-Xj6c05UzHq^u0000PbVXQn
zLvL+uWo~o;Lvm$dbY)~9cWHEJAV*0}P*;Ht7XSbPOG!jQR7l6Amdj5QQ51*2JJTn9
z07a@qAtVSEL=Y-8#0Lu+B}64LYGR@;OfWIQg(kXkY4l$(EEHL|@$Yc&f@ny<SA9m)
z(pDWQ)46U2En}yhsV6zPlgyd<=A7R-_l^KmAOr+0uCU#H0n4~F51=+bczRIVw|f*A
z00vDDSHwyE(ZZ6kv^WRoZUMwr3SL(70K(z`6#C<$ICLmcVzC3rxCSU?2}apADDdSw
z+F;*-5_Gu*m~|F4gM8n9ptnVvh{bx{YG4(zDoH6D__LZ&re_WV-bMhj!mC08AM<!8
zCP#tpMl%o<uquE8^d*LXo<;%E+CAHJSl3X5P?f3lWL?o}Xdvw}0BFjr3ne|B0`~q-
ziEO_v_%?@UWc(;F>=Ga=A+{O#vp-P{Jj$7KX&~xm4rIOZY*}daEB@K@GfuOxmZ+|H
zq1QQ#?#?};r)R=Ryy8^gKM!n{3BAe+_1g85z>rfw)lJUMA}>CpB*%}4ME?nMyRQw9
zQd+0E_716S5?RX%&y8CbfRx)db!5@yPpG|#Vdd29#ah!{ZIYe!w{Fn(?2Yiw-<+d8
ze%7vSl}29v_nasa&J;a?g~zuEM=o1V!GA<{RDY{AKmUNg<cS3yKDk4C`#dmGd0z$8
z*3{`Pf!qnifvwf&1R#LmyBtPqBy3#0G9|{wbjsxoxwiTqkOJ^^Ub>s~w(LrphyH$Z
z4O`15gs@`(P-+R1AK0O59bqXp^n0b_$L<R=iwMwU{=S6FYqf?h_4LXCF9H2GZ0?w7
TL|t_x00000NkvXXu0mjfz*;_~

literal 0
HcmV?d00001

diff --git a/libs/ardour/ardour/location.h b/libs/ardour/ardour/location.h
index 57e13de5af..fb69489385 100644
--- a/libs/ardour/ardour/location.h
+++ b/libs/ardour/ardour/location.h
@@ -159,11 +159,11 @@ class Locations : public PBD::StatefulDestructible
 	int set_current (Location *, bool want_lock = true);
 	Location *current () const { return current_location; }
 
-	Location *first_location_before (nframes_t);
-	Location *first_location_after (nframes_t);
+	Location *first_location_before (nframes_t, bool include_special_ranges = false);
+	Location *first_location_after (nframes_t, bool include_special_ranges = false);
 
-	nframes_t first_mark_before (nframes_t);
-	nframes_t first_mark_after (nframes_t);
+	nframes_t first_mark_before (nframes_t, bool include_special_ranges = false);
+	nframes_t first_mark_after (nframes_t, bool include_special_ranges = false);
 
 	sigc::signal<void,Location*> current_changed;
 	sigc::signal<void>           changed;
diff --git a/libs/ardour/location.cc b/libs/ardour/location.cc
index 75afb5091b..3d04c66824 100644
--- a/libs/ardour/location.cc
+++ b/libs/ardour/location.cc
@@ -661,7 +661,7 @@ struct LocationStartLaterComparison
 };
 
 Location *
-Locations::first_location_before (nframes_t frame)
+Locations::first_location_before (nframes_t frame, bool include_special_ranges)
 {
 	LocationList locs;
 
@@ -676,6 +676,9 @@ Locations::first_location_before (nframes_t frame)
 	/* locs is now sorted latest..earliest */
 	
 	for (LocationList::iterator i = locs.begin(); i != locs.end(); ++i) {
+		if (!include_special_ranges && ((*i)->is_auto_loop() || (*i)->is_auto_punch())) {
+			continue;
+		}
 		if (!(*i)->is_hidden() && (*i)->start() < frame) {
 			return (*i);
 		}
@@ -685,7 +688,7 @@ Locations::first_location_before (nframes_t frame)
 }
 
 Location *
-Locations::first_location_after (nframes_t frame)
+Locations::first_location_after (nframes_t frame, bool include_special_ranges)
 {
 	LocationList locs;
 
@@ -700,6 +703,9 @@ Locations::first_location_after (nframes_t frame)
 	/* locs is now sorted earliest..latest */
 	
 	for (LocationList::iterator i = locs.begin(); i != locs.end(); ++i) {
+		if (!include_special_ranges && ((*i)->is_auto_loop() || (*i)->is_auto_punch())) {
+			continue;
+		}
 		if (!(*i)->is_hidden() && (*i)->start() > frame) {
 			return (*i);
 		}
@@ -709,7 +715,7 @@ Locations::first_location_after (nframes_t frame)
 }
 
 nframes_t
-Locations::first_mark_before (nframes_t frame)
+Locations::first_mark_before (nframes_t frame, bool include_special_ranges)
 {
 	LocationList locs;
 
@@ -724,6 +730,9 @@ Locations::first_mark_before (nframes_t frame)
 	/* locs is now sorted latest..earliest */
 	
 	for (LocationList::iterator i = locs.begin(); i != locs.end(); ++i) {
+		if (!include_special_ranges && ((*i)->is_auto_loop() || (*i)->is_auto_punch())) {
+			continue;
+		}
 		if (!(*i)->is_hidden()) {
 			if ((*i)->is_mark()) {
 				/* MARK: start == end */
@@ -746,7 +755,7 @@ Locations::first_mark_before (nframes_t frame)
 }
 
 nframes_t
-Locations::first_mark_after (nframes_t frame)
+Locations::first_mark_after (nframes_t frame, bool include_special_ranges)
 {
 	LocationList locs;
 
@@ -761,6 +770,9 @@ Locations::first_mark_after (nframes_t frame)
 	/* locs is now sorted earliest..latest */
 	
 	for (LocationList::iterator i = locs.begin(); i != locs.end(); ++i) {
+		if (!include_special_ranges && ((*i)->is_auto_loop() || (*i)->is_auto_punch())) {
+			continue;
+		}
 		if (!(*i)->is_hidden()) {
 			if ((*i)->is_mark()) {
 				/* MARK, start == end so just compare start */