From 741f7e00980798044fc0117d873fb75c891c19e2 Mon Sep 17 00:00:00 2001
From: Mateusz Piesta <mateusz.piesta@gmail.com>
Date: Tue, 22 Feb 2022 11:27:49 +0100
Subject: [PATCH] [BH-1410] Alarms predefined order

Added specific order of alarm list under
alarms settings. Sorting is based on track id.
---
 .../audio/bell/alarm/Acoustic_Vibes.mp3       | Bin 245304 -> 247487 bytes
 .../audio/bell/alarm/Always_With_You.mp3      | Bin 2300498 -> 2302683 bytes
 .../assets/audio/bell/alarm/Autumnal_Sea.mp3  | Bin 580383 -> 582565 bytes
 image/assets/audio/bell/alarm/Back_Porch.mp3  | Bin 353914 -> 356094 bytes
 .../audio/bell/alarm/Bubbling_Brook.mp3       | Bin 567028 -> 569212 bytes
 .../assets/audio/bell/alarm/Cowboy_Chords.mp3 | Bin 174648 -> 176831 bytes
 .../audio/bell/alarm/Delightful_Morning.mp3   | Bin 296133 -> 298321 bytes
 .../audio/bell/alarm/Hawaiian_Blues.mp3       | Bin 343373 -> 345556 bytes
 image/assets/audio/bell/alarm/Koshi_Dream.mp3 | Bin 280278 -> 282458 bytes
 .../bell/alarm/Love_Peace_and_Harmony.mp3     | Bin 3787768 -> 3789959 bytes
 image/assets/audio/bell/alarm/Morning_Dew.mp3 | Bin 577835 -> 580014 bytes
 .../audio/bell/alarm/Natures_Harmony.mp3      | Bin 559036 -> 561220 bytes
 .../assets/audio/bell/alarm/Reverie_Harp.mp3  | Bin 242458 -> 244638 bytes
 .../audio/bell/alarm/Sunrise_Guitar.mp3       | Bin 180867 -> 183049 bytes
 .../assets/audio/bell/alarm/Tibetan_Bowls.mp3 | Bin 225082 -> 227263 bytes
 image/assets/audio/bell/alarm/Tongue_Drum.mp3 | Bin 187565 -> 189744 bytes
 .../audio/bell/alarm/Tranquil_Rainstick.mp3   | Bin 468077 -> 470263 bytes
 .../apps/common/src/SoundsRepository.cpp      |   3 +++
 18 files changed, 3 insertions(+)

diff --git a/image/assets/audio/bell/alarm/Acoustic_Vibes.mp3 b/image/assets/audio/bell/alarm/Acoustic_Vibes.mp3
index 4ceb1df36d5b2336e2f93a055cc7e35963841a05..cb7d2651337e55d865539428b98c045d83b5f934 100644
GIT binary patch
delta 139
zcmdn-hi`u`zoVy%F*5@Y2v~%8h8O`EiVO^l|Nl8MBs1hQlrj`ElrUrh*$NC{Kst#b
z6)3{M5EA6<4WvLCEhm0_J&ExS4rJD7-D=I)YR$COn)&Zu!4OAx$K?Fd;*!i{g|N(|
N)Z&RBbD22*0{}-yD?|VQ

delta 72
zcmdnr%fI6fpMj@~F*5@Q7>0O;7y)U1Aa+d7FD)*~OjZcXOiC>d33B!Z3WAgw7&e=8
Rw3~A<0x{Eea}H*XeE@ft5O4qh

diff --git a/image/assets/audio/bell/alarm/Always_With_You.mp3 b/image/assets/audio/bell/alarm/Always_With_You.mp3
index 59b14749fb25c0f317412da0dfeb1fdac4607dc2..5b5ae79a234decbecfc7e28f361dd0c713a46a98 100644
GIT binary patch
delta 241
zcmZ{aKTZN+97KN~;2%_U1w}=XRcZ?`q46~vNDQ$vn-EGmNH(DWLMSPwqk*&F5xjt{
z@dh?rK=>};WG3$w^R-^M@6Uy6wOh|=^9f$!c3k&THFMj)$P$}c&t^8V&^k7-vGu)m
zZD<q!ir<@W9vQz{W4ZZVxu1XfG)Fj*5^0eUdtzT4h(nPTN8(tVh@3bTXCe^iA}<Q!
zLR^ZXxDwamMwG;@xD#b@FDfDw590BIYO$1$qt_^z_GY87GZ^>7?r^f)B&lG#1D+{H
A8vp<R

delta 203
zcmWm4yAA<C7{zg8UB-RgS(lyV1sL6QLbK7yCZg1lNEC>u6`Fk<i6`&^S})^2U-HXI
z&iQ_ySbSfxn1;)lldz|wFw&%p`SG^9pVj7Y*{kj88m$*ATKhNA4<nyO3MAnmg)}nA
q!tOcbQ9uzTlu?0;Dr%^sfhJmLqk}Fy^w7ruL-<e#FnSv~4!l2TxGdfP

diff --git a/image/assets/audio/bell/alarm/Autumnal_Sea.mp3 b/image/assets/audio/bell/alarm/Autumnal_Sea.mp3
index 41e6a7a7aa7201e8501418aa174bf607b3f5721e..ec8e0ccbd19b3427bc649a35109d2967960b2981 100644
GIT binary patch
delta 149
zcmbQgO?l~YWjjw7V`c^*5HJn#3^4*SWEmJ3|NnDjC}k)C;#`J2hD3%O1_g#-hEyPn
zfgvQw*&9f)0I{L*#E&m0G2X&~JQ^)qEg4%anOZHGTP;~yEm>PF*;*~xw_0*MyTu>k
Y=<ZlrQkt8Wn4=J!nmF-eJ`?YM0N5ohegFUf

delta 90
zcmZ2_TzURBWj#+9V`c^r&=2tpF#^)OK<rprQkt8Wn4=J!nivw~><ttGDKao_HsNSD
c;a~(}CLm@8Viq7~1!6WJX5VhY!SV4H0Gu}zXaE2J

diff --git a/image/assets/audio/bell/alarm/Back_Porch.mp3 b/image/assets/audio/bell/alarm/Back_Porch.mp3
index c6a0e6b711f531086def8b07bfb3f3452505452d..6d36ec5e58bc6c2efac480a8f6cffa6f0e3cc663 100644
GIT binary patch
delta 134
zcmex$M)coZQ7cauV`c^*5HJk!3^4*SBpDbO|NnDhNMuN6$YxMr2w=!(C<3xGfN~*0
z&fY+Z1&9p|CVqTAiSY&w6xC?nYR=ed&eUqo+-lCU)tuEijW@*6-6=6STOlC7C^=)|
J$3iBq{{YiaDA)i1

delta 76
zcmex&SM=8zQ5{bgV`c^r&<*hnF#^)uK<t#5oUIU$UzD5?66EX+6aXnPFljd6XgA<s
S1Y#y2W(H!G?FJmIerW)|CJ?6p

diff --git a/image/assets/audio/bell/alarm/Bubbling_Brook.mp3 b/image/assets/audio/bell/alarm/Bubbling_Brook.mp3
index e2ef9a6b7c35bada29219e5e63d9a0c9fd67d9f6..b360e4bd4156ff5c748d69a33e834c2e4ec9591b 100644
GIT binary patch
delta 155
zcmexzR_V_@B_~f8V`c^*5U>pK3^4*S6d4#8|NnDhC}l_j!W@Q7hCGIJ1_cHuh9ZW1
zAj}4;2?=uc22w0QY-lv`<LgO`cW@xHM(b8<##U>lR%_-~YnE1P)>dn_R%`aH)*L&R
d35GbjJC!CS<z(iiD>xP9=Vwp+n9IcT9{?=6FO>iQ

delta 92
zcmex!PwC59B?C_vV`c^rFbwewF#^*3K<reSl$4X1m#*Mcl%Jm+66EX+6a*<VFm1Nr
eXt&^C1Y#y2W(HywAZ7((HXvr-Zo$EEWElV^P8H1n

diff --git a/image/assets/audio/bell/alarm/Cowboy_Chords.mp3 b/image/assets/audio/bell/alarm/Cowboy_Chords.mp3
index 1d960011ecc006baf363f3efd1a26b18b24f7090..270fc08afff3012ee95d66122f50a361aa3fd528 100644
GIT binary patch
delta 134
zcmdmSg=_y)E(cE+V`c^*5HJt%3^4*S<QW(k|NnDl$Y&^LNCJ|T3<?a+3>iRH5km??
zF;GQFkh3?CVgX`9!-*eXO=7%_1KBrPwOTQ5wPO0WQXs_9-8sKJDZf&|IU~O)rFi1U
IJSOh{0GTN%{r~^~

delta 67
zcmdo0lxxQoE`3iIV`c^rFbMGsF#^(jK<u1fo|Ipy;GB_Plu{fL<m?R;1F14FYc}I(
OH{)R3ZpOjHxe5R+wGUhX

diff --git a/image/assets/audio/bell/alarm/Delightful_Morning.mp3 b/image/assets/audio/bell/alarm/Delightful_Morning.mp3
index 7ea2e43bf9f04e29656e1471a032b2c13ae77081..8ba57df41dfc96820799a3d605ff7804afcbdf58 100644
GIT binary patch
delta 155
zcmX@wDRgm`ke8>6F*5@Y2snm#h8O`EnhXq#|Npr#q%!0%WHO{PWH6L4q%o8Nc?t}^
z4EYR240%BDJfI8%Lr9RbH;`fhVnfr3AKy=6e1HQ9HQKk@Gq&0@wc0apwP$H-5e;#4
dcS+63OwTAuE6q{x%`eK!%uAp6F_Ve^KLBfIF4h15

delta 80
zcmcaOOXz5)kcp>@F*5@Qn1*<U7y)TvAa+U3$xP2ENh{4!@XasE%gjp;33B!ZN`RCa
Ym^V9cv^#Jx0x=U1GjDg`V42tg02b5}HUIzs

diff --git a/image/assets/audio/bell/alarm/Hawaiian_Blues.mp3 b/image/assets/audio/bell/alarm/Hawaiian_Blues.mp3
index 7292ddd2b026b3037ff5ed0d4f120218e0da1e24..22e2d88be9a1d92d3c5cec4e1f24b469ad984238 100644
GIT binary patch
delta 145
zcmX^6OXNzosH3NgF*5@Y2v~%8h8O`EiVO^l|NnU~Br=o(aV8KZGUPERFgP*fFqAT+
zG86;VgakQz11XS3^NAl{Phz}-1DQ2iw^}o{S~Im;Gq+l^Y_(<;vK0(*boWRsPt43r
S%u{g6DNQY&_%WA>{XYO9+ACrJ

delta 80
zcmcc8EqeBsh=HezF*5@Q7>0O;7y)U1AofTsPt43r%u{g6DNQX733B!Z3WAgwSTvh+
Ww3~A<0x=U1GXpWpc5@C^Sz7=KoDsVK

diff --git a/image/assets/audio/bell/alarm/Koshi_Dream.mp3 b/image/assets/audio/bell/alarm/Koshi_Dream.mp3
index 8e0ab2bd34da383a005bfbc7809d8d38c178e946..34dc11e7050d0d40695b3de2347294f5d08b0fa6 100644
GIT binary patch
delta 133
zcmccCD|l<3ptYxqF*5@Y2pENUh8O`E(hLlY|NnV2<TDgAWH4khC@{D%6fvYSBr@az
zWkZ6Ty@3=+i}A#dFD5bG#DM}EEm|!YTP>JcEtt1ju*`Gg3vqP!&M(f$RB$OuP0XG6
Jv4DyBKLAo`C`$kU

delta 73
zcmcaLPw-l=psuHjF*5@Q=!JNO7y)S>Aok8L&d5}7DN0Su4GD7g28w{x7+5wNa<m(A
RFaj|X5HoK#<X~Cp1^{D%57z(y

diff --git a/image/assets/audio/bell/alarm/Love_Peace_and_Harmony.mp3 b/image/assets/audio/bell/alarm/Love_Peace_and_Harmony.mp3
index c24d31ddd1f57c2a749cdbfa0373e4e606cbcdbb..6bdee4d36cbaf4252c382dceb0054ba8570bd33b 100644
GIT binary patch
delta 339
zcmaivNlpS$6h;3B>^rc>w(R=`P|>0BBtl?7NNu13HKa&LBw^^_#sx5N4bF8Hj@^L?
zTW}<P-GDE-@1ESeJ9uBuJ^S?1v(+NGxN(y#`b9tMAY+W}f0s?uv`uI{Q*k>mwLcC_
zWa=&}xTIwo?j|xF*YT@&C1;7>dcJGzXE$j-{?WrD!it!Pi-Z^ugJMVwixDv@#>BXo
z5R+m`Bt=S0iy1L1=ES^M5Q`!$mc+7H5vyWNtP4+Uh)uC2w#AOv6?<Y|9Ed}4B#y<2
zI2C8&Tx3L6<iv%z6jvfIuHU$MeNX$h_vL0g^eSOc3%ww!dxfCYXht3Pa2QMVe*i~m
BVZQ(X

delta 298
zcmWm4OHRUI0K{=h1<F$p0YQaNzz0vEMJ;SGDMS{;^a2fZX`8Sxam}Jf;0&C=Eqe~q
zE3o9>Nq(8djJNlt)6SRl`KKm_f=tZ0snR7Z++SNPZEIx<%UO$=wfS+KKl6L~#TeX&
zgRP->h9V&h85f8kiWq`Djs%iOA&m?!kwp$y$m1FX6j8zr%BbKLceqCtH3&SQjs}`|
i#1o$Jf)?87po<>*c*OuisL(LN8{Y8&{ohc=hvOOiGf5->

diff --git a/image/assets/audio/bell/alarm/Morning_Dew.mp3 b/image/assets/audio/bell/alarm/Morning_Dew.mp3
index cbc6c86d3db84dffb6acb546fbd36c929c3aedb4..b0a7d36dabb6f16a4d04c12cdbd2ff6a57bfdcf8 100644
GIT binary patch
delta 145
zcmZ3zNO|36Wou6tV`c^*5HJey3^4*Sq!}0(|Nrx4$Y&^G$YaO^;&cWD1{a1@hH{{6
zNRYEPkOFBjocQtOB*t4fkVm6st0iNrB~z;<bE_pwt0ilzC0nZ{`&LViPZ#(?9Nm5M
Ui}Et_(iL1%%O`#;U}F3a06;h_SpWb4

delta 89
zcmZ3tS$Xv$WnE7fV`c^r&=2tpF#^&&K<t}el$V*8uHced9unm24HN;XF*Iy8;Al7C
bU<6_&AZ7+)79eH?Vm2UV-)_Lc@$UivbMX_)

diff --git a/image/assets/audio/bell/alarm/Natures_Harmony.mp3 b/image/assets/audio/bell/alarm/Natures_Harmony.mp3
index 4c8b90151733650219d46e675eef0c994a2f6f98..167987d712ed1121fe963b332af8b1b46d982343 100644
GIT binary patch
delta 158
zcmdnfuXJRAl8dK{F*5@Y2v~=Bh8O`E$_xyQ|Nr?hBr=pRlrj`Cq%ssUC@^>c`9%!5
z4EYRs43$7tAwkaGK#B#34NWF~d^?Hp9uB0^XxnPb*lNqvYRlYe%hGDg+G@+zYRkUW
hmZQF1D8$j-FR`SwD79F@Be5tqKd*A)#~dcU{{Sf_FQ@<j

delta 93
zcmX@IKxt3ElA))IF*5@Q7>9U<7y)SkAofcvDJ@DZR`5tH%FWNK3<+}f28x2z85%WP
fa<p4=Faj|X5HkZY3lOscF&hxGZ@1*&=xzr9|BV$g

diff --git a/image/assets/audio/bell/alarm/Reverie_Harp.mp3 b/image/assets/audio/bell/alarm/Reverie_Harp.mp3
index 218f2a1195d85a83296f993a48beebc34d183e89..34dc74be4d1c2f4cd76f3f37a2721e91812afb92 100644
GIT binary patch
delta 133
zcmbRBjBnm|K3h*0V`c^*5HJbx3^4*SWEmJ3|NjeONM$Gk;v$AjAgRFM!H@`K7Xal$
zf}Fj96iAcl#E-8gG2X_3>>I6Gtr%Oan6_FmKiI?{;^-cfT9#UrnX2HCSX40aV?Gn>
Fe*k%$DQW-!

delta 70
zcmbRDop07NK0QwtV`c^rFbMGsF#^)OKpd1>mRgjVs^F1WR1gy6><ttGDKa!}HsWYE
Q;$Q?~rtL-?%x^XU08Y^mZvX%Q

diff --git a/image/assets/audio/bell/alarm/Sunrise_Guitar.mp3 b/image/assets/audio/bell/alarm/Sunrise_Guitar.mp3
index 574ffd1b5d3e77e6dc77b4e39449e44fbd82de32..c14eb0cb113765cdf71db61ce1e499994a72c9af 100644
GIT binary patch
delta 136
zcmZo}<?fuu?da)Z%*+4;0u~{jAx1!kA_D{C|9`;@r3`rtMGTn?#SEzo3JmT*ekMZ+
zLn2U&fgvQw*&9fKG+Ipj_+}F0T^vZa(WcdgajOlJ`ys&)NB7{;yrRtFR0a3a%#y^S
Li63*BIQ|0wS?Vb>

delta 68
zcmeC2#@*b?ZQ$u*%*+4+Mj@UdMnIY$h=WV>iZY8+72HcROA?Dhf}Fj9f*@svCe3CX
P?PeT|+s!zbf)4=z1jY|J

diff --git a/image/assets/audio/bell/alarm/Tibetan_Bowls.mp3 b/image/assets/audio/bell/alarm/Tibetan_Bowls.mp3
index 5d5f9baf8591827e9630230a841564826fb39b7f..c849874354f834e662ea4812f8b69f863a9e7ef8 100644
GIT binary patch
delta 136
zcmdmWk9YrjUVBd$V`c^*5HJhz3^4*S<QW(k|NjeN$Ye-jNM$HtNMy)kP+)Lk$Y&^L
z$YCf3st5^k_6AZQZ6*^xzMjN*2M021v~IO#Y_(?EYR&vVPawq6JtQ+JwInf5!70By
Mr+DJWJSLX^0Qa#fUH||9

delta 71
zcmdo0o_E(hUVTp&V`c^rFbwewF#^(jKpc{plv<LQr{I)do>LqW<m?R;1F14JZ8qU(
QH{oCeVy5jT9L(JL0CE-&_y7O^

diff --git a/image/assets/audio/bell/alarm/Tongue_Drum.mp3 b/image/assets/audio/bell/alarm/Tongue_Drum.mp3
index 913b64aa153904ab7145dc17d8556811b416b1e1..2e13721a072eb36dc3d1926a9505c76397a2f3d1 100644
GIT binary patch
delta 127
zcmZ3xlY7G{Zfj2$V`c^*5HJey3^4*Sq!}0(|NjeN$Y;o7NM|TzNM%r9aA7C{vT}j4
zAwkaGKnkSAXyV70lNfK|Kpu^jt(J^iEtyL0@P#<Khves_m!>MX6qV*q{8+%m^dA6<
C%O`dK

delta 65
zcmdmRihJ!&Ze33oV`c^r&=2tpF#^&&Kpc{vmtLBx;8IkY8xrK~4HN;XF*Iv7;Al7C
MVBBuN!PIaE0P!CV)c^nh

diff --git a/image/assets/audio/bell/alarm/Tranquil_Rainstick.mp3 b/image/assets/audio/bell/alarm/Tranquil_Rainstick.mp3
index 6a3d46d22fd26b7591cbb94e8bb5c8985f9dce9a..9fe6ccfd32c1074d504ab0a6562eafd23bed9c9c 100644
GIT binary patch
delta 163
zcmaERLgxET8Bb3aV`c^*5O4_b3^4*SG#MBe|NjeNC}K!t$YUsEC}qfG$YD@m2m<mm
zfg;5WB|tivAseVRB*@ttNP!G6oA~j=B*uq05ND%9s{>=J15>L5bE^YOs{?DR1KU;y
kc3l<G5J&frqQtzy(##x%pv26);*!kd?1>*Unb`gV09+g~Qvd(}

delta 92
zcmex<Q|9dn852(zV`c^rFbnYvF#^)UKpaw(m{(YunWGStn3-2xl9`+x66EX+lmIC;
fG;g-!Xt(2F1Y#y2W(HywAZ7((w(WKt?3OA3SHl(M

diff --git a/products/BellHybrid/apps/common/src/SoundsRepository.cpp b/products/BellHybrid/apps/common/src/SoundsRepository.cpp
index fbbd662ae8b87076234ed0d5d89130815f0494da..92403d6b71d885376dba552a57d8abef926a74dc 100644
--- a/products/BellHybrid/apps/common/src/SoundsRepository.cpp
+++ b/products/BellHybrid/apps/common/src/SoundsRepository.cpp
@@ -17,6 +17,9 @@ SoundsRepository::SoundsRepository(std::filesystem::path dirToScan)
     for (auto const &entry : std::filesystem::directory_iterator(dirToScan)) {
         processEntry(entry);
     }
+
+    /// Sort entries by track ID
+    std::sort(samples.begin(), samples.end(), [](const auto &a, const auto &b) { return a.track < b.track; });
 }
 std::optional<std::filesystem::path> SoundsRepository::titleToPath(const UTF8 &title) const
 {