The branch, frodo has been updated
via 235c72213abe0b09bdb15be1ec9298f0a2d31a59 (commit)
from 5055c84f0dab1d3400344252f38c9c28b4a9f3c6 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=235c72213abe0b09bdb15be1ec9298f0a2d31a59
commit 235c72213abe0b09bdb15be1ec9298f0a2d31a59
Author: Martijn Kaijser <[email protected]>
Date: Fri Feb 14 12:56:53 2014 +0100
[script.xbmc.unpausejumpback] 2.3.0
diff --git a/script.xbmc.unpausejumpback/addon.xml
b/script.xbmc.unpausejumpback/addon.xml
index fbf3e8b..cf4da3c 100644
--- a/script.xbmc.unpausejumpback/addon.xml
+++ b/script.xbmc.unpausejumpback/addon.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="script.xbmc.unpausejumpback" name="XBMC Unpause Jumpback"
version="2.2.0" provider-name="Memphiz|Lucleonhart|schumi2004">
+<addon id="script.xbmc.unpausejumpback" name="XBMC Unpause Jumpback"
version="2.3.0" provider-name="Memphiz|Lucleonhart|schumi2004|bossanova808">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
</requires>
diff --git a/script.xbmc.unpausejumpback/changelog.txt
b/script.xbmc.unpausejumpback/changelog.txt
index ced4a52..5f6c9f0 100644
--- a/script.xbmc.unpausejumpback/changelog.txt
+++ b/script.xbmc.unpausejumpback/changelog.txt
@@ -1,3 +1,6 @@
+2.3.0
+- add jumpback after playback started from non zero starting time (needs
gotham for working properly!)
+
2.2.0
- add exclude settings
- add jumpback/forward after fwd or rwd based on the fwd/rwd speed (can be
adjusted for each speed separately for fwd and rwd).
diff --git a/script.xbmc.unpausejumpback/default.py
b/script.xbmc.unpausejumpback/default.py
index b834094..c02faba 100644
--- a/script.xbmc.unpausejumpback/default.py
+++ b/script.xbmc.unpausejumpback/default.py
@@ -45,6 +45,7 @@ global g_jumpBackSecsAfterRwdX4
global g_jumpBackSecsAfterRwdX8
global g_jumpBackSecsAfterRwdX16
global g_jumpBackSecsAfterRwdX32
+global g_jumpBackSecsAfterResume
global g_lastPlaybackSpeed
global g_pausedTime
global g_waitForJumpback
@@ -115,6 +116,7 @@ def loadSettings():
global g_jumpBackSecsAfterRwdX8
global g_jumpBackSecsAfterRwdX16
global g_jumpBackSecsAfterRwdX32
+ global g_jumpBackSecsAfterResume
g_jumpBackSecsAfterFwdPause =
int(float(__addon__.getSetting("jumpbacksecs")))
g_jumpBackSecsAfterFwdX2 =
int(float(__addon__.getSetting("jumpbacksecsfwdx2")))
@@ -127,6 +129,7 @@ def loadSettings():
g_jumpBackSecsAfterRwdX8 =
int(float(__addon__.getSetting("jumpbacksecsrwdx8")))
g_jumpBackSecsAfterRwdX16 =
int(float(__addon__.getSetting("jumpbacksecsrwdx16")))
g_jumpBackSecsAfterRwdX32 =
int(float(__addon__.getSetting("jumpbacksecsrwdx32")))
+ g_jumpBackSecsAfterResume =
int(float(__addon__.getSetting("jumpbacksecsresume")))
g_waitForJumpback = int(float(__addon__.getSetting("waitforjumpback")))
log('Settings loaded! JumpBackSecs: %d, WaitSecs: %d' %
(g_jumpBackSecsAfterFwdPause, g_waitForJumpback))
@@ -134,6 +137,23 @@ class MyPlayer( xbmc.Player ):
def __init__( self, *args, **kwargs ):
xbmc.Player.__init__( self )
log('MyPlayer - init')
+
+ def onPlayBackStarted(self):
+ global g_jumpBackSecsAfterResume
+ currentTime = xbmc.Player().getTime()
+ log('Playback started at ' + str(currentTime))
+
+ # check for exclusion
+ _filename = self.getPlayingFile()
+ if isExcluded(_filename):
+ log("Ignored because '%s' is in exclusion settings." % _filename)
+ return
+
+ else:
+ if currentTime > 0 and g_jumpBackSecsAfterResume > 0:
+ resumeTime = currentTime - g_jumpBackSecsAfterResume
+ log("Resuming playback from saved time: " + str(currentTime) + " with
jumpback seconds: " + str(g_jumpBackSecsAfterResume) + " - resume time: " +
str(resumeTime))
+ xbmc.Player().seekTime(resumeTime)
def onPlayBackPaused( self ):
global g_pausedTime
diff --git a/script.xbmc.unpausejumpback/resources/language/English/strings.xml
b/script.xbmc.unpausejumpback/resources/language/English/strings.xml
index 85e83e7..6fe4675 100644
--- a/script.xbmc.unpausejumpback/resources/language/English/strings.xml
+++ b/script.xbmc.unpausejumpback/resources/language/English/strings.xml
@@ -9,15 +9,16 @@
<string id="32013">Jump after x8</string>
<string id="32014">Jump after x16</string>
<string id="32015">Jump after x32</string>
- <string id="32020">Jump forward after rwd</string>
- <string id="32021">Jump after x2</string>
- <string id="32022">Jump after x4</string>
- <string id="32023">Jump after x8</string>
- <string id="32024">Jump after x16</string>
- <string id="32025">Jump after x32</string>
+ <string id="32020">Jump forward after rwd</string>
+ <string id="32021">Jump after x2</string>
+ <string id="32022">Jump after x4</string>
+ <string id="32023">Jump after x8</string>
+ <string id="32024">Jump after x16</string>
+ <string id="32025">Jump after x32</string>
<string id="32030">Exclude</string>
<string id="32031">Exclude Live TV</string>
<string id="32032">Exclude HTTP sources</string>
<string id="32033">Exclude path</string>
<string id="32034">Folder's path (and subfolders)</string>
+ <string id="32040">Jump after resume</string>
</strings>
diff --git a/script.xbmc.unpausejumpback/resources/settings.xml
b/script.xbmc.unpausejumpback/resources/settings.xml
index 0bc85a8..01dd201 100644
--- a/script.xbmc.unpausejumpback/resources/settings.xml
+++ b/script.xbmc.unpausejumpback/resources/settings.xml
@@ -18,6 +18,9 @@
<setting id="jumpbacksecsrwdx16" type="slider" label="32024" default="16"
range="0,60" />
<setting id="jumpbacksecsrwdx32" type="slider" label="32025" default="32"
range="0,60" />
</category>
+ <category label="32040">
+ <setting id="jumpbacksecsresume" type="slider" label="32040" default="8"
range="0,60" />
+ </category>
<category label="32030">
<setting id="ExcludeLiveTV" type="bool" label="32031" default="false"/>
<setting id="ExcludeHTTP" type="bool" label="32032" default="false"/>
-----------------------------------------------------------------------
Summary of changes:
script.xbmc.unpausejumpback/addon.xml | 2 +-
script.xbmc.unpausejumpback/changelog.txt | 3 +++
script.xbmc.unpausejumpback/default.py | 20 ++++++++++++++++++++
.../resources/language/English/strings.xml | 13 +++++++------
script.xbmc.unpausejumpback/resources/settings.xml | 3 +++
5 files changed, 34 insertions(+), 7 deletions(-)
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
Android apps run on BlackBerry 10
Introducing the new BlackBerry 10.2.1 Runtime for Android apps.
Now with support for Jelly Bean, Bluetooth, Mapview and more.
Get your Android app in front of a whole new audience. Start now.
http://pubads.g.doubleclick.net/gampad/clk?id=124407151&iu=/4140/ostg.clktrk
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
