From 81a9a36519d3d22d1915c997fde3fc29740b6875 Mon Sep 17 00:00:00 2001 From: Bill Dengler Date: Wed, 13 May 2015 21:59:46 -0400 Subject: [PATCH] Honor session volume during audio playback from interact method. --- src/controller/buffersController.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/controller/buffersController.py b/src/controller/buffersController.py index 428fd5b5..fa944d95 100644 --- a/src/controller/buffersController.py +++ b/src/controller/buffersController.py @@ -44,6 +44,7 @@ class bufferController(object): def clear_list(self): pass + def get_event(self, ev): if ev.GetKeyCode() == wx.WXK_RETURN and ev.ControlDown(): event = "audio" elif ev.GetKeyCode() == wx.WXK_RETURN: event = "interact" @@ -432,7 +433,7 @@ class baseBufferController(bufferController): try: sound.URLPlayer.play(url, self.session.settings["sound"]["volume"]) except: - self.url(url=url) + log("Exception while executing audio method.") @_tweets_exist def interact(self): "Select the best action for the currently focused tweet (audio, geocode, URL, etc)." @@ -451,7 +452,7 @@ class baseBufferController(bufferController): if hasattr(sound.URLPlayer,'stream'): return sound.URLPlayer.stop_audio(delete=True) output.speak("Opening media...",True) - if sound.URLPlayer.is_playable(url=url,play=True) == False: + if sound.URLPlayer.is_playable(url=url,play=True,volume=self.session.settings["sound"]["volume"]) == False: print "Opening",url,"in browser..." return self.url(url,announce=False) elif utils.is_geocoded(tweet):