gcompris r3795 - trunk/src/boards

[bcoudoin svn gnome org]

Author: bcoudoin
Date: Tue Mar 24 23:32:04 2009
New Revision: 3795
URL: http://svn.gnome.org/viewvc/gcompris?rev=3795&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.



Modified:
   trunk/src/boards/memory.c

Modified: trunk/src/boards/memory.c
==============================================================================
--- trunk/src/boards/memory.c	(original)
+++ trunk/src/boards/memory.c	Tue Mar 24 23:32:04 2009
@@ -866,14 +866,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();
     }
 }
@@ -959,6 +951,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(