From e9174b275a091318c179cd793d21f939cb9bb895 Mon Sep 17 00:00:00 2001 From: grindhold Date: Sat, 1 Nov 2014 12:18:08 +0100 Subject: [PATCH 1/2] first metronome click of a tact now has a higher pitch #1254 --- data/samples/misc/metronome02.ogg | Bin 0 -> 70143 bytes src/core/Mixer.cpp | 13 ++++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 data/samples/misc/metronome02.ogg diff --git a/data/samples/misc/metronome02.ogg b/data/samples/misc/metronome02.ogg new file mode 100644 index 0000000000000000000000000000000000000000..c380eb18f02d4160f92ee3c26edb1b7a169dc2c4 GIT binary patch literal 70143 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 literal 0 HcmV?d00001 diff --git a/src/core/Mixer.cpp b/src/core/Mixer.cpp index 7c1790a2a..3434de3de 100644 --- a/src/core/Mixer.cpp +++ b/src/core/Mixer.cpp @@ -322,10 +322,17 @@ const surroundSampleFrame * Mixer::renderNextBuffer() song::Mode_PlayPattern ); if( engine::getSong()->playMode() == song::Mode_PlayPattern && engine::pianoRoll()->isRecording() == true && - p != last_metro_pos && p.getTicks() % - (DefaultTicksPerTact / 4 ) == 0 ) + p != last_metro_pos ) { - addPlayHandle( new SamplePlayHandle( "misc/metronome01.ogg" ) ); + if ( p.getTicks() % (MidiTime::ticksPerTact() / 1 ) == 0 ) + { + addPlayHandle( new SamplePlayHandle( "misc/metronome02.ogg" ) ); + } + else if ( p.getTicks() % (MidiTime::ticksPerTact() / + engine::getSong()->getTimeSigModel().getNumerator() ) == 0 ) + { + addPlayHandle( new SamplePlayHandle( "misc/metronome01.ogg" ) ); + } last_metro_pos = p; } From eea294b8d69b78c98d829bd3722be7582d0e59b2 Mon Sep 17 00:00:00 2001 From: grindhold Date: Sat, 1 Nov 2014 12:56:18 +0100 Subject: [PATCH 2/2] use trimmed metronome sound of @mikobuntu --- data/samples/misc/metronome02.ogg | Bin 70143 -> 5291 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/data/samples/misc/metronome02.ogg b/data/samples/misc/metronome02.ogg index c380eb18f02d4160f92ee3c26edb1b7a169dc2c4..70b53e117e58ccb8e6c396f7034401ee289d8ab5 100644 GIT binary patch delta 936 zcmV;Z16Tb2qXerdR8MDTQvd=0000000001GnEn(10001K<}_;o9szc5a$;$700000 z0z|9;000000040U000000Js59XJ=CY00000000000A-l|6afGL04myZX|Yrk5q|`N z1ONa40001GnEn(30000tCcQihR#8nrJU~N2OHolAK0SrDy=C21f@$F0#HX&vwog*1 zN)Qda*Kf7xmPn9eFjdT&O|e?lMYX=LVqn$AF$0(bsHJsF1i`9SYem5pK~)iJb%EH3 zqETca_g;V8%&E0q1#C8VamQ30!GA$xvUW0ea+j$(aL|}6x2&yZph`<-jB<&=qM~TE zI#dm+C{43d?c1b!m{0 zCY8c+Odcwe3}ob1>J^gBCc`LVjg3YN>l9U0MzxAowY|6^dOA+zm z5l03Ci;T3|mMrb4|4heWk^1KNp)Q5E5lsw+DM!Eb4Ga9J;3>0VLjb>wuclawN=$xGMq>f&@o!tkgsy zg)j_>F-9vG5z&MKr$dBzbAKrk+HL=m8z?TI$zLb_jYXxF;sh-2%F`gAmP~<+#$7oP zxG;%IflNKqLpXsk#-v!M(h9{4l}iWl(6IuGyvtxsEj5`?&)Ph4M<0%TaM5=n2LR;d zuBADSkl_4>yCTSBCL{#R4}dUM7-Ldm8PL&DTE+zHp}`Wj&8~>J<9|@gt^3 zu%c5jSZQ6x1feKd10w7Yi&)Ll5|wq|!V#8oP4p12eRlH;tx48FgG4y;c8b?MyZA*` z>mW}e9RB+4WU#Cf0NC{hi^Zyfs?n{{3bsZoMMVHBTE$N`wK_@!!(L(C9)OiqbpZfJ KM(nCqVd((ph<|!|Far|<8u;1qE|F1=u`ItRDYF`NstAN{u#w8jEsRnfzGxLE{%^Zz0;WMGhSD^)G4UR)Z^ zyR312dthwm-Fq3aq0N~OZa>M``ohhRkC|DzcTHc`)_dR66BDkcz2;ih6xEk1%6cSf z?X|8Z-6Hw@^?DP;%#S+#`+F$KPq&>b$Ew_O`rAz*T9#LQpXWvS?ApR;v)+RT`n87r9oXhVn0Yox*VV)4PmY+m5xJFWLS2-%Ad+)eFi( zKUo+5eP|pbb$W_T$TH3|%PvL4om}eOU^v-2aQ%cekp_(yrPpk%znGCYchRa-E5a_W z+9saus=UUt#YmSYlsQU!0-ubVP+^LJJ8$I5Z5^yvGen+OE4@@Kz#ySl?}2(dooB_PsdC&a)!g?Yz!xhf;j*Z@YjSK7_>eWw~tjf;u zi{X%gh}vO|X^h8Z_e>K^vfUCjeXU-Os6e?)*3Qy;>sm`mr!^N+6<%&-H8EZHZ_RfV z1|F_*1wA7M0}Y-2T|uViFAB1|yd*UeJ5L%I-183&TpCm2K6{c=+FS!)k&e*4RRJ@8 z^YFPuUDv6!wydnpdYR4e<>e{m1;zCTCVnfi7BJ9kD0%G@>a<}Zx0-=eoY%FeD^A`k zS6$Q2((YK5q#YF<8tAfR!A7RATXVBwi~Ux0ZA>uXa??H`9rwcDTJz4!u7HNA%_7Ek z-g0RwtbMa&#zV2KtWHWSET)MnNk`SP9YZc=y9NfjELXZ!9^Sf1M?30h!qQSn;g&_| zQyymKuqYd)ZCSd)=l@BzR;Di;f|~X_k6&b2)OTIkWl6=3;~!Z%UfmD9!nTM-_aR3_ zw#J%J(Gb?PX(6nkk(vuP6kK_yvRW$CCA1(RK&SbU0*{XS#t-S+>J~;s%;DzZgM!H$ z*{d1(Hg9A<&qzF_2g$n*8HgOp3}jyW_;#5Pa!!P>Ni`kS9Wc9k5O%QundYBDjc8`q z283O#K<3o#`64v4>k7gyHXyTfk**WX?D~PQiyg=e=@P7>nO!oV(i{RffYkj7-FInb zmjl8sPM}@oJC^LHnO!LeySRXM&6fT@k!E&vAnf7>+O_WGOGTR5wFY4q574e?gKArv z*>wS77cbDRuZJU&X=c|Kgk5|