commit/StationPlaylist: josephsl: 5.0-dev: huge refactor, data structure changes and routine changes.
- From: commits-noreply@xxxxxxxxxxxxx
- To: nvda-addons-commits@xxxxxxxxxxxxx
- Date: Fri, 13 Mar 2015 01:29:44 -0000
1 new commit in StationPlaylist:
https://bitbucket.org/nvdaaddonteam/stationplaylist/commits/d32d5fbc05c6/
Changeset: d32d5fbc05c6
Branch: 5.0/encodersPackage
User: josephsl
Date: 2015-03-13 01:29:04+00:00
Summary: 5.0-dev: huge refactor, data structure changes and routine changes.
Quite a change:
* Each feature is now represented as a set for ease of maintenance for to
assist encoder initialization via membership testing. This means there is now a
central feature set for each feature, which eliminates encoder-specific
features map.
* With the introduction of feature sets, connection and other object routines
has been simplified. For now, each encoder type will retain various mutator
functions. These will be refactored and removed in a future commit.
* Added a new command in SPL Controller to report number of encoders being
monitored.
Because of this change, this will not be ported to past releases.
Affected #: 2 files
diff --git a/addon/globalPlugins/SPLStudioUtils/__init__.py
b/addon/globalPlugins/SPLStudioUtils/__init__.py
index 8e08125..187ab6b 100755
--- a/addon/globalPlugins/SPLStudioUtils/__init__.py
+++ b/addon/globalPlugins/SPLStudioUtils/__init__.py
@@ -239,6 +239,10 @@ class GlobalPlugin(globalPluginHandler.GlobalPlugin):
else: ui.message(str(remainingTime/1000))
self.finish()
+ def script_announceNumMonitoringEncoders(self, gesture):
+ encoders.announceNumMonitoringEncoders()
+ self.finish()
+
def script_conHelp(self, gesture):
# Translators: The title for SPL Controller help dialog.
wx.CallAfter(gui.messageBox, SPLConHelp, _("SPL Controller
help"))
@@ -259,6 +263,7 @@ class GlobalPlugin(globalPluginHandler.GlobalPlugin):
"kb:t":"stopInstant",
"kb:u":"pause",
"kb:r":"remainingTime",
+ "kb:e":"announceNumMonitoringEncoders",
"kb:f1":"conHelp"
}
diff --git a/addon/globalPlugins/SPLStudioUtils/encoders.py
b/addon/globalPlugins/SPLStudioUtils/encoders.py
index 6b164ae..4a473ea 100755
--- a/addon/globalPlugins/SPLStudioUtils/encoders.py
+++ b/addon/globalPlugins/SPLStudioUtils/encoders.py
@@ -30,15 +30,14 @@ SPLMSG = winUser.WM_USER
# Various SPL IPC tags.
SPLPlay = 12
-# Needed in SAM and SPL Encoder support:
-SAMFocusToStudio = {} # A dictionary to record whether to switch to SPL Studio
for this encoder.
-SPLFocusToStudio = {}
-SAMPlayAfterConnecting = {}
-SPLPlayAfterConnecting = {}
+# Needed in Encoder support:
+SPLFocusToStudio = set() # Whether to focus to Studio or not.
+SPLPlayAfterConnecting = set()
+SPLBackgroundMonitor = set()
+
+# Customized for each encoder type.
SAMStreamLabels= {} # A dictionary to store custom labels for each stream.
SPLStreamLabels= {} # Same as above but optimized for SPL encoders (Studio
5.00 and later).
-SAMBackgroundMonitor = {}
-SPLBackgroundMonitor = {}
SAMMonitorThreads = {}
SPLMonitorThreads = {}
encoderMonCount = {"SAM":0, "SPL":0}
@@ -60,6 +59,13 @@ def loadStreamLabels():
except KeyError:
SPLStreamLabels = {}
+# Report number of encoders being monitored.
+def announceNumMonitoringEncoders():
+ monitorCount = len(SPLBackgroundMonitor)
+ if not monitorCount:
+ ui.message("No encoders are being monitored")
+ else:
+ ui.message("Number of encoders monitored:
{numberOfEncoders}".format(numberOfEncoders = monitorCount))
# Try to see if SPL foreground object can be fetched. This is used for
switching to SPL Studio window from anywhere and to switch to Studio window
from SAM encoder window.
@@ -123,7 +129,7 @@ class Encoder(IAccessible):
self.playAfterConnecting = False
# Translators: Presented when toggling the setting to
switch to Studio when connected to a streaming server.
ui.message(_("Do not play first track after
connecting"))
- self._set_playAfterConnecting()
+ self.setPlayAfterConnecting()
# Translators: Input help mode message in SAM Encoder window.
script_togglePlay.__doc__=_("Toggles whether Studio will play the first
song when connected to a streaming server.")
@@ -179,6 +185,19 @@ class Encoder(IAccessible):
script_encoderDateTime.category=_("Station Playlist Studio")
+ def initOverlayClass(self):
+ encoderIdentifier = " ".join([self.encoderType,
str(self.IAccessibleChildID)])
+ # Can I switch to Studio when connected to a streaming server?
+ try:
+ self.focusToStudio = encoderIdentifier in
SPLFocusToStudio
+ except KeyError:
+ pass
+ # Am I being monitored for connection changes?
+ try:
+ self.backgroundMonitor = encoderIdentifier in
SPLBackgroundMonitor
+ except KeyError:
+ pass
+
def reportFocus(self):
try:
streamLabel = self.getStreamLabel()[0]
@@ -266,15 +285,13 @@ class SAMEncoder(Encoder):
if toneCounter%250 == 0:
tones.beep(500, 50)
if connecting: continue
- if not SAMBackgroundMonitor[self.IAccessibleChildID]:
return
+ if not " ".join([self.encoderType,
str(self.IAccessibleChildID)]) in SPLBackgroundMonitor: return
def script_connect(self, gesture):
gesture.send()
# Translators: Presented when SAM Encoder is trying to connect
to a streaming server.
ui.message(_("Connecting..."))
# Oi, status thread, can you keep an eye on the connection
status for me?
- if self.IAccessibleChildID not in SAMBackgroundMonitor.keys():
- SAMBackgroundMonitor[self.IAccessibleChildID] =
self.backgroundMonitor
if not self.backgroundMonitor:
statusThread =
threading.Thread(target=self.reportConnectionStatus,
kwargs=dict(connecting=True))
statusThread.name = "Connection Status Reporter " +
str(self.IAccessibleChildID)
@@ -287,33 +304,33 @@ class SAMEncoder(Encoder):
ui.message(_("Disconnecting..."))
def _set_FocusToStudio(self):
- SAMFocusToStudio[self.IAccessibleChildID] = self.focusToStudio
-
- def _set_playAfterConnecting(self):
- SAMPlayAfterConnecting[self.IAccessibleChildID] =
self.playAfterConnecting
+ SAMIdentifier = " ".join([self.encoderType,
str(self.IAccessibleChildID)])
+ if self.focusToStudio and not SAMIdentifier in SPLFocusToStudio:
+ SPLFocusToStudio.add(SAMIdentifier)
+ elif not self.focusToStudio and SAMIdentifier in
SPLFocusToStudio:
+ SPLFocusToStudio.remove(SAMIdentifier)
+
+ def setPlayAfterConnecting(self):
+ SAMIdentifier = " ".join([self.encoderType,
str(self.IAccessibleChildID)])
+ if self.playAfterConnecting and not SAMIdentifier in
SPLPlayAfterConnecting:
+ SPLPlayAfterConnecting.add(SAMIdentifier)
+ elif not self.playAfterConnecting and SAMIdentifier in
SPLPlayAfterConnecting:
+ SPLPlayAfterConnecting.remove(SAMIdentifier)
def setBackgroundMonitor(self):
- SAMBackgroundMonitor[self.IAccessibleChildID] =
self.backgroundMonitor
+ SAMIdentifier = " ".join([self.encoderType,
str(self.IAccessibleChildID)])
+ if self.backgroundMonitor and not SAMIdentifier in
SPLBackgroundMonitor:
+ SPLBackgroundMonitor.add(SAMIdentifier)
+ elif not self.backgroundMonitor and SAMIdentifier in
SPLBackgroundMonitor:
+ SPLBackgroundMonitor.remove(SAMIdentifier)
return SAMMonitorThreads
- def initOverlayClass(self):
- # Can I switch to Studio when connected to a streaming server?
- try:
- self.focusToStudio =
SAMFocusToStudio[self.IAccessibleChildID]
- except KeyError:
- pass
- # Am I being monitored for connection changes?
- try:
- self.backgroundMonitor =
SAMBackgroundMonitor[self.IAccessibleChildID]
- except KeyError:
- pass
-
def getStreamLabel(self, getTitle=False):
if str(self.IAccessibleChildID) in SAMStreamLabels:
streamLabel =
SAMStreamLabels[str(self.IAccessibleChildID)]
return streamLabel, self.IAccessibleChildID if getTitle
else streamLabel
- return self.IAccessibleChildID if getTitle else None
+ return None, self.IAccessibleChildID if getTitle else None
def setStreamLabel(self, newStreamLabel):
if len(newStreamLabel):
@@ -378,7 +395,7 @@ class SPLEncoder(Encoder):
if attempt>= 500 and
statChild.name == "Disconnected":
tones.beep(250, 250)
if connecting: continue
- if not SPLBackgroundMonitor[self.IAccessibleChildID]:
return
+ if not " ".join([self.encoderType,
str(self.IAccessibleChildID)]) in SPLBackgroundMonitor: return
def script_connect(self, gesture):
# Same as SAM's connection routine, but this time, keep an eye
on self.name and a different connection flag.
@@ -389,8 +406,6 @@ class SPLEncoder(Encoder):
connectButton.doAction()
self.setFocus()
# Same as SAM encoders.
- if self.IAccessibleChildID not in SPLBackgroundMonitor.keys():
- SPLBackgroundMonitor[self.IAccessibleChildID] =
self.backgroundMonitor
if not self.backgroundMonitor:
statusThread =
threading.Thread(target=self.reportConnectionStatus,
kwargs=dict(connecting=True))
statusThread.name = "Connection Status Reporter"
@@ -399,32 +414,32 @@ class SPLEncoder(Encoder):
script_connect.__doc__=_("Connects to a streaming server.")
def _set_FocusToStudio(self):
- SPLFocusToStudio[self.IAccessibleChildID] = self.focusToStudio
-
- def _set_playAfterConnecting(self):
- SPLPlayAfterConnecting[self.IAccessibleChildID] =
self.playAfterConnecting
+ SPLIdentifier = " ".join([self.encoderType,
str(self.IAccessibleChildID)])
+ if self.focusToStudio and not SPLIdentifier in SPLFocusToStudio:
+ SPLFocusToStudio.add(SPLIdentifier)
+ elif not self.focusToStudio and SPLIdentifier in
SPLFocusToStudio:
+ SPLFocusToStudio.remove(SPLIdentifier)
+
+ def setPlayAfterConnecting(self):
+ SPLIdentifier = " ".join([self.encoderType,
str(self.IAccessibleChildID)])
+ if self.playAfterConnecting and not SPLIdentifier in
SPLPlayAfterConnecting:
+ SPLPlayAfterConnecting.add(SPLIdentifier)
+ elif not self.playAfterConnecting and SPLIdentifier in
SPLPlayAfterConnecting:
+ SPLPlayAfterConnecting.remove(SPLIdentifier)
def setBackgroundMonitor(self):
- SPLBackgroundMonitor[self.IAccessibleChildID] =
self.backgroundMonitor
+ SPLIdentifier = " ".join([self.encoderType,
str(self.IAccessibleChildID)])
+ if self.backgroundMonitor and not SPLIdentifier in
SPLBackgroundMonitor:
+ SPLBackgroundMonitor.add(SPLIdentifier)
+ elif not self.backgroundMonitor and SPLIdentifier in
SPLBackgroundMonitor:
+ SPLBackgroundMonitor.remove(SPLIdentifier)
return SPLMonitorThreads
-
- def initOverlayClass(self):
- # Can I switch to Studio when connected to a streaming server?
- try:
- self.focusToStudio =
SPLFocusToStudio[self.IAccessibleChildID]
- except KeyError:
- pass
- try:
- self.backgroundMonitor =
SPLBackgroundMonitor[self.IAccessibleChildID]
- except KeyError:
- pass
-
def getStreamLabel(self, getTitle=False):
if str(self.IAccessibleChildID) in SPLStreamLabels:
streamLabel =
SPLStreamLabels[str(self.IAccessibleChildID)]
return streamLabel, self.firstChild.name if getTitle
else streamLabel
- return self.firstChild.name if getTitle else None
+ return None, self.firstChild.name if getTitle else None
def setStreamLabel(self, newStreamLabel):
if len(newStreamLabel):
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.
Other related posts:
- » commit/StationPlaylist: josephsl: 5.0-dev: huge refactor, data structure changes and routine changes. - commits-noreply
