mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-next
This commit is contained in:
Stephan Raue
commit
08c215b54c
@ -20,7 +20,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="CouchPotatoServer"
|
||||
PKG_VERSION="e1d7440"
|
||||
PKG_VERSION="393c14d"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="OSS"
|
||||
|
||||
13
packages/3rdparty/download/CouchPotatoServer/patches/CouchPotatoServer-393c14d-move-cache.patch
vendored
Normal file
13
packages/3rdparty/download/CouchPotatoServer/patches/CouchPotatoServer-393c14d-move-cache.patch
vendored
Normal file
@ -0,0 +1,13 @@
|
||||
diff --git a/couchpotato/runner.py b/couchpotato/runner.py
|
||||
index c0b7eb8..3a550f9 100644
|
||||
--- a/couchpotato/runner.py
|
||||
+++ b/couchpotato/runner.py
|
||||
@@ -112,7 +112,7 @@ def runCouchPotato(options, base_path, args, data_dir = None, log_dir = None, En
|
||||
Env.set('data_dir', data_dir)
|
||||
Env.set('log_path', os.path.join(log_dir, 'CouchPotato.log'))
|
||||
Env.set('db_path', 'sqlite:///' + db_path)
|
||||
- Env.set('cache_dir', os.path.join(data_dir, 'cache'))
|
||||
+ Env.set('cache_dir', os.path.join(data_dir, 'cache.cpv2'))
|
||||
Env.set('cache', FileSystemCache(os.path.join(Env.get('cache_dir'), 'python')))
|
||||
Env.set('console_log', options.console_log)
|
||||
Env.set('quiet', options.quiet)
|
||||
2
packages/3rdparty/download/Headphones/meta
vendored
2
packages/3rdparty/download/Headphones/meta
vendored
@ -20,7 +20,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="Headphones"
|
||||
PKG_VERSION="d07dc39"
|
||||
PKG_VERSION="263272c"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="OSS"
|
||||
|
||||
2
packages/3rdparty/download/SABnzbd/meta
vendored
2
packages/3rdparty/download/SABnzbd/meta
vendored
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="SABnzbd"
|
||||
PKG_VERSION="0.7.3"
|
||||
PKG_VERSION="0.7.9"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="OSS"
|
||||
|
||||
2
packages/3rdparty/download/SickBeard/meta
vendored
2
packages/3rdparty/download/SickBeard/meta
vendored
@ -20,7 +20,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="SickBeard"
|
||||
PKG_VERSION="b7cf06e"
|
||||
PKG_VERSION="e6dcfb3"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="OSS"
|
||||
|
||||
@ -1,44 +0,0 @@
|
||||
diff -Naur SickBeard-9b43f71/data/interfaces/default/config.tmpl SickBeard-9b43f71.patch/data/interfaces/default/config.tmpl
|
||||
--- SickBeard-9b43f71/data/interfaces/default/config.tmpl 2011-12-14 04:42:55.000000000 +0100
|
||||
+++ SickBeard-9b43f71.patch/data/interfaces/default/config.tmpl 2011-12-14 04:56:35.317466009 +0100
|
||||
@@ -25,9 +25,4 @@
|
||||
</table>
|
||||
</div>
|
||||
|
||||
-<table class="infoTable" cellspacing="1" border="0" cellpadding="0"><tr>
|
||||
- <td><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=JA8M7VDY89SQ4" onclick="window.open(this.href); return false;"><img src="$sbRoot/images/paypal/btn_donateCC_LG.gif" alt="[donate]" /></a></td>
|
||||
- <td>Sickbeard is free, but you can contribute by giving a <b><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=JA8M7VDY89SQ4" onclick="window.open(this.href); return false;">donation</a></b>.</td>
|
||||
-</tr></table>
|
||||
-
|
||||
#include $os.path.join($sickbeard.PROG_DIR, "data/interfaces/default/inc_bottom.tmpl")
|
||||
diff -Naur SickBeard-9b43f71/data/interfaces/default/inc_top.tmpl SickBeard-9b43f71.patch/data/interfaces/default/inc_top.tmpl
|
||||
--- SickBeard-9b43f71/data/interfaces/default/inc_top.tmpl 2011-12-14 04:42:55.000000000 +0100
|
||||
+++ SickBeard-9b43f71.patch/data/interfaces/default/inc_top.tmpl 2011-12-14 04:56:35.318466029 +0100
|
||||
@@ -140,19 +140,6 @@
|
||||
</head>
|
||||
|
||||
<body>
|
||||
-#if $sickbeard.NEWEST_VERSION_STRING:
|
||||
-<div id="upgrade-notification">
|
||||
- <div>
|
||||
- <span class="notify-text">$sickbeard.NEWEST_VERSION_STRING</span>
|
||||
- </div>
|
||||
-</div>
|
||||
-<div id="header-fix"></div>
|
||||
-#end if
|
||||
-<div id="header">
|
||||
- <a name="top"></a>
|
||||
- <span id="logo"><a href="$sbRoot/home/" title="Sick Beard homepage"><img alt="Sick Beard" src="$sbRoot/images/sickbeard_small.png" width="150" /></a></span>
|
||||
- <span id="versiontext">alpha $sickbeard.version.SICKBEARD_VERSION</span>
|
||||
-</div>
|
||||
<ul id="MainMenu" class="sf-menu">
|
||||
<li id="NAVsystem" class="first"><a href="#" class="navIcon" onclick="return false;"><img src="$sbRoot/images/menu/system18.png" alt="" width="18" height="18" /></a>
|
||||
<ul>
|
||||
@@ -194,7 +181,6 @@
|
||||
<li><a href="$sbRoot/errorlogs/viewlog/"><img src="$sbRoot/images/menu/viewlog16.png" alt="" width="16" height="16" />View Log</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
- <li id="donate"><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=JA8M7VDY89SQ4" onclick="window.open(this.href); return false;"><img src="$sbRoot/images/paypal/btn_donate_LG.gif" alt="[donate]" /></a></li>
|
||||
</ul>
|
||||
#if $varExists('submenu'):
|
||||
<div id="SubMenu">
|
||||
@ -0,0 +1,55 @@
|
||||
diff --git a/data/interfaces/default/config.tmpl b/data/interfaces/default/config.tmpl
|
||||
index ec28766..fdf3e30 100644
|
||||
--- a/data/interfaces/default/config.tmpl
|
||||
+++ b/data/interfaces/default/config.tmpl
|
||||
@@ -36,13 +36,4 @@
|
||||
</table>
|
||||
</div>
|
||||
|
||||
-<div class="container padding" style="width: 600px;">
|
||||
- <table class="infoTable">
|
||||
- <tr>
|
||||
- <td><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=JA8M7VDY89SQ4" onclick="window.open(this.href); return false;"><img src="$sbRoot/images/paypal/btn_donateCC_LG.gif" alt="[donate]" /></a></td>
|
||||
- <td>Sick Beard is free, but you can contribute by giving a <b><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=JA8M7VDY89SQ4" onclick="window.open(this.href); return false;">donation</a></b>.</td>
|
||||
- </tr>
|
||||
- </table>
|
||||
-</div>
|
||||
-
|
||||
#include $os.path.join($sickbeard.PROG_DIR, "data/interfaces/default/inc_bottom.tmpl")
|
||||
diff --git a/data/interfaces/default/inc_top.tmpl b/data/interfaces/default/inc_top.tmpl
|
||||
index f791be8..fb38f17 100644
|
||||
--- a/data/interfaces/default/inc_top.tmpl
|
||||
+++ b/data/interfaces/default/inc_top.tmpl
|
||||
@@ -108,20 +108,6 @@
|
||||
|
||||
<body>
|
||||
<header>
|
||||
-#if $sickbeard.NEWEST_VERSION_STRING:
|
||||
-<div id="upgrade-notification">
|
||||
- <div>
|
||||
- <span class="notify-text">$sickbeard.NEWEST_VERSION_STRING</span>
|
||||
- </div>
|
||||
-</div>
|
||||
-<div id="header-fix"></div>
|
||||
-#end if
|
||||
-<div id="header">
|
||||
- <a name="top"></a>
|
||||
- <span id="logo"><a href="$sbRoot/home/" title="Sick Beard homepage"><img alt="Sick Beard" src="$sbRoot/images/sickbeard.png" width="150" height="72" /></a></span>
|
||||
- <span id="versiontext">alpha <a href="https://github.com/midgetspy/Sick-Beard/wiki/ChangeLog" onclick="window.open(this.href, '_blank'); return false;">$sickbeard.version.SICKBEARD_VERSION</a></span>
|
||||
-</div>
|
||||
-
|
||||
<div class="navbar">
|
||||
<div class="navbar-inner">
|
||||
<div class="container">
|
||||
@@ -208,11 +194,6 @@
|
||||
</li>
|
||||
<li class="divider-vertical"></li>
|
||||
</ul>
|
||||
- <ul class="nav pull-right">
|
||||
- <li>
|
||||
- <a id="navDonate" href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=JA8M7VDY89SQ4" onclick="window.open(this.href); return false;"><img src="$sbRoot/images/paypal/btn_donate_LG.gif" alt="[donate]" height="26" width="92" /></a>
|
||||
- </li>
|
||||
- </ul>
|
||||
</div><!-- /nav-collapse -->
|
||||
|
||||
</div><!-- /container -->
|
||||
@ -1,14 +1,13 @@
|
||||
diff -Naur SickBeard-a24eac6/data/interfaces/default/config_notifications.tmpl SickBeard-a24eac6.patch/data/interfaces/default/config_notifications.tmpl
|
||||
--- SickBeard-a24eac6/data/interfaces/default/config_notifications.tmpl 2012-03-21 04:31:18.000000000 +0100
|
||||
+++ SickBeard-a24eac6.patch/data/interfaces/default/config_notifications.tmpl 2012-03-21 06:39:45.827897872 +0100
|
||||
@@ -528,45 +528,6 @@
|
||||
</fieldset>
|
||||
</div><!-- /notifo component-group //-->
|
||||
diff --git a/data/interfaces/default/config_notifications.tmpl b/data/interfaces/default/config_notifications.tmpl
|
||||
index 826cf0a..02f14af 100755
|
||||
--- a/data/interfaces/default/config_notifications.tmpl
|
||||
+++ b/data/interfaces/default/config_notifications.tmpl
|
||||
@@ -547,45 +547,6 @@
|
||||
|
||||
-
|
||||
- <div class="component-group clearfix">
|
||||
- <div class="component-group-desc">
|
||||
- <h3><a href="http://library.gnome.org/devel/libnotify/" onclick="window.open(this.href, '_blank'); return false;"><img src="$sbRoot/images/notifiers/libnotify.gif" alt="" title="Libnotify" width="16" height="16" /> Libnotify </a></h3>
|
||||
<div class="component-group clearfix">
|
||||
<div class="component-group-desc">
|
||||
- <img class="notifier-icon" src="$sbRoot/images/notifiers/libnotify.png" alt="" title="Libnotify" />
|
||||
- <h3><a href="http://library.gnome.org/devel/libnotify/" onclick="window.open(this.href, '_blank'); return false;">Libnotify</a></h3>
|
||||
- <p>The standard desktop notification API for Linux/*nix systems. This notifier will only function if the pynotify module is installed (Ubuntu/Debian package <a href="apt:python-notify">python-notify</a>).</p>
|
||||
- </div>
|
||||
- <fieldset class="component-group-list">
|
||||
@ -36,32 +35,37 @@ diff -Naur SickBeard-a24eac6/data/interfaces/default/config_notifications.tmpl S
|
||||
- </label>
|
||||
- </div>
|
||||
- <div class="testNotification" id="testLibnotify-result">Click below to test.</div>
|
||||
- <input type="button" value="Test Libnotify" id="testLibnotify" />
|
||||
- <input type="submit" class="config_submitter" value="Save Changes" />
|
||||
- <input type="button" class="btn" value="Test Libnotify" id="testLibnotify" />
|
||||
- <input type="submit" class="btn config_submitter" value="Save Changes" />
|
||||
- </div><!-- /content_use_libnotify //-->
|
||||
-
|
||||
- </fieldset>
|
||||
- </div><!-- /libnotify component-group //-->
|
||||
-
|
||||
-
|
||||
<div class="component-group clearfix">
|
||||
<div class="component-group-desc">
|
||||
<h3><a href="http://boxcar.io/" onclick="window.open(this.href, '_blank'); return false;"><img src="$sbRoot/images/notifiers/boxcar.gif" alt="" title="Boxcar" width="16" height="16" /> Boxcar </a></h3>
|
||||
diff -Naur SickBeard-a24eac6/data/interfaces/default/inc_top.tmpl SickBeard-a24eac6.patch/data/interfaces/default/inc_top.tmpl
|
||||
--- SickBeard-a24eac6/data/interfaces/default/inc_top.tmpl 2012-03-21 06:35:02.098433287 +0100
|
||||
+++ SickBeard-a24eac6.patch/data/interfaces/default/inc_top.tmpl 2012-03-21 06:35:34.445056278 +0100
|
||||
@@ -169,7 +169,6 @@
|
||||
<li id="NAVconfig"><a href="$sbRoot/config/">Config</a>
|
||||
<ul>
|
||||
<li><a href="$sbRoot/config/"><img src="$sbRoot/images/menu/config_index16.png" alt="" width="16" height="16" />Help & Info</a></li>
|
||||
- <li><a href="$sbRoot/config/general/"><img src="$sbRoot/images/menu/config16.png" alt="" width="16" height="16" />General</a></li>
|
||||
<li><a href="$sbRoot/config/search/"><img src="$sbRoot/images/menu/config16.png" alt="" width="16" height="16" />Search Settings</a></li>
|
||||
<li><a href="$sbRoot/config/providers/"><img src="$sbRoot/images/menu/config16.png" alt="" width="16" height="16" />Search Providers</a></li>
|
||||
<li><a href="$sbRoot/config/postProcessing/"><img src="$sbRoot/images/menu/config16.png" alt="" width="16" height="16" />Post Processing</a></li>
|
||||
diff -Naur SickBeard-a24eac6/sickbeard/webserve.py SickBeard-a24eac6.patch/sickbeard/webserve.py
|
||||
--- SickBeard-a24eac6/sickbeard/webserve.py 2012-03-21 04:31:18.000000000 +0100
|
||||
+++ SickBeard-a24eac6.patch/sickbeard/webserve.py 2012-03-21 06:35:34.447056316 +0100
|
||||
@@ -593,7 +593,6 @@
|
||||
- <div class="component-group clearfix">
|
||||
- <div class="component-group-desc">
|
||||
<img class="notifier-icon" src="$sbRoot/images/notifiers/pushover.png" alt="" title="Pushover" />
|
||||
<h3><a href="http://pushover.net/" onclick="window.open(this.href, '_blank'); return false;">Pushover</a></h3>
|
||||
<p>Pushover makes it easy to send real-time notifications to your Android and iOS devices.</p>
|
||||
diff --git a/data/interfaces/default/inc_top.tmpl b/data/interfaces/default/inc_top.tmpl
|
||||
index fb38f17..4ead36f 100644
|
||||
--- a/data/interfaces/default/inc_top.tmpl
|
||||
+++ b/data/interfaces/default/inc_top.tmpl
|
||||
@@ -172,8 +172,6 @@
|
||||
<ul class="dropdown-menu">
|
||||
<li><a href="$sbRoot/config/"><i class="icon-question-sign"></i> Help & Info</a></li>
|
||||
<li class="divider"></li>
|
||||
- <li><a href="$sbRoot/config/general/"><i class="icon-cog"></i> General</a></li>
|
||||
- <li class="divider"></li>
|
||||
<li><a href="$sbRoot/config/search/"><i class="icon-cog"></i> Search Settings</a></li>
|
||||
<li class="divider"></li>
|
||||
<li><a href="$sbRoot/config/providers/"><i class="icon-cog"></i> Search Providers</a></li>
|
||||
diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py
|
||||
index 20f0dfc..b0bf6a6 100644
|
||||
--- a/sickbeard/webserve.py
|
||||
+++ b/sickbeard/webserve.py
|
||||
@@ -609,7 +609,6 @@ class History:
|
||||
|
||||
|
||||
ConfigMenu = [
|
||||
@ -1,3 +1,6 @@
|
||||
3.0.2
|
||||
- update to htop-1.0.2
|
||||
|
||||
3.0.1
|
||||
- bump addon version
|
||||
|
||||
|
||||
@ -19,8 +19,8 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="htop"
|
||||
PKG_VERSION="1.0.1"
|
||||
PKG_REV="1"
|
||||
PKG_VERSION="1.0.2"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://htop.sourceforge.net/"
|
||||
|
||||
@ -1,3 +1,11 @@
|
||||
3.0.2
|
||||
- Fixed bug causing configobj to throw an exception with Couchpotato v2s config
|
||||
- corrected a bug causing most of the suite to crash on first launch in certain circumstances
|
||||
- update to SABnzbd-0.7.9
|
||||
- update to CouchPotatoServer-393c14d
|
||||
- update to Headphones-263272c
|
||||
- update to SickBeard-e6dcfb3
|
||||
|
||||
3.0.1
|
||||
- bump addon version
|
||||
|
||||
|
||||
@ -8,6 +8,6 @@
|
||||
<setting id="SABNZBD_LAUNCH" value="true" />
|
||||
<setting id="SICKBEARD_LAUNCH" value="true" />
|
||||
<setting id="COUCHPOTATO_LAUNCH" value="true" />
|
||||
<setting id="COUCHPOTATO_VERSION" value="0" />
|
||||
<setting id="COUCHPOTATO_VERSION" value="1" />
|
||||
<setting id="HEADPHONES_LAUNCH" value="true" />
|
||||
</settings>
|
||||
|
||||
@ -74,6 +74,7 @@ pSickBeardSettings = os.path.join(pAddonHome, 'sickbeard.ini')
|
||||
pCouchPotatoSettings = os.path.join(pAddonHome, 'couchpotato.ini')
|
||||
pCouchPotatoServerSettings = os.path.join(pAddonHome, 'couchpotatoserver.ini')
|
||||
pHeadphonesSettings = os.path.join(pAddonHome, 'headphones.ini')
|
||||
pTransmission_Addon_Settings ='/storage/.xbmc/userdata/addon_data/service.downloadmanager.transmission/settings.xml'
|
||||
|
||||
# directories
|
||||
pSabNzbdComplete = '/storage/downloads'
|
||||
@ -130,6 +131,18 @@ if firstLaunch:
|
||||
# read addon and xbmc settings
|
||||
# ----------------------------
|
||||
|
||||
# Transmission-Daemon
|
||||
if os.path.exists(pTransmission_Addon_Settings):
|
||||
fTransmission_Addon_Settings = open(pTransmission_Addon_Settings, 'r')
|
||||
data = fTransmission_Addon_Settings.read()
|
||||
fTransmission_Addon_Settings.close
|
||||
transmission_addon_settings = parseString(data)
|
||||
transuser = getAddonSetting(transmission_addon_settings, 'TRANSMISSION_USER')
|
||||
transpwd = getAddonSetting(transmission_addon_settings, 'TRANSMISSION_PWD')
|
||||
transauth = getAddonSetting(transmission_addon_settings, 'TRANSMISSION_AUTH')
|
||||
else:
|
||||
transauth = 'false'
|
||||
|
||||
# SABnzbd-Suite
|
||||
fSuiteSettings = open(pSuiteSettings, 'r')
|
||||
data = fSuiteSettings.read()
|
||||
@ -249,7 +262,7 @@ try:
|
||||
|
||||
# launch SABnzbd and get the API key
|
||||
# ----------------------------------
|
||||
if "true" in sabnzbd_launch:
|
||||
if firstLaunch or "true" in sabnzbd_launch:
|
||||
logging.debug('Launching SABnzbd...')
|
||||
subprocess.call(sabnzbd,close_fds=True)
|
||||
logging.debug('...done')
|
||||
@ -260,6 +273,8 @@ try:
|
||||
sabNzbdConfig.reload()
|
||||
sabNzbdApiKey = sabNzbdConfig['misc']['api_key']
|
||||
logging.debug('SABnzbd api key: ' + sabNzbdApiKey)
|
||||
if firstLaunch and "false" in sabnzbd_launch:
|
||||
urllib2.urlopen('http://' + sabNzbdHost + '/api?mode=shutdown&apikey=' + sabNzbdApiKey)
|
||||
except Exception,e:
|
||||
print 'SABnzbd: exception occurred:', e
|
||||
print traceback.format_exc()
|
||||
@ -308,6 +323,7 @@ try:
|
||||
defaultConfig['SABnzbd']['sab_host'] = sabNzbdHost
|
||||
defaultConfig['XBMC']['xbmc_notify_ondownload'] = '1'
|
||||
defaultConfig['XBMC']['xbmc_update_library'] = '1'
|
||||
defaultConfig['XBMC']['xbmc_update_full'] = '1'
|
||||
|
||||
sickBeardConfig.merge(defaultConfig)
|
||||
sickBeardConfig.write()
|
||||
@ -383,10 +399,8 @@ try:
|
||||
|
||||
# write CouchPotatoServer settings
|
||||
# --------------------------
|
||||
couchPotatoServerConfig = ConfigObj(pCouchPotatoServerSettings,create_empty=True)
|
||||
couchPotatoServerConfig = ConfigObj(pCouchPotatoServerSettings,create_empty=True, list_values=False)
|
||||
defaultConfig = ConfigObj()
|
||||
defaultConfig['newznab'] = {}
|
||||
defaultConfig['newznab']['api_key'] = ''
|
||||
defaultConfig['core'] = {}
|
||||
defaultConfig['core']['username'] = user
|
||||
defaultConfig['core']['password'] = md5pwd
|
||||
@ -415,15 +429,26 @@ try:
|
||||
defaultConfig['xbmc']['username'] = xbmcUser
|
||||
defaultConfig['xbmc']['password'] = xbmcPwd
|
||||
|
||||
if 'true' in transauth:
|
||||
defaultConfig['transmission'] = {}
|
||||
defaultConfig['transmission']['username'] = transuser
|
||||
defaultConfig['transmission']['password'] = transpwd
|
||||
defaultConfig['transmission']['directory'] = pSabNzbdCompleteMov
|
||||
defaultConfig['transmission']['host'] = 'localhost:9091'
|
||||
|
||||
if firstLaunch:
|
||||
defaultConfig['xbmc']['xbmc_update_library'] = '1'
|
||||
defaultConfig['xbmc']['xbmc_update_full'] = '1'
|
||||
defaultConfig['xbmc']['xbmc_notify_onsnatch'] = '1'
|
||||
defaultConfig['xbmc']['xbmc_notify_ondownload'] = '1'
|
||||
defaultConfig['Sabnzbd']['category'] = 'movies'
|
||||
defaultConfig['Sabnzbd']['pp_directory'] = pSabNzbdCompleteMov
|
||||
defaultConfig['Renamer'] = {}
|
||||
defaultConfig['Renamer']['enabled'] = 'True'
|
||||
defaultConfig['Renamer']['enabled'] = '1'
|
||||
defaultConfig['Renamer']['download'] = pSabNzbdCompleteMov
|
||||
defaultConfig['Renamer']['destination'] = '/storage/videos'
|
||||
defaultConfig['Renamer']['separator'] = '.'
|
||||
defaultConfig['Renamer']['cleanup'] = 'False'
|
||||
defaultConfig['Renamer']['cleanup'] = '0'
|
||||
|
||||
couchPotatoServerConfig.merge(defaultConfig)
|
||||
couchPotatoServerConfig.write()
|
||||
@ -446,13 +471,23 @@ try:
|
||||
headphonesConfig = ConfigObj(pHeadphonesSettings,create_empty=True)
|
||||
defaultConfig = ConfigObj()
|
||||
defaultConfig['General'] = {}
|
||||
defaultConfig['General']['launch_browser'] = '0'
|
||||
defaultConfig['General']['http_port'] = '8084'
|
||||
defaultConfig['General']['http_host'] = host
|
||||
defaultConfig['General']['http_username'] = user
|
||||
defaultConfig['General']['http_password'] = pwd
|
||||
defaultConfig['General']['launch_browser'] = '0'
|
||||
defaultConfig['General']['http_port'] = '8084'
|
||||
defaultConfig['General']['http_host'] = host
|
||||
defaultConfig['General']['http_username'] = user
|
||||
defaultConfig['General']['http_password'] = pwd
|
||||
defaultConfig['General']['check_github'] = '0'
|
||||
defaultConfig['General']['check_github_on_startup'] = '0'
|
||||
defaultConfig['General']['log_dir'] = pAddonHome + '/logs'
|
||||
defaultConfig['General']['folder_permissions'] = '0644'
|
||||
defaultConfig['XBMC'] = {}
|
||||
defaultConfig['XBMC']['xbmc_enabled'] = '1'
|
||||
defaultConfig['XBMC']['xbmc_host'] = '127.0.0.1:' + xbmcPort
|
||||
defaultConfig['XBMC']['xbmc_username'] = xbmcUser
|
||||
defaultConfig['XBMC']['xbmc_password'] = xbmcPwd
|
||||
defaultConfig['SABnzbd'] = {}
|
||||
|
||||
if "true" in sabnzbd_launch:
|
||||
defaultConfig['SABnzbd'] = {}
|
||||
defaultConfig['SABnzbd']['sab_apikey'] = sabNzbdApiKey
|
||||
defaultConfig['SABnzbd']['sab_host'] = sabNzbdHost
|
||||
defaultConfig['SABnzbd']['sab_username'] = user
|
||||
@ -460,6 +495,8 @@ try:
|
||||
|
||||
if firstLaunch:
|
||||
defaultConfig['SABnzbd']['sab_category'] = 'music'
|
||||
defaultConfig['XBMC']['xbmc_update'] = '1'
|
||||
defaultConfig['XBMC']['xbmc_notify'] = '1'
|
||||
defaultConfig['General']['music_dir'] = '/storage/music'
|
||||
defaultConfig['General']['destination_dir'] = '/storage/music'
|
||||
defaultConfig['General']['download_dir'] = '/storage/downloads/music'
|
||||
|
||||
@ -1,6 +1,2 @@
|
||||
#!/bin/sh
|
||||
kill -9 `ps | grep -E 'python.*/SABnzbd-Suite.py' | awk '{print $1}'` 2>/dev/null
|
||||
kill -9 `ps | grep -E 'python.*/SABnzbd.py' | awk '{print $1}'` 2>/dev/null
|
||||
kill -9 `ps | grep -E 'python.*/SickBeard.py' | awk '{print $1}'` 2>/dev/null
|
||||
kill -9 `ps | grep -E 'python.*/CouchPotato.py' | awk '{print $1}'` 2>/dev/null
|
||||
kill -9 `ps | grep -E 'python.*/Headphones.py' | awk '{print $1}'` 2>/dev/null
|
||||
kill `ps | grep -E 'python.*service.downloadmanager.SABnzbd-Suite' | awk '{print $1}'` 2>/dev/null
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
<setting id="SABNZBD_LAUNCH" type="bool" label="1024" default="true" />
|
||||
<setting id="SICKBEARD_LAUNCH" type="bool" label="1025" default="true" />
|
||||
<setting id="COUCHPOTATO_LAUNCH" type="bool" label="1026" default="true" />
|
||||
<setting id="COUCHPOTATO_VERSION" type="enum" label="1027" default="0" values="Version 1|Version 2" enable="eq(-1,true)" />
|
||||
<setting id="COUCHPOTATO_VERSION" type="enum" label="1027" default="1" values="Version 1|Version 2" enable="eq(-1,true)" />
|
||||
<setting id="HEADPHONES_LAUNCH" type="bool" label="1028" default="true" />
|
||||
|
||||
<setting label="2010" type="lsep"/>
|
||||
|
||||
@ -1,3 +1,9 @@
|
||||
3.0.5
|
||||
- update to oscam-8119
|
||||
- use internal crypto functions
|
||||
- disable ssl support
|
||||
- disable debug support
|
||||
|
||||
3.0.4
|
||||
- update to oscam-8030
|
||||
- update to pcsc-lite-1.8.7
|
||||
|
||||
@ -20,8 +20,8 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="oscam"
|
||||
PKG_VERSION="8030"
|
||||
PKG_REV="4"
|
||||
PKG_VERSION="8119"
|
||||
PKG_REV="5"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.streamboard.tv/oscam/wiki"
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="xbmc-theme-Confluence"
|
||||
PKG_VERSION="648b6fc"
|
||||
PKG_VERSION="966a6cc"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="xbmc"
|
||||
PKG_VERSION="648b6fc"
|
||||
PKG_VERSION="966a6cc"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
@ -0,0 +1,24 @@
|
||||
From 61faa9f05d3d78a68c8a317420391eb77ae0ef7a Mon Sep 17 00:00:00 2001
|
||||
From: xbmc <fernetmenta@online.de>
|
||||
Date: Thu, 17 Jan 2013 16:03:22 +0100
|
||||
Subject: [PATCH] X11: add keymapping for XF86XK_Sleep
|
||||
|
||||
---
|
||||
xbmc/windowing/WinEventsX11.cpp | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/xbmc/windowing/WinEventsX11.cpp b/xbmc/windowing/WinEventsX11.cpp
|
||||
index c31877e..ed31c04 100644
|
||||
--- a/xbmc/windowing/WinEventsX11.cpp
|
||||
+++ b/xbmc/windowing/WinEventsX11.cpp
|
||||
@@ -143,6 +143,7 @@
|
||||
, {XK_Break, XBMCK_BREAK}
|
||||
, {XK_Menu, XBMCK_MENU}
|
||||
, {XF86XK_PowerOff, XBMCK_POWER}
|
||||
+, {XF86XK_Sleep, XBMCK_SLEEP}
|
||||
, {XK_EcuSign, XBMCK_EURO}
|
||||
, {XK_Undo, XBMCK_UNDO}
|
||||
/* Media keys */
|
||||
--
|
||||
1.7.10
|
||||
|
||||
@ -1,168 +0,0 @@
|
||||
From 453e2b2c40ba023bc4f092601931ca51f64bd88b Mon Sep 17 00:00:00 2001
|
||||
From: popcornmix <popcornmix@gmail.com>
|
||||
Date: Tue, 15 Jan 2013 20:55:48 +0000
|
||||
Subject: [PATCH] [rbp] Apply volume control at audio_mixer when possible
|
||||
|
||||
---
|
||||
xbmc/cores/omxplayer/OMXAudio.cpp | 105 +++++++++++++++++++++++++++----------
|
||||
1 file changed, 78 insertions(+), 27 deletions(-)
|
||||
|
||||
diff --git a/xbmc/cores/omxplayer/OMXAudio.cpp b/xbmc/cores/omxplayer/OMXAudio.cpp
|
||||
index 5399b10..a19004a 100644
|
||||
--- a/xbmc/cores/omxplayer/OMXAudio.cpp
|
||||
+++ b/xbmc/cores/omxplayer/OMXAudio.cpp
|
||||
@@ -37,10 +37,6 @@
|
||||
#include "guilib/LocalizeStrings.h"
|
||||
#include "cores/AudioEngine/Utils/AEConvert.h"
|
||||
|
||||
-#ifndef VOLUME_MINIMUM
|
||||
-#define VOLUME_MINIMUM -6000 // -60dB
|
||||
-#endif
|
||||
-
|
||||
using namespace std;
|
||||
|
||||
#define OMX_MAX_CHANNELS 10
|
||||
@@ -77,6 +73,19 @@
|
||||
|
||||
static const uint16_t DTSFSCod [] = {0, 8000, 16000, 32000, 0, 0, 11025, 22050, 44100, 0, 0, 12000, 24000, 48000, 0, 0};
|
||||
|
||||
+// 7.1 downmixing coefficients
|
||||
+const float downmixing_coefficients_8[OMX_AUDIO_MAXCHANNELS] = {
|
||||
+ // L R
|
||||
+ /* L */ 1, 0,
|
||||
+ /* R */ 0, 1,
|
||||
+ /* C */ 0.7071, 0.7071,
|
||||
+ /* LFE */ 0.7071, 0.7071,
|
||||
+ /* Ls */ 0.7071, 0,
|
||||
+ /* Rs */ 0, 0.7071,
|
||||
+ /* Lr */ 0.7071, 0,
|
||||
+ /* Rr */ 0, 0.7071
|
||||
+};
|
||||
+
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
// Construction/Destruction
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
@@ -198,8 +207,6 @@ bool COMXAudio::Initialize(AEAudioFormat format, std::string& device, OMXClock *
|
||||
|
||||
m_drc = 0;
|
||||
|
||||
- m_CurrentVolume = g_settings.m_fVolumeLevel;
|
||||
-
|
||||
memset(m_input_channels, 0x0, sizeof(m_input_channels));
|
||||
memset(m_output_channels, 0x0, sizeof(m_output_channels));
|
||||
memset(&m_wave_header, 0x0, sizeof(m_wave_header));
|
||||
@@ -545,8 +552,6 @@ bool COMXAudio::Initialize(AEAudioFormat format, std::string& device, OMXClock *
|
||||
m_first_frame = true;
|
||||
m_last_pts = DVD_NOPTS_VALUE;
|
||||
|
||||
- SetCurrentVolume(m_CurrentVolume);
|
||||
-
|
||||
CLog::Log(LOGDEBUG, "COMXAudio::Initialize Ouput bps %d samplerate %d channels %d buffer size %d bytes per second %d",
|
||||
(int)m_pcm_output.nBitPerSample, (int)m_pcm_output.nSamplingRate, (int)m_pcm_output.nChannels, m_BufferLen, m_BytesPerSec);
|
||||
CLog::Log(LOGDEBUG, "COMXAudio::Initialize Input bps %d samplerate %d channels %d buffer size %d bytes per second %d",
|
||||
@@ -694,20 +699,76 @@ bool COMXAudio::SetCurrentVolume(float fVolume)
|
||||
CSingleLock lock (m_critSection);
|
||||
|
||||
if(!m_Initialized || m_Passthrough)
|
||||
- return -1;
|
||||
-
|
||||
+ return false;
|
||||
+ double gain = pow(10, (g_advancedSettings.m_ac3Gain - 12.0f) / 20.0);
|
||||
m_CurrentVolume = fVolume;
|
||||
|
||||
- OMX_AUDIO_CONFIG_VOLUMETYPE volume;
|
||||
- OMX_INIT_STRUCTURE(volume);
|
||||
- volume.nPortIndex = m_omx_render->GetInputPort();
|
||||
+ if (m_format.m_channelLayout.Count() > 2)
|
||||
+ {
|
||||
+ double r = fVolume;
|
||||
+ const float* coeff = downmixing_coefficients_8;
|
||||
+ int input_channels = 0;
|
||||
+
|
||||
+ // normally we normalalise the levels, can be skipped (boosted) at risk of distortion
|
||||
+ if(!g_guiSettings.GetBool("audiooutput.normalizelevels"))
|
||||
+ {
|
||||
+ double sum_L = 0;
|
||||
+ double sum_R = 0;
|
||||
+
|
||||
+ for(size_t i = 0; i < OMX_AUDIO_MAXCHANNELS; ++i)
|
||||
+ {
|
||||
+ if (m_input_channels[i] == OMX_AUDIO_ChannelMax)
|
||||
+ break;
|
||||
+ if(i & 1)
|
||||
+ sum_R += coeff[i];
|
||||
+ else
|
||||
+ sum_L += coeff[i];
|
||||
+ }
|
||||
+
|
||||
+ r /= max(sum_L, sum_R);
|
||||
+ }
|
||||
+
|
||||
+ // the analogue volume is too quiet for some. Allow use of an advancedsetting to boost this (at risk of distortion)
|
||||
+ r *= gain;
|
||||
|
||||
- volume.bLinear = OMX_TRUE;
|
||||
- float hardwareVolume = std::max(VOLUME_MINIMUM, std::min(VOLUME_MAXIMUM, fVolume)) * 100.0f;
|
||||
- volume.sVolume.nValue = (int)hardwareVolume;
|
||||
+ OMX_CONFIG_BRCMAUDIODOWNMIXCOEFFICIENTS mix;
|
||||
+ OMX_INIT_STRUCTURE(mix);
|
||||
+ mix.nPortIndex = m_omx_mixer.GetInputPort();
|
||||
|
||||
- m_omx_render->SetConfig(OMX_IndexConfigAudioVolume, &volume);
|
||||
+ assert(sizeof(mix.coeff)/sizeof(mix.coeff[0]) == 16);
|
||||
|
||||
+ for(size_t i = 0; i < 16; ++i)
|
||||
+ mix.coeff[i] = static_cast<unsigned int>(0x10000 * (coeff[i] * r));
|
||||
+
|
||||
+ OMX_ERRORTYPE omx_err =
|
||||
+ m_omx_mixer.SetConfig(OMX_IndexConfigBrcmAudioDownmixCoefficients, &mix);
|
||||
+
|
||||
+ if(omx_err != OMX_ErrorNone)
|
||||
+ {
|
||||
+ CLog::Log(LOGERROR, "%s::%s - error setting OMX_IndexConfigBrcmAudioDownmixCoefficients, error 0x%08x\n",
|
||||
+ CLASSNAME, __func__, omx_err);
|
||||
+ return false;
|
||||
+ }
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ OMX_AUDIO_CONFIG_VOLUMETYPE volume;
|
||||
+ OMX_INIT_STRUCTURE(volume);
|
||||
+ volume.nPortIndex = m_omx_render->GetInputPort();
|
||||
+
|
||||
+ volume.bLinear = OMX_TRUE;
|
||||
+ float hardwareVolume = fVolume * gain * 100.0f;
|
||||
+ volume.sVolume.nValue = (int)(hardwareVolume + 0.5f);
|
||||
+
|
||||
+ OMX_ERRORTYPE omx_err =
|
||||
+ m_omx_render->SetConfig(OMX_IndexConfigAudioVolume, &volume);
|
||||
+ if(omx_err != OMX_ErrorNone)
|
||||
+ {
|
||||
+ CLog::Log(LOGERROR, "%s::%s - error setting OMX_IndexConfigAudioVolume, error 0x%08x\n",
|
||||
+ CLASSNAME, __func__, omx_err);
|
||||
+ return false;
|
||||
+ }
|
||||
+ }
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -885,16 +946,6 @@ unsigned int COMXAudio::AddPackets(const void* data, unsigned int len, double dt
|
||||
}
|
||||
}
|
||||
|
||||
- if ((m_pcm_input.nChannels > m_pcm_output.nChannels) &&g_guiSettings.GetBool("audiooutput.normalizelevels"))
|
||||
- {
|
||||
- OMX_AUDIO_CONFIG_VOLUMETYPE volume;
|
||||
- OMX_INIT_STRUCTURE(volume);
|
||||
- volume.nPortIndex = m_omx_mixer.GetInputPort();
|
||||
- volume.bLinear = OMX_FALSE;
|
||||
- volume.sVolume.nValue = (int)(g_advancedSettings.m_ac3Gain*100.0f+0.5f);
|
||||
- m_omx_mixer.SetConfig(OMX_IndexConfigAudioVolume, &volume);
|
||||
- }
|
||||
-
|
||||
memcpy(m_pcm_input.eChannelMapping, m_input_channels, sizeof(m_input_channels));
|
||||
m_pcm_input.nSamplingRate = m_format.m_sampleRate;
|
||||
|
||||
--
|
||||
1.7.10
|
||||
|
||||
@ -1,103 +0,0 @@
|
||||
From 5f33482f3bd2993576c6f7f616df68a9d6846d81 Mon Sep 17 00:00:00 2001
|
||||
From: popcornmix <popcornmix@gmail.com>
|
||||
Date: Tue, 15 Jan 2013 20:46:07 +0000
|
||||
Subject: [PATCH] [rbp] Fix for audio out of sync part 2
|
||||
|
||||
---
|
||||
xbmc/cores/omxplayer/OMXAudio.cpp | 2 ++
|
||||
xbmc/cores/omxplayer/OMXVideo.cpp | 24 ++++++++++++++++++------
|
||||
xbmc/cores/omxplayer/OMXVideo.h | 2 +-
|
||||
3 files changed, 21 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/xbmc/cores/omxplayer/OMXAudio.cpp b/xbmc/cores/omxplayer/OMXAudio.cpp
|
||||
index 5399b10..1b2a1ef 100644
|
||||
--- a/xbmc/cores/omxplayer/OMXAudio.cpp
|
||||
+++ b/xbmc/cores/omxplayer/OMXAudio.cpp
|
||||
@@ -805,6 +805,8 @@ unsigned int COMXAudio::AddPackets(const void* data, unsigned int len, double dt
|
||||
if(m_av_clock->AudioStart())
|
||||
{
|
||||
omx_buffer->nFlags = OMX_BUFFERFLAG_STARTTIME;
|
||||
+ if(pts == DVD_NOPTS_VALUE)
|
||||
+ omx_buffer->nFlags |= OMX_BUFFERFLAG_TIME_UNKNOWN;
|
||||
|
||||
m_last_pts = pts;
|
||||
|
||||
diff --git a/xbmc/cores/omxplayer/OMXVideo.cpp b/xbmc/cores/omxplayer/OMXVideo.cpp
|
||||
index b11aa22..0464790 100644
|
||||
--- a/xbmc/cores/omxplayer/OMXVideo.cpp
|
||||
+++ b/xbmc/cores/omxplayer/OMXVideo.cpp
|
||||
@@ -84,7 +84,6 @@
|
||||
m_deinterlace = false;
|
||||
m_hdmi_clock_sync = false;
|
||||
m_first_frame = true;
|
||||
- m_contains_valid_pts= false;
|
||||
}
|
||||
|
||||
COMXVideo::~COMXVideo()
|
||||
@@ -666,6 +665,9 @@ bool COMXVideo::Open(CDVDStreamInfo &hints, OMXClock *clock, bool deinterlace, b
|
||||
m_deinterlace, m_hdmi_clock_sync);
|
||||
|
||||
m_first_frame = true;
|
||||
+ // start from assuming all recent frames had valid pts
|
||||
+ m_history_valid_pts = ~0;
|
||||
+
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -720,6 +722,14 @@ unsigned int COMXVideo::GetSize()
|
||||
return m_omx_decoder.GetInputBufferSize();
|
||||
}
|
||||
|
||||
+static unsigned count_bits(int32_t value)
|
||||
+{
|
||||
+ unsigned bits = 0;
|
||||
+ for(;value;++bits)
|
||||
+ value &= value - 1;
|
||||
+ return bits;
|
||||
+}
|
||||
+
|
||||
int COMXVideo::Decode(uint8_t *pData, int iSize, double dts, double pts)
|
||||
{
|
||||
OMX_ERRORTYPE omx_err;
|
||||
@@ -754,11 +764,11 @@ int COMXVideo::Decode(uint8_t *pData, int iSize, double dts, double pts)
|
||||
|
||||
omx_buffer->nFlags = 0;
|
||||
omx_buffer->nOffset = 0;
|
||||
-
|
||||
- // if a stream contains any pts values, then use those with UNKNOWNs. Otherwise try using dts.
|
||||
- if(pts != DVD_NOPTS_VALUE)
|
||||
- m_contains_valid_pts = true;
|
||||
- if(pts == DVD_NOPTS_VALUE && !m_contains_valid_pts)
|
||||
+ // some packed bitstream AVI files set almost all pts values to DVD_NOPTS_VALUE, but have a scattering of real pts values.
|
||||
+ // the valid pts values match the dts values.
|
||||
+ // if a stream has had more than 4 valid pts values in the last 16, the use UNKNOWN, otherwise use dts
|
||||
+ m_history_valid_pts = (m_history_valid_pts << 1) | (pts != DVD_NOPTS_VALUE);
|
||||
+ if(pts == DVD_NOPTS_VALUE && count_bits(m_history_valid_pts & 0xffff) < 4)
|
||||
pts = dts;
|
||||
|
||||
if(m_av_clock->VideoStart())
|
||||
@@ -766,6 +776,8 @@ int COMXVideo::Decode(uint8_t *pData, int iSize, double dts, double pts)
|
||||
// only send dts on first frame to get nearly correct starttime
|
||||
if(pts == DVD_NOPTS_VALUE)
|
||||
pts = dts;
|
||||
+ if(pts == DVD_NOPTS_VALUE)
|
||||
+ omx_buffer->nFlags |= OMX_BUFFERFLAG_TIME_UNKNOWN;
|
||||
omx_buffer->nFlags = OMX_BUFFERFLAG_STARTTIME;
|
||||
CLog::Log(LOGDEBUG, "OMXVideo::Decode VDec : setStartTime %f\n", (pts == DVD_NOPTS_VALUE ? 0.0 : pts) / DVD_TIME_BASE);
|
||||
m_av_clock->VideoStart(false);
|
||||
diff --git a/xbmc/cores/omxplayer/OMXVideo.h b/xbmc/cores/omxplayer/OMXVideo.h
|
||||
index 24cc6c8..180c2db 100644
|
||||
--- a/xbmc/cores/omxplayer/OMXVideo.h
|
||||
+++ b/xbmc/cores/omxplayer/OMXVideo.h
|
||||
@@ -90,7 +90,7 @@ class COMXVideo
|
||||
bool m_deinterlace;
|
||||
bool m_hdmi_clock_sync;
|
||||
bool m_first_frame;
|
||||
- bool m_contains_valid_pts;
|
||||
+ uint32_t m_history_valid_pts;
|
||||
|
||||
bool NaluFormatStartCodes(enum CodecID codec, uint8_t *in_extradata, int in_extrasize);
|
||||
};
|
||||
--
|
||||
1.7.10
|
||||
|
||||
@ -1,184 +0,0 @@
|
||||
From 9f5810f159200d9736556fe28806768d9dfd6c7b Mon Sep 17 00:00:00 2001
|
||||
From: popcornmix <popcornmix@gmail.com>
|
||||
Date: Mon, 14 Jan 2013 20:46:29 +0000
|
||||
Subject: [PATCH] Send mute commands to players not using AE
|
||||
|
||||
---
|
||||
xbmc/Application.cpp | 38 +++++++++++++++++++++++++-----------
|
||||
xbmc/cores/IPlayer.h | 2 ++
|
||||
xbmc/cores/amlplayer/AMLPlayer.cpp | 5 +++++
|
||||
xbmc/cores/amlplayer/AMLPlayer.h | 2 ++
|
||||
xbmc/cores/omxplayer/OMXPlayer.cpp | 9 ++++++++-
|
||||
xbmc/cores/omxplayer/OMXPlayer.h | 3 +++
|
||||
6 files changed, 47 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
|
||||
index 4c79137..b453e9f 100644
|
||||
--- a/xbmc/Application.cpp
|
||||
+++ b/xbmc/Application.cpp
|
||||
@@ -4117,6 +4117,13 @@ bool CApplication::PlayFile(const CFileItem& item, bool bRestart)
|
||||
SetPlaySpeed(iSpeed);
|
||||
}
|
||||
|
||||
+ // if player has volume control, set it.
|
||||
+ if (m_pPlayer && m_pPlayer->ControlsVolume())
|
||||
+ {
|
||||
+ m_pPlayer->SetVolume(g_settings.m_fVolumeLevel);
|
||||
+ m_pPlayer->SetMute(g_settings.m_bMute);
|
||||
+ }
|
||||
+
|
||||
if( IsPlayingAudio() )
|
||||
{
|
||||
if (g_windowManager.GetActiveWindow() == WINDOW_FULLSCREEN_VIDEO)
|
||||
@@ -5383,10 +5390,6 @@ void CApplication::SetHardwareVolume(float hardwareVolume)
|
||||
value = 1.0f;
|
||||
|
||||
CAEFactory::SetVolume(value);
|
||||
-
|
||||
- /* for platforms where we do not have AE */
|
||||
- if (!CAEFactory::GetEngine() && m_pPlayer)
|
||||
- m_pPlayer->SetVolume(g_settings.m_fVolumeLevel);
|
||||
}
|
||||
|
||||
int CApplication::GetVolume() const
|
||||
@@ -5401,6 +5404,13 @@ void CApplication::VolumeChanged() const
|
||||
data["volume"] = GetVolume();
|
||||
data["muted"] = g_settings.m_bMute;
|
||||
CAnnouncementManager::Announce(Application, "xbmc", "OnVolumeChanged", data);
|
||||
+
|
||||
+ // if player has volume control, set it.
|
||||
+ if (m_pPlayer && m_pPlayer->ControlsVolume())
|
||||
+ {
|
||||
+ m_pPlayer->SetVolume(g_settings.m_fVolumeLevel);
|
||||
+ m_pPlayer->SetMute(g_settings.m_bMute);
|
||||
+ }
|
||||
}
|
||||
|
||||
int CApplication::GetSubtitleDelay() const
|
||||
@@ -5437,13 +5447,19 @@ void CApplication::SetPlaySpeed(int iSpeed)
|
||||
m_iPlaySpeed = iSpeed;
|
||||
|
||||
m_pPlayer->ToFFRW(m_iPlaySpeed);
|
||||
- if (m_iPlaySpeed == 1)
|
||||
- { // restore volume
|
||||
- m_pPlayer->SetVolume(VOLUME_MAXIMUM);
|
||||
- }
|
||||
- else
|
||||
- { // mute volume
|
||||
- m_pPlayer->SetVolume(VOLUME_MINIMUM);
|
||||
+
|
||||
+ // if player has volume control, set it.
|
||||
+ if (m_pPlayer->ControlsVolume())
|
||||
+ {
|
||||
+ if (m_iPlaySpeed == 1)
|
||||
+ { // restore volume
|
||||
+ m_pPlayer->SetVolume(VOLUME_MAXIMUM);
|
||||
+ }
|
||||
+ else
|
||||
+ { // mute volume
|
||||
+ m_pPlayer->SetVolume(VOLUME_MINIMUM);
|
||||
+ }
|
||||
+ m_pPlayer->SetMute(g_settings.m_bMute);
|
||||
}
|
||||
}
|
||||
|
||||
diff --git a/xbmc/cores/IPlayer.h b/xbmc/cores/IPlayer.h
|
||||
index 2042026..f2aa227 100644
|
||||
--- a/xbmc/cores/IPlayer.h
|
||||
+++ b/xbmc/cores/IPlayer.h
|
||||
@@ -114,6 +114,8 @@ class IPlayer
|
||||
virtual void SeekPercentage(float fPercent = 0){}
|
||||
virtual float GetPercentage(){ return 0;}
|
||||
virtual float GetCachePercentage(){ return 0;}
|
||||
+ virtual bool ControlsVolume(){ return false;}
|
||||
+ virtual void SetMute(bool bOnOff){}
|
||||
virtual void SetVolume(float volume){}
|
||||
virtual void SetDynamicRangeCompression(long drc){}
|
||||
virtual void GetAudioInfo( CStdString& strAudioInfo) = 0;
|
||||
diff --git a/xbmc/cores/amlplayer/AMLPlayer.cpp b/xbmc/cores/amlplayer/AMLPlayer.cpp
|
||||
index 13014e2..0aee9a9 100644
|
||||
--- a/xbmc/cores/amlplayer/AMLPlayer.cpp
|
||||
+++ b/xbmc/cores/amlplayer/AMLPlayer.cpp
|
||||
@@ -777,6 +777,11 @@ float CAMLPlayer::GetPercentage()
|
||||
return 0.0f;
|
||||
}
|
||||
|
||||
+void CAMLPlayer::SetMute(bool bOnOff)
|
||||
+{
|
||||
+ // TODO: set mute
|
||||
+}
|
||||
+
|
||||
void CAMLPlayer::SetVolume(float volume)
|
||||
{
|
||||
CLog::Log(LOGDEBUG, "CAMLPlayer::SetVolume(%f)", volume);
|
||||
diff --git a/xbmc/cores/amlplayer/AMLPlayer.h b/xbmc/cores/amlplayer/AMLPlayer.h
|
||||
index 54d8fae..39c8913 100644
|
||||
--- a/xbmc/cores/amlplayer/AMLPlayer.h
|
||||
+++ b/xbmc/cores/amlplayer/AMLPlayer.h
|
||||
@@ -80,6 +80,8 @@ class CAMLPlayer : public IPlayer, public CThread
|
||||
virtual bool SeekScene(bool bPlus = true);
|
||||
virtual void SeekPercentage(float fPercent = 0.0f);
|
||||
virtual float GetPercentage();
|
||||
+ virtual void SetMute(bool bOnOff);
|
||||
+ virtual bool ControlsVolume() {return true;}
|
||||
virtual void SetVolume(float volume);
|
||||
virtual void SetDynamicRangeCompression(long drc) {}
|
||||
virtual void GetAudioInfo(CStdString &strAudioInfo);
|
||||
diff --git a/xbmc/cores/omxplayer/OMXPlayer.cpp b/xbmc/cores/omxplayer/OMXPlayer.cpp
|
||||
index aac591c..ea02693 100644
|
||||
--- a/xbmc/cores/omxplayer/OMXPlayer.cpp
|
||||
+++ b/xbmc/cores/omxplayer/OMXPlayer.cpp
|
||||
@@ -460,6 +460,7 @@ bool COMXPlayer::OpenFile(const CFileItem &file, const CPlayerOptions &options)
|
||||
m_UpdateApplication = 0;
|
||||
m_offset_pts = 0;
|
||||
m_current_volume = 0;
|
||||
+ m_current_mute = false;
|
||||
m_change_volume = true;
|
||||
|
||||
m_item = file;
|
||||
@@ -1262,7 +1263,7 @@ void COMXPlayer::Process()
|
||||
|
||||
if(m_change_volume)
|
||||
{
|
||||
- m_player_audio.SetCurrentVolume(m_current_volume);
|
||||
+ m_player_audio.SetCurrentVolume(m_current_mute ? VOLUME_MINIMUM : m_current_volume);
|
||||
m_change_volume = false;
|
||||
}
|
||||
|
||||
@@ -4134,6 +4135,12 @@ void COMXPlayer::GetVideoRect(CRect& SrcRect, CRect& DestRect)
|
||||
g_renderManager.GetVideoRect(SrcRect, DestRect);
|
||||
}
|
||||
|
||||
+void COMXPlayer::SetMute(bool bOnOff)
|
||||
+{
|
||||
+ m_current_mute = bOnOff;
|
||||
+ m_change_volume = true;
|
||||
+}
|
||||
+
|
||||
void COMXPlayer::SetVolume(float fVolume)
|
||||
{
|
||||
m_current_volume = fVolume;
|
||||
diff --git a/xbmc/cores/omxplayer/OMXPlayer.h b/xbmc/cores/omxplayer/OMXPlayer.h
|
||||
index 3a2a63d..d606e84 100644
|
||||
--- a/xbmc/cores/omxplayer/OMXPlayer.h
|
||||
+++ b/xbmc/cores/omxplayer/OMXPlayer.h
|
||||
@@ -227,6 +227,8 @@ class COMXPlayer : public IPlayer, public CThread, public IDVDPlayer
|
||||
virtual float GetPercentage();
|
||||
virtual float GetCachePercentage();
|
||||
|
||||
+ virtual void SetMute(bool bOnOff);
|
||||
+ virtual bool ControlsVolume() {return true;}
|
||||
virtual void SetVolume(float fVolume);
|
||||
virtual void SetDynamicRangeCompression(long drc) {}
|
||||
virtual void GetAudioInfo(CStdString &strAudioInfo);
|
||||
@@ -484,6 +486,7 @@ class COMXPlayer : public IPlayer, public CThread, public IDVDPlayer
|
||||
CEvent m_ready;
|
||||
|
||||
float m_current_volume;
|
||||
+ bool m_current_mute;
|
||||
bool m_change_volume;
|
||||
CDVDOverlayContainer m_overlayContainer;
|
||||
ECacheState m_caching;
|
||||
--
|
||||
1.7.10
|
||||
|
||||
@ -1,95 +0,0 @@
|
||||
From 67319ef389d0b664c92fa1753ba2bbdf4257dfbe Mon Sep 17 00:00:00 2001
|
||||
From: Stephan Raue <stephan@openelec.tv>
|
||||
Date: Sun, 13 Jan 2013 19:21:34 +0100
|
||||
Subject: [PATCH] [automake] remove long time deprecated automake macros and
|
||||
variables which are removed finally in automake-1.13
|
||||
|
||||
Signed-off-by: Stephan Raue <stephan@openelec.tv>
|
||||
---
|
||||
lib/enca/configure.ac | 3 +--
|
||||
lib/libdvd/libdvdcss/configure.ac | 2 +-
|
||||
lib/libmad/configure.ac | 2 +-
|
||||
lib/libmicrohttpd/configure.ac | 2 +-
|
||||
xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/configure.in | 3 +--
|
||||
5 files changed, 5 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/lib/enca/configure.ac b/lib/enca/configure.ac
|
||||
index e4aad8c..41434df 100644
|
||||
--- a/lib/enca/configure.ac
|
||||
+++ b/lib/enca/configure.ac
|
||||
@@ -24,7 +24,7 @@ AC_CONFIG_FILES( \
|
||||
test/Makefile \
|
||||
tools/Makefile)
|
||||
|
||||
-AM_CONFIG_HEADER(config.h)
|
||||
+AC_CONFIG_HEADERS(config.h)
|
||||
AM_INIT_AUTOMAKE([1.8 gnits check-news dist-bzip2])
|
||||
AM_ACLOCAL_INCLUDE(m4)
|
||||
AM_MAINTAINER_MODE
|
||||
@@ -40,7 +40,6 @@ AC_GNU_SOURCE
|
||||
AC_AIX
|
||||
AC_ISC_POSIX
|
||||
AC_PROG_LIBTOOL
|
||||
-AM_PROG_CC_STDC
|
||||
AM_PROG_CC_C_O
|
||||
AC_PROG_INSTALL
|
||||
AC_PROG_LN_S
|
||||
diff --git a/lib/libdvd/libdvdcss/configure.ac b/lib/libdvd/libdvdcss/configure.ac
|
||||
index 1b9ff8b..a40a161 100644
|
||||
--- a/lib/libdvd/libdvdcss/configure.ac
|
||||
+++ b/lib/libdvd/libdvdcss/configure.ac
|
||||
@@ -5,7 +5,7 @@ AC_CONFIG_AUX_DIR(.auto)
|
||||
AC_CANONICAL_SYSTEM
|
||||
|
||||
AM_INIT_AUTOMAKE(libdvdcss, 1.2.10)
|
||||
-AM_CONFIG_HEADER(config.h)
|
||||
+AC_CONFIG_HEADERS(config.h)
|
||||
|
||||
AC_PROG_CC
|
||||
AC_STDC_HEADERS
|
||||
diff --git a/lib/libmad/configure.ac b/lib/libmad/configure.ac
|
||||
index bc19d8e..e137ca6 100644
|
||||
--- a/lib/libmad/configure.ac
|
||||
+++ b/lib/libmad/configure.ac
|
||||
@@ -28,7 +28,7 @@ AC_CONFIG_SRCDIR([decoder.h])
|
||||
|
||||
AM_INIT_AUTOMAKE
|
||||
|
||||
-AM_CONFIG_HEADER([config.h])
|
||||
+AC_CONFIG_HEADERS([config.h])
|
||||
|
||||
dnl System type.
|
||||
|
||||
diff --git a/lib/libmicrohttpd/configure.ac b/lib/libmicrohttpd/configure.ac
|
||||
index b314357..c00e55b 100644
|
||||
--- a/lib/libmicrohttpd/configure.ac
|
||||
+++ b/lib/libmicrohttpd/configure.ac
|
||||
@@ -23,7 +23,7 @@
|
||||
AC_PREREQ(2.57)
|
||||
AC_INIT([libmicrohttpd], [0.4.5],[libmicrohttpd@gnu.org])
|
||||
AM_INIT_AUTOMAKE([libmicrohttpd], [0.4.5])
|
||||
-AM_CONFIG_HEADER([MHD_config.h])
|
||||
+AC_CONFIG_HEADERS([MHD_config.h])
|
||||
AC_CONFIG_MACRO_DIR([m4])
|
||||
AH_TOP([#define _GNU_SOURCE 1])
|
||||
|
||||
diff --git a/xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/configure.in b/xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/configure.in
|
||||
index 4e94d4b..cc0646f 100644
|
||||
--- a/xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/configure.in
|
||||
+++ b/xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/configure.in
|
||||
@@ -2,11 +2,10 @@ dnl Process this file with autoconf to produce a configure script.
|
||||
|
||||
AC_INIT(configure.in)
|
||||
AM_INIT_AUTOMAKE(goom2, 0.1)
|
||||
-AM_CONFIG_HEADER(config.h)
|
||||
+AC_CONFIG_HEADERS(config.h)
|
||||
|
||||
AC_ISC_POSIX
|
||||
AC_PROG_CC
|
||||
-AM_PROG_CC_STDC
|
||||
AC_HEADER_STDC
|
||||
AC_C_BIGENDIAN
|
||||
|
||||
--
|
||||
1.7.10
|
||||
|
||||
@ -26,12 +26,16 @@
|
||||
PATH="/bin:/sbin:/usr/bin:/usr/sbin"
|
||||
|
||||
# hack: add addons to $PATH
|
||||
for addons in `find /storage/.xbmc/addons/* -name bin -type d`; do
|
||||
PATH="$PATH:$addons"
|
||||
for addon in /storage/.xbmc/addons/*/bin; do
|
||||
if [ -d "$addon" ] ; then
|
||||
PATH="$PATH:$addon"
|
||||
fi
|
||||
done
|
||||
|
||||
for sys in `find /usr/lib/xbmc/addons/* -name bin -type d`; do
|
||||
PATH="$PATH:$sys"
|
||||
for sys in /usr/lib/xbmc/addons/*/bin; do
|
||||
if [ -d "$sys" ] ; then
|
||||
PATH="$PATH:$sys"
|
||||
fi
|
||||
done
|
||||
|
||||
export PATH
|
||||
|
||||
@ -60,6 +60,8 @@
|
||||
}
|
||||
|
||||
# read config files
|
||||
for config in `ls /etc/profile.d/`; do
|
||||
. /etc/profile.d/$config
|
||||
for config in /etc/profile.d/*; do
|
||||
if [ -f "$config" ] ; then
|
||||
. $config
|
||||
fi
|
||||
done
|
||||
|
||||
@ -28,12 +28,16 @@
|
||||
LD_LIBRARY_PATH="/usr/lib:/lib"
|
||||
|
||||
# hack: add addons to $LD_LIBRARY_PATH
|
||||
for addons in `find /storage/.xbmc/addons/* -name lib -type d`; do
|
||||
LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$addons"
|
||||
for addon in /storage/.xbmc/addons/*/lib; do
|
||||
if [ -d "$addon" ] ; then
|
||||
LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$addon"
|
||||
fi
|
||||
done
|
||||
|
||||
for sys in `find /usr/lib/xbmc/addons/* -name lib -type d`; do
|
||||
LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$sys"
|
||||
for sys in /usr/lib/xbmc/addons/*/lib; do
|
||||
if [ -d "$sys" ] ; then
|
||||
LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$sys"
|
||||
fi
|
||||
done
|
||||
|
||||
export LD_LIBRARY_PATH
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user