From 2578296e35a319eabcfd6f5bfa5c251a3e70034d Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 1 Nov 2011 14:10:19 +0100 Subject: [PATCH] xbmc-addon-settings: remove options to run library scan on wakeup (supported already by xbmc), cleanup Signed-off-by: Stephan Raue --- .../config/default_settings.xml | 9 ----- .../xbmc-addon-settings/source/addon.xml | 2 +- .../xbmc-addon-settings/source/default.py | 2 +- .../resources/language/Dutch/strings.xml | 3 -- .../resources/language/English/strings.xml | 3 -- .../resources/language/French/strings.xml | 3 -- .../resources/language/German/strings.xml | 3 -- .../resources/language/Norwegian/strings.xml | 5 +-- .../source/resources/settings.xml | 4 -- .../xbmc/sleep.d/01_update_videodb | 40 ------------------- .../xbmc/sleep.d/02_update_musicdb | 40 ------------------- 11 files changed, 3 insertions(+), 111 deletions(-) delete mode 100755 packages/mediacenter/xbmc/sleep.d/01_update_videodb delete mode 100755 packages/mediacenter/xbmc/sleep.d/02_update_musicdb diff --git a/packages/mediacenter/xbmc-addon-settings/config/default_settings.xml b/packages/mediacenter/xbmc-addon-settings/config/default_settings.xml index 83873b2a97..60181b8f53 100644 --- a/packages/mediacenter/xbmc-addon-settings/config/default_settings.xml +++ b/packages/mediacenter/xbmc-addon-settings/config/default_settings.xml @@ -25,17 +25,8 @@ - - - - - - - - - diff --git a/packages/mediacenter/xbmc-addon-settings/source/addon.xml b/packages/mediacenter/xbmc-addon-settings/source/addon.xml index 8125c70016..61c756f1ba 100644 --- a/packages/mediacenter/xbmc-addon-settings/source/addon.xml +++ b/packages/mediacenter/xbmc-addon-settings/source/addon.xml @@ -1,7 +1,7 @@ diff --git a/packages/mediacenter/xbmc-addon-settings/source/default.py b/packages/mediacenter/xbmc-addon-settings/source/default.py index ae4715017a..dfcb2215f9 100644 --- a/packages/mediacenter/xbmc-addon-settings/source/default.py +++ b/packages/mediacenter/xbmc-addon-settings/source/default.py @@ -27,7 +27,7 @@ __author__ = "OpenELEC" __url__ = "http://www.openelec.tv" __svn_url__ = "" __credits__ = "" -__version__ = "0.0.9" +__version__ = "0.0.13" __XBMC_Revision__ = "22240" __settings__ = xbmcaddon.Addon(id='os.openelec.settings') diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/language/Dutch/strings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/language/Dutch/strings.xml index ba2c174e5b..86b553b2f8 100644 --- a/packages/mediacenter/xbmc-addon-settings/source/resources/language/Dutch/strings.xml +++ b/packages/mediacenter/xbmc-addon-settings/source/resources/language/Dutch/strings.xml @@ -10,9 +10,6 @@ Systeem update LCD/VFD Driver Te gebruiken LCD Driver - Services na slaapstand - Update video database na slaapstand - Update music database na slaapstand Netwerk diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/language/English/strings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/language/English/strings.xml index 0ffa78fb2e..72c9edc799 100644 --- a/packages/mediacenter/xbmc-addon-settings/source/resources/language/English/strings.xml +++ b/packages/mediacenter/xbmc-addon-settings/source/resources/language/English/strings.xml @@ -10,9 +10,6 @@ System Update LCD/VFD LCD Driver to use - Wakeup - Update Video Database on Wakeup - Update Music Database on Wakeup Network diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/language/French/strings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/language/French/strings.xml index af3ac4da7d..a874d30608 100644 --- a/packages/mediacenter/xbmc-addon-settings/source/resources/language/French/strings.xml +++ b/packages/mediacenter/xbmc-addon-settings/source/resources/language/French/strings.xml @@ -10,9 +10,6 @@ Mise à jour du système LCD/VFD Pilote LCD - Retour de veille - Mettre à jour la base Vidéo au retour de veille - Mettre à jour la base Musique au retour de veille Réseau diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/language/German/strings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/language/German/strings.xml index 3c8d466e51..af74752d99 100644 --- a/packages/mediacenter/xbmc-addon-settings/source/resources/language/German/strings.xml +++ b/packages/mediacenter/xbmc-addon-settings/source/resources/language/German/strings.xml @@ -10,9 +10,6 @@ System Aktualisierung LCD/VFD LCD Treiber -Beim Aufwachen -Video-Datenbank automatisch aktualisieren -Musik-Datenbank automatisch aktualisieren Netzwerk diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/language/Norwegian/strings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/language/Norwegian/strings.xml index 6c8c118f44..9d34d8da62 100644 --- a/packages/mediacenter/xbmc-addon-settings/source/resources/language/Norwegian/strings.xml +++ b/packages/mediacenter/xbmc-addon-settings/source/resources/language/Norwegian/strings.xml @@ -5,14 +5,11 @@ System Tastatur Språklayout - Språklayout #2 + Språklayout #2 Systemoppdateringer Systemoppdateringer LCD/VFD LCD Driver - Vekke - Oppdater Video Database på vekking - Oppdater Musikk Database på vekking Nettverk diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml index c53f57a16e..ae06f3d34a 100644 --- a/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml +++ b/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml @@ -13,10 +13,6 @@ - - - - diff --git a/packages/mediacenter/xbmc/sleep.d/01_update_videodb b/packages/mediacenter/xbmc/sleep.d/01_update_videodb deleted file mode 100755 index 7b509b0c12..0000000000 --- a/packages/mediacenter/xbmc/sleep.d/01_update_videodb +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. /etc/profile - -case "$1" in - thaw|resume) - ( - if [ -f /var/config/settings.conf ]; then - . /var/config/settings.conf - - if [ "$WAKEUP_VIDEODBUPDATE" = "true" ]; then - usleep 5000000 - xbmc-send --host=127.0.0.1 -a "UpdateLibrary(video)" - fi - fi - )& - ;; - *) exit $NA - ;; -esac diff --git a/packages/mediacenter/xbmc/sleep.d/02_update_musicdb b/packages/mediacenter/xbmc/sleep.d/02_update_musicdb deleted file mode 100755 index 22ab151a7b..0000000000 --- a/packages/mediacenter/xbmc/sleep.d/02_update_musicdb +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. /etc/profile - -case "$1" in - thaw|resume) - ( - if [ -f /var/config/settings.conf ]; then - . /var/config/settings.conf - - if [ "$WAKEUP_MUSICDBUPDATE" = "true" ]; then - usleep 5000000 - xbmc-send --host=127.0.0.1 -a "UpdateLibrary(music)" - fi - fi - )& - ;; - *) exit $NA - ;; -esac