From 5a0904ca120fad78690695aea6205a1ebc58eee2 Mon Sep 17 00:00:00 2001 From: Aleksey Lim Date: Thu, 29 Jan 2009 15:20:05 +0000 Subject: Add new instruments Nepali madal, sarangi and temple bells --- diff --git a/TamTamMini.activity/Mini/miniTamTamMain.py b/TamTamMini.activity/Mini/miniTamTamMain.py index 2665b5a..6927658 100644 --- a/TamTamMini.activity/Mini/miniTamTamMain.py +++ b/TamTamMini.activity/Mini/miniTamTamMain.py @@ -268,6 +268,9 @@ class miniTamTamMain(gtk.EventBox): generationDrumBtn5 = ImageRadioButton(group = generationDrumBtn1 , mainImg_path = Config.IMAGE_ROOT + 'drum5kit.png' , altImg_path = Config.IMAGE_ROOT + 'drum5kitselgen.png') generationDrumBtn5.connect('clicked' , self.handleGenerationDrumBtn , 'drum5kit') geneMidBox.pack_start(generationDrumBtn5, True) + generationDrumBtn6 = ImageRadioButton(group = generationDrumBtn1 , mainImg_path = Config.IMAGE_ROOT + 'drum6kit.png' , altImg_path = Config.IMAGE_ROOT + 'drum6kitselgen.png') + generationDrumBtn6.connect('clicked' , self.handleGenerationDrumBtn , 'drum6kit') + geneMidBox.pack_start(generationDrumBtn6, True) geneVBox.pack_start(generateBtnSub, True) geneVBox.pack_start(geneTopBox, True) geneVBox.pack_start(geneMidBox, True) diff --git a/common/Resources/Images/drum6kit.png b/common/Resources/Images/drum6kit.png new file mode 100644 index 0000000..69559b1 --- /dev/null +++ b/common/Resources/Images/drum6kit.png Binary files differ diff --git a/common/Resources/Images/drum6kitmadal.orig.jpg b/common/Resources/Images/drum6kitmadal.orig.jpg new file mode 100644 index 0000000..a5248fb --- /dev/null +++ b/common/Resources/Images/drum6kitmadal.orig.jpg Binary files differ diff --git a/common/Resources/Images/drum6kitsel.png b/common/Resources/Images/drum6kitsel.png new file mode 100644 index 0000000..567309b --- /dev/null +++ b/common/Resources/Images/drum6kitsel.png Binary files differ diff --git a/common/Resources/Images/drum6kitselgen.png b/common/Resources/Images/drum6kitselgen.png new file mode 100644 index 0000000..f4f0fdc --- /dev/null +++ b/common/Resources/Images/drum6kitselgen.png Binary files differ diff --git a/common/Resources/Images/sarangi.orig.jpg b/common/Resources/Images/sarangi.orig.jpg new file mode 100644 index 0000000..c0c5fa6 --- /dev/null +++ b/common/Resources/Images/sarangi.orig.jpg Binary files differ diff --git a/common/Resources/Images/sarangi.png b/common/Resources/Images/sarangi.png new file mode 100644 index 0000000..666c129 --- /dev/null +++ b/common/Resources/Images/sarangi.png Binary files differ diff --git a/common/Resources/Images/sarangisel.png b/common/Resources/Images/sarangisel.png new file mode 100644 index 0000000..b84b495 --- /dev/null +++ b/common/Resources/Images/sarangisel.png Binary files differ diff --git a/common/Resources/Images/templebell.orig.jpg b/common/Resources/Images/templebell.orig.jpg new file mode 100644 index 0000000..5ad1231 --- /dev/null +++ b/common/Resources/Images/templebell.orig.jpg Binary files differ diff --git a/common/Resources/Images/templebell.png b/common/Resources/Images/templebell.png new file mode 100644 index 0000000..b84b499 --- /dev/null +++ b/common/Resources/Images/templebell.png Binary files differ diff --git a/common/Resources/Images/templebellsel.png b/common/Resources/Images/templebellsel.png new file mode 100644 index 0000000..c8ef8e7 --- /dev/null +++ b/common/Resources/Images/templebellsel.png Binary files differ diff --git a/common/Resources/Sounds/drum6kit b/common/Resources/Sounds/drum6kit new file mode 120000 index 0000000..332b551 --- /dev/null +++ b/common/Resources/Sounds/drum6kit @@ -0,0 +1 @@ +drum6madal05 \ No newline at end of file diff --git a/common/Resources/Sounds/drum6kit.orig b/common/Resources/Sounds/drum6kit.orig new file mode 100644 index 0000000..8bfe82c --- /dev/null +++ b/common/Resources/Sounds/drum6kit.orig Binary files differ diff --git a/common/Resources/Sounds/drum6madal00 b/common/Resources/Sounds/drum6madal00 new file mode 100644 index 0000000..6af692f --- /dev/null +++ b/common/Resources/Sounds/drum6madal00 Binary files differ diff --git a/common/Resources/Sounds/drum6madal01 b/common/Resources/Sounds/drum6madal01 new file mode 100644 index 0000000..0a7dbdb --- /dev/null +++ b/common/Resources/Sounds/drum6madal01 Binary files differ diff --git a/common/Resources/Sounds/drum6madal02 b/common/Resources/Sounds/drum6madal02 new file mode 100644 index 0000000..e12a412 --- /dev/null +++ b/common/Resources/Sounds/drum6madal02 Binary files differ diff --git a/common/Resources/Sounds/drum6madal03 b/common/Resources/Sounds/drum6madal03 new file mode 100644 index 0000000..b3a210e --- /dev/null +++ b/common/Resources/Sounds/drum6madal03 Binary files differ diff --git a/common/Resources/Sounds/drum6madal04 b/common/Resources/Sounds/drum6madal04 new file mode 100644 index 0000000..fcef18f --- /dev/null +++ b/common/Resources/Sounds/drum6madal04 Binary files differ diff --git a/common/Resources/Sounds/drum6madal05 b/common/Resources/Sounds/drum6madal05 new file mode 100644 index 0000000..a409f6c --- /dev/null +++ b/common/Resources/Sounds/drum6madal05 Binary files differ diff --git a/common/Resources/Sounds/drum6madal06 b/common/Resources/Sounds/drum6madal06 new file mode 100644 index 0000000..e7c307d --- /dev/null +++ b/common/Resources/Sounds/drum6madal06 Binary files differ diff --git a/common/Resources/Sounds/drum6madal07 b/common/Resources/Sounds/drum6madal07 new file mode 100644 index 0000000..25bf251 --- /dev/null +++ b/common/Resources/Sounds/drum6madal07 Binary files differ diff --git a/common/Resources/Sounds/drum6madal08 b/common/Resources/Sounds/drum6madal08 new file mode 100644 index 0000000..4bcba5a --- /dev/null +++ b/common/Resources/Sounds/drum6madal08 Binary files differ diff --git a/common/Resources/Sounds/drum6madal09 b/common/Resources/Sounds/drum6madal09 new file mode 100644 index 0000000..3cb92ee --- /dev/null +++ b/common/Resources/Sounds/drum6madal09 Binary files differ diff --git a/common/Resources/Sounds/drum6madal10 b/common/Resources/Sounds/drum6madal10 new file mode 100644 index 0000000..af6f451 --- /dev/null +++ b/common/Resources/Sounds/drum6madal10 Binary files differ diff --git a/common/Resources/Sounds/drum6madal11 b/common/Resources/Sounds/drum6madal11 new file mode 100644 index 0000000..cddcf4a --- /dev/null +++ b/common/Resources/Sounds/drum6madal11 Binary files differ diff --git a/common/Resources/Sounds/drum6madal12 b/common/Resources/Sounds/drum6madal12 new file mode 100644 index 0000000..1b3dc5b --- /dev/null +++ b/common/Resources/Sounds/drum6madal12 Binary files differ diff --git a/common/Resources/Sounds/sarangi b/common/Resources/Sounds/sarangi new file mode 100644 index 0000000..69bde54 --- /dev/null +++ b/common/Resources/Sounds/sarangi Binary files differ diff --git a/common/Resources/Sounds/sarangi.orig b/common/Resources/Sounds/sarangi.orig new file mode 100644 index 0000000..4fb94da --- /dev/null +++ b/common/Resources/Sounds/sarangi.orig Binary files differ diff --git a/common/Resources/Sounds/templebell b/common/Resources/Sounds/templebell new file mode 100644 index 0000000..705fbbc --- /dev/null +++ b/common/Resources/Sounds/templebell Binary files differ diff --git a/common/Resources/Sounds/templebell.orig b/common/Resources/Sounds/templebell.orig new file mode 100644 index 0000000..0790114 --- /dev/null +++ b/common/Resources/Sounds/templebell.orig Binary files differ diff --git a/common/Util/Instruments.py b/common/Util/Instruments.py index 4f5b987..1bbf8b5 100644 --- a/common/Util/Instruments.py +++ b/common/Util/Instruments.py @@ -178,6 +178,21 @@ _addInstrument( "crash", INST_SIMP, MID, 'concret', 0, 0, 0, 1 ) _addInstrument( "guit2", INST_TIED, MID, 'strings', 1.186341406, 1.929568266, .2, 0.25 ) _addInstrument( "plane", INST_SIMP, MID, 'concret', 0, 0, 0, 0.6 ) _addInstrument( "slap", INST_SIMP, MID, 'concret', 0, 0, 0, 0.7 ) +_addInstrument( "templebell", INST_SIMP, MID, 'percussions', 0, 0, 0, 1) +_addInstrument( "sarangi", INST_SIMP, MID, 'strings', 0, 0, 0, 1) +_addInstrument( "drum6madal00", INST_SIMP, LOW, 'percussions', 0, 0 ,0, 1, kitStage = True ) +_addInstrument( "drum6madal01", INST_SIMP, LOW, 'percussions', 0, 0 ,0, 1, kitStage = True ) +_addInstrument( "drum6madal02", INST_SIMP, LOW, 'percussions', 0, 0 ,0, 1, kitStage = True ) +_addInstrument( "drum6madal03", INST_SIMP, LOW, 'percussions', 0, 0 ,0, 1, kitStage = True ) +_addInstrument( "drum6madal04", INST_SIMP, LOW, 'percussions', 0, 0 ,0, 1, kitStage = True ) +_addInstrument( "drum6madal05", INST_SIMP, LOW, 'percussions', 0, 0 ,0, 1, kitStage = True ) +_addInstrument( "drum6madal06", INST_SIMP, LOW, 'percussions', 0, 0 ,0, 1, kitStage = True ) +_addInstrument( "drum6madal07", INST_SIMP, LOW, 'percussions', 0, 0 ,0, 1, kitStage = True ) +_addInstrument( "drum6madal08", INST_SIMP, LOW, 'percussions', 0, 0 ,0, 1, kitStage = True ) +_addInstrument( "drum6madal09", INST_SIMP, LOW, 'percussions', 0, 0 ,0, 1, kitStage = True ) +_addInstrument( "drum6madal10", INST_SIMP, LOW, 'percussions', 0, 0 ,0, 1, kitStage = True ) +_addInstrument( "drum6madal11", INST_SIMP, LOW, 'percussions', 0, 0 ,0, 1, kitStage = True ) +_addInstrument( "drum6madal12", INST_SIMP, LOW, 'percussions', 0, 0 ,0, 1, kitStage = True ) if Config.FEATURES_NEWSOUNDS: try: @@ -260,8 +275,23 @@ DRUM5KIT = { 24 : "drum5timablesslap", 46 : "drum5agogograve", 48 : "drum5bongoaiguouvert" } +DRUM6KIT = { 24 : "drum6madal00", + 26 : "drum6madal01", + 28 : "drum6madal02", + 30 : "drum6madal03", + 32 : "drum6madal04", + 34 : "drum6madal05", + 36 : "drum6madal06", + 38 : "drum6madal07", + 40 : "drum6madal08", + 42 : "drum6madal09", + 44 : "drum6madal10", + 46 : "drum6madal11", + 48 : "drum6madal12" } + _addInstrument( "drum1kit", 0, 0, "percussions", 0, 0, 0, 1, DRUM1KIT ) _addInstrument( "drum2kit", 0, 0, "percussions", 0, 0, 0, 1, DRUM2KIT ) _addInstrument( "drum3kit", 0, 0, "percussions", 0, 0, 0, 1, DRUM3KIT ) _addInstrument( "drum4kit", 0, 0, "percussions", 0, 0, 0, 1, DRUM4KIT ) _addInstrument( "drum5kit", 0, 0, "percussions", 0, 0, 0, 1, DRUM5KIT ) +_addInstrument( "drum6kit", 0, 0, "percussions", 0, 0, 0, 1, DRUM6KIT ) -- cgit v0.9.1