API tools faq
paste
Advertisement
Guest User

XBMC Cinema Experience 2.0.57 Trivia Display Timer patch

a guest
Jul 10th, 2012
115
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 11.38 KB | None | 0 0
raw download clone embed print report
  1. --- resources/language/English/strings.xml  Mon Jan 19 17:26:36 1970
  2. +++ resources/language/English/strings.xml  Mon Jan 19 17:26:36 1970
  3. @@ -61,6 +61,10 @@
  4.      <string id="32216">Movie Quiz Script Question Limit</string>
  5.      <string id="32217">Movie Quiz Script Mode</string>
  6.      <string id="32220">- Show each Slide for(in Seconds)</string>
  7. +    <string id="32292">- Show each Question Slide for(in Seconds)</string>
  8. +    <string id="32293">- Show each Answer Slide for(in Seconds)</string>
  9. +    <string id="32294">- Show each Clue Slide for(in Seconds)</string>
  10. +    <string id="32295">- Show each Still Slide for(in Seconds)</string>
  11.      <string id="32221">5 sec</string>
  12.      <string id="32222">10 sec</string>
  13.      <string id="32223">15 sec</string>
  14. --- resources/lib/slides.py Mon Jan 19 17:26:36 1970
  15. +++ resources/lib/slides.py Mon Jan 19 17:26:36 1970
  16. @@ -89,22 +89,22 @@
  17.                      if ( question ):
  18.                          tmp_slides += [ [ "", "", "" ] ]
  19.                          clue = answer = False
  20. -                    tmp_slides[ -1 ][ 0 ] = entry
  21. +                    tmp_slides[ -1 ][ 0 ] = "__question__" + entry
  22.                  # clue
  23.                  elif ( clue_format and re.search( clue_format, os.path.basename( entry ), re.IGNORECASE ) ):
  24.                      if ( clue ):
  25.                          tmp_slides += [ [ "", "", "" ] ]
  26.                          question = answer = False
  27. -                    tmp_slides[ -1 ][ 1 ] = entry
  28. +                    tmp_slides[ -1 ][ 1 ] = "__clue__" + entry
  29.                  # answer
  30.                  elif ( answer_format and re.search( answer_format, os.path.basename( entry ), re.IGNORECASE ) ):
  31.                      if ( answer ):
  32.                          tmp_slides += [ [ "", "", "" ] ]
  33.                          question = clue = False
  34. -                    tmp_slides[ -1 ][ 2 ] = entry
  35. +                    tmp_slides[ -1 ][ 2 ] = "__answer__" + entry
  36.              # add the file as a question TODO: maybe check for valid picture format?
  37.              elif ( entry and os.path.splitext( entry )[ 1 ].lower() in xbmc.getSupportedMedia( "picture" ) ):
  38. -                tmp_slides += [ [ "", "", entry ] ]
  39. +                tmp_slides += [ [ "", "", "__question__" + entry ] ]
  40.      # if there are folders call again (we want recursive)
  41.      if ( folders ):
  42.          tmp_slides.extend( _get_slides( folders, movie_mpaa ) )
  43. --- resources/lib/xbmcscript_trivia.py  Mon Jan 19 17:26:36 1970
  44. +++ resources/lib/xbmcscript_trivia.py  Mon Jan 19 17:26:36 1970
  45. @@ -13,6 +13,7 @@
  46.  from random import shuffle, random
  47.  import re
  48.  import time
  49. +import string
  50.  
  51.  
  52.  _A_ = xbmcaddon.Addon(__scriptID__)
  53. @@ -120,11 +121,21 @@
  54.              self._exit_trivia()
  55.          else:    
  56.              # set the property the image control uses
  57. -            xbmcgui.Window( xbmcgui.getCurrentWindowId() ).setProperty( "Slide", self.slide_playlist[ self.image_count ] )
  58. +            #xbmcgui.Window( xbmcgui.getCurrentWindowId() ).setProperty( "Slide", self.slide_playlist[ self.image_count ] )
  59. +            myslide = self.slide_playlist[ self.image_count ]
  60. +            slide_type = "question"
  61. +            if (re.search("__question__", myslide)) :
  62. +                slide_type = "question"
  63. +                myslide = string.replace(myslide, "__question__", "")
  64. +            elif (re.search("__answer__", myslide)) :
  65. +                slide_type = "answer"
  66. +                myslide = string.replace(myslide, "__answer__", "")
  67. +            xbmc.log("[script.cinema.experience] Slide %s - %s" % (myslide, slide_type), level=xbmc.LOGDEBUG)
  68. +            xbmcgui.Window( xbmcgui.getCurrentWindowId() ).setProperty( "Slide", myslide )
  69.              # add id to watched file TODO: maybe don't add if not user preference
  70.              self.watched += [ xbmc.getCacheThumbName( self.slide_playlist[ self.image_count ] ) ]
  71.              # start slide timer
  72. -            self._get_slide_timer()
  73. +            self._get_slide_timer(slide_type)
  74.          
  75.  
  76.      def _load_watched_trivia_file( self ):
  77. @@ -164,8 +175,14 @@
  78.              delete_file( base_path )
  79.              self.watched = []
  80.  
  81. -    def _get_slide_timer( self ):
  82. -        self.slide_timer = threading.Timer( self.settings[ "trivia_slide_time" ], self._next_slide,() )
  83. +    def _get_slide_timer( self, slide_type="question" ):
  84. +        if (slide_type and slide_type == "question"):
  85. +            timer = self.settings[ "trivia_slide_time" ]
  86. +        elif (slide_type and slide_type == "answer"):
  87. +            timer = self.settings[ "trivia_slide_time_a" ]
  88. +        xbmc.log("[script.cinema.experience] Slide delay %s seconds" % timer, xbmc.LOGDEBUG)
  89. +        #self.slide_timer = threading.Timer( self.settings[ "trivia_slide_time" ], self._next_slide,() )
  90. +        self.slide_timer = threading.Timer( timer, self._next_slide,() )
  91.          self.slide_timer.start()
  92.  
  93.      def _get_global_timer( self, time, function ):
  94. --- resources/settings.xml  Mon Jan 19 17:26:36 1970
  95. +++ resources/settings.xml  Mon Jan 19 17:26:36 1970
  96. @@ -8,25 +8,29 @@
  97.          <setting id="trivia_total_time" type="slider" visible="eq(-1,1)" enable="eq(-1,1)" range="0,60" label="32200" default="5" />        
  98.          <setting id="trivia_folder" type="folder" visible="eq(-2,1)" source="files" label="32210" default="" />
  99.          <setting id="trivia_slide_time" type="slider" visible="eq(-3,1)" enable="!eq(-1,)" range="1,30" label="32220" default="15" />
  100. -        <setting id="trivia_music" type="enum" visible="eq(-4,1) + !eq(-3,0)" enable="!eq(-3,0)" lvalues="32281|32243|32244" label="32231" default="0" />
  101. +        <setting id="trivia_slide_time_q" type="slider" visible="false" enable="!eq(-2,)" range="1,30" label="32292" default="5" />
  102. +        <setting id="trivia_slide_time_a" type="slider" visible="eq(-5,1)" enable="!eq(-3,)" range="1,30" label="32293" default="3" />
  103. +        <setting id="trivia_slide_time_c" type="slider" visible="false" enable="!eq(-4,)" range="1,30" label="32294" default="2" />       
  104. +        <setting id="trivia_slide_time_s" type="slider" visible="false" enable="!eq(-5,)" range="1,30" label="32295" default="7" />
  105. +        <setting id="trivia_music" type="enum" visible="eq(-4,1) + !eq(-7,0)" enable="!eq(-7,0)" lvalues="32281|32243|32244" label="32231" default="0" />
  106.          <setting id="trivia_music_file" type="audio" visible="eq(-1,1) + eq(-5,1)" enable="!eq(-1,0)" label="32230" default="" />
  107.          <setting id="trivia_music_folder" type="folder" visible="eq(-2,2) + eq(-6,1)" enable="!eq(-2,0)" label="32230" default="" />
  108.          <setting id="trivia_adjust_volume" type="bool" visible="!eq(-3,0) + eq(-7,1)" enable="!eq(-3,0)" label="32232" default="true" />
  109.          <setting id="trivia_music_volume" type="slider" visible="!eq(-1,false) + gt(-4,0) + eq(-8,1)" enable="!eq(-1,false) + gt(-4,0)" range="0,100" label="32240" default="100" />
  110.          <setting id="trivia_fade_volume" type="bool" visible="!eq(-2,false) + gt(-5,0) + eq(-9,1)" enable="!eq(-2,false) + gt(-5,0)" label="32241" default="true" />
  111.          <setting id="trivia_fade_time" type="slider" visible="!eq(-3,false) + !eq(-1,false) + gt(-6,0) + eq(-10,1)" enable="!eq(-1,false) + gt(-6,0)" range="0,15" label="32242" default="2" />
  112. -        <setting id="trivia_unwatched_only" type="bool" visible="eq(-11,1)" enable="!eq(-9,)" label="32270" default="false" />
  113. -        <setting type="action" label="32271" visible="eq(-12,1)" enable="!eq(-10,) + eq(-1,true)" action="RunScript($CWD/addon.py,ClearWatchedTrivia)" />
  114. -        <setting id="trivia_moviequiz_mode" type="enum" visible="eq(-13,2)" label="32217" lvalues="32214|32215" default="0" />
  115. -        <setting id="trivia_moviequiz_qlimit" type="slider" visible="eq(-14,2)" label="32216" range="1,60" default="15" />
  116. -        <setting id="trivia_limit_query" type="bool" visible="!eq(-15,0)" label="32290" default="true" />
  117. -        <setting id="trivia_rating" type="labelenum"  visible="!eq(-16,0)"  enable="eq(-1,false)" values="G|PG|PG-13|R|NC-17|--" label="32291" default="--" />
  118. -        <setting id="trivia_intro" type="enum" visible="!eq(-17,0)" lvalues="32281|32282|32283|32284|32285|32286|32287" label="32280" default="0" />
  119. -        <setting id="trivia_intro_file" type="video" visible="!eq(-18,0) + eq(-1,1)" label="32288" default="" />
  120. -        <setting id="trivia_intro_folder" type="folder" visible="!eq(-19,0) + gt(-2,1)" label="32289" default="" />
  121. -        <setting id="trivia_outro" type="enum" visible="!eq(-20,0)" lvalues="32281|32282|32283|32284|32285|32286|32287" label="32250" default="0" />
  122. -        <setting id="trivia_outro_file" type="video" visible="!eq(-21,0) + eq(-1,1)" label="32288" default="" />
  123. -        <setting id="trivia_outro_folder" type="folder" visible="!eq(-22,0) + gt(-2,1)" label="32289" default="" />
  124. +        <setting id="trivia_unwatched_only" type="bool" visible="eq(-15,1)" enable="!eq(-13,)" label="32270" default="false" />
  125. +        <setting type="action" label="32271" visible="eq(-16,1)" enable="!eq(-14,) + eq(-1,true)" action="RunScript($CWD/addon.py,ClearWatchedTrivia)" />
  126. +        <setting id="trivia_moviequiz_mode" type="enum" visible="eq(-17,2)" label="32217" lvalues="32214|32215" default="0" />
  127. +        <setting id="trivia_moviequiz_qlimit" type="slider" visible="eq(-18,2)" label="32216" range="1,60" default="15" />
  128. +        <setting id="trivia_limit_query" type="bool" visible="!eq(-19,0)" label="32290" default="true" />
  129. +        <setting id="trivia_rating" type="labelenum"  visible="!eq(-20,0)"  enable="eq(-1,false)" values="G|PG|PG-13|R|NC-17|--" label="32291" default="--" />
  130. +        <setting id="trivia_intro" type="enum" visible="!eq(-21,0)" lvalues="32281|32282|32283|32284|32285|32286|32287" label="32280" default="0" />
  131. +        <setting id="trivia_intro_file" type="video" visible="!eq(-22,0) + eq(-1,1)" label="32288" default="" />
  132. +        <setting id="trivia_intro_folder" type="folder" visible="!eq(-23,0) + gt(-2,1)" label="32289" default="" />
  133. +        <setting id="trivia_outro" type="enum" visible="!eq(-24,0)" lvalues="32281|32282|32283|32284|32285|32286|32287" label="32250" default="0" />
  134. +        <setting id="trivia_outro_file" type="video" visible="!eq(-25,0) + eq(-1,1)" label="32288" default="" />
  135. +        <setting id="trivia_outro_folder" type="folder" visible="!eq(-26,0) + gt(-2,1)" label="32289" default="" />
  136.      </category>
  137.      
  138.  <!-- Special videos settings -->
  139. --- addon.py    Mon Jan 19 17:26:36 1970
  140. +++ addon.py    Mon Jan 19 17:26:36 1970
  141. @@ -2,9 +2,9 @@
  142.  
  143.  # constants
  144.  __script__ = "Cinema Experience"
  145. -__author__ = "nuka1195-giftie-ackbarr"
  146. +__author__ = "nuka1195-giftie-ackbarr-selrahc"
  147.  __url__ = "https://github.com/Giftie/script.cinema.experience"
  148. -__version__ = "2.0.57"
  149. +__version__ = "2.0.57-mod"
  150.  __scriptID__ = "script.cinema.experience"
  151.  
  152.  import xbmcgui, xbmc, xbmcaddon, os, re, sys
  153. @@ -69,6 +69,7 @@
  154.  __builtin__.slide_settings = {  "trivia_total_time": int( float( _S_( "trivia_total_time" ) ) ),
  155.                                      "trivia_folder": xbmc.translatePath( _S_( "trivia_folder" ) ),
  156.                                  "trivia_slide_time": int( float( _S_( "trivia_slide_time" ) ) ),
  157. +                                "trivia_slide_time_a": int( float( _S_( "trivia_slide_time_a" ) ) ),
  158.                                       "trivia_intro": _S_( "trivia_intro" ),
  159.                                       "trivia_music": _S_( "trivia_music" ),
  160.                               "trivia_adjust_volume": _S_( "trivia_adjust_volume" ),
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!