GNOME.org
 

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

Author: bcoudoin
Date: Thu Aug  7 20:02:55 2008
New Revision: 3489
URL: http://svn.gnome.org/viewvc/gcompris?rev=3489&view=rev

Log:
	Now use the directory boards/voices instead of boards/sounds
	for the translated sounds to match trunk
release 8.3.7


Modified:
   branches/GCOMPRIS_8_3/ChangeLog
   branches/GCOMPRIS_8_3/Makefile.am
   branches/GCOMPRIS_8_3/configure.in
   branches/GCOMPRIS_8_3/src/boards/algebra.c
   branches/GCOMPRIS_8_3/src/boards/click_on_letter.c
   branches/GCOMPRIS_8_3/src/boards/colors.c
   branches/GCOMPRIS_8_3/src/boards/gletters.c
   branches/GCOMPRIS_8_3/src/boards/smallnumbers.c
   branches/GCOMPRIS_8_3/src/gcompris/bar.c
   branches/GCOMPRIS_8_3/src/gcompris/board_config.c
   branches/GCOMPRIS_8_3/src/gcompris/bonus.c
   branches/GCOMPRIS_8_3/src/gcompris/gameutil.c
   branches/GCOMPRIS_8_3/src/gcompris/gcompris.c

Modified: branches/GCOMPRIS_8_3/Makefile.am
==============================================================================
--- branches/GCOMPRIS_8_3/Makefile.am	(original)
+++ branches/GCOMPRIS_8_3/Makefile.am	Thu Aug  7 20:02:55 2008
@@ -88,8 +88,6 @@
 	  mkdir $(PACKAGE_DATA_DIR)/voices; \
 	  svn co http://svn.gnome.org/svn/gcompris/voices $(PACKAGE_DATA_DIR)/voices; \
 	fi
-	mv $(PACKAGE_DATA_DIR)/voices/* $(PACKAGE_DATA_DIR)/sounds
-	rm -rf $(PACKAGE_DATA_DIR)/voices
 
 # Creates separates distribution files for the sounds by locale
 dist-sounds:

Modified: branches/GCOMPRIS_8_3/configure.in
==============================================================================
--- branches/GCOMPRIS_8_3/configure.in	(original)
+++ branches/GCOMPRIS_8_3/configure.in	Thu Aug  7 20:02:55 2008
@@ -2,7 +2,7 @@
 
 AC_INIT(src/gcompris/gcompris.c)
 AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE(gcompris, 8.3.6)
+AM_INIT_AUTOMAKE(gcompris, 8.3.7)
 AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE
 

Modified: branches/GCOMPRIS_8_3/src/boards/algebra.c
==============================================================================
--- branches/GCOMPRIS_8_3/src/boards/algebra.c	(original)
+++ branches/GCOMPRIS_8_3/src/boards/algebra.c	Thu Aug  7 20:02:55 2008
@@ -607,19 +607,19 @@
     {
     case PLUSSIGNFILE:
       expected_result = g_strdup_printf("%d", first_operand+second_operand);
-      audioOperand = "sounds/$LOCALE/misc/plus.ogg";
+      audioOperand = "voices/$LOCALE/misc/plus.ogg";
       break;
     case MINUSSIGNFILE:
       expected_result = g_strdup_printf("%d", first_operand-second_operand);
-      audioOperand = "sounds/$LOCALE/misc/minus.ogg";
+      audioOperand = "voices/$LOCALE/misc/minus.ogg";
       break;
     case BYSIGNFILE:
       expected_result = g_strdup_printf("%d", first_operand*second_operand);
-      audioOperand = "sounds/$LOCALE/misc/by.ogg";
+      audioOperand = "voices/$LOCALE/misc/by.ogg";
       break;
     case DIVIDESIGNFILE:
       expected_result = g_strdup_printf("%d", first_operand/second_operand);
-      audioOperand = "sounds/$LOCALE/misc/outof.ogg";
+      audioOperand = "voices/$LOCALE/misc/outof.ogg";
       break;
     default:
       g_error("Bad Operation");
@@ -646,10 +646,10 @@
     g_free(first_operand_str);
     g_free(second_operand_str);
 
-    first_operand_str = g_strdup_printf("sounds/$LOCALE/alphabet/%s", str1);
-    second_operand_str = g_strdup_printf("sounds/$LOCALE/alphabet/%s", str2);
+    first_operand_str = g_strdup_printf("voices/$LOCALE/alphabet/%s", str1);
+    second_operand_str = g_strdup_printf("voices/$LOCALE/alphabet/%s", str2);
 
-    gc_sound_play_ogg(first_operand_str, audioOperand , second_operand_str, "sounds/$LOCALE/misc/equal.ogg", NULL);
+    gc_sound_play_ogg(first_operand_str, audioOperand , second_operand_str, "voices/$LOCALE/misc/equal.ogg", NULL);
 
     g_free(str1);
     g_free(str2);

Modified: branches/GCOMPRIS_8_3/src/boards/click_on_letter.c
==============================================================================
--- branches/GCOMPRIS_8_3/src/boards/click_on_letter.c	(original)
+++ branches/GCOMPRIS_8_3/src/boards/click_on_letter.c	Thu Aug  7 20:02:55 2008
@@ -237,7 +237,7 @@
 
       str1 = gc_sound_alphabet(right_letter);
 
-      right_letter_ogg = g_strdup_printf("sounds/$LOCALE/alphabet/%s", str1);
+      right_letter_ogg = g_strdup_printf("voices/$LOCALE/alphabet/%s", str1);
       g_free(str1);
 
       if(right_letter_ogg) {
@@ -269,7 +269,7 @@
   letter_str = gc_sound_alphabet(letter);
   g_free(letter);
 
-  str2 = gc_file_find_absolute("sounds/$LOCALE/alphabet/%s", letter_str);
+  str2 = gc_file_find_absolute("voices/$LOCALE/alphabet/%s", letter_str);
 
   if (!str2)
     {
@@ -323,7 +323,7 @@
   gc_score_set(gcomprisBoard->sublevel);
   g_free (right_letter);
   /* Try the next level */
-  gc_sound_play_ogg("sounds/$LOCALE/misc/click_on_letter.ogg", NULL);
+  gc_sound_play_ogg("voices/$LOCALE/misc/click_on_letter.ogg", NULL);
   click_on_letter_create_item(gnome_canvas_root(gcomprisBoard->canvas));
 }
 /* ==================================== */
@@ -634,7 +634,7 @@
   gchar *saved_locale_sound = g_hash_table_lookup( config, "locale_sound");
 
   gc_board_config_combo_locales_asset( "Select sound locale", saved_locale_sound,
-				"sounds/$LOCALE/colors/purple.ogg");
+				"voices/$LOCALE/colors/purple.ogg");
 
   gboolean up_init = FALSE;
 

Modified: branches/GCOMPRIS_8_3/src/boards/colors.c
==============================================================================
--- branches/GCOMPRIS_8_3/src/boards/colors.c	(original)
+++ branches/GCOMPRIS_8_3/src/boards/colors.c	Thu Aug  7 20:02:55 2008
@@ -175,7 +175,7 @@
   gchar *saved_locale_sound = g_hash_table_lookup( config, "locale_sound");
 
   gc_board_config_combo_locales_asset( _("Select sound locale"), saved_locale_sound,
-				"sounds/$LOCALE/colors/purple.ogg");
+				"voices/$LOCALE/colors/purple.ogg");
 
   g_hash_table_destroy(config);
 
@@ -319,7 +319,7 @@
       char *str  = NULL;
       GcomprisProperties *properties = gc_prop_get();
 
-      str = g_strdup_printf("sounds/$LOCALE/colors/%s.ogg",
+      str = g_strdup_printf("voices/$LOCALE/colors/%s.ogg",
 			    colors[GPOINTER_TO_INT(g_list_nth_data(listColors, 0))*2]);
 
       /* If we don't find a sound in our locale or the sounds are disabled */

Modified: branches/GCOMPRIS_8_3/src/boards/gletters.c
==============================================================================
--- branches/GCOMPRIS_8_3/src/boards/gletters.c	(original)
+++ branches/GCOMPRIS_8_3/src/boards/gletters.c	Thu Aug  7 20:02:55 2008
@@ -637,7 +637,7 @@
       gchar *str2 = NULL;
       gchar *letter_unichar_name = gc_sound_alphabet(letter);
 
-      str2 = g_strdup_printf("sounds/$LOCALE/alphabet/%s", letter_unichar_name);
+      str2 = g_strdup_printf("voices/$LOCALE/alphabet/%s", letter_unichar_name);
 
       gc_sound_play_ogg(str2, NULL);
 

Modified: branches/GCOMPRIS_8_3/src/boards/smallnumbers.c
==============================================================================
--- branches/GCOMPRIS_8_3/src/boards/smallnumbers.c	(original)
+++ branches/GCOMPRIS_8_3/src/boards/smallnumbers.c	Thu Aug  7 20:02:55 2008
@@ -415,7 +415,7 @@
 	g_free(lettersItem);
 	g_free(unichar_letterItem);
 
-	str2 = g_strdup_printf("sounds/$LOCALE/alphabet/%s", str1);
+	str2 = g_strdup_printf("voices/$LOCALE/alphabet/%s", str1);
 
 	gc_sound_play_ogg(str2, NULL);
 
@@ -611,7 +611,7 @@
 
   GtkComboBox *sound_box = gc_board_config_combo_locales_asset( _("Select sound locale"),
 							 saved_locale_sound,
-							 "sounds/$LOCALE/colors/purple.ogg");
+							 "voices/$LOCALE/colors/purple.ogg");
 
   gtk_widget_set_sensitive(GTK_WIDGET(sound_box), with_sound);
 

Modified: branches/GCOMPRIS_8_3/src/gcompris/bar.c
==============================================================================
--- branches/GCOMPRIS_8_3/src/gcompris/bar.c	(original)
+++ branches/GCOMPRIS_8_3/src/gcompris/bar.c	Thu Aug  7 20:02:55 2008
@@ -452,7 +452,7 @@
   gchar *str;
   gc_sound_policy_set(PLAY_ONLY_IF_IDLE);
 
-  str = g_strdup_printf("sounds/$LOCALE/misc/%s.ogg", sound);
+  str = g_strdup_printf("voices/$LOCALE/misc/%s.ogg", sound);
 
   gc_sound_play_ogg(str, NULL);
 
@@ -531,9 +531,9 @@
 	      gchar *current_level_str = gc_sound_alphabet(number_str);
 	      g_free(number_str);
 
-	      str_number = g_strdup_printf("sounds/$LOCALE/alphabet/%s", current_level_str);
+	      str_number = g_strdup_printf("voices/$LOCALE/alphabet/%s", current_level_str);
 
-	      gc_sound_play_ogg("sounds/$LOCALE/misc/level.ogg", str_number, NULL);
+	      gc_sound_play_ogg("voices/$LOCALE/misc/level.ogg", str_number, NULL);
 
 	      g_free(str_number);
 	      g_free(current_level_str);

Modified: branches/GCOMPRIS_8_3/src/gcompris/board_config.c
==============================================================================
--- branches/GCOMPRIS_8_3/src/gcompris/board_config.c	(original)
+++ branches/GCOMPRIS_8_3/src/gcompris/board_config.c	Thu Aug  7 20:02:55 2008
@@ -858,7 +858,7 @@
  *
  * \param file: the file to search. In order to work, you need to provide a
  *              filename that includes a $LOCALE in it like:
- *              sounds/$LOCALE/colors/blue.ogg
+ *              voices/$LOCALE/colors/blue.ogg
  *
  * \return a list of locale
  */

Modified: branches/GCOMPRIS_8_3/src/gcompris/bonus.c
==============================================================================
--- branches/GCOMPRIS_8_3/src/gcompris/bonus.c	(original)
+++ branches/GCOMPRIS_8_3/src/gcompris/bonus.c	Thu Aug  7 20:02:55 2008
@@ -45,21 +45,21 @@
 // List of sounds to use for greetings
 static gchar *greetingsList[] =
 {
-  "sounds/$LOCALE/misc/congratulation.ogg",
-  "sounds/$LOCALE/misc/great.ogg",
-  "sounds/$LOCALE/misc/good.ogg",
-  "sounds/$LOCALE/misc/awesome.ogg",
-  "sounds/$LOCALE/misc/fantastic.ogg",
-  "sounds/$LOCALE/misc/waytogo.ogg",
-  "sounds/$LOCALE/misc/super.ogg",
-  "sounds/$LOCALE/misc/perfect.ogg"
+  "voices/$LOCALE/misc/congratulation.ogg",
+  "voices/$LOCALE/misc/great.ogg",
+  "voices/$LOCALE/misc/good.ogg",
+  "voices/$LOCALE/misc/awesome.ogg",
+  "voices/$LOCALE/misc/fantastic.ogg",
+  "voices/$LOCALE/misc/waytogo.ogg",
+  "voices/$LOCALE/misc/super.ogg",
+  "voices/$LOCALE/misc/perfect.ogg"
 };
 #define NUMBER_OF_GREETINGS G_N_ELEMENTS(greetingsList)
 
 // List of sounds to use for loosing
 static gchar *loosingList[] =
 {
-  "sounds/$LOCALE/misc/check_answer.ogg",
+  "voices/$LOCALE/misc/check_answer.ogg",
 };
 #define NUMBER_OF_LOOSING 1
 

Modified: branches/GCOMPRIS_8_3/src/gcompris/gameutil.c
==============================================================================
--- branches/GCOMPRIS_8_3/src/gcompris/gameutil.c	(original)
+++ branches/GCOMPRIS_8_3/src/gcompris/gameutil.c	Thu Aug  7 20:02:55 2008
@@ -669,7 +669,7 @@
 {
   gchar *str;
 
-  str = gc_file_find_absolute("sounds/$LOCALE/activity/%s-intro.ogg",
+  str = gc_file_find_absolute("voices/$LOCALE/activity/%s-intro.ogg",
 			      gcomprisBoard->name, NULL);
   gc_sound_play_ogg(str, NULL);
   g_free(str);

Modified: branches/GCOMPRIS_8_3/src/gcompris/gcompris.c
==============================================================================
--- branches/GCOMPRIS_8_3/src/gcompris/gcompris.c	(original)
+++ branches/GCOMPRIS_8_3/src/gcompris/gcompris.c	Thu Aug  7 20:02:55 2008
@@ -1896,9 +1896,9 @@
   if(!popt_root_menu)
     {
       if (properties->music)
-	gc_sound_play_ogg("music/intro.ogg", "sounds/$LOCALE/misc/welcome.ogg", NULL);
+	gc_sound_play_ogg("music/intro.ogg", "voices/$LOCALE/misc/welcome.ogg", NULL);
       else
-	gc_sound_play_ogg("sounds/$LOCALE/misc/welcome.ogg", NULL);
+	gc_sound_play_ogg("voices/$LOCALE/misc/welcome.ogg", NULL);
     }
 
   gtk_main ();
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]