mute button; is playing test delay

This commit is contained in:
Frank DeMarco 2013-12-27 12:56:42 +09:00
parent 7df72f4fc4
commit d77b148c5b
3 changed files with 10 additions and 7 deletions

View File

@ -48,14 +48,15 @@ class Animation(GameChild):
if self.accounts.has_key(method):
self.accounts[method].halt()
def is_playing(self, method=None, check_all=False, include_delay=True):
def is_playing(self, method=None, check_all=False, include_delay=False):
if check_all:
return any(self.is_account_playing(account) for method, account in
self.accounts.iteritems())
return self.is_account_playing(self.accounts[self.get_default(method)])
return any(self.is_account_playing(account, include_delay) for \
method, account in self.accounts.iteritems())
return self.is_account_playing(self.accounts[self.get_default(method)],
include_delay)
def is_account_playing(self, account):
return account.playing and not account.delay
def is_account_playing(self, account, include_delay):
return account.playing and (not include_delay or not account.delay)
def update(self):
for method, account in self.accounts.iteritems():

View File

@ -109,6 +109,7 @@ class Configuration(RawConfigParser):
set_option(section, "toggle-fullscreen", "K_F11")
set_option(section, "reset-game", "K_F8")
set_option(section, "record-video", "K_F10")
set_option(section, "mute", "K_F12")
section = "joy"
add_section(section)
set_option(section, "advance", "7")

View File

@ -28,7 +28,8 @@ class Input(GameChild):
def set_any_press_ignore_list(self):
self.any_press_ignored = set(["capture-screen", "toggle-fullscreen",
"reset-game", "record-video", "quit"])
"reset-game", "record-video", "quit",
"mute"])
self.any_press_ignored_keys = set()
def unsuppress(self):