rename dvdplayer to VideoPlayer

43 files changed, 14 insertions, 14 deletions

diff --git a/system/playercorefactory.xml b/system/playercorefactory.xml
index df0e42f1f3..be6b7219ab 100644
--- a/system/playercorefactory.xml
+++ b/system/playercorefactory.xml
@@ -3,38 +3,38 @@
   <players>
     <!-- These are compiled-in as re-ordering them would break scripts
     The following aliases may also be used:
-      audiodefaultplayer, videodefaultplayer, videodefaultdvdplayer
-    <player name="DVDPlayer" audio="true" video="true" />
-    <player name="DVDPlayer" /> placeholder for MPlayer
+      audiodefaultplayer, videodefaultplayer, videodefaultVideoPlayer
+    <player name="VideoPlayer" audio="true" video="true" />
+    <player name="VideoPlayer" /> placeholder for MPlayer
     <player name="PAPlayer" audio="true" />
     -->
   </players>
 
   <rules name="system rules">
-    <rule name="mms/udp" protocols="mms|mmsh|udp" player="DVDPlayer" />
+    <rule name="mms/udp" protocols="mms|mmsh|udp" player="VideoPlayer" />
     <rule name="lastfm/shout" protocols="lastfm|shout" player="PAPlayer" />
     <rule name="rtmp" protocols="rtmp" player="videodefaultplayer" />
 
-    <!-- dvdplayer can play standard rtsp streams -->
+    <!-- VideoPlayer can play standard rtsp streams -->
     <rule name="rtsp" protocols="rtsp" filetypes="!(rm|ra)"  player="PAPlayer" />
 
     <!-- Internet streams -->
     <rule name="streams" internetstream="true">
-      <rule name="aacp/sdp" mimetypes="audio/aacp|application/sdp" player="DVDPlayer" />
+      <rule name="aacp/sdp" mimetypes="audio/aacp|application/sdp" player="VideoPlayer" />
       <rule name="mp2" mimetypes="application/octet-stream" filetypes="mp2" player="PAPlayer" />
     </rule>
 
     <!-- DVDs -->
-    <rule name="dvd" dvd="true" player="DVDPlayer" />
-    <rule name="dvdimage" dvdimage="true" player="DVDPlayer" />
+    <rule name="dvd" dvd="true" player="VideoPlayer" />
+    <rule name="dvdimage" dvdimage="true" player="VideoPlayer" />
 
-    <!-- Only dvdplayer can handle these normally -->
-    <rule name="sdp/asf" filetypes="sdp|asf" player="DVDPlayer" />
+    <!-- Only VideoPlayer can handle these normally -->
+    <rule name="sdp/asf" filetypes="sdp|asf" player="VideoPlayer" />
 
-    <!-- Pass these to dvdplayer as we do not know if they are audio or video -->
-    <rule name="nsv" filetypes="nsv" player="DVDPlayer" />
+    <!-- Pass these to VideoPlayer as we do not know if they are audio or video -->
+    <rule name="nsv" filetypes="nsv" player="VideoPlayer" />
 
-    <!-- pvr radio channels should be played by dvdplayer because they need buffering -->
-    <rule name="radio" filetypes="pvr" filename=".*/radio/.*" player="DVDPlayer" />
+    <!-- pvr radio channels should be played by VideoPlayer because they need buffering -->
+    <rule name="radio" filetypes="pvr" filename=".*/radio/.*" player="VideoPlayer" />
   </rules>
 </playercorefactory>
diff --git a/system/players/dvdplayer/etc/fonts/conf.avail/10-autohint.conf b/system/players/VideoPlayer/etc/fonts/conf.avail/10-autohint.conf
index 5406f4eddb..5406f4eddb 100644
--- a/system/players/dvdplayer/etc/fonts/conf.avail/10-autohint.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.avail/10-autohint.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.avail/10-no-sub-pixel.conf b/system/players/VideoPlayer/etc/fonts/conf.avail/10-no-sub-pixel.conf
index 5d64a0b433..5d64a0b433 100644
--- a/system/players/dvdplayer/etc/fonts/conf.avail/10-no-sub-pixel.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.avail/10-no-sub-pixel.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.avail/10-sub-pixel-bgr.conf b/system/players/VideoPlayer/etc/fonts/conf.avail/10-sub-pixel-bgr.conf
index 2aba95e13d..2aba95e13d 100644
--- a/system/players/dvdplayer/etc/fonts/conf.avail/10-sub-pixel-bgr.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.avail/10-sub-pixel-bgr.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.avail/10-sub-pixel-rgb.conf b/system/players/VideoPlayer/etc/fonts/conf.avail/10-sub-pixel-rgb.conf
index c4e8a42e1c..c4e8a42e1c 100644
--- a/system/players/dvdplayer/etc/fonts/conf.avail/10-sub-pixel-rgb.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.avail/10-sub-pixel-rgb.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.avail/10-sub-pixel-vbgr.conf b/system/players/VideoPlayer/etc/fonts/conf.avail/10-sub-pixel-vbgr.conf
index 0cdad2a700..0cdad2a700 100644
--- a/system/players/dvdplayer/etc/fonts/conf.avail/10-sub-pixel-vbgr.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.avail/10-sub-pixel-vbgr.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.avail/10-sub-pixel-vrgb.conf b/system/players/VideoPlayer/etc/fonts/conf.avail/10-sub-pixel-vrgb.conf
index 60239e0254..60239e0254 100644
--- a/system/players/dvdplayer/etc/fonts/conf.avail/10-sub-pixel-vrgb.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.avail/10-sub-pixel-vrgb.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.avail/10-unhinted.conf b/system/players/VideoPlayer/etc/fonts/conf.avail/10-unhinted.conf
index fb0b375acd..fb0b375acd 100644
--- a/system/players/dvdplayer/etc/fonts/conf.avail/10-unhinted.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.avail/10-unhinted.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.avail/20-fix-globaladvance.conf b/system/players/VideoPlayer/etc/fonts/conf.avail/20-fix-globaladvance.conf
index a62162ca0f..a62162ca0f 100644
--- a/system/players/dvdplayer/etc/fonts/conf.avail/20-fix-globaladvance.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.avail/20-fix-globaladvance.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.avail/20-lohit-gujarati.conf b/system/players/VideoPlayer/etc/fonts/conf.avail/20-lohit-gujarati.conf
index 1c29d0d0ad..1c29d0d0ad 100644
--- a/system/players/dvdplayer/etc/fonts/conf.avail/20-lohit-gujarati.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.avail/20-lohit-gujarati.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.avail/20-unhint-small-vera.conf b/system/players/VideoPlayer/etc/fonts/conf.avail/20-unhint-small-vera.conf
index 3078119803..3078119803 100644
--- a/system/players/dvdplayer/etc/fonts/conf.avail/20-unhint-small-vera.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.avail/20-unhint-small-vera.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.avail/30-amt-aliases.conf b/system/players/VideoPlayer/etc/fonts/conf.avail/30-amt-aliases.conf
index d6df67e055..d6df67e055 100644
--- a/system/players/dvdplayer/etc/fonts/conf.avail/30-amt-aliases.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.avail/30-amt-aliases.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.avail/30-urw-aliases.conf b/system/players/VideoPlayer/etc/fonts/conf.avail/30-urw-aliases.conf
index cf90dd5466..cf90dd5466 100644
--- a/system/players/dvdplayer/etc/fonts/conf.avail/30-urw-aliases.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.avail/30-urw-aliases.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.avail/40-generic.conf b/system/players/VideoPlayer/etc/fonts/conf.avail/40-generic.conf
index 84e85e44bb..84e85e44bb 100644
--- a/system/players/dvdplayer/etc/fonts/conf.avail/40-generic.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.avail/40-generic.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.avail/49-sansserif.conf b/system/players/VideoPlayer/etc/fonts/conf.avail/49-sansserif.conf
index c6209a7d31..c6209a7d31 100644
--- a/system/players/dvdplayer/etc/fonts/conf.avail/49-sansserif.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.avail/49-sansserif.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.avail/50-user.conf b/system/players/VideoPlayer/etc/fonts/conf.avail/50-user.conf
index 9a38a40ad9..9a38a40ad9 100644
--- a/system/players/dvdplayer/etc/fonts/conf.avail/50-user.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.avail/50-user.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.avail/51-local.conf b/system/players/VideoPlayer/etc/fonts/conf.avail/51-local.conf
index d35046e78b..d35046e78b 100644
--- a/system/players/dvdplayer/etc/fonts/conf.avail/51-local.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.avail/51-local.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.avail/60-latin.conf b/system/players/VideoPlayer/etc/fonts/conf.avail/60-latin.conf
index 06cdd7e6c7..06cdd7e6c7 100644
--- a/system/players/dvdplayer/etc/fonts/conf.avail/60-latin.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.avail/60-latin.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.avail/65-fonts-persian.conf b/system/players/VideoPlayer/etc/fonts/conf.avail/65-fonts-persian.conf
index e30c4d9691..e30c4d9691 100644
--- a/system/players/dvdplayer/etc/fonts/conf.avail/65-fonts-persian.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.avail/65-fonts-persian.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.avail/65-nonlatin.conf b/system/players/VideoPlayer/etc/fonts/conf.avail/65-nonlatin.conf
index f8dbb64fc4..f8dbb64fc4 100644
--- a/system/players/dvdplayer/etc/fonts/conf.avail/65-nonlatin.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.avail/65-nonlatin.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.avail/69-unifont.conf b/system/players/VideoPlayer/etc/fonts/conf.avail/69-unifont.conf
index a784af920d..a784af920d 100644
--- a/system/players/dvdplayer/etc/fonts/conf.avail/69-unifont.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.avail/69-unifont.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.avail/70-no-bitmaps.conf b/system/players/VideoPlayer/etc/fonts/conf.avail/70-no-bitmaps.conf
index e8fb6a947f..e8fb6a947f 100644
--- a/system/players/dvdplayer/etc/fonts/conf.avail/70-no-bitmaps.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.avail/70-no-bitmaps.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.avail/70-yes-bitmaps.conf b/system/players/VideoPlayer/etc/fonts/conf.avail/70-yes-bitmaps.conf
index c539c70ac3..c539c70ac3 100644
--- a/system/players/dvdplayer/etc/fonts/conf.avail/70-yes-bitmaps.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.avail/70-yes-bitmaps.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.avail/80-delicious.conf b/system/players/VideoPlayer/etc/fonts/conf.avail/80-delicious.conf
index 701429bcc4..701429bcc4 100644
--- a/system/players/dvdplayer/etc/fonts/conf.avail/80-delicious.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.avail/80-delicious.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.avail/90-synthetic.conf b/system/players/VideoPlayer/etc/fonts/conf.avail/90-synthetic.conf
index 63d9b891b3..63d9b891b3 100644
--- a/system/players/dvdplayer/etc/fonts/conf.avail/90-synthetic.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.avail/90-synthetic.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.avail/README b/system/players/VideoPlayer/etc/fonts/conf.avail/README
index dbcfe2135f..dbcfe2135f 100644
--- a/system/players/dvdplayer/etc/fonts/conf.avail/README
+++ b/system/players/VideoPlayer/etc/fonts/conf.avail/README
diff --git a/system/players/dvdplayer/etc/fonts/conf.d/20-fix-globaladvance.conf b/system/players/VideoPlayer/etc/fonts/conf.d/20-fix-globaladvance.conf
index a62162ca0f..a62162ca0f 100644
--- a/system/players/dvdplayer/etc/fonts/conf.d/20-fix-globaladvance.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.d/20-fix-globaladvance.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.d/20-lohit-gujarati.conf b/system/players/VideoPlayer/etc/fonts/conf.d/20-lohit-gujarati.conf
index 1c29d0d0ad..1c29d0d0ad 100644
--- a/system/players/dvdplayer/etc/fonts/conf.d/20-lohit-gujarati.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.d/20-lohit-gujarati.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.d/20-unhint-small-vera.conf b/system/players/VideoPlayer/etc/fonts/conf.d/20-unhint-small-vera.conf
index 3078119803..3078119803 100644
--- a/system/players/dvdplayer/etc/fonts/conf.d/20-unhint-small-vera.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.d/20-unhint-small-vera.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.d/30-amt-aliases.conf b/system/players/VideoPlayer/etc/fonts/conf.d/30-amt-aliases.conf
index d6df67e055..d6df67e055 100644
--- a/system/players/dvdplayer/etc/fonts/conf.d/30-amt-aliases.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.d/30-amt-aliases.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.d/30-urw-aliases.conf b/system/players/VideoPlayer/etc/fonts/conf.d/30-urw-aliases.conf
index cf90dd5466..cf90dd5466 100644
--- a/system/players/dvdplayer/etc/fonts/conf.d/30-urw-aliases.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.d/30-urw-aliases.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.d/40-generic.conf b/system/players/VideoPlayer/etc/fonts/conf.d/40-generic.conf
index 84e85e44bb..84e85e44bb 100644
--- a/system/players/dvdplayer/etc/fonts/conf.d/40-generic.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.d/40-generic.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.d/49-sansserif.conf b/system/players/VideoPlayer/etc/fonts/conf.d/49-sansserif.conf
index c6209a7d31..c6209a7d31 100644
--- a/system/players/dvdplayer/etc/fonts/conf.d/49-sansserif.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.d/49-sansserif.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.d/50-user.conf b/system/players/VideoPlayer/etc/fonts/conf.d/50-user.conf
index 9a38a40ad9..9a38a40ad9 100644
--- a/system/players/dvdplayer/etc/fonts/conf.d/50-user.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.d/50-user.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.d/51-local.conf b/system/players/VideoPlayer/etc/fonts/conf.d/51-local.conf
index d35046e78b..d35046e78b 100644
--- a/system/players/dvdplayer/etc/fonts/conf.d/51-local.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.d/51-local.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.d/60-latin.conf b/system/players/VideoPlayer/etc/fonts/conf.d/60-latin.conf
index 06cdd7e6c7..06cdd7e6c7 100644
--- a/system/players/dvdplayer/etc/fonts/conf.d/60-latin.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.d/60-latin.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.d/65-fonts-persian.conf b/system/players/VideoPlayer/etc/fonts/conf.d/65-fonts-persian.conf
index e30c4d9691..e30c4d9691 100644
--- a/system/players/dvdplayer/etc/fonts/conf.d/65-fonts-persian.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.d/65-fonts-persian.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.d/65-nonlatin.conf b/system/players/VideoPlayer/etc/fonts/conf.d/65-nonlatin.conf
index f8dbb64fc4..f8dbb64fc4 100644
--- a/system/players/dvdplayer/etc/fonts/conf.d/65-nonlatin.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.d/65-nonlatin.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.d/69-unifont.conf b/system/players/VideoPlayer/etc/fonts/conf.d/69-unifont.conf
index a784af920d..a784af920d 100644
--- a/system/players/dvdplayer/etc/fonts/conf.d/69-unifont.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.d/69-unifont.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.d/80-delicious.conf b/system/players/VideoPlayer/etc/fonts/conf.d/80-delicious.conf
index 701429bcc4..701429bcc4 100644
--- a/system/players/dvdplayer/etc/fonts/conf.d/80-delicious.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.d/80-delicious.conf
diff --git a/system/players/dvdplayer/etc/fonts/conf.d/90-synthetic.conf b/system/players/VideoPlayer/etc/fonts/conf.d/90-synthetic.conf
index 63d9b891b3..63d9b891b3 100644
--- a/system/players/dvdplayer/etc/fonts/conf.d/90-synthetic.conf
+++ b/system/players/VideoPlayer/etc/fonts/conf.d/90-synthetic.conf
diff --git a/system/players/dvdplayer/etc/fonts/fonts.conf b/system/players/VideoPlayer/etc/fonts/fonts.conf
index 9e2067c099..9e2067c099 100644
--- a/system/players/dvdplayer/etc/fonts/fonts.conf
+++ b/system/players/VideoPlayer/etc/fonts/fonts.conf
diff --git a/system/players/dvdplayer/etc/fonts/fonts.dtd b/system/players/VideoPlayer/etc/fonts/fonts.dtd
index a5c54f9835..a5c54f9835 100644
--- a/system/players/dvdplayer/etc/fonts/fonts.dtd
+++ b/system/players/VideoPlayer/etc/fonts/fonts.dtd