Fixes loss of Line-In from menu

henkelis · Mar 12, 2012 · 13d1950 · 13d1950
1 parent a7320a8
commit 13d1950
Showing 1 changed file with 37 additions and 38 deletions.
diff --git a/sonospy/pycpoint.py b/sonospy/pycpoint.py
@@ -2794,60 +2794,59 @@ def browse_media_server_root(self, searchvars=None):
             '''
             self.AvailableServiceListVersion = service_result['AvailableServiceListVersion']
 
+        # if current server is a zone player, append any line in
+        current_server = self.control_point.get_current_server()
+        if current_server.udn in self.known_zone_players:
+            linein_result = self.control_point.get_audio_in()
+            log.debug("get_audio_in result: %s", linein_result)
+            li_title = linein_result['CurrentName']
+            li_id = "AI:"
+            li_type = "LineIn_ROOT"
+            self.update_rootdata(li_title, li_id, li_type)
+
         # if current server is a zone player, append any third party media servers
         current_server = self.control_point.get_current_server()
         if current_server.udn in self.known_zone_players:
             zt_sid = self.control_point.get_zt_service(current_server).event_sid
 
             # TODO: check whether this can occur
-            if self.thirdpartymediaservers == {}:
-                return
+            if self.thirdpartymediaservers != {}:
 
-#            print "~~~~~~~~~~~~~~~~~~~~~~~~~"
-#            print "third party media servers"
-
-            mediaservers = self.thirdpartymediaservers[zt_sid]
-            xml = [None, None]    # nothing to play at this level
+    #            print "~~~~~~~~~~~~~~~~~~~~~~~~~"
+    #            print "third party media servers"
+                
+                mediaservers = self.thirdpartymediaservers[zt_sid]
+                xml = [None, None]    # nothing to play at this level
 
-            for num, mediaserver in mediaservers.items():
+                for num, mediaserver in mediaservers.items():
 
-#                print "MS: " + str(mediaserver['Name'])
+    #                print "MS: " + str(mediaserver['Name'])
 
-                if mediaserver['UDN'] in self.sonospyproxies.keys():
-                    type = 'SonospyMediaServer_ROOT'
-                else:
-                    if mediaserver['Name'].find('Windows Media') != -1:
-                        type = 'MSMediaServer_ROOT'
+                    if mediaserver['UDN'] in self.sonospyproxies.keys():
+                        type = 'SonospyMediaServer_ROOT'
                     else:
-                        type = 'ThirdPartyMediaServer_ROOT'
-                self.update_rootdata(mediaserver['Name'], mediaserver['UDN'], type)
+                        if mediaserver['Name'].find('Windows Media') != -1:
+                            type = 'MSMediaServer_ROOT'
+                        else:
+                            type = 'ThirdPartyMediaServer_ROOT'
+                    self.update_rootdata(mediaserver['Name'], mediaserver['UDN'], type)
 
-#                print mediaserver['Name']
-#                print mediaserver['UDN']
-#                print type
-#                print
+    #                print mediaserver['Name']
+    #                print mediaserver['UDN']
+    #                print type
+    #                print
 
-                # save udn's of third party media servers, unless already set from device discovery
-                if not mediaserver['Name'] in self.rootids:
-                    self.rootids[mediaserver['Name']] = mediaserver['UDN']
+                    # save udn's of third party media servers, unless already set from device discovery
+                    if not mediaserver['Name'] in self.rootids:
+                        self.rootids[mediaserver['Name']] = mediaserver['UDN']
 
-                # save udn's of MS media servers
-                if type == 'MSMediaServer_ROOT':
-                    self.msrootids[mediaserver['UDN']] = mediaserver['Name']
+                    # save udn's of MS media servers
+                    if type == 'MSMediaServer_ROOT':
+                        self.msrootids[mediaserver['UDN']] = mediaserver['Name']
 
-#            print "~~~~~~~~~~~~~~~~~~~~~~~~~"
+    #            print "~~~~~~~~~~~~~~~~~~~~~~~~~"
 
-        # if current server is a zone player, append any line in
-        current_server = self.control_point.get_current_server()
-        if current_server.udn in self.known_zone_players:
-            linein_result = self.control_point.get_audio_in()
-            log.debug("get_audio_in result: %s", linein_result)
-            li_title = linein_result['CurrentName']
-            li_id = "AI:"
-            li_type = "LineIn_ROOT"
-            self.update_rootdata(li_title, li_id, li_type)
-
-
+
 
     def browse_media_server(self, id, root=None, searchstring='', searchoperator='', setkey=''):
         '''