anna
/
ocarina
1
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity

Volume through new preferences tree 

The volume is now controlled through the preferences tree.
This commit is contained in:
Bryan Schumaker 2010-11-15 08:29:25 -05:00
parent 3cd7f4b20f
commit 4335c1a111
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libsaria/audio/__init__.py
View File

@ -10,7 +10,7 @@ audio = None
tdelta = None
def ls_init():
libsaria.init_pref("volume", 1.0)
libsaria.init_pref2("libsaria.audio.volume", 1.0)
libsaria.event.invite("POSTINIT", ls_init)
def init():

4
libsaria/audio/audio.py
View File

@ -20,7 +20,7 @@ def init():
lock.acquire()
player = gst.element_factory_make("playbin2", "player")
set_volume_locked(libsaria.prefs["volume"])
set_volume_locked(libsaria.prefs2.get_pref("libsaria.audio.volume"))
time = gst.Format(gst.FORMAT_TIME)
bus = player.get_bus()
bus.add_signal_watch()
@ -181,7 +181,7 @@ def seek(prcnt):
def set_volume_locked(prcnt):
global player
player.set_property("volume", prcnt)
libsaria.prefs["volume"] = prcnt
libsaria.prefs2.set_pref("libsaria.audio.volume", prcnt)
return prcnt
def set_volume(prcnt):

2
ocarina/button.py
View File

@ -146,7 +146,7 @@ class VolumeButton(gtk.VolumeButton):
adj = self.get_adjustment()
adj.set_page_increment(0.05)
self.set_value(prefs["volume"])
self.set_value(prefs2.get_pref("libsaria.audio.volume"))
self.resize()
self.connect("value-changed", self.changed)