[gcompris] Add sounds to mining activity
- From: Bruno Coudoin <bcoudoin src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gcompris] Add sounds to mining activity
- Date: Tue, 25 Sep 2012 22:12:14 +0000 (UTC)
commit 6071e7e6afdac6e2f0c833339f39aab1baed306b
Author: Peter Albrecht <pa-dev gmx de>
Date: Mon Sep 10 21:50:32 2012 +0200
Add sounds to mining activity
Both sounds have been provided by tuxpaint under GPL. Thanks for this
work and sharing it for free!
- realrainbow.ogg has been copied as is
- metalpaint.wav has been remixed by me to pickaxe.ogg
src/mining-activity/mining.py | 9 ++++++---
src/mining-activity/mining.xml.in | 4 +++-
src/mining-activity/resources/mining/Makefile.am | 4 +++-
src/mining-activity/resources/mining/pickaxe.ogg | Bin 0 -> 5400 bytes
.../resources/mining/realrainbow.ogg | Bin 0 -> 21530 bytes
5 files changed, 12 insertions(+), 5 deletions(-)
---
diff --git a/src/mining-activity/mining.py b/src/mining-activity/mining.py
index c7fc75a..8f93604 100644
--- a/src/mining-activity/mining.py
+++ b/src/mining-activity/mining.py
@@ -174,6 +174,9 @@ class Gcompris_mining:
self.sparkling.animation_start()
self.need_new_nugget = False
+ # The following sound was copied form "Tuxpaint" (GPL)
+ gcompris.sound.play_ogg("mining/realrainbow.ogg")
+
def on_zoom_change(self, state):
""" Do something according to specific zoom states (E.g. the nugget is only visible at maximum zoom.) """
@@ -239,6 +242,9 @@ class Gcompris_mining:
if self.nugget_count >= self.nuggets_to_collect:
self.on_level_won()
else:
+ # The following sound is based on "metalpaint.wav" from "Tuxpaint" (GPL)
+ gcompris.sound.play_ogg("mining/pickaxe.ogg")
+
# we need to collect more nuggets, so lets place a new one
self.need_new_nugget = True
@@ -985,9 +991,6 @@ class Sparkling:
self.__update_transformation()
self.__show_spark()
- # make some noise ;)
- #TODO: gcompris.sound.play_ogg("sounds/sparkle.ogg")
-
def __calculate_new_state(self):
""" Calculate next animation step """
diff --git a/src/mining-activity/mining.xml.in b/src/mining-activity/mining.xml.in
index a735672..2f955d6 100644
--- a/src/mining-activity/mining.xml.in
+++ b/src/mining-activity/mining.xml.in
@@ -23,7 +23,9 @@ The lorry in the lower, right corner of the screen will tell you the number of a
in this level.
Have fun! :)</_manual>
- <_credit></_credit>
+ <_credit>Thanks to the Tuxpaint team for providing the following sounds under GPL:
+- realrainbow.ogg - used when a new gold nugget appears
+- metalpaint.wav - remixed and used when a gold nugget is collected</_credit>
</Board>
<Data directory=""/>
</GCompris>
diff --git a/src/mining-activity/resources/mining/Makefile.am b/src/mining-activity/resources/mining/Makefile.am
index b76e38a..bb4e76a 100644
--- a/src/mining-activity/resources/mining/Makefile.am
+++ b/src/mining-activity/resources/mining/Makefile.am
@@ -1,5 +1,7 @@
imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/mining
img_DATA = \
- rockwall.svgz
+ rockwall.svgz \
+ pickaxe.ogg \
+ realrainbow.ogg
EXTRA_DIST = $(img_DATA)
diff --git a/src/mining-activity/resources/mining/pickaxe.ogg b/src/mining-activity/resources/mining/pickaxe.ogg
new file mode 100644
index 0000000..ea2dbb7
Binary files /dev/null and b/src/mining-activity/resources/mining/pickaxe.ogg differ
diff --git a/src/mining-activity/resources/mining/realrainbow.ogg b/src/mining-activity/resources/mining/realrainbow.ogg
new file mode 100644
index 0000000..69d0a1f
Binary files /dev/null and b/src/mining-activity/resources/mining/realrainbow.ogg differ
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]