GNOME.org
 

[gnome-games] Move sound files into each game directory

commit e64440273bb56001931877811623e121f77faba6
Author: Robert Ancell <robert ancell canonical com>
Date:   Thu Feb 2 09:32:50 2012 +1100

    Move sound files into each game directory

 Makefile.am                            |    4 ++--
 configure.ac                           |    1 -
 gnect/data/Makefile.am                 |    8 ++++++++
 {sounds => gnect/data}/bad.ogg         |  Bin 3087 -> 3087 bytes
 {sounds => gnect/data}/bonus.ogg       |  Bin 4739 -> 4739 bytes
 {sounds => gnect/data}/reverse.ogg     |  Bin 5600 -> 5600 bytes
 {sounds => gnect/data}/slide.ogg       |  Bin 4036 -> 4036 bytes
 gnect/src/Makefile.am                  |    2 +-
 gnibbles/data/Makefile.am              |   14 +++++++++++++-
 {sounds => gnibbles/data}/appear.ogg   |  Bin 3932 -> 3932 bytes
 {sounds => gnibbles/data}/bonus.ogg    |  Bin 4739 -> 4739 bytes
 {sounds => gnibbles/data}/crash.ogg    |  Bin 4549 -> 4549 bytes
 {sounds => gnibbles/data}/gameover.ogg |  Bin 8175 -> 8175 bytes
 {sounds => gnibbles/data}/gobble.ogg   |  Bin 3752 -> 3752 bytes
 {sounds => gnibbles/data}/life.ogg     |  Bin 4436 -> 4436 bytes
 {sounds => gnibbles/data}/reverse.ogg  |  Bin 5600 -> 5600 bytes
 {sounds => gnibbles/data}/teleport.ogg |  Bin 3443 -> 3443 bytes
 gnibbles/src/Makefile.am               |    2 +-
 gnobots2/data/Makefile.am              |    9 +++++++++
 {sounds => gnobots2/data}/die.ogg      |  Bin 8439 -> 8439 bytes
 {sounds => gnobots2/data}/splat.ogg    |  Bin 4160 -> 4160 bytes
 {sounds => gnobots2/data}/teleport.ogg |  Bin 3443 -> 3443 bytes
 {sounds => gnobots2/data}/victory.ogg  |  Bin 9862 -> 9862 bytes
 {sounds => gnobots2/data}/yahoo.ogg    |  Bin 6426 -> 6426 bytes
 gnobots2/src/Makefile.am               |    2 +-
 iagno/data/Makefile.am                 |    8 +++++++-
 {sounds => iagno/data}/flip-piece.ogg  |  Bin 7021 -> 7021 bytes
 {sounds => iagno/data}/gameover.ogg    |  Bin 8175 -> 8175 bytes
 iagno/src/Makefile.am                  |    2 +-
 iagno/src/iagno.vala                   |   19 +++++++++++++------
 sounds/Makefile.am                     |   25 -------------------------
 sounds/click.ogg                       |  Bin 3186 -> 0 bytes
 sounds/laughter.ogg                    |  Bin 10793 -> 0 bytes
 sounds/pop.ogg                         |  Bin 3283 -> 0 bytes
 34 files changed, 56 insertions(+), 40 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 8ab1049..0314376 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,8 @@
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
-SUBDIRS = libgames-support $(gamelist) po sounds
+SUBDIRS = libgames-support $(gamelist) po
 
-DIST_SUBDIRS = po sounds libgames-support $(allgames) $(staginggames)
+DIST_SUBDIRS = po libgames-support $(allgames) $(staginggames)
 
 DISTCHECK_CONFIGURE_FLAGS = \
 	--with-platform=gnome \
diff --git a/configure.ac b/configure.ac
index 040ffb8..e3b0a41 100644
--- a/configure.ac
+++ b/configure.ac
@@ -476,7 +476,6 @@ AC_SUBST([AM_LDFLAGS])
 AC_CONFIG_FILES([
 Makefile
 po/Makefile.in
-sounds/Makefile
 libgames-support/Makefile
 gnect/Makefile
 gnect/src/Makefile
diff --git a/gnect/data/Makefile.am b/gnect/data/Makefile.am
index ba2e5ef..718eb6d 100644
--- a/gnect/data/Makefile.am
+++ b/gnect/data/Makefile.am
@@ -17,6 +17,13 @@ pixmap_DATA = \
     bg_nightfall.jpg \
     bg_toplight.png
 
+soundsdir = $(datadir)/gnect/sounds
+sounds_DATA = \
+	bad.ogg \
+	bonus.ogg \
+	reverse.ogg \
+	slide.ogg
+
 velenadir      = $(datadir)/gnect
 velena_DATA    = white_ob.cn4.gz
 
@@ -27,6 +34,7 @@ desktop_DATA     = $(desktop_in_files:.desktop.in.in=.desktop)
 man_MANS     = gnect.6
 
 EXTRA_DIST = $(pixmap_DATA) \
+             $(sounds_DATA) \
              $(velena_DATA) \
              $(desktop_in_files) \
              $(gsettings_in_file) \
diff --git a/sounds/bad.ogg b/gnect/data/bad.ogg
similarity index 100%
rename from sounds/bad.ogg
rename to gnect/data/bad.ogg
diff --git a/sounds/bonus.ogg b/gnect/data/bonus.ogg
similarity index 100%
copy from sounds/bonus.ogg
copy to gnect/data/bonus.ogg
diff --git a/sounds/reverse.ogg b/gnect/data/reverse.ogg
similarity index 100%
copy from sounds/reverse.ogg
copy to gnect/data/reverse.ogg
diff --git a/sounds/slide.ogg b/gnect/data/slide.ogg
similarity index 100%
rename from sounds/slide.ogg
rename to gnect/data/slide.ogg
diff --git a/gnect/src/Makefile.am b/gnect/src/Makefile.am
index 9232d50..8611ce5 100644
--- a/gnect/src/Makefile.am
+++ b/gnect/src/Makefile.am
@@ -29,7 +29,7 @@ gnect_CPPFLAGS = \
 
 gnect_CFLAGS = \
 	-DDATA_DIRECTORY=\"$(datadir)/gnect\" \
-	-DSOUND_DIRECTORY=\"$(pkgdatadir)/sounds\" \
+	-DSOUND_DIRECTORY=\"$(datadir)/gnect/sounds\" \
 	-DLOCALEDIR=\"$(datadir)/locale\" \
 	$(GTK_CFLAGS) \
 	$(CANBERRA_GTK_CFLAGS) \
diff --git a/gnibbles/data/Makefile.am b/gnibbles/data/Makefile.am
index 5e72bb1..3536dc6 100644
--- a/gnibbles/data/Makefile.am
+++ b/gnibbles/data/Makefile.am
@@ -8,6 +8,17 @@ gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml)
 pixmapdir = $(datadir)/gnibbles/pixmaps
 pixmap_DATA = gnibbles-logo.svg
 
+soundsdir = $(datadir)/gnibbles/sounds
+sounds_DATA = \
+	appear.ogg \
+	bonus.ogg \
+	crash.ogg \
+	gameover.ogg \
+	gobble.ogg \
+	life.ogg \
+	reverse.ogg \
+	teleport.ogg
+
 desktopdir=$(datadir)/applications
 desktop_in_files = gnibbles.desktop.in.in
 desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
@@ -16,7 +27,8 @@ desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
 man_MANS = gnibbles.6
 
 EXTRA_DIST = \
-	$(pixmap_DATA) 	\
+	$(pixmap_DATA) \
+	$(sounds_DATA) \
 	$(gsettings_in_file) \
 	$(man_MANS)
 
diff --git a/sounds/appear.ogg b/gnibbles/data/appear.ogg
similarity index 100%
rename from sounds/appear.ogg
rename to gnibbles/data/appear.ogg
diff --git a/sounds/bonus.ogg b/gnibbles/data/bonus.ogg
similarity index 100%
rename from sounds/bonus.ogg
rename to gnibbles/data/bonus.ogg
diff --git a/sounds/crash.ogg b/gnibbles/data/crash.ogg
similarity index 100%
rename from sounds/crash.ogg
rename to gnibbles/data/crash.ogg
diff --git a/sounds/gameover.ogg b/gnibbles/data/gameover.ogg
similarity index 100%
copy from sounds/gameover.ogg
copy to gnibbles/data/gameover.ogg
diff --git a/sounds/gobble.ogg b/gnibbles/data/gobble.ogg
similarity index 100%
rename from sounds/gobble.ogg
rename to gnibbles/data/gobble.ogg
diff --git a/sounds/life.ogg b/gnibbles/data/life.ogg
similarity index 100%
rename from sounds/life.ogg
rename to gnibbles/data/life.ogg
diff --git a/sounds/reverse.ogg b/gnibbles/data/reverse.ogg
similarity index 100%
rename from sounds/reverse.ogg
rename to gnibbles/data/reverse.ogg
diff --git a/sounds/teleport.ogg b/gnibbles/data/teleport.ogg
similarity index 100%
copy from sounds/teleport.ogg
copy to gnibbles/data/teleport.ogg
diff --git a/gnibbles/src/Makefile.am b/gnibbles/src/Makefile.am
index 88aa2da..8bd2a21 100644
--- a/gnibbles/src/Makefile.am
+++ b/gnibbles/src/Makefile.am
@@ -32,7 +32,7 @@ gnibbles_CPPFLAGS = \
 
 gnibbles_CFLAGS = \
 	-DDATA_DIRECTORY=\"$(datadir)/gnibbles\" \
-	-DSOUND_DIRECTORY=\"$(pkgdatadir)/sounds\" \
+	-DSOUND_DIRECTORY=\"$(datadir)/gnibbles/sounds\" \
 	-DLOCALEDIR=\"$(datadir)/locale\" \
 	$(GTK_CFLAGS) \
 	$(CANBERRA_GTK_CFLAGS) \
diff --git a/gnobots2/data/Makefile.am b/gnobots2/data/Makefile.am
index 8ea5e7f..5df0890 100644
--- a/gnobots2/data/Makefile.am
+++ b/gnobots2/data/Makefile.am
@@ -23,6 +23,14 @@ pixmap_DATA = yahoo.png \
               aieee.png \
               splat.png
 
+soundsdir = $(datadir)/gnobots2/sounds
+sounds_DATA = \
+	die.ogg \
+	splat.ogg \
+	teleport.ogg \
+	victory.ogg \
+	yahoo.ogg
+
 themedir = $(datadir)/gnobots2/themes
 theme_DATA = gnomes.png \
              robots.svg \
@@ -55,6 +63,7 @@ install-data-local:
 
 EXTRA_DIST = $(cursor_files) \
              $(pixmap_DATA) \
+             $(sounds_DATA) \
              $(theme_DATA) \
              $(Games_DATA) \
              $(config_DATA) \
diff --git a/sounds/die.ogg b/gnobots2/data/die.ogg
similarity index 100%
rename from sounds/die.ogg
rename to gnobots2/data/die.ogg
diff --git a/sounds/splat.ogg b/gnobots2/data/splat.ogg
similarity index 100%
rename from sounds/splat.ogg
rename to gnobots2/data/splat.ogg
diff --git a/sounds/teleport.ogg b/gnobots2/data/teleport.ogg
similarity index 100%
rename from sounds/teleport.ogg
rename to gnobots2/data/teleport.ogg
diff --git a/sounds/victory.ogg b/gnobots2/data/victory.ogg
similarity index 100%
rename from sounds/victory.ogg
rename to gnobots2/data/victory.ogg
diff --git a/sounds/yahoo.ogg b/gnobots2/data/yahoo.ogg
similarity index 100%
rename from sounds/yahoo.ogg
rename to gnobots2/data/yahoo.ogg
diff --git a/gnobots2/src/Makefile.am b/gnobots2/src/Makefile.am
index e578b19..25f7b62 100644
--- a/gnobots2/src/Makefile.am
+++ b/gnobots2/src/Makefile.am
@@ -40,7 +40,7 @@ gnobots2_CPPFLAGS = \
 
 gnobots2_CFLAGS = \
 	-DDATA_DIRECTORY=\"$(datadir)/gnobots2\" \
-	-DSOUND_DIRECTORY=\"$(pkgdatadir)/sounds\" \
+	-DSOUND_DIRECTORY=\"$(datadir)/gnobots2/sounds\" \
 	-DLOCALEDIR=\"$(datadir)/locale\" \
 	$(GTK_CFLAGS) \
 	$(CANBERRA_GTK_CFLAGS) \
diff --git a/iagno/data/Makefile.am b/iagno/data/Makefile.am
index 3101584..b3c7825 100644
--- a/iagno/data/Makefile.am
+++ b/iagno/data/Makefile.am
@@ -5,6 +5,11 @@ theme_DATA = \
 	sun_and_star.svg \
 	black_and_white.svg
 
+soundsdir = $(datadir)/iagno/sounds
+sounds_DATA = \
+	flip-piece.ogg \
+	gameover.ogg
+
 Gamesdir = $(datadir)/applications
 Games_in_files = iagno.desktop.in.in
 Games_DATA = $(Games_in_files:.desktop.in.in=.desktop)
@@ -17,7 +22,8 @@ gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml)
 man_MANS = iagno.6
 
 EXTRA_DIST = \
-	$(theme_DATA)	\
+	$(theme_DATA) \
+	$(sounds_DATA) \
 	$(gsettings_in_file) \
 	$(man_MANS)
 
diff --git a/sounds/flip-piece.ogg b/iagno/data/flip-piece.ogg
similarity index 100%
rename from sounds/flip-piece.ogg
rename to iagno/data/flip-piece.ogg
diff --git a/sounds/gameover.ogg b/iagno/data/gameover.ogg
similarity index 100%
rename from sounds/gameover.ogg
rename to iagno/data/gameover.ogg
diff --git a/iagno/src/Makefile.am b/iagno/src/Makefile.am
index 666f780..74235ce 100644
--- a/iagno/src/Makefile.am
+++ b/iagno/src/Makefile.am
@@ -12,7 +12,7 @@ iagno_CFLAGS = \
 	-DVERSION=\"$(VERSION)\" \
 	-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \
 	-DDATA_DIRECTORY=\"$(datadir)/iagno\" \
-	-DSOUND_DIRECTORY=\"$(pkgdatadir)/sounds\" \
+	-DSOUND_DIRECTORY=\"$(datadir)/iagno/sounds\" \
 	-DLOCALEDIR=\"$(datadir)/locale\" \
 	$(GTK_CFLAGS) \
 	$(CANBERRA_GTK_CFLAGS)
diff --git a/iagno/src/iagno.vala b/iagno/src/iagno.vala
index 9f085c2..1a2909e 100644
--- a/iagno/src/iagno.vala
+++ b/iagno/src/iagno.vala
@@ -308,6 +308,8 @@ public class Iagno : Gtk.Application
 
     private void game_move_cb ()
     {
+        play_sound ("flip-piece");
+
         if (!game.can_move)
         {
             was_pass = true;
@@ -343,12 +345,17 @@ public class Iagno : Gtk.Application
         if (game.n_light_tiles == game.n_dark_tiles)
             show_message (_("The game was a draw."));
 
-        if (settings.get_boolean ("sound"))
-        {
-            CanberraGtk.play_for_widget (view, 0,
-                                         Canberra.PROP_MEDIA_NAME, "gameover",
-                                         Canberra.PROP_MEDIA_FILENAME, Path.build_filename (SOUND_DIRECTORY, "gameover.ogg"));
-        }
+        play_sound ("gameover");
+    }
+
+    private void play_sound (string name)
+    {
+        if (!settings.get_boolean ("sound"))
+            return;
+
+        CanberraGtk.play_for_widget (view, 0,
+                                     Canberra.PROP_MEDIA_NAME, name,
+                                     Canberra.PROP_MEDIA_FILENAME, Path.build_filename (SOUND_DIRECTORY, "%s.ogg".printf (name)));
     }
 
     private void player_move_cb (int x, int y)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]