2 new commits in StationPlaylist:
https://bitbucket.org/nvdaaddonteam/stationplaylist/commits/4a79bfd78220/
Changeset: 4a79bfd78220
Branch: None
User: josephsl
Date: 2016-01-30 05:52:52+00:00
Summary: 6.3: Remove accidentally added 7.0-dev encoder support map
Affected #: 1 file
diff --git a/addon/globalPlugins/SPLStudioUtils/encoders.py
b/addon/globalPlugins/SPLStudioUtils/encoders.py
index 6c1a89e..7ca0cc9 100755
--- a/addon/globalPlugins/SPLStudioUtils/encoders.py
+++ b/addon/globalPlugins/SPLStudioUtils/encoders.py
@@ -130,7 +130,7 @@ def _removeEncoderID(encoderType, pos):
# Nullify various flag sets, otherwise memory leak occurs.
def cleanup():
- global streamLabels, SAMStreamLabels, SPLStreamLabels,
SPLFocusToStudio, SPLPlayAfterConnecting, SPLBackgroundMonitor,
SPLNoConnectionTone, encoderMonCount
+ global streamLabels, SAMStreamLabels, SPLStreamLabels,
SPLFocusToStudio, SPLPlayAfterConnecting, SPLBackgroundMonitor, encoderMonCount
for map in [streamLabels, SAMStreamLabels, SPLStreamLabels,
SPLFocusToStudio, SPLPlayAfterConnecting, SPLBackgroundMonitor]:
if map is not None: map.clear()
# Without resetting monitor count, we end up with higher and higher
value for this.
https://bitbucket.org/nvdaaddonteam/stationplaylist/commits/fc8eca05a442/
Changeset: fc8eca05a442
Branch: 6.x
User: josephsl
Date: 2016-01-30 07:20:17+00:00
Summary: 6.3 (security): Nullify stream labels when app module exits so
encoders can load it later.
Affected #: 1 file
diff --git a/addon/globalPlugins/SPLStudioUtils/encoders.py
b/addon/globalPlugins/SPLStudioUtils/encoders.py
index 7ca0cc9..d2b0e62 100755
--- a/addon/globalPlugins/SPLStudioUtils/encoders.py
+++ b/addon/globalPlugins/SPLStudioUtils/encoders.py
@@ -133,6 +133,8 @@ def cleanup():
global streamLabels, SAMStreamLabels, SPLStreamLabels,
SPLFocusToStudio, SPLPlayAfterConnecting, SPLBackgroundMonitor, encoderMonCount
for map in [streamLabels, SAMStreamLabels, SPLStreamLabels,
SPLFocusToStudio, SPLPlayAfterConnecting, SPLBackgroundMonitor]:
if map is not None: map.clear()
+ # Nullify stream labels.
+ streamLabels = None
# Without resetting monitor count, we end up with higher and higher
value for this.
# 7.0: Destroy threads also.
encoderMonCount = {"SAM":0, "SPL":0}
@@ -323,7 +325,7 @@ class Encoder(IAccessible):
def initOverlayClass(self):
global encoderMonCount
# Load stream labels upon request.
- if not streamLabels: loadStreamLabels()
+ if streamLabels is None: loadStreamLabels()
encoderIdentifier = self.getEncoderId()
# Can I switch to Studio when connected to a streaming server?
try:
Repository URL: https://bitbucket.org/nvdaaddonteam/stationplaylist/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
