Changeset 1473:27899f7bc2c2

Timestamp:

07/20/10 20:26:50 (7 weeks ago)

Author:

Q <q@…>

Branch:

default

Message:

Updated the sound_lib repo to the new version which I just released with volume support, gave the sound session ability to hold a volume.

Files:

• .hgsubstate (modified) (1 diff)
• src/Main.defaults (modified) (1 diff)
• src/session/sound/main.py (modified) (4 diffs)

.hgsubstate

@@ -2 +2 @@
 0c0728d6c13a2f2d075a3615f7b40fceb8a86254 src/locale
 2ead1652be4efdb22af9fbad6013a61503863a2c src/session/solona/solona
-75499ae9a28b7c6512b26aae918c562acd56023b src/session/sound/sound_lib
+527c00bf8491be636ce15713964cf37b1ecb1b25 src/session/sound/sound_lib

src/Main.defaults

@@ -25 +25 @@
 fullMute=boolean(default=False)
 soundPack=string(default="Standard")
+volume=float(default=100.00)
 
 #Export information

src/session/sound/main.py

@@ -26 +26 @@
    self.output = sound_lib.output.BassSoundOutput()
    self.input = sound_lib.input.BassSoundInput()
+   self.output.volume = config.main['sounds']['volume']
   except:
    self.output = None
@@ -46 +47 @@
   snd.play()
   self.sounds.append(snd)
-
+  return snd
 
  def find_sound_file (self, file):
@@ -59 +60 @@
   if not os.path.exists(sound_file):
    logging.warning('Unable to find sound file %r' % file)
-   raise IOError, "Unable to fine sound file"
+   raise IOError, "Unable to find sound file"
   return sound_file
 
@@ -97 +98 @@
   logging.debug("%s: Cleanup: removed %d sounds." % (self.name, old_len-len(self.sounds)))
 
+ def get_volume (self):
+  return self.output.volume
+
+ def set_volume (self, volume):
+  config.main['sounds']['volume'] = volume
+  self.output.volume = volume
+
+ volume = property(get_volume, set_volume)