Changeset 247

Timestamp:

01/05/07 03:57:30 (5 years ago)

Author:

mg

Message:

Added support for music. Sadly, no actual music yet.

Location:

trunk

Files:

• setup.py (modified) (1 diff)
• src/pyspacewar/music (added)
• src/pyspacewar/music/README.txt (added)
• src/pyspacewar/ui.py (modified) (8 diffs)

trunk/setup.py

@@ -50 +50 @@
       packages=['pyspacewar'],
       package_dir={'pyspacewar': 'src/pyspacewar'},
-      package_data={'pyspacewar': ['images/*', 'sounds/*']},
+      package_data={'pyspacewar': ['images/*', 'sounds/*', 'music/*']},
      )

trunk/src/pyspacewar/ui.py

@@ -1092 +1092 @@
     mouse_visible = False
     keys_repeat = False
+    music = None
 
     inherit_pause_from_prev_mode = False
@@ -1117 +1118 @@
         else:
             pygame.key.set_repeat()
+        if self.music:
+            self.ui.play_music(self.music)
 
     def leave(self, next_mode=None):
@@ -1237 +1240 @@
 
     paused = False
+    music = 'demo'
 
     def init(self):
@@ -1600 +1604 @@
 
     paused = False
+    music = 'game'
 
     def init(self):
@@ -1639 +1644 @@
 
     paused = False
+    music = 'gravitywars'
 
     def init(self):
@@ -1780 +1786 @@
 
     _ui_mode = None         # Previous user interface mode
+
+    now_playing = None      # Filename of the current music track
 
     # Some debug information
@@ -1854 +1862 @@
         self._init_trail_colors()
         self._load_sounds()
+        self._load_music()
         self._load_planet_images()
         self._load_background()
@@ -1983 +1992 @@
         self.respawn_sound = pygame.mixer.Sound(find('sounds', 'coin2.wav'))
         self.menu_sound = pygame.mixer.Sound(find('sounds', 'briefcs1.wav'))
+
+    def _load_music(self):
+        """Load music files."""
+        self.music_files = {
+                'demo': find('music', 'demo.ogg'),
+                'game': find('music', 'game.ogg'),
+                'gravitywars': find('music', 'gravitywars.ogg'),
+            }
+
+    def play_music(self, which):
+        """Loop the music file for a certain mode."""
+        if which == self.now_playing:
+            return
+        filename = self.music_files.get(which)
+        if not filename:
+            pygame.mixer.music.stop()
+        else:
+            try:
+                pygame.mixer.music.load(filename)
+                pygame.mixer.music.play(-1)
+            except pygame.error:
+                # Don't print warnings while I don't have any music actually
+                # bundled with pyspacewar
+                # print "pyspacewar: could not load %s" % filename
+                pygame.mixer.music.stop()
+        self.now_playing = which
 
     def _init_fonts(self):