Skip to content

Commit 396fdc3

Browse files
committed
Add Menaiek tune
1 parent 2df9381 commit 396fdc3

File tree

9 files changed

+78
-5
lines changed

9 files changed

+78
-5
lines changed

app/shared/config.js

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,27 @@ angular.module("beatbox").factory("bbConfig", function(ng, $document) {
66
bbConfig.instruments = {
77
ls: {
88
name: "Low Surdo",
9-
strokes: [ "X", "0", "s", "t", "r" ]
9+
strokes: [ "X", "0", "s", "t", "r", "z", "i" ]
1010
},
1111
ms: {
1212
name: "Mid Surdo",
13-
strokes: [ "X", "0", "s", "t", "r" ]
13+
strokes: [ "X", "0", "s", "t", "r", "z", "i" ]
1414
},
1515
hs: {
1616
name: "High Surdo",
17-
strokes: [ "X", "0", "s", "t", "r" ]
17+
strokes: [ "X", "0", "s", "t", "r", "z", "i" ]
1818
},
1919
re: {
2020
name: "Repi",
21-
strokes: [ "X", "f", "r", "h", "s", "." ]
21+
strokes: [ "X", "f", "r", "h", "s", ".", "z" ]
2222
},
2323
sn: {
2424
name: "Snare",
2525
strokes: [ ".", "X", "r", "f" ]
2626
},
2727
ta: {
2828
name: "Tamborim",
29-
strokes: [ "X", "r" ]
29+
strokes: [ "X", "r", "f" ]
3030
},
3131
ag: {
3232
name: "Agogo",
@@ -45,6 +45,7 @@ angular.module("beatbox").factory("bbConfig", function(ng, $document) {
4545
bbConfig.strokes = {
4646
"X": "X",
4747
"h": "hd",
48+
"i": "sl",
4849
"0": "0",
4950
"s": "sil",
5051
"f": "fl",
@@ -55,6 +56,7 @@ angular.module("beatbox").factory("bbConfig", function(ng, $document) {
5556
".": ".",
5657
"w" : "Wh",
5758
"y" : "Wh2", // Long whistle
59+
"z": "HS", // Hand + Stick
5860
"A" : "Oi!",
5961
"B" : "Ua!",
6062
"D" : "Oo",
@@ -83,6 +85,19 @@ angular.module("beatbox").factory("bbConfig", function(ng, $document) {
8385
"5" : "el"
8486
};
8587

88+
bbConfig.strokesDescription = {
89+
"h": "Hand",
90+
"i": "Slap with hand",
91+
"0": "Damp with hand",
92+
"s": "Silent stroke",
93+
"f": "Flare",
94+
"t": "Whippy (tamborim) stick",
95+
".": "Silent stroke",
96+
"w" : "Whistle",
97+
"y" : "Long whistle",
98+
"z": "Hand + Stick"
99+
};
100+
86101
bbConfig.times = [ 2, 3, 4, 12 ];
87102

88103
// Time measurement that is used for beatbox.js. Should be able to represent all the time measurements above

app/shared/defaultTunes.js

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -777,6 +777,64 @@ angular.module("beatbox").factory("bbDefaultTunes", function(ng, $rootScope, bbC
777777
}
778778
}
779779
},
780+
'Menaiek': {
781+
patterns: {
782+
Tune: {
783+
ls: 'X z X X z X X z X X z X ',
784+
ms: ' z X z X X ',
785+
hs: 'X z X z X ',
786+
re: 'rrX z f f f Xhr Xhr Xh',
787+
sn: 'X..XX..XX..XX.X.X..XX..XX...X.X.',
788+
ta: 'X X XXX X f f ',
789+
ag: 'o a a o o a o o o '
790+
},
791+
"Break 1": {
792+
ls: 'X X X XX X XX X ',
793+
ms: '@ls',
794+
hs: '@ls',
795+
re: '@ls',
796+
sn: '@ls',
797+
ta: '@ls',
798+
ag: '@ls'
799+
},
800+
"Break 2": {
801+
ls: repeat(3, ' XXX XX XX'),
802+
ms: '@ls',
803+
hs: '@ls',
804+
re: '@ls',
805+
sn: '@ls',
806+
ta: '@ls',
807+
ag: repeat(3, 'o a o o a ') + 'o a o o a oo o '
808+
},
809+
"Double Break": {
810+
ls: 'X z X z X ',
811+
ms: ' z X z X X ',
812+
hs: 'X hXX hXX hXX hX',
813+
re: 'r rr r r rr r ',
814+
sn: 'X..XX..XX..XX.X.',
815+
ta: 'X X XXX X f ',
816+
ag: 'o a o o a oo oa'
817+
},
818+
"Kick Break": {
819+
ls: 'X X X X X ',
820+
ms: '@ls',
821+
hs: '@ls',
822+
re: ' X X ',
823+
sn: '@re',
824+
ta: '@re',
825+
ag: 'o a o o a oo oa'
826+
},
827+
"Mozambique Break": {
828+
ls: ' i h i h ',
829+
ms: '@ls',
830+
hs: '@ls',
831+
re: 'r r rr r rr rr r',
832+
sn: '@re',
833+
ta: '@re',
834+
ag: '@re'
835+
}
836+
}
837+
},
780838
'No Border Bossa': {
781839
patterns: {
782840
Tune: {

assets/audio/hs_h.mp3

1.63 KB
Binary file not shown.

assets/audio/hs_z.mp3

8.98 KB
Binary file not shown.

assets/audio/ls_h.mp3

2.86 KB
Binary file not shown.

assets/audio/ls_z.mp3

15.9 KB
Binary file not shown.

assets/audio/ms_h.mp3

4.28 KB
Binary file not shown.

assets/audio/ms_z.mp3

8.98 KB
Binary file not shown.

assets/audio/ta_f.mp3

12.7 KB
Binary file not shown.

0 commit comments

Comments
 (0)