diff options
-rw-r--r-- | AUTHORS | 1 | ||||
-rw-r--r-- | activity/activity.info | 4 | ||||
-rw-r--r-- | common/Resources/Images/au_pipes.png | bin | 0 -> 8777 bytes | |||
-rw-r--r-- | common/Resources/Images/au_pipessel.png | bin | 0 -> 8148 bytes | |||
-rw-r--r-- | common/Resources/Sounds/au_pipes | bin | 0 -> 29340 bytes | |||
-rw-r--r-- | common/Util/Instruments.py | 5 | ||||
-rw-r--r-- | orig/Images/au_pipes.jpg | bin | 0 -> 412982 bytes | |||
-rw-r--r-- | orig/Images/drum6kitmadal.jpg (renamed from common/Resources/Images/drum6kitmadal.orig.jpg) | bin | 6976 -> 6976 bytes | |||
-rw-r--r-- | orig/Images/sarangi.jpg (renamed from common/Resources/Images/sarangi.orig.jpg) | bin | 7467 -> 7467 bytes | |||
-rw-r--r-- | orig/Images/templebell.jpg (renamed from common/Resources/Images/templebell.orig.jpg) | bin | 3396 -> 3396 bytes | |||
-rw-r--r-- | orig/Sounds/au_pipes.wav | bin | 0 -> 84842 bytes | |||
-rw-r--r-- | orig/Sounds/drum6kit.wav (renamed from common/Resources/Sounds/drum6kit.orig) | bin | 172794 -> 172794 bytes | |||
-rw-r--r-- | orig/Sounds/sarangi.wav (renamed from common/Resources/Sounds/sarangi.orig) | bin | 164992 -> 164992 bytes | |||
-rw-r--r-- | orig/Sounds/templebell.wav (renamed from common/Resources/Sounds/templebell.orig) | bin | 86973 -> 86973 bytes |
14 files changed, 8 insertions, 2 deletions
@@ -28,6 +28,7 @@ Marco Pesenti Gritti <marco@localhost.localdomain> Nathanaël Lécaudé <natcl@hotmail.com> Olivier Belanger <olivier.belanger@umontreal.ca> Rafael Ortiz <rafael@activitycentral.com> +Sean Linton <sean@lpnz.org> Sean Wood <sean.wood@umontreal.ca> Walter Bender <walter.bender@gmail.com> diff --git a/activity/activity.info b/activity/activity.info index 540d583..d8f6f4d 100644 --- a/activity/activity.info +++ b/activity/activity.info @@ -12,7 +12,7 @@ description = TamTam is a suite of four music and sound related activities homepage = http://wiki.sugarlabs.org/go/Activities/TamTam license = GPLv2+ -version = %(activity_version)s +version = 59 stability = stable icon = %(component_name)s @@ -20,4 +20,4 @@ exec = sugar-activity %(component_name)s.%(component_name)s -s # original activity.info options bundle_id = org.laptop.%(component_name)s -activity_version = 59 +activity_version = %(version)s diff --git a/common/Resources/Images/au_pipes.png b/common/Resources/Images/au_pipes.png Binary files differnew file mode 100644 index 0000000..93524bd --- /dev/null +++ b/common/Resources/Images/au_pipes.png diff --git a/common/Resources/Images/au_pipessel.png b/common/Resources/Images/au_pipessel.png Binary files differnew file mode 100644 index 0000000..2493f02 --- /dev/null +++ b/common/Resources/Images/au_pipessel.png diff --git a/common/Resources/Sounds/au_pipes b/common/Resources/Sounds/au_pipes Binary files differnew file mode 100644 index 0000000..0284d11 --- /dev/null +++ b/common/Resources/Sounds/au_pipes diff --git a/common/Util/Instruments.py b/common/Util/Instruments.py index 9acfca8..5ba8937 100644 --- a/common/Util/Instruments.py +++ b/common/Util/Instruments.py @@ -557,6 +557,11 @@ _addInstrument("drum6madal11", INST_SIMP, LOW, 'percussions', 0, 0, 0, 1, kitStage=True) _addInstrument("drum6madal12", INST_SIMP, LOW, 'percussions', 0, 0, 0, 1, kitStage=True) +_addInstrument('au_pipes', INST_TIED, MID, 'winds', + 0, 1, 0, 0.9, + # TRANS: The sound of a Solomon Islands pipe, named "'au tahana" + # TRANS: http://www.jstor.org/pss/851365 + nameTooltip=_('\'au tahana')) if Config.FEATURES_NEWSOUNDS: try: diff --git a/orig/Images/au_pipes.jpg b/orig/Images/au_pipes.jpg Binary files differnew file mode 100644 index 0000000..16511c3 --- /dev/null +++ b/orig/Images/au_pipes.jpg diff --git a/common/Resources/Images/drum6kitmadal.orig.jpg b/orig/Images/drum6kitmadal.jpg Binary files differindex a5248fb..a5248fb 100644 --- a/common/Resources/Images/drum6kitmadal.orig.jpg +++ b/orig/Images/drum6kitmadal.jpg diff --git a/common/Resources/Images/sarangi.orig.jpg b/orig/Images/sarangi.jpg Binary files differindex c0c5fa6..c0c5fa6 100644 --- a/common/Resources/Images/sarangi.orig.jpg +++ b/orig/Images/sarangi.jpg diff --git a/common/Resources/Images/templebell.orig.jpg b/orig/Images/templebell.jpg Binary files differindex 5ad1231..5ad1231 100644 --- a/common/Resources/Images/templebell.orig.jpg +++ b/orig/Images/templebell.jpg diff --git a/orig/Sounds/au_pipes.wav b/orig/Sounds/au_pipes.wav Binary files differnew file mode 100644 index 0000000..7231004 --- /dev/null +++ b/orig/Sounds/au_pipes.wav diff --git a/common/Resources/Sounds/drum6kit.orig b/orig/Sounds/drum6kit.wav Binary files differindex 8bfe82c..8bfe82c 100644 --- a/common/Resources/Sounds/drum6kit.orig +++ b/orig/Sounds/drum6kit.wav diff --git a/common/Resources/Sounds/sarangi.orig b/orig/Sounds/sarangi.wav Binary files differindex 4fb94da..4fb94da 100644 --- a/common/Resources/Sounds/sarangi.orig +++ b/orig/Sounds/sarangi.wav diff --git a/common/Resources/Sounds/templebell.orig b/orig/Sounds/templebell.wav Binary files differindex 0790114..0790114 100644 --- a/common/Resources/Sounds/templebell.orig +++ b/orig/Sounds/templebell.wav |