The branch, eden has been updated
       via  d30979499c4b002814906d98adc6c53284da9ada (commit)
       via  e5c019bf4108ec5e739677a99006afba301891b9 (commit)
      from  86aeb581473432fccc8d7535e2c3e0a06594bb08 (commit)

- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=d30979499c4b002814906d98adc6c53284da9ada

commit d30979499c4b002814906d98adc6c53284da9ada
Author: amet <[email protected]>
Date:   Thu Mar 29 02:01:59 2012 +0400

    [script.xbmc.subtitles] -v 3.0.0
    
    - Updated argenteam service, thx Esteban Mendoza
    - fix error if auto search is on

diff --git a/script.xbmc.subtitles/addon.xml b/script.xbmc.subtitles/addon.xml
index ceaad75..be53c73 100755
--- a/script.xbmc.subtitles/addon.xml
+++ b/script.xbmc.subtitles/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="script.xbmc.subtitles"
        name="XBMC Subtitles"
-       version="2.9.38"
+       version="3.0.0"
        provider-name="Amet, mr_blobby">
   <requires>
     <import addon="xbmc.python" version="2.0"/>
diff --git a/script.xbmc.subtitles/changelog.txt 
b/script.xbmc.subtitles/changelog.txt
index 7ee5467..39bd5b1 100644
--- a/script.xbmc.subtitles/changelog.txt
+++ b/script.xbmc.subtitles/changelog.txt
@@ -1,3 +1,7 @@
+3.0.0
+- Updated argenteam service, thx Esteban Mendoza
+- fix error if auto search is on
+
 2.9.38
 - fix Argenteam service
 - "fix" for Subdivx service, not happy with this but best I can do for now
diff --git a/script.xbmc.subtitles/resources/lib/gui.py 
b/script.xbmc.subtitles/resources/lib/gui.py
index 765c567..580fba0 100644
--- a/script.xbmc.subtitles/resources/lib/gui.py
+++ b/script.xbmc.subtitles/resources/lib/gui.py
@@ -236,7 +236,8 @@ class GUI( xbmcgui.WindowXMLDialog ):
           select_index = self.service_list.index(self.service)
         except IndexError:
           select_index = 0
-        self.getControl( SERVICES_LIST ).selectItem( select_index )
+        if gui:  
+          self.getControl( SERVICES_LIST ).selectItem( select_index )
         log( __name__ ,"Auto Searching '%s' Service" % (self.service,) )
         self.Search_Subtitles(gui)
       else:
diff --git a/script.xbmc.subtitles/resources/lib/services/Argenteam/service.py 
b/script.xbmc.subtitles/resources/lib/services/Argenteam/service.py
index 9948185..8376254 100644
--- a/script.xbmc.subtitles/resources/lib/services/Argenteam/service.py
+++ b/script.xbmc.subtitles/resources/lib/services/Argenteam/service.py
@@ -33,7 +33,7 @@ subtitle_pattern = 
"<div\sclass=\"links\">(.+?)<strong>Descargado:</strong>(.+?)
 def getallsubs(searchstring, languageshort, languagelong, file_original_path, 
subtitles_list, tvshow, season, episode):
        
        if languageshort == "es":
-               log( __name__ ,"TVShow: %s" % (tvshow))
+               #log( __name__ ,"TVShow: %s" % (tvshow))
                if len(tvshow) > 0:
                        url = main_url + urllib.quote_plus(searchstring)
                else:
@@ -43,11 +43,6 @@ def getallsubs(searchstring, languageshort, languagelong, 
file_original_path, su
        content = geturl(url)
        #subtitles_list.append({'rating': '0', 'no_files': 1, 'filename': 
searchstring, 'sync': False, 'id' : 1, 'language_flag': 'flags/' + 
languageshort + '.gif', 'language_name': languagelong})
        for matches in re.finditer(search_results_pattern, content, 
re.IGNORECASE | re.DOTALL | re.MULTILINE | re.UNICODE):
-               log( __name__ ,u"Resultado: %s" % (matches))
-               log( __name__ ,u"Tipo: %s" % (matches.group(2)))
-               log( __name__ ,u"ID: %s" % (matches.group(3)))
-               log( __name__ ,u"Link: %s" % (matches.group(4)))
-               
                tipo = matches.group(2)
                id = matches.group(3)
                link = matches.group(4)
@@ -56,7 +51,7 @@ def getallsubs(searchstring, languageshort, languagelong, 
file_original_path, su
                
                content_subtitle = geturl(url_subtitle)
                for matches in re.finditer(subtitle_pattern, content_subtitle, 
re.IGNORECASE | re.DOTALL | re.MULTILINE | re.UNICODE):
-                       log( __name__ ,u"Descargas: %s" % (matches.group(2)))
+                       #log( __name__ ,"Descargas: %s" % (matches.group(2)))
                        
                        id = matches.group(6)
                        filename=urllib.unquote_plus(matches.group(7))
@@ -65,7 +60,7 @@ def getallsubs(searchstring, languageshort, languagelong, 
file_original_path, su
                        if (downloads > 10):
                                downloads=10
                        #server = matches.group(4).encode('ascii')
-                       log( __name__ ,u"Resultado Subtítulo 2: %s" % 
(matches.group(6)))
+                       #log( __name__ ,"Resultado Subtítulo 2: %s" % 
(matches.group(6)))
                        subtitles_list.append({'rating': str(downloads), 
'no_files': 1, 'filename': filename, 'server': server, 'sync': False, 'id' : 
id, 'language_flag': 'flags/' + languageshort + '.gif', 'language_name': 
languagelong})
        
        
@@ -73,12 +68,12 @@ def geturl(url):
     class MyOpener(urllib.FancyURLopener):
         version = ''
     my_urlopener = MyOpener()
-    log( __name__ ,"%s Getting url: %s" % (debug_pretext, url))
+    #log( __name__ ,"%s Getting url: %s" % (debug_pretext, url))
     try:
         response = my_urlopener.open(url)
         content    = response.read()
     except:
-        log( __name__ ,"%s Failed to get url:%s" % (debug_pretext, url))
+        #log( __name__ ,"%s Failed to get url:%s" % (debug_pretext, url))
         content    = None
     return content
 
@@ -90,7 +85,7 @@ def search_subtitles( file_original_path, title, tvshow, 
year, season, episode,
         searchstring = title
     if len(tvshow) > 0:
         searchstring = "%s S%#02dE%#02d" % (tvshow, int(season), int(episode))
-    log( __name__ ,"%s Search string = %s" % (debug_pretext, searchstring))
+    #log( __name__ ,"%s Search string = %s" % (debug_pretext, searchstring))
 
     spanish = 0
     if string.lower(lang1) == "spanish": spanish = 1
@@ -117,9 +112,9 @@ def download_subtitles (subtitles_list, pos, zip_subs, 
tmp_sub_dir, sub_folder,
     if content is not None:
         header = content[:4]
         if header == 'Rar!':
-            log( __name__ ,"%s argenteam: el contenido es RAR" % 
(debug_pretext)) #EGO
+            #log( __name__ ,"%s argenteam: el contenido es RAR" % 
(debug_pretext)) #EGO
             local_tmp_file = os.path.join(tmp_sub_dir, "argenteam.rar")
-            log( __name__ ,"%s argenteam: local_tmp_file %s" % (debug_pretext, 
local_tmp_file)) #EGO
+            #log( __name__ ,"%s argenteam: local_tmp_file %s" % 
(debug_pretext, local_tmp_file)) #EGO
             packed = True
         elif header == 'PK':
             local_tmp_file = os.path.join(tmp_sub_dir, "argenteam.zip")
@@ -130,16 +125,17 @@ def download_subtitles (subtitles_list, pos, zip_subs, 
tmp_sub_dir, sub_folder,
             packed = False
         log( __name__ ,"%s Saving subtitles to '%s'" % (debug_pretext, 
local_tmp_file))
         try:
-            log( __name__ ,"%s argenteam: escribo en %s" % (debug_pretext, 
local_tmp_file)) #EGO
+            #log( __name__ ,"%s argenteam: escribo en %s" % (debug_pretext, 
local_tmp_file)) #EGO
             local_file_handle = open(local_tmp_file, "wb")
             local_file_handle.write(content)
             local_file_handle.close()
         except:
-            log( __name__ ,"%s Failed to save subtitles to '%s'" % 
(debug_pretext, local_tmp_file))
+            pass
+            #log( __name__ ,"%s Failed to save subtitles to '%s'" % 
(debug_pretext, local_tmp_file))
         if packed:
             files = os.listdir(tmp_sub_dir)
             init_filecount = len(files)
-            log( __name__ ,"%s argenteam: número de init_filecount %s" % 
(debug_pretext, init_filecount)) #EGO
+            #log( __name__ ,"%s argenteam: número de init_filecount %s" % 
(debug_pretext, init_filecount)) #EGO
             filecount = init_filecount
             max_mtime = 0
             # determine the newest file from tmp_sub_dir

http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=e5c019bf4108ec5e739677a99006afba301891b9

commit e5c019bf4108ec5e739677a99006afba301891b9
Author: amet <[email protected]>
Date:   Thu Mar 29 02:01:09 2012 +0400

    [script.xbmc.blindplayer] -v1.2.3
    
    Fix playlist load/save and test on XBMCbuntu Eden 11

diff --git a/script.xbmc.blindplayer/README.md 
b/script.xbmc.blindplayer/README.md
index 7603b0b..6cfb891 100644
--- a/script.xbmc.blindplayer/README.md
+++ b/script.xbmc.blindplayer/README.md
@@ -5,7 +5,7 @@ This script helps using xbmc as music player only, without the 
need for display
 Script mainly works for music files, when started without parameters or with 
the 'music' parameter.
 It might plays also audio track from videos, when started with the 'video' 
parameter.
 On startup script scans all media mentioned in the sources.xml file, creating 
a scan list.
-If the list already exists if will be reused. To rescan press 'Rescan' button..
+If the list already exists if will be reused. To rescan press 'Rescan' button.
 
 Script works in three modes, NORMAL, PROGRAM and ALBUM.
 NORMAL and PROGRAM modes have their own playlists. These playlists are 
mutually exclusive and together
@@ -18,7 +18,7 @@ And vice versa, pressing OK while in PROGRAM mode will move 
the current track to
 To switch to the PROGRAM mode press 'Normal mode' button, it will also disable 
any repeat mode.
 To switch to the ALBUM mode press 'Progrem mode' button, it will also disable 
any repeat mode.
 
-There are two repeat modes:
+There are three repeat modes:
 one - plays repeatedly current track, activate it with 'Repeat one' button.
 all - plays repeatedly current playlist (or limited to single album if in 
ALBUM mode), activate it with 'Repeat all' button.
 A-B - plays repeatedly selected part of a track, activate it with 'Repeat A-B' 
button
diff --git a/script.xbmc.blindplayer/addon.xml 
b/script.xbmc.blindplayer/addon.xml
index e2a3f78..b6b730b 100644
--- a/script.xbmc.blindplayer/addon.xml
+++ b/script.xbmc.blindplayer/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="script.xbmc.blindplayer" name="Blind Player XBMC Script" 
version="1.2.2" provider-name="prudy">
+<addon id="script.xbmc.blindplayer" name="Blind Player XBMC Script" 
version="1.2.3" provider-name="prudy">
   <requires>
     <import addon="xbmc.python" version="2.0"/>
   </requires>
@@ -14,7 +14,7 @@ This script helps using xbmc as music player only, without 
the need for display
 Script mainly works for music files, when started without parameters or with 
the 'music' parameter.
 It might plays also audio track from videos, when started with the 'video' 
parameter.
 On startup script scans all media mentioned in the sources.xml file, creating 
a scan list.
-If the list already exists if will be reused. To rescan press 'Rescan' button..
+If the list already exists if will be reused. To rescan press 'Rescan' button.
 
 Script works in three modes, NORMAL, PROGRAM and ALBUM.
 NORMAL and PROGRAM modes have their own playlists. These playlists are 
mutually exclusive and together
@@ -27,7 +27,7 @@ And vice versa, pressing OK while in PROGRAM mode will move 
the current track to
 To switch to the PROGRAM mode press 'Normal mode' button, it will also disable 
any repeat mode.
 To switch to the ALBUM mode press 'Progrem mode' button, it will also disable 
any repeat mode.
 
-There are two repeat modes:
+There are three repeat modes:
 one - plays repeatedly current track, activate it with 'Repeat one' button.
 all - plays repeatedly current playlist (or limited to single album if in 
ALBUM mode), activate it with 'Repeat all' button.
 A-B - plays repeatedly selected part of a track, activate it with 'Repeat A-B' 
button
diff --git a/script.xbmc.blindplayer/changelog.txt 
b/script.xbmc.blindplayer/changelog.txt
index 659d419..e6bd215 100644
--- a/script.xbmc.blindplayer/changelog.txt
+++ b/script.xbmc.blindplayer/changelog.txt
@@ -1,14 +1,16 @@
-Version 1.2.2  Add a hot-key to startup script with a button press.
+Version 1.2.3 Fix playlist load/save and test on XBMCbuntu Eden 11
 
-Version 1.2.1  Add repeat A-B mode, plus small fixes
+Version 1.2.2 Add a hot-key to startup script with a button press.
 
-Version 1.2.0  updated to xbmc Eden, tested with XBMC Eden live 11 beta3
+Version 1.2.1 Add repeat A-B mode, plus small fixes
 
-Version 1.1.2  fixed exceptions, tested with XBMC live 10.2
+Version 1.2.0 updated to xbmc Eden, tested with XBMC Eden live 11 beta3
 
-Version 1.1.0  change the program mode so it keeps track of the files order,
+Version 1.1.2 fixed exceptions, tested with XBMC live 10.2
+
+Version 1.1.0 change the program mode so it keeps track of the files order,
 fix switching from normal to currently selected album mode,
 readme not updated to respect above changes,
 tested with XBMC live 10.2
 
-Version 1.0.0  initial release, tested with XBMC live 10.2
\ No newline at end of file
+Version 1.0.0 initial release, tested with XBMC live 10.2
\ No newline at end of file
diff --git a/script.xbmc.blindplayer/resources/language/English/strings.xml 
b/script.xbmc.blindplayer/resources/language/English/strings.xml
index 457e564..099f659 100644
--- a/script.xbmc.blindplayer/resources/language/English/strings.xml
+++ b/script.xbmc.blindplayer/resources/language/English/strings.xml
@@ -36,4 +36,6 @@
   <string id="30116">Navigate</string>
   <string id="30117">Repeat: A-?</string>
   <string id="30118">Repeat: A-B</string>
+  <string id="30119">Save to #1..9</string>
+  <string id="30120">Load from #1..9</string>
 </strings>
diff --git a/script.xbmc.blindplayer/resources/lib/gui.py 
b/script.xbmc.blindplayer/resources/lib/gui.py
index 177a06b..1305af6 100644
--- a/script.xbmc.blindplayer/resources/lib/gui.py
+++ b/script.xbmc.blindplayer/resources/lib/gui.py
@@ -775,15 +775,13 @@ class Album:
             for t in range(len(self.npTracks[a])):
                 self.npTracks[a][t] = L_NORM
 
-    def OpenGeneral(self, fname):
-        global IOError
+    def OpenGeneral(self, f):
         self.albums[:] = []
         self.tracks[:] = []
         self.npAlbums[:] = [] #empty it
         self.npTracks[:] = [] #empty it
         self.program[:] = [] #empty it
         try:
-            f = open(fname, 'r')
             withinAlbumName = ''
             for track in f.readlines():
                 track = track.strip('\n')
@@ -798,12 +796,14 @@ class Album:
                     self.tracks.append([trackName])
                     self.npAlbums.append(L_NORM)
                     self.npTracks.append([L_NORM])
-            f.close()
-        except IOError, e:
-            debuglog("Open %s" % e)
+        except:
+            return False
+        return True
+
 
-    def OpenNormal(self, fname):
-        global ValueError, IOError
+    def OpenNormal(self, f):
+        global ValueError
+        self.program[:] = [] #empty it
         for a in range(len(self.npAlbums)):
             self.npAlbums[a] = L_PROG
             for t in range(len(self.npTracks[a])):
@@ -827,20 +827,18 @@ class Album:
                             self.program.remove([a,t])
                         except ValueError:
                             # the list is broken
-                            pass                            
-            f.close()
-        except IOError, e:
-            debuglog("Open %s" % e)
+                            pass
+        except:
+            return False
+        return True
 
-    def OpenProgram(self, fname):
-        global IOError
+    def OpenProgram(self, f):
         self.program[:] = [] #empty it
         for a in range(len(self.npAlbums)):
             self.npAlbums[a] = L_NORM
             for t in range(len(self.npTracks[a])):
                 self.npTracks[a][t] = L_NORM
         try:
-            f = open(fname, 'r')
             for l in f.readlines():
                 l = l.strip('\n')
                 pos = [(int(e) + 1) for e in l.split(',')]
@@ -855,21 +853,24 @@ class Album:
                         except:
                             self.npAlbums[a] = L_PROG #assign album to program 
list only
                         self.program.append([a,t]) 
-            f.close()
-        except IOError, e:
-            debuglog("Open %s" % e)
+        except:
+            return False
+        return True
 
     def Open(self, fname, destination = L_BOTH):
         try:
-            if destination == L_PROG:
-                self.OpenProgram(fname)
-            elif destination == L_NORM:
-                self.OpenNormal(fname)
-            else:
-                self.OpenGeneral(fname)
+            f = open(fname, 'r')
         except:
             return False
-        return True
+        if destination == L_PROG:
+            status = self.OpenProgram(f)
+        elif destination == L_NORM:
+            status = self.OpenNormal(f)
+        else:
+            status = self.OpenGeneral(f)
+
+        f.close()
+        return status
 
     def ShortPlaylistNormal(self):
         for a in range(len(self.npAlbums)):
@@ -883,7 +884,6 @@ class Album:
             yield "%s" % (','.join(str(n) for n in e))
     
     def Save(self, fname, destination = L_BOTH):
-        global IOError
         if destination == L_PROG:
             pL = self.ShortPlaylistProgram()
         elif destination == L_NORM:
@@ -892,14 +892,15 @@ class Album:
             pL = self.PlaylistGeneral()
         try:
             f = open(fname, 'w')
-            f.writelines("%s\n" % e for e in pL)
-            f.close()
-        except IOError, e:
-            debuglog("Save %s" % e)
-            return False
         except:
             return False
-        return True
+        status = False
+        try:
+            f.writelines("%s\n" % e for e in pL)
+            status = True
+        finally:
+            f.close()
+        return status
 
     def PlaylistGeneral(self):
         for a, albumName in enumerate(self.albums):
@@ -1114,6 +1115,10 @@ class CallbackPlayer(xbmc.Player):
     def stop(self, *args): # not thread safe with other APIs
         self.paused = False
         xbmc.Player.stop(self, *args)
+        #Problem: Calling anything from the onAction() code of GUI shows that
+        #         no callback is received until the onAction() is finished.
+        #         Cannot us the callback for synchronization thus use simle 
timeout.
+        xbmc.sleep(300)
 
     def pause(self, *args): # not thread safe with other APIs
         self.paused = not self.paused
@@ -1318,26 +1323,26 @@ class GUI( xbmcgui.WindowXMLDialog ):
         if self.setup == True:
            text = __language__(30100)
         else:
-        if self.mode == L_NORM:
-          if self.thisAlbumOnly == True:
-             text = __language__(30101) + "\n"
-          else:
-             text = __language__(30102) + "\n"
-        else:
-          text = __language__(30103) + "\n"
-        if self.repeatAB == AB_REPEATER_A:
-          text += __language__(30117) + "\n"
-        elif self.repeatAB == AB_REPEATER_AB:
-          text += __language__(30118) + "\n"
-        elif self.loop == LOOP_ONE:
-          text += __language__(30104) + "\n"
-        elif self.loop == LOOP_ALL:
-          text += __language__(30105) + "\n"
-        else:
-          text += __language__(30106) + "\n"
-        if self.powerOff == True:
-          text += __language__(30107)
-       self.getControl(999).setLabel(text)
+           if self.mode == L_NORM:
+               if self.thisAlbumOnly == True:
+                   text = __language__(30101) + "\n"
+               else:
+                   text = __language__(30102) + "\n"
+           else:
+               text = __language__(30103) + "\n"
+           if self.repeatAB == AB_REPEATER_A:
+               text += __language__(30117) + "\n"
+           elif self.repeatAB == AB_REPEATER_AB:
+               text += __language__(30118) + "\n"
+           elif self.loop == LOOP_ONE:
+               text += __language__(30104) + "\n"
+           elif self.loop == LOOP_ALL:
+               text += __language__(30105) + "\n"
+           else:
+               text += __language__(30106) + "\n"
+           if self.powerOff == True:
+               text += __language__(30107)
+        self.getControl(999).setLabel(text)
 
     def Setup(self, on = True):
         if on == True:
@@ -1559,7 +1564,7 @@ class GUI( xbmcgui.WindowXMLDialog ):
     def onAction(self, action):
         class BreakException(Exception):
             pass
-            
+
         if not self.lock_onAction.acquire(False):
             return
 
@@ -1601,7 +1606,7 @@ class GUI( xbmcgui.WindowXMLDialog ):
                actionId = BP_ACTION_NONE
                raise BreakException
 
-            
+            refresh = False
             if actionId == BP_ACTION_PREVIOUS_MENU:
                self.powerOff = False
                self.lock_onAction.release()
@@ -1656,7 +1661,7 @@ class GUI( xbmcgui.WindowXMLDialog ):
                     if number > 0:
                         self.playerLock.acquire()
                         self.InfoText("%s #%d" % (__language__(30110), 
number), __language__(30111))
-                        fname = xbmc.translatePath( 
os.path.join(HOME_SCRIPT_DIR, "%s.%d" % (AV_NAMES[self.avMode], number)) )
+                        fname = xbmc.translatePath( os.path.join(TEMP_DIR, 
"blindplayer.%s%d" % (AV_NAMES[self.avMode], number)) )
                         self.movePos = []
                         self.thisAlbumOnly = False
                         self.loop = LOOP_DISABLED
@@ -1664,22 +1669,23 @@ class GUI( xbmcgui.WindowXMLDialog ):
                         playing = self.player.isPlaying()
                         if playing:
                             self.player.stop()
-                        if not self.A.Open(fname, self.mode):
-                            self.A.Normalize()
-                        self.ComposeNewPlaylist()
-                        pos = self.A.NextAlbum(self.mode, False, [1,1])
-                        self.A.Pos(pos)
-                        self.InfoText()
-                        if playing:
-                            self.player.play(self.playlist, None, True)
+                        if self.A.Open(fname, self.mode):
+                            self.ComposeNewPlaylist()
+                            pos = self.A.NextAlbum(self.mode, False, [1,1])
+                            self.A.Pos(pos)
+                            if playing:
+                                self.player.play(self.playlist, None, True)
+                            else:
+                                xbmc.playSFX(xbmc.translatePath( 
os.path.join(XBMC_DIR, 'addons', 'skin.confluence', 'sounds', 'notify.wav') ))
                         self.playerLock.release()
                 elif self.onNumberAction[1] == NUMBER_ACTION_SAVE:
                     if number > 0:
                         self.playerLock.acquire()
                         self.InfoText("%s #%d" % (__language__(30110), 
number), __language__(30112))
-                        fname = xbmc.translatePath( 
os.path.join(HOME_SCRIPT_DIR, "%s.%d" % (AV_NAMES[self.avMode], number)) )
+                        fname = xbmc.translatePath( os.path.join(TEMP_DIR, 
"blindplayer.%s%d" % (AV_NAMES[self.avMode], number)) )
                         self.A.Save(fname, self.mode)
-                        self.InfoText()
+                        if not self.player.isPlaying():
+                            xbmc.playSFX(xbmc.translatePath( 
os.path.join(XBMC_DIR, 'addons', 'skin.confluence', 'sounds', 'notify.wav') ))
                         self.playerLock.release()
                 else:
                     if not self.BC.active():
@@ -1721,8 +1727,10 @@ class GUI( xbmcgui.WindowXMLDialog ):
                 self.playerLock.release()
             elif actionId == BP_ACTION_LOAD:
                 self.onNumberAction[0] = NUMBER_ACTION_LOAD
+                self.InfoText(__language__(30110), __language__(30120))
             elif actionId == BP_ACTION_SAVE:
                 self.onNumberAction[0] = NUMBER_ACTION_SAVE
+                self.InfoText(__language__(30110), __language__(30119))
             elif actionId == BP_ACTION_RESCAN:
                 self.playerLock.acquire()
                 self.movePos = []
@@ -1751,7 +1759,7 @@ class GUI( xbmcgui.WindowXMLDialog ):
                 else:
                     xbmc.playSFX(xbmc.translatePath( os.path.join(XBMC_DIR, 
'addons', 'skin.confluence', 'sounds', 'notify.wav') ))
                 self.playerLock.release()
-                self.NavigationInfo(True)
+                refresh = True
             elif actionId == BP_ACTION_PROGRAM:
                 self.playerLock.acquire()
                 xbmc.executebuiltin("xbmc.playercontrol(repeatoff)")
@@ -2036,13 +2044,19 @@ class GUI( xbmcgui.WindowXMLDialog ):
                 actionId = BP_ACTION_NONE
         except BreakException:
             pass
+        
+        self.setupSequence = actionId
+        
         if actionId != BP_ACTION_NONE:
-            self.setupSequence = actionId
             if self.onNumberAction[0] != NUMBER_ACTION_BC_ALBUM and 
self.onNumberAction[0] != NUMBER_ACTION_BC_TRACK:
                 self.BC.cancel()
+            
+            if self.onNumberAction[1] != NUMBER_ACTION_NONE:
+                refresh = True
             self.onNumberAction[1:len(self.onNumberAction)] = 
self.onNumberAction[0:len(self.onNumberAction)-1]
             self.onNumberAction[0] = NUMBER_ACTION_NONE
-            self.NavigationInfo()
+        
+            self.NavigationInfo(refresh)
         self.lock_onAction.release()
 
     def __exit(self):

-----------------------------------------------------------------------

Summary of changes:
 script.xbmc.blindplayer/README.md                  |    4 +-
 script.xbmc.blindplayer/addon.xml                  |    6 +-
 script.xbmc.blindplayer/changelog.txt              |   14 +-
 .../resources/language/English/strings.xml         |    2 +
 script.xbmc.blindplayer/resources/lib/gui.py       |  150 +++++++++++---------
 script.xbmc.subtitles/addon.xml                    |    2 +-
 script.xbmc.subtitles/changelog.txt                |    4 +
 script.xbmc.subtitles/resources/lib/gui.py         |    3 +-
 .../resources/lib/services/Argenteam/service.py    |   28 ++--
 9 files changed, 116 insertions(+), 97 deletions(-)


hooks/post-receive
-- 
Scripts

------------------------------------------------------------------------------
This SF email is sponsosred by:
Try Windows Azure free for 90 days Click Here 
http://p.sf.net/sfu/sfd2d-msazure
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons

Reply via email to