Skip to content

Fix Sound.is_precached and StreamSound.is_precached performance #222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jordanbriere merged 2 commits into from
Nov 3, 2017
Merged

Fix Sound.is_precached and StreamSound.is_precached performance #222

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a01db3
Change Sound.is_precached and StreamSound.is_precached to not iterate…
jsza Nov 3, 2017
038fd0b
Add comment about engine_sound.is_sound_precached.
jsza Nov 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions addons/source-python/packages/source-python/engines/sound.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
# Paths
from paths import GAME_PATH
# Stringtables
from stringtables import string_tables
from stringtables import INVALID_STRING_INDEX, string_tables
from stringtables.downloads import Downloadables


Expand Down Expand Up @@ -323,7 +323,9 @@ def is_precached(self):

:rtype: bool
"""
return self.sample in string_tables.soundprecache
# We can't use engine_sound.is_sound_precached here because it always
# returns True.
return string_tables.soundprecache[self.sample] != INVALID_STRING_INDEX


class StreamSound(_BaseSound):
Expand Down Expand Up @@ -368,4 +370,7 @@ def is_precached(self):

:rtype: bool
"""
return self._stream_sample in string_tables.soundprecache
# We can't use engine_sound.is_sound_precached here because it always
# returns True.
index = string_tables.soundprecache[self._stream_sample]
return index != INVALID_STRING_INDEX