mcvsoftware/twblue
1
0
Fork 0
mirror of https://github.com/MCV-Software/TWBlue.git synced 2024-11-26 12:53:12 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleanup, disabled accurate audio algo by default, string cleanup.

Browse Source
This commit is contained in:
Bill Dengler 2015-05-13 20:26:05 -04:00
parent 9ddc74d640
commit e92565013b
6 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/app-configuration.defaults
View File

@ -12,6 +12,7 @@ use_invisible_keyboard_shorcuts = boolean(default=True)
play_ready_sound = boolean(default=True) play_ready_sound = boolean(default=True)
speak_ready_msg = boolean(default=True) speak_ready_msg = boolean(default=True)
log_level = string(default="error") log_level = string(default="error")
use_slow_audio_algo = boolean(default=False)
[keymap] [keymap]
up = string(default="control+win+up") up = string(default="control+win+up")

1
src/controller/buffersController.py
View File

@ -452,6 +452,7 @@ class baseBufferController(bufferController):
return sound.URLPlayer.stop_audio() return sound.URLPlayer.stop_audio()
output.speak("Opening media...",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) == False:
print "Opening",url,"in browser..."
return self.url(url,announce=False) return self.url(url,announce=False)
elif utils.is_geocoded(tweet): elif utils.is_geocoded(tweet):
return output.speak("Not implemented",True) return output.speak("Not implemented",True)

6
src/controller/settings.py
View File

@ -40,7 +40,7 @@ class globalSettingsController(object):
self.dialog.set_value("general", "use_invisible_shorcuts", config.app["app-settings"]["use_invisible_keyboard_shorcuts"]) self.dialog.set_value("general", "use_invisible_shorcuts", config.app["app-settings"]["use_invisible_keyboard_shorcuts"])
self.dialog.set_value("general", "disable_sapi5", config.app["app-settings"]["voice_enabled"]) self.dialog.set_value("general", "disable_sapi5", config.app["app-settings"]["voice_enabled"])
self.dialog.set_value("general", "hide_gui", config.app["app-settings"]["hide_gui"]) self.dialog.set_value("general", "hide_gui", config.app["app-settings"]["hide_gui"])
self.dialog.set_value("general", "use_modern_audio_algo", config.app["app-settings"]["use_modern_audio_algo"]) self.dialog.set_value("general", "use_slow_audio_algo", config.app["app-settings"]["use_slow_audio_algo"])
self.dialog.create_proxy() self.dialog.create_proxy()
self.dialog.set_value("proxy", "server", config.app["proxy"]["server"]) self.dialog.set_value("proxy", "server", config.app["proxy"]["server"])
self.dialog.set_value("proxy", "port", config.app["proxy"]["port"]) self.dialog.set_value("proxy", "port", config.app["proxy"]["port"])
@ -62,8 +62,8 @@ class globalSettingsController(object):
config.app["app-settings"]["ask_at_exit"] = self.dialog.get_value("general", "ask_at_exit") config.app["app-settings"]["ask_at_exit"] = self.dialog.get_value("general", "ask_at_exit")
config.app["app-settings"]["play_ready_sound"] = self.dialog.get_value("general", "play_ready_sound") config.app["app-settings"]["play_ready_sound"] = self.dialog.get_value("general", "play_ready_sound")
config.app["app-settings"]["speak_ready_msg"] = self.dialog.get_value("general", "speak_ready_msg") config.app["app-settings"]["speak_ready_msg"] = self.dialog.get_value("general", "speak_ready_msg")
if config.app["app-settings"]["use_modern_audio_algo"] != self.dialog.get_value("general", "use_modern_audio_algo"): if config.app["app-settings"]["use_slow_audio_algo"] != self.dialog.get_value("general", "use_modern_audio_algo"):
config.app["app-settings"]["use_modern_audio_algo"] = self.dialog.get_value("general", "use_modern_audio_algo") config.app["app-settings"]["use_slow_audio_algo"] = self.dialog.get_value("general", "use_slow_audio_algo")
#Todo: clean memmos. #Todo: clean memmos.
if config.app["proxy"]["server"] != self.dialog.get_value("proxy", "server") or config.app["proxy"]["port"] != self.dialog.get_value("proxy", "port") or config.app["proxy"]["user"] != self.dialog.get_value("proxy", "user") or config.app["proxy"]["password"] != self.dialog.get_value("proxy", "password"): if config.app["proxy"]["server"] != self.dialog.get_value("proxy", "server") or config.app["proxy"]["port"] != self.dialog.get_value("proxy", "port") or config.app["proxy"]["user"] != self.dialog.get_value("proxy", "user") or config.app["proxy"]["password"] != self.dialog.get_value("proxy", "password"):
if self.is_started == True: if self.is_started == True:

2
src/sound.py
View File

@ -145,7 +145,7 @@ class URLStream(object):
return self.play(stream=stream,volume=volume,announce=False) return self.play(stream=stream,volume=volume,announce=False)
return True return True
except: except:
log.exception("Exception.") print "Exception."
return False return False
def stop_audio(self): def stop_audio(self):
if hasattr(self, "stream") and self.stream.is_playing == True: if hasattr(self, "stream") and self.stream.is_playing == True:

2
src/twitter/utils.py
View File

@ -60,7 +60,7 @@ def is_audio(tweet,force=False):
except: except:
log.exception("Exception while executing is_audio hashtag algorithm") log.exception("Exception while executing is_audio hashtag algorithm")
try: try:
if config.app["app-settings"]["use_modern_audio_algo"]: if config.app["app-settings"]["use_slow_audio_algo"]:
for u in find_urls(tweet): for u in find_urls(tweet):
if url_is_audio(u): if url_is_audio(u):
tweet['is_audio']=True tweet['is_audio']=True

4
src/wxUI/dialogs/configuration.py
View File

@ -30,8 +30,8 @@ class general(wx.Panel, baseDialog.BaseWXDialog):
self.hide_gui = wx.CheckBox(self, -1, _(u"Hide GUI on launch")) self.hide_gui = wx.CheckBox(self, -1, _(u"Hide GUI on launch"))
sizer.Add(self.hide_gui, 0, wx.ALL, 5) sizer.Add(self.hide_gui, 0, wx.ALL, 5)
self.SetSizer(sizer) self.SetSizer(sizer)
self.use_modern_audio_algo= wx.CheckBox(self, -1, _(U"Use audio tweet detection algorithm by Codeofdusk")) self.use_slow_audio_algo= wx.CheckBox(self, -1, _(U"Use slow audio tweet detection algorithm (improves audio tweet detection accuracy at the cost of performance))"))
sizer.Add(self.use_modern_audio_algo, 0, wx.ALL, 5) sizer.Add(self.use_slow_audio_algo, 0, wx.ALL, 5)
class proxy(wx.Panel, baseDialog.BaseWXDialog): class proxy(wx.Panel, baseDialog.BaseWXDialog):