rename dvdplayer to VideoPlayer

3 files changed, 24 insertions, 24 deletions

diff --git a/lib/libdvd/Makefile.in b/lib/libdvd/Makefile.in
index 54387cc99a..2dfa6e3fb3 100644
--- a/lib/libdvd/Makefile.in
+++ b/lib/libdvd/Makefile.in
@@ -3,7 +3,7 @@ ARCH=@ARCH@
 CC=@CC@
 CXX=@CXX@
 
-SYSDIR=@abs_top_srcdir@/system/players/dvdplayer
+SYSDIR=@abs_top_srcdir@/system/players/VideoPlayer
 SOS= libdvdnav-$(ARCH).so
 DIRS=	libdvdread \
 	libdvdnav
diff --git a/lib/libdvd/build-xbmc-win32.sh b/lib/libdvd/build-xbmc-win32.sh
index e9287380ca..0945773ec0 100644
--- a/lib/libdvd/build-xbmc-win32.sh
+++ b/lib/libdvd/build-xbmc-win32.sh
@@ -32,7 +32,7 @@ strip -S .libs/libdvdcss-2.dll
 cd ..
 mkdir -p includes/dvdcss
 cp libdvdcss/src/dvdcss/dvdcss.h includes/dvdcss
-cp libdvdcss/.libs/libdvdcss-2.dll /xbmc/system/players/dvdplayer/
+cp libdvdcss/.libs/libdvdcss-2.dll /xbmc/system/players/VideoPlayer/
 
 #libdvdread
 cd libdvdread
@@ -79,7 +79,7 @@ gcc \
 
 strip -S obj/libdvdnav.dll
 cd ..
-cp libdvdnav/obj/libdvdnav.dll /xbmc/system/players/dvdplayer/
+cp libdvdnav/obj/libdvdnav.dll /xbmc/system/players/VideoPlayer/
 echo "***** Done *****"
 #remove the bgprocessfile for signaling the process end
 rm $BGPROCESSFILE
diff --git a/lib/libdvd/patches/cores.diff b/lib/libdvd/patches/cores.diff
index 72463226ae..35438b2f5a 100644
--- a/lib/libdvd/patches/cores.diff
+++ b/lib/libdvd/patches/cores.diff
@@ -1,6 +1,6 @@
-diff -uwr ../../dvdnav_diff/config.h xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/config.h
+diff -uwr ../../dvdnav_diff/config.h xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/config.h
 --- ../../dvdnav_diff/config.h	Sun Sep 14 22:02:38 2008
-+++ xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/config.h	Sat Oct 19 06:29:41 2013
++++ xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/config.h	Sat Oct 19 06:29:41 2013
 @@ -1,56 +1,95 @@
 -/* config.h.  Generated by hand.  */
 +#pragma once
@@ -116,9 +116,9 @@ diff -uwr ../../dvdnav_diff/config.h xbmc/cores/dvdplayer/DVDInputStreams/dvdnav
 -
 -#endif /* LIBDVDREAD_CONFIG_H */
 +#endif
-diff -uwr ../../dvdnav_diff/decoder.h xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/decoder.h
+diff -uwr ../../dvdnav_diff/decoder.h xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/decoder.h
 --- ../../dvdnav_diff/decoder.h	Sun Sep 14 21:31:44 2008
-+++ xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/decoder.h	Fri Feb  7 19:51:38 2014
++++ xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/decoder.h	Fri Feb  7 19:51:38 2014
 @@ -22,6 +22,9 @@
  #ifndef LIBDVDNAV_DECODER_H
  #define LIBDVDNAV_DECODER_H
@@ -129,9 +129,9 @@ diff -uwr ../../dvdnav_diff/decoder.h xbmc/cores/dvdplayer/DVDInputStreams/dvdna
  /* link command types */
  typedef enum {
    LinkNoLink  = 0,
-diff -uwr ../../dvdnav_diff/dvd_reader.h xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/dvd_reader.h
+diff -uwr ../../dvdnav_diff/dvd_reader.h xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/dvd_reader.h
 --- ../../dvdnav_diff/dvd_reader.h	Mon Dec  7 03:50:20 2009
-+++ xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/dvd_reader.h	Thu Feb  7 18:22:32 2013
++++ xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/dvd_reader.h	Thu Feb  7 18:22:32 2013
 @@ -24,14 +24,14 @@
  #define LIBDVDREAD_DVD_READER_H
  
@@ -149,9 +149,9 @@ diff -uwr ../../dvdnav_diff/dvd_reader.h xbmc/cores/dvdplayer/DVDInputStreams/dv
  
  /**
   * The DVD access interface.
-diff -uwr ../../dvdnav_diff/dvd_types.h xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/dvd_types.h
+diff -uwr ../../dvdnav_diff/dvd_types.h xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/dvd_types.h
 --- ../../dvdnav_diff/dvd_types.h	Tue Dec 30 14:48:46 2008
-+++ xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/dvd_types.h	Fri Feb  7 20:03:34 2014
++++ xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/dvd_types.h	Fri Feb  7 20:03:34 2014
 @@ -60,7 +60,8 @@
  
  /* the following types are currently unused */
@@ -221,9 +221,9 @@ diff -uwr ../../dvdnav_diff/dvd_types.h xbmc/cores/dvdplayer/DVDInputStreams/dvd
  
  #endif
  
-diff -uwr ../../dvdnav_diff/dvdnav.h xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/dvdnav.h
+diff -uwr ../../dvdnav_diff/dvdnav.h xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/dvdnav.h
 --- ../../dvdnav_diff/dvdnav.h	Sun Oct  6 21:47:20 2013
-+++ xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/dvdnav.h	Fri Feb  7 19:58:51 2014
++++ xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/dvdnav.h	Fri Feb  7 19:58:51 2014
 @@ -32,11 +32,11 @@
  extern "C" {
  #endif
@@ -252,9 +252,9 @@ diff -uwr ../../dvdnav_diff/dvdnav.h xbmc/cores/dvdplayer/DVDInputStreams/dvdnav
  
  #ifdef __cplusplus
  }
-diff -uwr ../../dvdnav_diff/dvdnav_events.h xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/dvdnav_events.h
+diff -uwr ../../dvdnav_diff/dvdnav_events.h xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/dvdnav_events.h
 --- ../../dvdnav_diff/dvdnav_events.h	Tue Dec 30 14:48:46 2008
-+++ xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/dvdnav_events.h	Sat Feb  9 11:12:51 2013
++++ xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/dvdnav_events.h	Sat Feb  9 11:12:51 2013
 @@ -25,6 +25,10 @@
  #ifndef LIBDVDNAV_DVDNAV_EVENTS_H
  #define LIBDVDNAV_DVDNAV_EVENTS_H
@@ -266,9 +266,9 @@ diff -uwr ../../dvdnav_diff/dvdnav_events.h xbmc/cores/dvdplayer/DVDInputStreams
  /*
   * DVDNAV_BLOCK_OK
   *
-diff -uwr ../../dvdnav_diff/dvdnav_internal.h xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/dvdnav_internal.h
+diff -uwr ../../dvdnav_diff/dvdnav_internal.h xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/dvdnav_internal.h
 --- ../../dvdnav_diff/dvdnav_internal.h	Sun Dec  9 21:22:16 2012
-+++ xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/dvdnav_internal.h	Fri Feb  7 20:06:27 2014
++++ xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/dvdnav_internal.h	Fri Feb  7 20:06:27 2014
 @@ -25,9 +25,15 @@
  #include "config.h"
  #endif
@@ -348,9 +348,9 @@ diff -uwr ../../dvdnav_diff/dvdnav_internal.h xbmc/cores/dvdplayer/DVDInputStrea
  #endif
  #define printerr(str) \
  	do { if (this) strncpy(this->err_str, str, MAX_ERR_LEN - 1); } while (0)
-diff -uwr ../../dvdnav_diff/ifo_types.h xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/ifo_types.h
+diff -uwr ../../dvdnav_diff/ifo_types.h xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/ifo_types.h
 --- ../../dvdnav_diff/ifo_types.h	Sun Dec  9 21:08:00 2012
-+++ xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/ifo_types.h	Fri Feb  7 19:24:37 2014
++++ xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/ifo_types.h	Fri Feb  7 19:24:37 2014
 @@ -22,8 +22,8 @@
  #ifndef LIBDVDREAD_IFO_TYPES_H
  #define LIBDVDREAD_IFO_TYPES_H
@@ -362,9 +362,9 @@ diff -uwr ../../dvdnav_diff/ifo_types.h xbmc/cores/dvdplayer/DVDInputStreams/dvd
  
  
  #undef ATTRIBUTE_PACKED
-diff -uwr ../../dvdnav_diff/nav_types.h xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/nav_types.h
+diff -uwr ../../dvdnav_diff/nav_types.h xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/nav_types.h
 --- ../../dvdnav_diff/nav_types.h	Sun Aug  8 23:49:28 2010
-+++ xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/nav_types.h	Thu Feb  7 18:22:32 2013
++++ xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/nav_types.h	Thu Feb  7 18:22:32 2013
 @@ -28,9 +28,27 @@
  #ifndef LIBDVDREAD_NAV_TYPES_H
  #define LIBDVDREAD_NAV_TYPES_H
@@ -407,10 +407,10 @@ diff -uwr ../../dvdnav_diff/nav_types.h xbmc/cores/dvdplayer/DVDInputStreams/dvd
  /**
   * PCI General Information
   */
-Only in xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/: remap.h
-diff -uwr ../../dvdnav_diff/vm.h xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/vm.h
+Only in xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/: remap.h
+diff -uwr ../../dvdnav_diff/vm.h xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/vm.h
 --- ../../dvdnav_diff/vm.h	Sat Jul 31 00:34:16 2010
-+++ xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/vm.h	Fri Feb  7 19:37:55 2014
++++ xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/vm.h	Fri Feb  7 19:37:55 2014
 @@ -23,6 +23,9 @@
  #ifndef LIBDVDNAV_VM_H
  #define LIBDVDNAV_VM_H