[pvr] bye, bye libXBMC_pvr.cpp

tadly · Dec 10, 2016 · fecbd17 · fecbd17
1 parent b69b0f1
commit fecbd17
Show file tree

Hide file tree

Showing 19 changed files with 137 additions and 592 deletions.
diff --git a/.gitignore b/.gitignore
@@ -149,7 +149,6 @@ cmake_install.cmake
 /lib/addons/library.kodi.guilib/project/VS2010Express/Debug
 /lib/addons/library.xbmc.addon/Makefile
 /lib/addons/library.kodi.adsp/Makefile
-/lib/addons/library.xbmc.pvr/Makefile
 /lib/addons/library.xbmc.codec/Makefile
 /lib/addons/library.kodi.peripheral/Makefile
 /lib/addons/library.kodi.game/Makefile
@@ -159,8 +158,6 @@ cmake_install.cmake
 /lib/addons/library.kodi.adsp/project/VS2010Express/Debug
 /lib/addons/library.xbmc.codec/project/VS2010Express/Release
 /lib/addons/library.xbmc.codec/project/VS2010Express/Debug
-/lib/addons/library.xbmc.pvr/project/VS2010Express/Release
-/lib/addons/library.xbmc.pvr/project/VS2010Express/Debug
 /lib/addons/library.kodi.audioengine/Makefile
 /lib/addons/library.kodi.audioengine/project/VS2010Express/Release/
 /lib/addons/library.kodi.audioengine/project/VS2010Express/Debug/
@@ -551,8 +548,6 @@ lib/cpluff/stamp-h1
 /addons/library.xbmc.codec/libXBMC_codec.lib
 /addons/library.kodi.guilib/libKODI_guilib.dll
 /addons/library.kodi.guilib/libKODI_guilib.lib
-/addons/library.xbmc.pvr/libXBMC_pvr.dll
-/addons/library.xbmc.pvr/libXBMC_pvr.lib
 /addons/library.kodi.audioengine/libKODI_audioengine.dll
 /addons/library.kodi.audioengine/libKODI_audioengine.lib
 

diff --git a/Makefile.in b/Makefile.in
@@ -240,7 +240,6 @@ LIBADDON_DIRS=\
 	lib/addons/library.kodi.adsp \
 	lib/addons/library.kodi.audioengine \
 	lib/addons/library.xbmc.codec \
-	lib/addons/library.xbmc.pvr \
 	lib/addons/library.kodi.guilib \
 	lib/addons/library.kodi.inputstream \
 	lib/addons/library.kodi.peripheral \
@@ -368,7 +367,6 @@ libaddon: exports
 	$(MAKE) -C lib/addons/library.kodi.game
 	$(MAKE) -C lib/addons/library.kodi.guilib
 	$(MAKE) -C lib/addons/library.kodi.peripheral
-	$(MAKE) -C lib/addons/library.xbmc.pvr
 	$(MAKE) -C lib/addons/library.kodi.inputstream
 dvdpcodecs: dllloader
 	$(MAKE) -C lib/libdvd

diff --git a/Makefile.include.in b/Makefile.include.in
@@ -45,7 +45,6 @@ INCLUDES+=-I@abs_top_srcdir@/addons/library.kodi.guilib
 INCLUDES+=-I@abs_top_srcdir@/addons/library.xbmc.addon
 INCLUDES+=-I@abs_top_srcdir@/addons/library.kodi.adsp
 INCLUDES+=-I@abs_top_srcdir@/addons/library.kodi.audioengine
-INCLUDES+=-I@abs_top_srcdir@/addons/library.xbmc.pvr
 INCLUDES+=-I@abs_top_srcdir@/addons/library.xbmc.codec
 INCLUDES+=$(sort @INCLUDES@)
 INCLUDES+=-I@abs_top_srcdir@/xbmc/linux

diff --git a/addons/library.xbmc.pvr/.gitignore b/addons/library.xbmc.pvr/.gitignore
diff --git a/configure.ac b/configure.ac
@@ -2198,7 +2198,6 @@ OUTPUT_FILES="Makefile \
     lib/addons/library.kodi.game/Makefile \
     lib/addons/library.kodi.guilib/Makefile \
     lib/addons/library.kodi.peripheral/Makefile \
-    lib/addons/library.xbmc.pvr/Makefile \
     lib/addons/library.kodi.inputstream/Makefile \
     tools/Linux/kodi.sh \
     tools/Linux/kodi-standalone.sh \

diff --git a/lib/addons/library.kodi.game/libKODI_game.cpp b/lib/addons/library.kodi.game/libKODI_game.cpp
@@ -41,7 +41,7 @@ DLLEXPORT CB_GameLib* GAME_register_me(AddonCB* frontend)
     fprintf(stderr, "ERROR: GAME_register_frontend is called with NULL handle!!!\n");
   else
   {
-    cb = frontend->GameLib_RegisterMe(frontend->addonData);
+    cb = static_cast<CB_GameLib*>(frontend->GameLib_RegisterMe(frontend->addonData));
     if (!cb)
       fprintf(stderr, "ERROR: GAME_register_frontend can't get callback table from frontend!!!\n");
   }

diff --git a/lib/addons/library.kodi.peripheral/libKODI_peripheral.cpp b/lib/addons/library.kodi.peripheral/libKODI_peripheral.cpp
@@ -41,7 +41,7 @@ DLLEXPORT CB_PeripheralLib* PERIPHERAL_register_me(AddonCB* frontend)
     fprintf(stderr, "ERROR: PERIPHERAL_register_frontend is called with NULL handle!!!\n");
   else
   {
-    cb = frontend->PeripheralLib_RegisterMe(frontend->addonData);
+    cb = static_cast<CB_PeripheralLib*>(frontend->PeripheralLib_RegisterMe(frontend->addonData));
     if (!cb)
       fprintf(stderr, "ERROR: PERIPHERAL_register_frontend can't get callback table from frontend!!!\n");
   }

diff --git a/lib/addons/library.xbmc.pvr/CMakeLists.txt b/lib/addons/library.xbmc.pvr/CMakeLists.txt
diff --git a/lib/addons/library.xbmc.pvr/Makefile.in b/lib/addons/library.xbmc.pvr/Makefile.in
diff --git a/lib/addons/library.xbmc.pvr/libXBMC_pvr.cpp b/lib/addons/library.xbmc.pvr/libXBMC_pvr.cpp