gcompris r3797 - in branches/GCOMPRIS_8_3: . src/boards

[bcoudoin svn gnome org]

Author: bcoudoin
Date: Tue Mar 24 23:39:03 2009
New Revision: 3797
URL: http://svn.gnome.org/viewvc/gcompris?rev=3797&view=rev

Log:
	* src/boards/memory.c: (start_board), (memory_next_level): fixed a cased in which
	  the memory sound was in a fuzzy state if the level was changed by the user.
	  Merged from trunk 3795
	  By the way in this branch this is not enough, tux play more than he should
	  when we change the level during the game.



Modified:
   branches/GCOMPRIS_8_3/   (props changed)
   branches/GCOMPRIS_8_3/ChangeLog
   branches/GCOMPRIS_8_3/src/boards/memory.c

Modified: branches/GCOMPRIS_8_3/src/boards/memory.c
==============================================================================
--- branches/GCOMPRIS_8_3/src/boards/memory.c	(original)
+++ branches/GCOMPRIS_8_3/src/boards/memory.c	Tue Mar 24 23:39:03 2009
@@ -868,14 +868,6 @@
 
       Paused = FALSE;
 
-      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);
-      } else
-	playing_sound = FALSE;
-
       memory_next_level();
     }
 }
@@ -961,6 +953,15 @@
 {
   gc_bar_set_level(gcomprisBoard);
 
+  to_tux = FALSE;
+  if (currentUiMode == UIMODE_SOUND){
+    /* We play a sound here to cancel any pending sounds callback from a previous play */
+    playing_sound = TRUE;
+    gc_sound_play_ogg_cb("sounds/LuneRouge/musique/LRBuddhist_gong_05_by_Lionel_Allorge.ogg",
+			 start_callback);
+  } else
+    playing_sound = FALSE;
+
   memory_destroy_all_items();
 
   boardRootItem = GNOME_CANVAS_GROUP(