gcompris r3798 - in branches/gcomprixogoo: . src/memory-activity

[bcoudoin svn gnome org]

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



Modified:
   branches/gcomprixogoo/ChangeLog
   branches/gcomprixogoo/src/memory-activity/memory.c

Modified: branches/gcomprixogoo/src/memory-activity/memory.c
==============================================================================
--- branches/gcomprixogoo/src/memory-activity/memory.c	(original)
+++ branches/gcomprixogoo/src/memory-activity/memory.c	Tue Mar 24 23:39:57 2009
@@ -969,13 +969,6 @@
 
       Paused = FALSE;
 
-      to_tux = FALSE;
-      if (currentUiMode == UIMODE_SOUND){
-	playing_sound = TRUE;
-	gc_sound_play_ogg_cb("memory/LRBuddhist_gong_05_LA.ogg",start_callback);
-      } else
-	playing_sound = FALSE;
-
       memory_next_level();
     }
 }
@@ -1059,6 +1052,14 @@
 {
   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("memory/LRBuddhist_gong_05_LA.ogg",start_callback);
+  } else
+    playing_sound = FALSE;
+
   memory_destroy_all_items();
 
   boardRootItem = goo_canvas_group_new (goo_canvas_get_root_item(gcomprisBoard->canvas),