commit/StationPlaylist: josephsl: Merge branch 'master' into 7.0/blueProfileTriggers

  • From: commits-noreply@xxxxxxxxxxxxx
  • To: nvda-addons-commits@xxxxxxxxxxxxx
  • Date: Sat, 02 Jan 2016 02:10:03 -0000

1 new commit in StationPlaylist:

https://bitbucket.org/nvdaaddonteam/stationplaylist/commits/6b3025c31758/
Changeset:   6b3025c31758
Branch:      7.0/blueProfileTriggers
User:        josephsl
Date:        2016-01-02 02:09:10+00:00
Summary:     Merge branch 'master' into 7.0/blueProfileTriggers

Affected #:  2 files

diff --git a/addon/appModules/splstudio/__init__.py 
b/addon/appModules/splstudio/__init__.py
index 9335455..f8cd44c 100755
--- a/addon/appModules/splstudio/__init__.py
+++ b/addon/appModules/splstudio/__init__.py
@@ -527,14 +527,14 @@ class AppModule(appModuleHandler.AppModule):
                                        and 
splconfig.SPLConfig["IntroOutroAlarms"]["SaySongRamp"]):
                                                self.alarmAnnounce(obj.name, 
512, 400, intro=True)
                                # Hack: auto scroll in Studio itself might be 
broken (according to Brian Hartgen), so force NVDA to announce currently 
playing track automatically if told to do so.
-                               if 
splconfig.SPLConfig["SayStatus"]["SayPlayingTrackName"] == "True": # Had to do 
this to transform this key to something else later.
+                               if ((splconfig.SPLConfig["SayPlayingTrackName"] 
== "True" and self.SPLCurVersion < "5.11")
+                               or (splconfig.SPLConfig["SayPlayingTrackName"] 
== "Background" and api.getForegroundObject().windowClassName != 
"TStudioForm")):
                                        try:
                                                statusBarFG = 
obj.parent.parent.parent
                                                if statusBarFG is not None:
                                                        statusBar = 
statusBarFG.previous.previous.previous
                                                        if statusBar is not 
None and statusBar.firstChild is not None and statusBar.firstChild.role == 
controlTypes.ROLE_STATUSBAR:
                                                                
ui.message(obj.name)
-                                                               
tones.beep(1000, 100)
                                        except AttributeError:
                                                pass
                nextHandler()

diff --git a/addon/globalPlugins/SPLStudioUtils/encoders.py 
b/addon/globalPlugins/SPLStudioUtils/encoders.py
index 5e13012..5a9d874 100755
--- a/addon/globalPlugins/SPLStudioUtils/encoders.py
+++ b/addon/globalPlugins/SPLStudioUtils/encoders.py
@@ -439,6 +439,15 @@ class Encoder(IAccessible):
                        self.backgroundMonitor = encoderIdentifier in 
SPLBackgroundMonitor
                except KeyError:
                        pass
+               # 6.2: Make sure background monitor threads are started if the 
flag is set.
+               if self.backgroundMonitor:
+                       if self.encoderType == "SAM": threadPool = 
SAMMonitorThreads
+                       elif self.encoderType == "SPL": threadPool = 
SPLMonitorThreads
+                       if self.IAccessibleChildID not in threadPool:
+                               statusThread = 
threading.Thread(target=self.reportConnectionStatus)
+                               statusThread.name = "Connection Status Reporter 
" + str(self.IAccessibleChildID)
+                               statusThread.start()
+                               threadPool[self.IAccessibleChildID] = 
statusThread
                # Can I play connection beeps?
                try:
                        self.connectionTone = encoderIdentifier not in 
SPLNoConnectionTone

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: Merge branch 'master' into 7.0/blueProfileTriggers - commits-noreply