Commit d279c1f7 authored by Bruno Coudoin's avatar Bruno Coudoin

Now in memory_sound activity the intro is heard.

https://bugzilla.gnome.org/show_bug.cgi?id=607642
parent cc1b6323
...@@ -891,7 +891,8 @@ static void start_board (GcomprisBoard *agcomprisBoard) ...@@ -891,7 +891,8 @@ static void start_board (GcomprisBoard *agcomprisBoard)
/* initial state to restore */ /* initial state to restore */
sound_policy = gc_sound_policy_get(); sound_policy = gc_sound_policy_get();
gc_sound_policy_set(PLAY_AND_INTERRUPT); // Will set the PLAY_AND_INTERRUPT policy on first
// user click so that intro sounds is not
gc_set_background(goo_canvas_get_root_item(gcomprisBoard->canvas), gc_set_background(goo_canvas_get_root_item(gcomprisBoard->canvas),
"memory/gcompris_band.svg"); "memory/gcompris_band.svg");
...@@ -1657,6 +1658,9 @@ static gboolean item_event (GooCanvasItem *item, ...@@ -1657,6 +1658,9 @@ static gboolean item_event (GooCanvasItem *item,
if(!gcomprisBoard) if(!gcomprisBoard)
return FALSE; return FALSE;
if (currentUiMode == UIMODE_SOUND)
gc_sound_policy_set(PLAY_AND_INTERRUPT);
if (event->type != GDK_BUTTON_PRESS || if (event->type != GDK_BUTTON_PRESS ||
event->button != 1) event->button != 1)
return FALSE; return FALSE;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment