The branch, frodo has been updated
via bf48441fb04d65202358ec0d504a606f327396dc (commit)
from c93b31275829e78bede81896ca84814bfa9e0f31 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=bf48441fb04d65202358ec0d504a606f327396dc
commit bf48441fb04d65202358ec0d504a606f327396dc
Author: Martijn Kaijser <mcm.kaij...@gmail.com>
Date: Sat Oct 5 22:37:39 2013 +0200
[script.xbmc.audio.mixer] 2.0.3
diff --git a/script.xbmc.audio.mixer/addon.xml
b/script.xbmc.audio.mixer/addon.xml
index fc5355a..02760a9 100644
--- a/script.xbmc.audio.mixer/addon.xml
+++ b/script.xbmc.audio.mixer/addon.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="script.xbmc.audio.mixer"
name="XBMC Audio Mixer"
- version="2.0.2"
+ version="2.0.3"
provider-name="Team XBMC">
<requires>
- <import addon="xbmc.python" version="2.0.0"/>
+ <import addon="xbmc.python" version="2.1.0"/>
</requires>
<extension point="xbmc.python.script"
library="default.py" />
@@ -12,5 +12,10 @@
<platform>osx linux</platform>
<summary lang="en">XBMC Audio Mixer</summary>
<description lang="en"></description>
+ <license>GNU GENERAL PUBLIC LICENSE. Version 2, June 1991</license>
+ <forum></forum>
+ <website></website>
+ <email></email>
+ <source></source>
</extension>
</addon>
diff --git a/script.xbmc.audio.mixer/default.py
b/script.xbmc.audio.mixer/default.py
index a478f27..e140c95 100644
--- a/script.xbmc.audio.mixer/default.py
+++ b/script.xbmc.audio.mixer/default.py
@@ -1,6 +1,6 @@
-# *
-# * Copyright (C) 2005-2012 Team XBMC
-# * http://www.xbmc.org
+#/*
+# * Copyright (C) 2005-2013 Team XBMC
+# * http://xbmc.org
# *
# * 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
@@ -13,9 +13,8 @@
# * GNU General Public License for more details.
# *
# * You should have received a copy of the GNU General Public License
-# * along with XBMC; 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
+# * along with XBMC; see the file COPYING. If not, see
+# * <http://www.gnu.org/licenses/>.
# *
# */
diff --git a/script.xbmc.audio.mixer/resources/language/English/strings.xml
b/script.xbmc.audio.mixer/resources/language/English/strings.xml
index 2b32189..f5dd085 100644
--- a/script.xbmc.audio.mixer/resources/language/English/strings.xml
+++ b/script.xbmc.audio.mixer/resources/language/English/strings.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<strings>
<!--Common-->
- <string id="10">Mute</string>
- <string id="11">Apply</string>
- <string id="12">Save</string>
+ <string id="30010">Mute</string>
+ <string id="30011">Apply</string>
+ <string id="30012">Save</string>
<string id="30001">Failed to save audio settings</string>
</strings>
diff --git a/script.xbmc.audio.mixer/resources/lib/alsaMixerCore.py
b/script.xbmc.audio.mixer/resources/lib/alsaMixerCore.py
index e0c94f9..eb699c6 100644
--- a/script.xbmc.audio.mixer/resources/lib/alsaMixerCore.py
+++ b/script.xbmc.audio.mixer/resources/lib/alsaMixerCore.py
@@ -1,8 +1,8 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
-# *
-# * Copyright (C) 2005-2012 Team XBMC
-# * http://www.xbmc.org
+#/*
+# * Copyright (C) 2005-2013 Team XBMC
+# * http://xbmc.org
# *
# * 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
@@ -15,9 +15,8 @@
# * GNU General Public License for more details.
# *
# * You should have received a copy of the GNU General Public License
-# * along with XBMC; 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
+# * along with XBMC; see the file COPYING. If not, see
+# * <http://www.gnu.org/licenses/>.
# *
# */
diff --git a/script.xbmc.audio.mixer/resources/lib/gui.py
b/script.xbmc.audio.mixer/resources/lib/gui.py
index 8351f83..d7dcb40 100644
--- a/script.xbmc.audio.mixer/resources/lib/gui.py
+++ b/script.xbmc.audio.mixer/resources/lib/gui.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
-# *
-# * Copyright (C) 2005-2012 Team XBMC
-# * http://www.xbmc.org
+#/*
+# * Copyright (C) 2005-2013 Team XBMC
+# * http://xbmc.org
# *
# * 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
@@ -14,9 +14,8 @@
# * GNU General Public License for more details.
# *
# * You should have received a copy of the GNU General Public License
-# * along with XBMC; 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
+# * along with XBMC; see the file COPYING. If not, see
+# * <http://www.gnu.org/licenses/>.
# *
# */
diff --git a/script.xbmc.audio.mixer/resources/lib/osascriptCore.py
b/script.xbmc.audio.mixer/resources/lib/osascriptCore.py
index 63a48dc..768e1f4 100644
--- a/script.xbmc.audio.mixer/resources/lib/osascriptCore.py
+++ b/script.xbmc.audio.mixer/resources/lib/osascriptCore.py
@@ -1,8 +1,7 @@
#!/usr/bin/python
-# -*- coding: utf-8 -*-
-# *
-# * Copyright (C) 2005-2012 Team XBMC
-# * http://www.xbmc.org
+#/*
+# * Copyright (C) 2005-2013 Team XBMC
+# * http://xbmc.org
# *
# * 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
@@ -15,9 +14,8 @@
# * GNU General Public License for more details.
# *
# * You should have received a copy of the GNU General Public License
-# * along with XBMC; 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
+# * along with XBMC; see the file COPYING. If not, see
+# * <http://www.gnu.org/licenses/>.
# *
# */
diff --git
a/script.xbmc.audio.mixer/resources/skins/Default/720p/script-xbmc-audio-mixer.xml
b/script.xbmc.audio.mixer/resources/skins/Default/720p/script-xbmc-audio-mixer.xml
index b11c633..8eb7547 100644
---
a/script.xbmc.audio.mixer/resources/skins/Default/720p/script-xbmc-audio-mixer.xml
+++
b/script.xbmc.audio.mixer/resources/skins/Default/720p/script-xbmc-audio-mixer.xml
@@ -77,7 +77,7 @@
<height>45</height>
<visible>true</visible>
<colordiffuse>FFFFFFFF</colordiffuse>
- <label>$LOCALIZE[SCRIPT10]</label>
+ <label>$ADDON[script.xbmc.audio.mixer
30010]</label>
<font>font12</font>
<textcolor>FFFFFFFF</textcolor>
<texturefocus>alsa-MenuItemFO.png</texturefocus>
@@ -158,7 +158,7 @@
<height>45</height>
<visible>true</visible>
<colordiffuse>FFFFFFFF</colordiffuse>
- <label>$LOCALIZE[SCRIPT10]</label>
+ <label>$ADDON[script.xbmc.audio.mixer
30010]</label>
<font>font12</font>
<textcolor>FFFFFFFF</textcolor>
<texturefocus>alsa-MenuItemFO.png</texturefocus>
@@ -239,7 +239,7 @@
<height>45</height>
<visible>true</visible>
<colordiffuse>FFFFFFFF</colordiffuse>
- <label>$LOCALIZE[SCRIPT10]</label>
+ <label>$ADDON[script.xbmc.audio.mixer
30010]</label>
<font>font12</font>
<textcolor>FFFFFFFF</textcolor>
<texturefocus>alsa-MenuItemFO.png</texturefocus>
@@ -320,7 +320,7 @@
<height>45</height>
<visible>true</visible>
<colordiffuse>FFFFFFFF</colordiffuse>
- <label>$LOCALIZE[SCRIPT10]</label>
+ <label>$ADDON[script.xbmc.audio.mixer
30010]</label>
<font>font12</font>
<textcolor>FFFFFFFF</textcolor>
<texturefocus>alsa-MenuItemFO.png</texturefocus>
@@ -401,7 +401,7 @@
<height>45</height>
<visible>true</visible>
<colordiffuse>FFFFFFFF</colordiffuse>
- <label>$LOCALIZE[SCRIPT10]</label>
+ <label>$ADDON[script.xbmc.audio.mixer
30010]</label>
<font>font12</font>
<textcolor>FFFFFFFF</textcolor>
<texturefocus>alsa-MenuItemFO.png</texturefocus>
@@ -482,7 +482,7 @@
<height>45</height>
<visible>true</visible>
<colordiffuse>FFFFFFFF</colordiffuse>
- <label>$LOCALIZE[SCRIPT10]</label>
+ <label>$ADDON[script.xbmc.audio.mixer
30010]</label>
<font>font12</font>
<textcolor>FFFFFFFF</textcolor>
<texturefocus>alsa-MenuItemFO.png</texturefocus>
@@ -563,7 +563,7 @@
<height>45</height>
<visible>true</visible>
<colordiffuse>FFFFFFFF</colordiffuse>
- <label>$LOCALIZE[SCRIPT10]</label>
+ <label>$ADDON[script.xbmc.audio.mixer
30010]</label>
<font>font12</font>
<textcolor>FFFFFFFF</textcolor>
<texturefocus>alsa-MenuItemFO.png</texturefocus>
@@ -644,7 +644,7 @@
<height>45</height>
<visible>true</visible>
<colordiffuse>FFFFFFFF</colordiffuse>
- <label>$LOCALIZE[SCRIPT10]</label>
+ <label>$ADDON[script.xbmc.audio.mixer
30010]</label>
<font>font12</font>
<textcolor>FFFFFFFF</textcolor>
<texturefocus>alsa-MenuItemFO.png</texturefocus>
@@ -725,7 +725,7 @@
<height>45</height>
<visible>true</visible>
<colordiffuse>FFFFFFFF</colordiffuse>
- <label>$LOCALIZE[SCRIPT10]</label>
+ <label>$ADDON[script.xbmc.audio.mixer
30010]</label>
<font>font12</font>
<textcolor>FFFFFFFF</textcolor>
<texturefocus>alsa-MenuItemFO.png</texturefocus>
@@ -806,7 +806,7 @@
<height>45</height>
<visible>true</visible>
<colordiffuse>FFFFFFFF</colordiffuse>
- <label>$LOCALIZE[SCRIPT10]</label>
+ <label>$ADDON[script.xbmc.audio.mixer
30010]</label>
<font>font12</font>
<textcolor>FFFFFFFF</textcolor>
<texturefocus>alsa-MenuItemFO.png</texturefocus>
@@ -887,7 +887,7 @@
<height>45</height>
<visible>true</visible>
<colordiffuse>FFFFFFFF</colordiffuse>
- <label>$LOCALIZE[SCRIPT10]</label>
+ <label>$ADDON[script.xbmc.audio.mixer
30010]</label>
<font>font12</font>
<textcolor>FFFFFFFF</textcolor>
<texturefocus>alsa-MenuItemFO.png</texturefocus>
@@ -968,7 +968,7 @@
<height>45</height>
<visible>true</visible>
<colordiffuse>FFFFFFFF</colordiffuse>
- <label>$LOCALIZE[SCRIPT10]</label>
+ <label>$ADDON[script.xbmc.audio.mixer
30010]</label>
<font>font12</font>
<textcolor>FFFFFFFF</textcolor>
<texturefocus>alsa-MenuItemFO.png</texturefocus>
@@ -1049,7 +1049,7 @@
<height>45</height>
<visible>true</visible>
<colordiffuse>FFFFFFFF</colordiffuse>
- <label>$LOCALIZE[SCRIPT10]</label>
+ <label>$ADDON[script.xbmc.audio.mixer
30010]</label>
<font>font12</font>
<textcolor>FFFFFFFF</textcolor>
<texturefocus>alsa-MenuItemFO.png</texturefocus>
@@ -1130,7 +1130,7 @@
<height>45</height>
<visible>true</visible>
<colordiffuse>FFFFFFFF</colordiffuse>
- <label>$LOCALIZE[SCRIPT10]</label>
+ <label>$ADDON[script.xbmc.audio.mixer
30010]</label>
<font>font12</font>
<textcolor>FFFFFFFF</textcolor>
<texturefocus>alsa-MenuItemFO.png</texturefocus>
@@ -1211,7 +1211,7 @@
<height>45</height>
<visible>true</visible>
<colordiffuse>FFFFFFFF</colordiffuse>
- <label>$LOCALIZE[SCRIPT10]</label>
+ <label>$ADDON[script.xbmc.audio.mixer
30010]</label>
<font>font12</font>
<textcolor>FFFFFFFF</textcolor>
<texturefocus>alsa-MenuItemFO.png</texturefocus>
@@ -1292,7 +1292,7 @@
<height>45</height>
<visible>true</visible>
<colordiffuse>FFFFFFFF</colordiffuse>
- <label>$LOCALIZE[SCRIPT10]</label>
+ <label>$ADDON[script.xbmc.audio.mixer
30010]</label>
<font>font12</font>
<textcolor>FFFFFFFF</textcolor>
<texturefocus>alsa-MenuItemFO.png</texturefocus>
@@ -1373,7 +1373,7 @@
<height>45</height>
<visible>true</visible>
<colordiffuse>FFFFFFFF</colordiffuse>
- <label>$LOCALIZE[SCRIPT10]</label>
+ <label>$ADDON[script.xbmc.audio.mixer
30010]</label>
<font>font12</font>
<textcolor>FFFFFFFF</textcolor>
<texturefocus>alsa-MenuItemFO.png</texturefocus>
@@ -1454,7 +1454,7 @@
<height>45</height>
<visible>true</visible>
<colordiffuse>FFFFFFFF</colordiffuse>
- <label>$LOCALIZE[SCRIPT10]</label>
+ <label>$ADDON[script.xbmc.audio.mixer
30010]</label>
<font>font12</font>
<textcolor>FFFFFFFF</textcolor>
<texturefocus>alsa-MenuItemFO.png</texturefocus>
@@ -1535,7 +1535,7 @@
<height>45</height>
<visible>true</visible>
<colordiffuse>FFFFFFFF</colordiffuse>
- <label>$LOCALIZE[SCRIPT10]</label>
+ <label>$ADDON[script.xbmc.audio.mixer
30010]</label>
<font>font12</font>
<textcolor>FFFFFFFF</textcolor>
<texturefocus>alsa-MenuItemFO.png</texturefocus>
@@ -1616,7 +1616,7 @@
<height>45</height>
<visible>true</visible>
<colordiffuse>FFFFFFFF</colordiffuse>
- <label>$LOCALIZE[SCRIPT10]</label>
+ <label>$ADDON[script.xbmc.audio.mixer
30010]</label>
<font>font12</font>
<textcolor>FFFFFFFF</textcolor>
<texturefocus>alsa-MenuItemFO.png</texturefocus>
@@ -1696,7 +1696,7 @@
<height>45</height>
<visible>true</visible>
<colordiffuse>FFFFFFFF</colordiffuse>
- <label>$LOCALIZE[SCRIPT10]</label>
+ <label>$ADDON[script.xbmc.audio.mixer
30010]</label>
<font>font12</font>
<textcolor>FFFFFFFF</textcolor>
<texturefocus>alsa-MenuItemFO.png</texturefocus>
@@ -1777,7 +1777,7 @@
<height>45</height>
<visible>true</visible>
<colordiffuse>FFFFFFFF</colordiffuse>
- <label>$LOCALIZE[SCRIPT10]</label>
+ <label>$ADDON[script.xbmc.audio.mixer
30010]</label>
<font>font12</font>
<textcolor>FFFFFFFF</textcolor>
<texturefocus>alsa-MenuItemFO.png</texturefocus>
@@ -1858,7 +1858,7 @@
<height>45</height>
<visible>true</visible>
<colordiffuse>FFFFFFFF</colordiffuse>
- <label>$LOCALIZE[SCRIPT10]</label>
+ <label>$ADDON[script.xbmc.audio.mixer
30010]</label>
<font>font12</font>
<textcolor>FFFFFFFF</textcolor>
<texturefocus>alsa-MenuItemFO.png</texturefocus>
@@ -1939,7 +1939,7 @@
<height>45</height>
<visible>true</visible>
<colordiffuse>FFFFFFFF</colordiffuse>
- <label>$LOCALIZE[SCRIPT10]</label>
+ <label>$ADDON[script.xbmc.audio.mixer
30010]</label>
<font>font12</font>
<textcolor>FFFFFFFF</textcolor>
<texturefocus>alsa-MenuItemFO.png</texturefocus>
@@ -2020,7 +2020,7 @@
<height>45</height>
<visible>true</visible>
<colordiffuse>FFFFFFFF</colordiffuse>
- <label>$LOCALIZE[SCRIPT10]</label>
+ <label>$ADDON[script.xbmc.audio.mixer
30010]</label>
<font>font12</font>
<textcolor>FFFFFFFF</textcolor>
<texturefocus>alsa-MenuItemFO.png</texturefocus>
@@ -2101,7 +2101,7 @@
<height>45</height>
<visible>true</visible>
<colordiffuse>FFFFFFFF</colordiffuse>
- <label>$LOCALIZE[SCRIPT10]</label>
+ <label>$ADDON[script.xbmc.audio.mixer
30010]</label>
<font>font12</font>
<textcolor>FFFFFFFF</textcolor>
<texturefocus>alsa-MenuItemFO.png</texturefocus>
@@ -2182,7 +2182,7 @@
<height>45</height>
<visible>true</visible>
<colordiffuse>FFFFFFFF</colordiffuse>
- <label>$LOCALIZE[SCRIPT10]</label>
+ <label>$ADDON[script.xbmc.audio.mixer
30010]</label>
<font>font12</font>
<textcolor>FFFFFFFF</textcolor>
<texturefocus>alsa-MenuItemFO.png</texturefocus>
@@ -2263,7 +2263,7 @@
<height>45</height>
<visible>true</visible>
<colordiffuse>FFFFFFFF</colordiffuse>
- <label>$LOCALIZE[SCRIPT10]</label>
+ <label>$ADDON[script.xbmc.audio.mixer
30010]</label>
<font>font12</font>
<textcolor>FFFFFFFF</textcolor>
<texturefocus>alsa-MenuItemFO.png</texturefocus>
@@ -2344,7 +2344,7 @@
<height>45</height>
<visible>true</visible>
<colordiffuse>FFFFFFFF</colordiffuse>
- <label>$LOCALIZE[SCRIPT10]</label>
+ <label>$ADDON[script.xbmc.audio.mixer
30010]</label>
<font>font12</font>
<textcolor>FFFFFFFF</textcolor>
<texturefocus>alsa-MenuItemFO.png</texturefocus>
@@ -2425,7 +2425,7 @@
<height>45</height>
<visible>true</visible>
<colordiffuse>FFFFFFFF</colordiffuse>
- <label>$LOCALIZE[SCRIPT10]</label>
+ <label>$ADDON[script.xbmc.audio.mixer
30010]</label>
<font>font12</font>
<textcolor>FFFFFFFF</textcolor>
<texturefocus>alsa-MenuItemFO.png</texturefocus>
-----------------------------------------------------------------------
Summary of changes:
script.xbmc.audio.mixer/addon.xml | 9 ++-
script.xbmc.audio.mixer/default.py | 11 ++--
.../resources/language/English/strings.xml | 6 +-
.../resources/lib/alsaMixerCore.py | 11 ++--
script.xbmc.audio.mixer/resources/lib/gui.py | 11 ++--
.../resources/lib/osascriptCore.py | 12 ++--
.../skins/Default/720p/script-xbmc-audio-mixer.xml | 60 ++++++++++----------
7 files changed, 60 insertions(+), 60 deletions(-)
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from
the latest Intel processors and coprocessors. See abstracts and register >
http://pubads.g.doubleclick.net/gampad/clk?id=60134791&iu=/4140/ostg.clktrk
_______________________________________________
Xbmc-addons mailing list
Xbmc-addons@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
