sync with upstream

14 files changed, 31 insertions, 31 deletions

diff --git a/project/cmake/addons/addons/pvr.argustv/pvr.argustv.txt b/project/cmake/addons/addons/pvr.argustv/pvr.argustv.txt
index 43df697..88ccde4 100644
--- a/project/cmake/addons/addons/pvr.argustv/pvr.argustv.txt
+++ b/project/cmake/addons/addons/pvr.argustv/pvr.argustv.txt
@@ -1 +1 @@
-pvr.argustv https://github.com/kodi-pvr/pvr.argustv 6d1f1dd
+pvr.argustv https://github.com/kodi-pvr/pvr.argustv 96ee875
diff --git a/project/cmake/addons/addons/pvr.dvblink/pvr.dvblink.txt b/project/cmake/addons/addons/pvr.dvblink/pvr.dvblink.txt
index ce9e369..1aa96d8 100644
--- a/project/cmake/addons/addons/pvr.dvblink/pvr.dvblink.txt
+++ b/project/cmake/addons/addons/pvr.dvblink/pvr.dvblink.txt
@@ -1 +1 @@
-pvr.dvblink https://github.com/kodi-pvr/pvr.dvblink 342a299
+pvr.dvblink https://github.com/kodi-pvr/pvr.dvblink 5d505b8
diff --git a/project/cmake/addons/addons/pvr.filmon/pvr.filmon.txt b/project/cmake/addons/addons/pvr.filmon/pvr.filmon.txt
index afd4ba4..2e7142c 100644
--- a/project/cmake/addons/addons/pvr.filmon/pvr.filmon.txt
+++ b/project/cmake/addons/addons/pvr.filmon/pvr.filmon.txt
@@ -1 +1 @@
-pvr.filmon https://github.com/kodi-pvr/pvr.filmon 0e5bad6
+pvr.filmon https://github.com/kodi-pvr/pvr.filmon 413fe9e
diff --git a/project/cmake/addons/addons/pvr.hts/pvr.hts.txt b/project/cmake/addons/addons/pvr.hts/pvr.hts.txt
index 4b5530d..5f913f8 100644
--- a/project/cmake/addons/addons/pvr.hts/pvr.hts.txt
+++ b/project/cmake/addons/addons/pvr.hts/pvr.hts.txt
@@ -1 +1 @@
-pvr.hts https://github.com/kodi-pvr/pvr.hts cc1b511
+pvr.hts https://github.com/kodi-pvr/pvr.hts 4bf1a97
diff --git a/project/cmake/addons/addons/pvr.iptvsimple/pvr.iptvsimple.txt b/project/cmake/addons/addons/pvr.iptvsimple/pvr.iptvsimple.txt
index e35bb0d..d1d4d3c 100644
--- a/project/cmake/addons/addons/pvr.iptvsimple/pvr.iptvsimple.txt
+++ b/project/cmake/addons/addons/pvr.iptvsimple/pvr.iptvsimple.txt
@@ -1 +1 @@
-pvr.iptvsimple https://github.com/kodi-pvr/pvr.iptvsimple 4e1e7f6
+pvr.iptvsimple https://github.com/kodi-pvr/pvr.iptvsimple a2e6c6f
diff --git a/project/cmake/addons/addons/pvr.mediaportal.tvserver/pvr.mediaportal.tvserver.txt b/project/cmake/addons/addons/pvr.mediaportal.tvserver/pvr.mediaportal.tvserver.txt
index f113fab..665dfff 100644
--- a/project/cmake/addons/addons/pvr.mediaportal.tvserver/pvr.mediaportal.tvserver.txt
+++ b/project/cmake/addons/addons/pvr.mediaportal.tvserver/pvr.mediaportal.tvserver.txt
@@ -1 +1 @@
-pvr.mediaportal.tvserver https://github.com/kodi-pvr/pvr.mediaportal.tvserver 51e68c4
+pvr.mediaportal.tvserver https://github.com/kodi-pvr/pvr.mediaportal.tvserver 6f8ca82
diff --git a/project/cmake/addons/addons/pvr.mythtv/pvr.mythtv.txt b/project/cmake/addons/addons/pvr.mythtv/pvr.mythtv.txt
index fb37936..de930ab 100644
--- a/project/cmake/addons/addons/pvr.mythtv/pvr.mythtv.txt
+++ b/project/cmake/addons/addons/pvr.mythtv/pvr.mythtv.txt
@@ -1 +1 @@
-pvr.mythtv https://github.com/kodi-pvr/pvr.mythtv ae577ad
+pvr.mythtv https://github.com/kodi-pvr/pvr.mythtv ef9cf41
diff --git a/project/cmake/addons/addons/pvr.nextpvr/pvr.nextpvr.txt b/project/cmake/addons/addons/pvr.nextpvr/pvr.nextpvr.txt
index 95a56b9..ecb73d2 100644
--- a/project/cmake/addons/addons/pvr.nextpvr/pvr.nextpvr.txt
+++ b/project/cmake/addons/addons/pvr.nextpvr/pvr.nextpvr.txt
@@ -1 +1 @@
-pvr.nextpvr https://github.com/kodi-pvr/pvr.nextpvr 7c6f1f8
+pvr.nextpvr https://github.com/kodi-pvr/pvr.nextpvr 1ecbf87
diff --git a/project/cmake/addons/addons/pvr.njoy/pvr.njoy.txt b/project/cmake/addons/addons/pvr.njoy/pvr.njoy.txt
index 967d5b9..fec1b59 100644
--- a/project/cmake/addons/addons/pvr.njoy/pvr.njoy.txt
+++ b/project/cmake/addons/addons/pvr.njoy/pvr.njoy.txt
@@ -1 +1 @@
-pvr.njoy https://github.com/kodi-pvr/pvr.njoy 583f1cc
+pvr.njoy https://github.com/kodi-pvr/pvr.njoy fcd6294
diff --git a/project/cmake/addons/addons/pvr.pctv/pvr.pctv.txt b/project/cmake/addons/addons/pvr.pctv/pvr.pctv.txt
index 8ba7d9c..b17bdc7 100644
--- a/project/cmake/addons/addons/pvr.pctv/pvr.pctv.txt
+++ b/project/cmake/addons/addons/pvr.pctv/pvr.pctv.txt
@@ -1 +1 @@
-pvr.pctv https://github.com/kodi-pvr/pvr.pctv 7929c6b
+pvr.pctv https://github.com/kodi-pvr/pvr.pctv 0a0924e
diff --git a/project/cmake/addons/addons/pvr.vuplus/pvr.vuplus.txt b/project/cmake/addons/addons/pvr.vuplus/pvr.vuplus.txt
index 1192460..36d60af 100644
--- a/project/cmake/addons/addons/pvr.vuplus/pvr.vuplus.txt
+++ b/project/cmake/addons/addons/pvr.vuplus/pvr.vuplus.txt
@@ -1 +1 @@
-pvr.vuplus https://github.com/kodi-pvr/pvr.vuplus 366c8df
+pvr.vuplus https://github.com/kodi-pvr/pvr.vuplus d6abad3
diff --git a/project/cmake/addons/depends/common/kodi-platform/kodi-platform.txt b/project/cmake/addons/depends/common/kodi-platform/kodi-platform.txt
index fb6916a..009c72b 100644
--- a/project/cmake/addons/depends/common/kodi-platform/kodi-platform.txt
+++ b/project/cmake/addons/depends/common/kodi-platform/kodi-platform.txt
@@ -1 +1 @@
-kodi-platform https://github.com/xbmc/kodi-platform 68315f0
+kodi-platform https://github.com/xbmc/kodi-platform 48bdd985
diff --git a/version.txt b/version.txt
index d21c18f..09644f6 100644
--- a/version.txt
+++ b/version.txt
@@ -3,9 +3,9 @@ COMPANY_NAME XBMC-Foundation
 WEBSITE http://kodi.tv
 VERSION_MAJOR 15
 VERSION_MINOR 0
-VERSION_TAG ALPHA2
-VERSION_CODE 149702
-ADDON_API 14.9.702
+VERSION_TAG BETA1
+VERSION_CODE 149801
+ADDON_API 14.9.801
 
 # Notes:
 # Change AC_INIT in configure.in
diff --git a/xbmc/cores/AudioEngine/Utils/AEChannelData.h b/xbmc/cores/AudioEngine/Utils/AEChannelData.h
index 5d47651..9993c84 100644
--- a/xbmc/cores/AudioEngine/Utils/AEChannelData.h
+++ b/xbmc/cores/AudioEngine/Utils/AEChannelData.h
@@ -32,22 +32,22 @@ enum AEChannel
   AE_CH_TC  , AE_CH_TBL, AE_CH_TBR, AE_CH_TBC, AE_CH_BLOC, AE_CH_BROC,
 
   /* p16v devices */
-  AE_CH_UNKNOWN1,
-  AE_CH_UNKNOWN2,
-  AE_CH_UNKNOWN3,
-  AE_CH_UNKNOWN4,
-  AE_CH_UNKNOWN5,
-  AE_CH_UNKNOWN6,
-  AE_CH_UNKNOWN7,
-  AE_CH_UNKNOWN8,
-  AE_CH_UNKNOWN9,
-  AE_CH_UNKNOWN10,
-  AE_CH_UNKNOWN11,
-  AE_CH_UNKNOWN12,
-  AE_CH_UNKNOWN13,
-  AE_CH_UNKNOWN14,
-  AE_CH_UNKNOWN15,
-  AE_CH_UNKNOWN16,
+  AE_CH_UNKNOWN1 , AE_CH_UNKNOWN2 , AE_CH_UNKNOWN3 , AE_CH_UNKNOWN4 ,
+  AE_CH_UNKNOWN5 , AE_CH_UNKNOWN6 , AE_CH_UNKNOWN7 , AE_CH_UNKNOWN8 ,
+  AE_CH_UNKNOWN9 , AE_CH_UNKNOWN10, AE_CH_UNKNOWN11, AE_CH_UNKNOWN12,
+  AE_CH_UNKNOWN13, AE_CH_UNKNOWN14, AE_CH_UNKNOWN15, AE_CH_UNKNOWN16,
+  AE_CH_UNKNOWN17, AE_CH_UNKNOWN18, AE_CH_UNKNOWN19, AE_CH_UNKNOWN20,
+  AE_CH_UNKNOWN21, AE_CH_UNKNOWN22, AE_CH_UNKNOWN23, AE_CH_UNKNOWN24,
+  AE_CH_UNKNOWN25, AE_CH_UNKNOWN26, AE_CH_UNKNOWN27, AE_CH_UNKNOWN28,
+  AE_CH_UNKNOWN29, AE_CH_UNKNOWN30, AE_CH_UNKNOWN31, AE_CH_UNKNOWN32,
+  AE_CH_UNKNOWN33, AE_CH_UNKNOWN34, AE_CH_UNKNOWN35, AE_CH_UNKNOWN36,
+  AE_CH_UNKNOWN37, AE_CH_UNKNOWN38, AE_CH_UNKNOWN39, AE_CH_UNKNOWN40,
+  AE_CH_UNKNOWN41, AE_CH_UNKNOWN42, AE_CH_UNKNOWN43, AE_CH_UNKNOWN44,
+  AE_CH_UNKNOWN45, AE_CH_UNKNOWN46, AE_CH_UNKNOWN47, AE_CH_UNKNOWN48,
+  AE_CH_UNKNOWN49, AE_CH_UNKNOWN50, AE_CH_UNKNOWN51, AE_CH_UNKNOWN52,
+  AE_CH_UNKNOWN53, AE_CH_UNKNOWN54, AE_CH_UNKNOWN55, AE_CH_UNKNOWN56,
+  AE_CH_UNKNOWN57, AE_CH_UNKNOWN58, AE_CH_UNKNOWN59, AE_CH_UNKNOWN60,
+  AE_CH_UNKNOWN61, AE_CH_UNKNOWN62, AE_CH_UNKNOWN63, AE_CH_UNKNOWN64,
 
   AE_CH_MAX
 };