Changeset 248

Timestamp:

01/05/07 04:06:01 (5 years ago)

Author:

mg

Message:

Make music files configurable in an .ini file.

Location:

trunk/src/pyspacewar

Files:

• music/README.txt (modified) (1 diff)
• music/music.ini (added)
• ui.py (modified) (2 diffs)

trunk/src/pyspacewar/music/README.txt

@@ -3 +3 @@
 
 If you want you, you can take your favourite tunes and place them in this
-directory, with the following names:
-
-  demo.ogg
-  game.ogg
-  gravitywars.ogg
-
+directory, then put their file names in music.ini.

trunk/src/pyspacewar/ui.py

@@ -1995 +1995 @@
     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'),
-            }
+        config = ConfigParser.RawConfigParser()
+        config.add_section('music')
+        config.read([find('music', 'music.ini')])
+        self.music_files = {}
+        for what in ['demo', 'game', 'gravitywars']:
+            if config.has_option('music', what):
+                filename = config.get('music', what)
+                if filename:
+                    self.music_files[what] = find('music', filename)
 
     def play_music(self, which):
@@ -2013 +2017 @@
                 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
+                print "pyspacewar: could not load %s" % filename
                 pygame.mixer.music.stop()
         self.now_playing = which