Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruno Coudoin <bcoudoin@src.gnome.org>2009-03-16 22:45:07 (GMT)
committer Bruno Coudoin <bcoudoin@src.gnome.org>2009-03-16 22:45:07 (GMT)
commitaeb41ce702b13601f341d0be99613a25f40e880c (patch)
treea844035ee0aed57f4a3a959d21786146ff7ea814
parent6434b58f880f9d745ffb5b7138980208aa7f5142 (diff)
Fixed melody activity, some sound files was not correct which
made it sometimes imposible to complete. merged from trunk 3779 svn path=/branches/GCOMPRIS_8_3/; revision=3780
-rw-r--r--ChangeLog8
-rw-r--r--src/boards/memory.c20
2 files changed, 18 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 397e2ea..eafda8c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-03-16 Bruno coudoin <bruno.coudoin@free.fr>
+
+ Fixed melody activity, some sound files was not correct which
+ made it sometimes imposible to complete.
+ merged from trunk 3779
+
+ * src/boards/memory.c:
+
2009-03-15 Bruno Coudoin <bruno.coudoin@free.fr>
- Replaced letter that differenciate blocks for
diff --git a/src/boards/memory.c b/src/boards/memory.c
index 5d62d83..6e9ad18 100644
--- a/src/boards/memory.c
+++ b/src/boards/memory.c
@@ -239,16 +239,16 @@ static gchar *soundList[] =
"sounds/memory/tri.ogg",
"sounds/chronos/space/1.ogg",
"sounds/chronos/space/2.ogg",
- "sounds/chronos/space/2.ogg",
- "sounds/melody/guitar/melody.ogg",
- "sounds/melody/guitar/son1.ogg",
- "sounds/melody/guitar/son2.ogg",
- "sounds/melody/guitar/son3.ogg",
- "sounds/melody/guitar/son4.ogg",
- "sounds/melody/tachos/son1.ogg",
- "sounds/melody/tachos/son2.ogg",
- "sounds/melody/tachos/son3.ogg",
- "sounds/melody/tachos/son4.ogg",
+ "sounds/melody/guitar/melody.wav",
+ "sounds/melody/guitar/son1.wav",
+ "sounds/melody/guitar/son2.wav",
+ "sounds/melody/guitar/son3.wav",
+ "sounds/melody/guitar/son4.wav",
+ "sounds/melody/tachos/melody.wav",
+ "sounds/melody/tachos/son1.wav",
+ "sounds/melody/tachos/son2.wav",
+ "sounds/melody/tachos/son3.wav",
+ "sounds/melody/tachos/son4.wav",
"sounds/melody/tachos/melody.ogg"
};