From 0140e94f79bf196503e4dc1d45b381636505647f Mon Sep 17 00:00:00 2001
From: Vesa <contact.diizy@nbl.fi>
Date: Tue, 1 Apr 2014 19:13:36 +0300
Subject: [PATCH 1/2] Make loop points different

---
 data/themes/default/loop_point.png   | Bin 522 -> 0 bytes
 data/themes/default/loop_point_b.png | Bin 0 -> 472 bytes
 data/themes/default/loop_point_e.png | Bin 0 -> 474 bytes
 include/timeline.h                   |   3 ++-
 src/core/timeline.cpp                |  15 ++++++++++-----
 5 files changed, 12 insertions(+), 6 deletions(-)
 delete mode 100644 data/themes/default/loop_point.png
 create mode 100644 data/themes/default/loop_point_b.png
 create mode 100644 data/themes/default/loop_point_e.png

diff --git a/data/themes/default/loop_point.png b/data/themes/default/loop_point.png
deleted file mode 100644
index be64992079b2cb8ad78f6e2ce8769af7e1f47d87..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 522
zcmV+l0`>igP)<h;3K|Lk000e1NJLTq000dD000dL1^@s6a_i)L00004b3#c}2nYxW
zd<bNS00009a7bBm000fi000fi0k5^kOaK4?8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10f$LMK~yM_jgqlSD?t>7zd19r+05!j5|jv$3xWg-LG5kw3S#FY
z2x4uW(n`5t;VVS2v$3#I?Cui;M6eUG3&F&l8H-#l7JBu-sm}TM;s1Yt-++lR^4$Vv
z_OI|b^8hS-11#Xo0}2myU8vp8n{xUQSo;E4Q%*ms-Od|zT?jz3(>B@R#){<0y|Svu
zhf!AbBv0<M!;O_>r)>ZPz`7c4tIhIhuW6U&26{d@0MPTvfnAy#ET8t8ZmW%THD-_~
zjJ24W#jQ5!4)z+^`eNVa>7Q(UvELo+HQZ_wQ?nRrLDWo1i9)m>TCjOa+G$Aev6Xfj
zV)OLhO^N!eL?nhl@Bu%q7#>}hFE_)hFrNN;xfxy!kFHBUtq494LjWQ|fND}vjVC-G
z-<IXw)1@E1?#CFtAHD9EcTbnk$G2rQo={CH2mp0mBq!U^Y_<x??8Rr6OJ*<3W~)d}
zwj*_2K&nf+`3R@a{~NB;=XCQCsV)H`PM`g#Moymr5upDQ;6pq5?-wx{jaM%p`Tzg`
M07*qoM6N<$g8F3Qd;kCd

diff --git a/data/themes/default/loop_point_b.png b/data/themes/default/loop_point_b.png
new file mode 100644
index 0000000000000000000000000000000000000000..bcd65ad0866ce8acb889c557997caf3255225b0b
GIT binary patch
literal 472
zcmeAS@N?(olHy`uVBq!ia0vp@Ak4uAB#T}@sR2?f#ZI0f96(URk<tO=a~60+76a8>
z2Vq7hjoB4ILCF%=h?3y^w370~qEv?R@^Zb*yzJuS#DY}4{G#;P?`)(P7#Kr6T^vI+
zCbkCc^<s9En4=;tB+R<llH-SXkcv_S*RnvB-j_8j@(0*AY!cma<<v2=-moU6W8nhT
z&U!)uvpaU4y?5{3_T6S~!FOIBFk$}8d*8rAd|4cW$l9$E#_`3!PqUZm1F6ZsW}Hmg
zJWDrcs=RQg3+H_e6Ri;2yRn)kS}hzZ6TJi97UkEL?Y`redfA&HK}9izv8U&Y!pfy=
zk-euXi*wV8AKsgJF2p30L(E}vpP?q}!(xv~5jHm?&*o3b^E|O7h0$YGhOlST2g{c8
zf^CX-7FUIGKW)=#2)yXoH;u*ci9OTqm-{laWekPZExR$lZgN}h`{ui){id06n;1l*
zTa;Sr82)`Z=YD-I_f^?>lAaUlw>+N^VlbESW!U>uUv4Ne{JB0a*)H|gmOboyKK<S3
z5p-}9gVi!yh3Qpn6Xwq0yyGMPwUR$it;mg&q4?S@$1^8AY8ZVpzZ`z|dQKED78pET
L{an^LB{Ts5`&YVX

literal 0
HcmV?d00001

diff --git a/data/themes/default/loop_point_e.png b/data/themes/default/loop_point_e.png
new file mode 100644
index 0000000000000000000000000000000000000000..40fdad94a542b58b48438fe02ec096ded35df9c1
GIT binary patch
literal 474
zcmV<00VV#4P)<h;3K|Lk000e1NJLTq000dD000dL1^@s6a_i)L00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10ar;xK~yM_g_2K80#Ovj&r65Qe`GizX(b{GLG6Ov6yYX!eS|(h
z?OU~tXj%KV60|OY+V=_CC`t%H&>x)9dGp@Az80xejCJ5_4*V{M!-X*hza1;vou&Os
zJ65(k-*W(ID>c)YLV!}$0+mj8mQ&RNjWQubCbgNrPuEJ3Kxm){zUyJ2zL-$NTAba=
z-<2<RR}l?SAjHIwt_LPYI6hrSY-Dc>=d~3w3|5SA5JXBtxgJO=E4H4w&Yf(R6e++_
zV6B6pfoAxw2bS8lk17kk?*snmAejmE2(l-^X7KTP`S>imeT>YCL?A@NA(*)D-n5Rp
zckOrS^dX%-SkZ)filBz;=~nkFoKIxQG6$hzGRm6p?|J}0ZRgOdH?O?r8<CnY1St*U
zdSIo;nR)8%QN3*=X|0Ljd;E}?k91Is6B=&VyvW=*7b1da=phjLOG1dbPtKCtTh!@k
Qga7~l07*qoM6N<$g2sHv^Z)<=

literal 0
HcmV?d00001

diff --git a/include/timeline.h b/include/timeline.h
index ff4661837..642ee76f2 100644
--- a/include/timeline.h
+++ b/include/timeline.h
@@ -149,7 +149,8 @@ protected:
 private:
 	static QPixmap * s_timeLinePixmap;
 	static QPixmap * s_posMarkerPixmap;
-	static QPixmap * s_loopPointPixmap;
+	static QPixmap * s_loopPointStartPixmap;
+	static QPixmap * s_loopPointEndPixmap;
 	static QPixmap * s_loopPointDisabledPixmap;
 
 	AutoScrollStates m_autoScroll;
diff --git a/src/core/timeline.cpp b/src/core/timeline.cpp
index 6a417f57e..53843034e 100644
--- a/src/core/timeline.cpp
+++ b/src/core/timeline.cpp
@@ -81,10 +81,15 @@ timeLine::timeLine( const int _xoff, const int _yoff, const float _ppt,
 		s_posMarkerPixmap = new QPixmap( embed::getIconPixmap(
 							"playpos_marker" ) );
 	}
-	if( s_loopPointPixmap == NULL )
+	if( s_loopPointBeginPixmap == NULL )
 	{
-		s_loopPointPixmap = new QPixmap( embed::getIconPixmap(
-							"loop_point" ) );
+		s_loopPointBeginPixmap = new QPixmap( embed::getIconPixmap(
+							"loop_point_b" ) );
+	}
+	if( s_loopPointEndPixmap == NULL )
+	{
+		s_loopPointEndPixmap = new QPixmap( embed::getIconPixmap(
+							"loop_point_e" ) );
 	}
 
 	setAttribute( Qt::WA_OpaquePaintEvent, true );
@@ -235,8 +240,8 @@ void timeLine::paintEvent( QPaintEvent * )
 	p.setPen( QColor( 0, 0, 0 ) );
 
 	p.setOpacity( loopPointsEnabled() ? 0.9 : 0.2 );
-	p.drawPixmap( markerX( loopBegin() )+2, 2, *s_loopPointPixmap );
-	p.drawPixmap( markerX( loopEnd() )+2, 2, *s_loopPointPixmap );
+	p.drawPixmap( markerX( loopBegin() )+2, 2, *s_loopPointBeginPixmap );
+	p.drawPixmap( markerX( loopEnd() )+2, 2, *s_loopPointEndPixmap );
 	p.setOpacity( 1.0 );
 
 

From 030f9566c83d0da84c4db361b9a0977b216a90b8 Mon Sep 17 00:00:00 2001
From: Vesa <contact.diizy@nbl.fi>
Date: Tue, 1 Apr 2014 19:24:48 +0300
Subject: [PATCH 2/2] Finish previous

---
 include/timeline.h    | 2 +-
 src/core/timeline.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/timeline.h b/include/timeline.h
index 642ee76f2..58322d747 100644
--- a/include/timeline.h
+++ b/include/timeline.h
@@ -149,7 +149,7 @@ protected:
 private:
 	static QPixmap * s_timeLinePixmap;
 	static QPixmap * s_posMarkerPixmap;
-	static QPixmap * s_loopPointStartPixmap;
+	static QPixmap * s_loopPointBeginPixmap;
 	static QPixmap * s_loopPointEndPixmap;
 	static QPixmap * s_loopPointDisabledPixmap;
 
diff --git a/src/core/timeline.cpp b/src/core/timeline.cpp
index 53843034e..1aa932acf 100644
--- a/src/core/timeline.cpp
+++ b/src/core/timeline.cpp
@@ -47,8 +47,8 @@
 
 QPixmap * timeLine::s_timeLinePixmap = NULL;
 QPixmap * timeLine::s_posMarkerPixmap = NULL;
-QPixmap * timeLine::s_loopPointPixmap = NULL;
-
+QPixmap * timeLine::s_loopPointBeginPixmap = NULL;
+QPixmap * timeLine::s_loopPointEndPixmap = NULL;
 
 timeLine::timeLine( const int _xoff, const int _yoff, const float _ppt,
 			song::playPos & _pos, const MidiTime & _begin,