X-Git-Url: http://git.ya2.it/?p=pmachines.git;a=blobdiff_plain;f=pmachines%2Fmusic.py;h=16e13dc9827052f777bcfd2d759111a6ec31aac7;hp=71d2cf15a6ad5296875a3600578afde38bf87685;hb=9ba5488befb9026a114997fad890d0ca0f887ccc;hpb=c7093023a3930d131254deaaa3017f4de2587d1a

diff --git a/pmachines/music.py b/pmachines/music.py
index 71d2cf1..16e13dc 100644
--- a/pmachines/music.py
+++ b/pmachines/music.py
@@ -6,10 +6,10 @@ from panda3d.core import AudioSound
 
 class MusicMgr:
 
-    def __init__(self):
+    def __init__(self, volume):
         self._start_music(glob('assets/audio/music/*.ogg'))
-        base.musicManager.setVolume(.8)
-        base.sfxManagerList[0].setVolume(1)
+        base.musicManager.setVolume(.8 * volume)
+        base.sfxManagerList[0].setVolume(volume)
         taskMgr.add(self._on_frame, 'on frame music')
 
     def _start_music(self, files):