- Replaced a level in memory sound to make the difficulty always increasing

	  Merged from trunk 3790


svn path=/branches/GCOMPRIS_8_3/; revision=3791

51 files changed, 15 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index be12ce8..58d6652 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-03-24  Bruno coudoin  <bruno.coudoin@free.fr>
+
+	- Replaced a level in memory sound to make the difficulty always increasing
+	  Merged from trunk 3790
+
+	* src/boards/memory.c: (start_board):
+	* boards/voices/*: normalized sounds.
+
 2009-03-20  Bruno coudoin  <bruno.coudoin@free.fr>
 
 	- Reverted a commit in which Bruno broke the saving of the content.txt
diff --git a/boards/sounds/LuneRouge/LRLaPause_short.ogg b/boards/sounds/LuneRouge/LRLaPause_short.ogg
index 7efaf50..503439a 100644
--- a/boards/sounds/LuneRouge/LRLaPause_short.ogg
+++ b/boards/sounds/LuneRouge/LRLaPause_short.ogg
diff --git a/boards/sounds/LuneRouge/animaux/LRBark_1_by_Lionel_Allorge_cut.ogg b/boards/sounds/LuneRouge/animaux/LRBark_1_by_Lionel_Allorge_cut.ogg
index c9f5073..11fa023 100644
--- a/boards/sounds/LuneRouge/animaux/LRBark_1_by_Lionel_Allorge_cut.ogg
+++ b/boards/sounds/LuneRouge/animaux/LRBark_1_by_Lionel_Allorge_cut.ogg
diff --git a/boards/sounds/LuneRouge/animaux/LRBark_3_by_Lionel_Allorge_cut.ogg b/boards/sounds/LuneRouge/animaux/LRBark_3_by_Lionel_Allorge_cut.ogg
index 5ad4318..8abf4fa 100644
--- a/boards/sounds/LuneRouge/animaux/LRBark_3_by_Lionel_Allorge_cut.ogg
+++ b/boards/sounds/LuneRouge/animaux/LRBark_3_by_Lionel_Allorge_cut.ogg
diff --git a/boards/sounds/LuneRouge/animaux/LRFrogsInPondDuringStormByLionelAllorgeCut.ogg b/boards/sounds/LuneRouge/animaux/LRFrogsInPondDuringStormByLionelAllorgeCut.ogg
index 431ac2a..034b8f1 100644
--- a/boards/sounds/LuneRouge/animaux/LRFrogsInPondDuringStormByLionelAllorgeCut.ogg
+++ b/boards/sounds/LuneRouge/animaux/LRFrogsInPondDuringStormByLionelAllorgeCut.ogg
diff --git a/boards/sounds/LuneRouge/animaux/LRRain_in_garden_01_by_Lionel_Allorge_cut.ogg b/boards/sounds/LuneRouge/animaux/LRRain_in_garden_01_by_Lionel_Allorge_cut.ogg
index 6310cb8..03bf9e3 100644
--- a/boards/sounds/LuneRouge/animaux/LRRain_in_garden_01_by_Lionel_Allorge_cut.ogg
+++ b/boards/sounds/LuneRouge/animaux/LRRain_in_garden_01_by_Lionel_Allorge_cut.ogg
diff --git a/boards/sounds/LuneRouge/engins/LRObject_falling_01_by_Lionel_Allorge.ogg b/boards/sounds/LuneRouge/engins/LRObject_falling_01_by_Lionel_Allorge.ogg
index 6802c2f..9cc6c56 100644
--- a/boards/sounds/LuneRouge/engins/LRObject_falling_01_by_Lionel_Allorge.ogg
+++ b/boards/sounds/LuneRouge/engins/LRObject_falling_01_by_Lionel_Allorge.ogg
diff --git a/boards/sounds/LuneRouge/engins/LRObject_falling_02_by_Lionel_Allorge.ogg b/boards/sounds/LuneRouge/engins/LRObject_falling_02_by_Lionel_Allorge.ogg
index 797d39e..f97c8d2 100644
--- a/boards/sounds/LuneRouge/engins/LRObject_falling_02_by_Lionel_Allorge.ogg
+++ b/boards/sounds/LuneRouge/engins/LRObject_falling_02_by_Lionel_Allorge.ogg
diff --git a/boards/sounds/LuneRouge/engins/LRStartAndStopCarEngine1ByLionelAllorgeCut.ogg b/boards/sounds/LuneRouge/engins/LRStartAndStopCarEngine1ByLionelAllorgeCut.ogg
index a215c03..92a9103 100644
--- a/boards/sounds/LuneRouge/engins/LRStartAndStopCarEngine1ByLionelAllorgeCut.ogg
+++ b/boards/sounds/LuneRouge/engins/LRStartAndStopCarEngine1ByLionelAllorgeCut.ogg
diff --git a/boards/sounds/LuneRouge/engins/LRTrain_slowing_down_01_by_Lionel_Allorge_cut.ogg b/boards/sounds/LuneRouge/engins/LRTrain_slowing_down_01_by_Lionel_Allorge_cut.ogg
index fbae1e7..0eac13d 100644
--- a/boards/sounds/LuneRouge/engins/LRTrain_slowing_down_01_by_Lionel_Allorge_cut.ogg
+++ b/boards/sounds/LuneRouge/engins/LRTrain_slowing_down_01_by_Lionel_Allorge_cut.ogg
diff --git a/boards/sounds/LuneRouge/humain/LRApplauses_1_by_Lionel_Allorge_cut.ogg b/boards/sounds/LuneRouge/humain/LRApplauses_1_by_Lionel_Allorge_cut.ogg
index 9dbbfa0..b9c8d57 100644
--- a/boards/sounds/LuneRouge/humain/LRApplauses_1_by_Lionel_Allorge_cut.ogg
+++ b/boards/sounds/LuneRouge/humain/LRApplauses_1_by_Lionel_Allorge_cut.ogg
diff --git a/boards/sounds/LuneRouge/humain/LRHeart_beat_01_by_Lionel_Allorge.ogg b/boards/sounds/LuneRouge/humain/LRHeart_beat_01_by_Lionel_Allorge.ogg
index e0bbfc6..860e23d 100644
--- a/boards/sounds/LuneRouge/humain/LRHeart_beat_01_by_Lionel_Allorge.ogg
+++ b/boards/sounds/LuneRouge/humain/LRHeart_beat_01_by_Lionel_Allorge.ogg
diff --git a/boards/sounds/LuneRouge/maison/LRDoor_Open_2_by_Lionel_Allorge.ogg b/boards/sounds/LuneRouge/maison/LRDoor_Open_2_by_Lionel_Allorge.ogg
index 8973991..49a268a 100644
--- a/boards/sounds/LuneRouge/maison/LRDoor_Open_2_by_Lionel_Allorge.ogg
+++ b/boards/sounds/LuneRouge/maison/LRDoor_Open_2_by_Lionel_Allorge.ogg
diff --git a/boards/sounds/LuneRouge/maison/LRRing_01_by_Lionel_Allorge.ogg b/boards/sounds/LuneRouge/maison/LRRing_01_by_Lionel_Allorge.ogg
index aebb4ea..1356bc0 100644
--- a/boards/sounds/LuneRouge/maison/LRRing_01_by_Lionel_Allorge.ogg
+++ b/boards/sounds/LuneRouge/maison/LRRing_01_by_Lionel_Allorge.ogg
diff --git a/boards/sounds/LuneRouge/musique/LRBuddhist_gong_05_by_Lionel_Allorge.ogg b/boards/sounds/LuneRouge/musique/LRBuddhist_gong_05_by_Lionel_Allorge.ogg
index 85c5b8c..e707a0d 100644
--- a/boards/sounds/LuneRouge/musique/LRBuddhist_gong_05_by_Lionel_Allorge.ogg
+++ b/boards/sounds/LuneRouge/musique/LRBuddhist_gong_05_by_Lionel_Allorge.ogg
diff --git a/boards/sounds/LuneRouge/sf/LRWeird_1_by_Lionel_Allorge.ogg b/boards/sounds/LuneRouge/sf/LRWeird_1_by_Lionel_Allorge.ogg
index 5b1517f..b8d45bb 100644
--- a/boards/sounds/LuneRouge/sf/LRWeird_1_by_Lionel_Allorge.ogg
+++ b/boards/sounds/LuneRouge/sf/LRWeird_1_by_Lionel_Allorge.ogg
diff --git a/boards/sounds/LuneRouge/sf/LRWeird_2_by_Lionel_Allorge.ogg b/boards/sounds/LuneRouge/sf/LRWeird_2_by_Lionel_Allorge.ogg
index 1820b36..d76f315 100644
--- a/boards/sounds/LuneRouge/sf/LRWeird_2_by_Lionel_Allorge.ogg
+++ b/boards/sounds/LuneRouge/sf/LRWeird_2_by_Lionel_Allorge.ogg
diff --git a/boards/sounds/LuneRouge/sf/LRWeird_3_by_Lionel_Allorge.ogg b/boards/sounds/LuneRouge/sf/LRWeird_3_by_Lionel_Allorge.ogg
index 47d2a50..1a843c6 100644
--- a/boards/sounds/LuneRouge/sf/LRWeird_3_by_Lionel_Allorge.ogg
+++ b/boards/sounds/LuneRouge/sf/LRWeird_3_by_Lionel_Allorge.ogg
diff --git a/boards/sounds/LuneRouge/sf/LRWeird_4_by_Lionel_Allorge.ogg b/boards/sounds/LuneRouge/sf/LRWeird_4_by_Lionel_Allorge.ogg
index dc50716..ad59f65 100644
--- a/boards/sounds/LuneRouge/sf/LRWeird_4_by_Lionel_Allorge.ogg
+++ b/boards/sounds/LuneRouge/sf/LRWeird_4_by_Lionel_Allorge.ogg
diff --git a/boards/sounds/LuneRouge/sf/LRWeird_5_by_Lionel_Allorge.ogg b/boards/sounds/LuneRouge/sf/LRWeird_5_by_Lionel_Allorge.ogg
index c793af8..5afd999 100644
--- a/boards/sounds/LuneRouge/sf/LRWeird_5_by_Lionel_Allorge.ogg
+++ b/boards/sounds/LuneRouge/sf/LRWeird_5_by_Lionel_Allorge.ogg
diff --git a/boards/sounds/LuneRouge/sf/LRWeird_6_by_Lionel_Allorge.ogg b/boards/sounds/LuneRouge/sf/LRWeird_6_by_Lionel_Allorge.ogg
index dad01f7..ffed77f 100644
--- a/boards/sounds/LuneRouge/sf/LRWeird_6_by_Lionel_Allorge.ogg
+++ b/boards/sounds/LuneRouge/sf/LRWeird_6_by_Lionel_Allorge.ogg
diff --git a/boards/sounds/LuneRouge/usine/LRFactory_noise_01_by_Lionel_Allorge.ogg b/boards/sounds/LuneRouge/usine/LRFactory_noise_01_by_Lionel_Allorge.ogg
index 1200d7a..243c10a 100644
--- a/boards/sounds/LuneRouge/usine/LRFactory_noise_01_by_Lionel_Allorge.ogg
+++ b/boards/sounds/LuneRouge/usine/LRFactory_noise_01_by_Lionel_Allorge.ogg
diff --git a/boards/sounds/LuneRouge/usine/LRFactory_noise_02_by_Lionel_Allorge.ogg b/boards/sounds/LuneRouge/usine/LRFactory_noise_02_by_Lionel_Allorge.ogg
index f031058..6b76b5e 100644
--- a/boards/sounds/LuneRouge/usine/LRFactory_noise_02_by_Lionel_Allorge.ogg
+++ b/boards/sounds/LuneRouge/usine/LRFactory_noise_02_by_Lionel_Allorge.ogg
diff --git a/boards/sounds/LuneRouge/usine/LRFactory_noise_03_by_Lionel_Allorge.ogg b/boards/sounds/LuneRouge/usine/LRFactory_noise_03_by_Lionel_Allorge.ogg
index da7d06e..efab381 100644
--- a/boards/sounds/LuneRouge/usine/LRFactory_noise_03_by_Lionel_Allorge.ogg
+++ b/boards/sounds/LuneRouge/usine/LRFactory_noise_03_by_Lionel_Allorge.ogg
diff --git a/boards/sounds/LuneRouge/usine/LRFactory_noise_04_by_Lionel_Allorge.ogg b/boards/sounds/LuneRouge/usine/LRFactory_noise_04_by_Lionel_Allorge.ogg
index a7574ba..90391cb 100644
--- a/boards/sounds/LuneRouge/usine/LRFactory_noise_04_by_Lionel_Allorge.ogg
+++ b/boards/sounds/LuneRouge/usine/LRFactory_noise_04_by_Lionel_Allorge.ogg
diff --git a/boards/sounds/LuneRouge/usine/LRFactory_noise_05_by_Lionel_Allorge.ogg b/boards/sounds/LuneRouge/usine/LRFactory_noise_05_by_Lionel_Allorge.ogg
index 95ad839..a52cc5c 100644
--- a/boards/sounds/LuneRouge/usine/LRFactory_noise_05_by_Lionel_Allorge.ogg
+++ b/boards/sounds/LuneRouge/usine/LRFactory_noise_05_by_Lionel_Allorge.ogg
diff --git a/boards/sounds/LuneRouge/usine/LRFactory_noise_06_by_Lionel_Allorge.ogg b/boards/sounds/LuneRouge/usine/LRFactory_noise_06_by_Lionel_Allorge.ogg
index 56a1d01..23013c3 100644
--- a/boards/sounds/LuneRouge/usine/LRFactory_noise_06_by_Lionel_Allorge.ogg
+++ b/boards/sounds/LuneRouge/usine/LRFactory_noise_06_by_Lionel_Allorge.ogg
diff --git a/boards/sounds/LuneRouge/usine/LRFireballs_01_by_Lionel_Allorge.ogg b/boards/sounds/LuneRouge/usine/LRFireballs_01_by_Lionel_Allorge.ogg
index bec6ca6..0913b7c 100644
--- a/boards/sounds/LuneRouge/usine/LRFireballs_01_by_Lionel_Allorge.ogg
+++ b/boards/sounds/LuneRouge/usine/LRFireballs_01_by_Lionel_Allorge.ogg
diff --git a/boards/sounds/LuneRouge/usine/LRHits_01_by_Lionel_Allorge.ogg b/boards/sounds/LuneRouge/usine/LRHits_01_by_Lionel_Allorge.ogg
index fdfb18f..c79480b 100644
--- a/boards/sounds/LuneRouge/usine/LRHits_01_by_Lionel_Allorge.ogg
+++ b/boards/sounds/LuneRouge/usine/LRHits_01_by_Lionel_Allorge.ogg
diff --git a/boards/sounds/chronos/space/1.ogg b/boards/sounds/chronos/space/1.ogg
index 01cb51a..e22b1f7 100644
--- a/boards/sounds/chronos/space/1.ogg
+++ b/boards/sounds/chronos/space/1.ogg
diff --git a/boards/sounds/chronos/space/2.ogg b/boards/sounds/chronos/space/2.ogg
index 7c8b0d8..1286878 100644
--- a/boards/sounds/chronos/space/2.ogg
+++ b/boards/sounds/chronos/space/2.ogg
diff --git a/boards/sounds/chronos/space/3.ogg b/boards/sounds/chronos/space/3.ogg
index 5c3ba77..4b3f049 100644
--- a/boards/sounds/chronos/space/3.ogg
+++ b/boards/sounds/chronos/space/3.ogg
diff --git a/boards/sounds/melody/guitar/melody.wav b/boards/sounds/melody/guitar/melody.wav
index 7e35b09..5819acf 100644
--- a/boards/sounds/melody/guitar/melody.wav
+++ b/boards/sounds/melody/guitar/melody.wav
diff --git a/boards/sounds/melody/guitar/son1.wav b/boards/sounds/melody/guitar/son1.wav
index 8ac7cbc..0816db2 100644
--- a/boards/sounds/melody/guitar/son1.wav
+++ b/boards/sounds/melody/guitar/son1.wav
diff --git a/boards/sounds/melody/guitar/son2.wav b/boards/sounds/melody/guitar/son2.wav
index 83cbd97..d81bd55 100644
--- a/boards/sounds/melody/guitar/son2.wav
+++ b/boards/sounds/melody/guitar/son2.wav
diff --git a/boards/sounds/melody/guitar/son3.wav b/boards/sounds/melody/guitar/son3.wav
index 99860d3..eaad74b 100644
--- a/boards/sounds/melody/guitar/son3.wav
+++ b/boards/sounds/melody/guitar/son3.wav
diff --git a/boards/sounds/melody/guitar/son4.wav b/boards/sounds/melody/guitar/son4.wav
index 70c904c..d3505eb 100644
--- a/boards/sounds/melody/guitar/son4.wav
+++ b/boards/sounds/melody/guitar/son4.wav
diff --git a/boards/sounds/melody/tachos/melody.wav b/boards/sounds/melody/tachos/melody.wav
index 31f159c..c74afa4 100644
--- a/boards/sounds/melody/tachos/melody.wav
+++ b/boards/sounds/melody/tachos/melody.wav
diff --git a/boards/sounds/melody/tachos/son1.wav b/boards/sounds/melody/tachos/son1.wav
index bdcef73..4d75472 100644
--- a/boards/sounds/melody/tachos/son1.wav
+++ b/boards/sounds/melody/tachos/son1.wav
diff --git a/boards/sounds/melody/tachos/son2.wav b/boards/sounds/melody/tachos/son2.wav
index 5d0a068..5002765 100644
--- a/boards/sounds/melody/tachos/son2.wav
+++ b/boards/sounds/melody/tachos/son2.wav
diff --git a/boards/sounds/melody/tachos/son3.wav b/boards/sounds/melody/tachos/son3.wav
index 1e17d4c..a7d0643 100644
--- a/boards/sounds/melody/tachos/son3.wav
+++ b/boards/sounds/melody/tachos/son3.wav
diff --git a/boards/sounds/melody/tachos/son4.wav b/boards/sounds/melody/tachos/son4.wav
index 4045325..3c0e2dd 100644
--- a/boards/sounds/melody/tachos/son4.wav
+++ b/boards/sounds/melody/tachos/son4.wav
diff --git a/boards/sounds/melody/xylofon/melody.wav b/boards/sounds/melody/xylofon/melody.wav
index 7e35b09..5819acf 100644
--- a/boards/sounds/melody/xylofon/melody.wav
+++ b/boards/sounds/melody/xylofon/melody.wav
diff --git a/boards/sounds/melody/xylofon/son1.wav b/boards/sounds/melody/xylofon/son1.wav
index 1adca07..76eaf30 100644
--- a/boards/sounds/melody/xylofon/son1.wav
+++ b/boards/sounds/melody/xylofon/son1.wav
diff --git a/boards/sounds/melody/xylofon/son2.wav b/boards/sounds/melody/xylofon/son2.wav
index 4bc595a..1d0e9df 100644
--- a/boards/sounds/melody/xylofon/son2.wav
+++ b/boards/sounds/melody/xylofon/son2.wav
diff --git a/boards/sounds/melody/xylofon/son3.wav b/boards/sounds/melody/xylofon/son3.wav
index 25a15be..31bc7d6 100644
--- a/boards/sounds/melody/xylofon/son3.wav
+++ b/boards/sounds/melody/xylofon/son3.wav
diff --git a/boards/sounds/melody/xylofon/son4.wav b/boards/sounds/melody/xylofon/son4.wav
index efb4947..e9b8d5f 100644
--- a/boards/sounds/melody/xylofon/son4.wav
+++ b/boards/sounds/melody/xylofon/son4.wav
diff --git a/boards/sounds/memory/plick.ogg b/boards/sounds/memory/plick.ogg
index ae656da..e05f70b 100644
--- a/boards/sounds/memory/plick.ogg
+++ b/boards/sounds/memory/plick.ogg
diff --git a/boards/sounds/memory/tick.ogg b/boards/sounds/memory/tick.ogg
index cbc5167..2b2b360 100644
--- a/boards/sounds/memory/tick.ogg
+++ b/boards/sounds/memory/tick.ogg
diff --git a/boards/sounds/memory/tri.ogg b/boards/sounds/memory/tri.ogg
index a79fc07..a8a8bed 100644
--- a/boards/sounds/memory/tri.ogg
+++ b/boards/sounds/memory/tri.ogg
diff --git a/src/boards/memory.c b/src/boards/memory.c
index 3b55dcf..56d6527 100644
--- a/src/boards/memory.c
+++ b/src/boards/memory.c
@@ -164,9 +164,9 @@ static guint levelDescription[] =
   0,0,
   3,2,
   4,2,
+  5,2,
   4,3,
   6,3,
-  4,4,
   5,4,
   6,4,
   7,4,
@@ -871,7 +871,8 @@ static void start_board (GcomprisBoard *agcomprisBoard)
       to_tux = FALSE;
       if (currentUiMode == UIMODE_SOUND){
 	playing_sound = TRUE;
-	gc_sound_play_ogg_cb("sounds/LuneRouge/musique/LRBuddhist_gong_05_by_Lionel_Allorge.ogg",start_callback);
+	gc_sound_play_ogg_cb("sounds/LuneRouge/musique/LRBuddhist_gong_05_by_Lionel_Allorge.ogg",
+			     start_callback);
       } else
 	playing_sound = FALSE;
 
@@ -1451,7 +1452,10 @@ static gint hide_card (GtkWidget *widget, gpointer data)
     GList *to_remove = NULL;
 
     for (list =  winning_pairs; list != NULL; list=list->next)
-      if ((((WINNING *) list->data)->first == firstCard) || (((WINNING *) list->data)->first == secondCard) || (((WINNING *) list->data)->second == firstCard) || (((WINNING *) list->data)->second == secondCard) ){
+      if ((((WINNING *) list->data)->first == firstCard) ||
+	  (((WINNING *) list->data)->first == secondCard) ||
+	  (((WINNING *) list->data)->second == firstCard) ||
+	  (((WINNING *) list->data)->second == secondCard) ){
 	to_remove = g_list_append( to_remove, list->data);
       }