upnp: adjust include paths of Platinum and Neptune

12 files changed, 32 insertions, 22 deletions

diff --git a/xbmc/filesystem/Makefile.in b/xbmc/filesystem/Makefile.in
index c5a6738597..623bbb8c64 100644
--- a/xbmc/filesystem/Makefile.in
+++ b/xbmc/filesystem/Makefile.in
@@ -124,6 +124,7 @@ SRCS += BlurayDirectory.cpp
 endif
 
 ifeq (@USE_UPNP@,1)
+INCLUDES+=-I@abs_top_srcdir@/lib/libUPnP
 INCLUDES+=-I@abs_top_srcdir@/lib/libUPnP/Platinum/Source/Core
 INCLUDES+=-I@abs_top_srcdir@/lib/libUPnP/Platinum/Source/Platinum
 INCLUDES+=-I@abs_top_srcdir@/lib/libUPnP/Platinum/Source/Devices/MediaConnect
diff --git a/xbmc/filesystem/NptXbmcFile.cpp b/xbmc/filesystem/NptXbmcFile.cpp
index 57e73553a0..77fb616070 100644
--- a/xbmc/filesystem/NptXbmcFile.cpp
+++ b/xbmc/filesystem/NptXbmcFile.cpp
@@ -32,18 +32,19 @@
 /*----------------------------------------------------------------------
 |   includes
 +---------------------------------------------------------------------*/
+#include <limits>
+#include <Neptune/Source/Core/NptDebug.h>
+#include <Neptune/Source/Core/NptFile.h>
+#include <Neptune/Source/Core/NptInterfaces.h>
+#include <Neptune/Source/Core/NptStrings.h>
+#include <Neptune/Source/Core/NptThreads.h>
+#include <Neptune/Source/Core/NptUtils.h>
+
 #include "File.h"
 #include "FileFactory.h"
 #include "utils/log.h"
 #include "Util.h"
 #include "URL.h"
-#include <limits>
-#include "NptUtils.h"
-#include "NptFile.h"
-#include "NptThreads.h"
-#include "NptInterfaces.h"
-#include "NptStrings.h"
-#include "NptDebug.h"
 
 #ifdef TARGET_WINDOWS
 #define S_IWUSR _S_IWRITE
diff --git a/xbmc/filesystem/UPnPDirectory.cpp b/xbmc/filesystem/UPnPDirectory.cpp
index dfc1105944..6fb2b07aa7 100644
--- a/xbmc/filesystem/UPnPDirectory.cpp
+++ b/xbmc/filesystem/UPnPDirectory.cpp
@@ -22,12 +22,13 @@
  *  <http://www.gnu.org/licenses/>.
  *
  */
+#include <Platinum/Source/Platinum/Platinum.h>
+#include <Platinum/Source/Devices/MediaServer/PltSyncMediaBrowser.h>
+
 #include "UPnPDirectory.h"
 #include "URL.h"
 #include "network/upnp/UPnP.h"
 #include "network/upnp/UPnPInternal.h"
-#include "Platinum.h"
-#include "PltSyncMediaBrowser.h"
 #include "video/VideoInfoTag.h"
 #include "FileItem.h"
 #include "utils/log.h"
diff --git a/xbmc/network/upnp/Makefile.in b/xbmc/network/upnp/Makefile.in
index f0ab298ddb..0dda664a05 100644
--- a/xbmc/network/upnp/Makefile.in
+++ b/xbmc/network/upnp/Makefile.in
@@ -1,5 +1,6 @@
 ifeq (@USE_UPNP@, 1)
-INCLUDES+=-I@abs_top_srcdir@/lib/libUPnP/Platinum/Source/Core \
+INCLUDES+=-I@abs_top_srcdir@/lib/libUPnP \
+          -I@abs_top_srcdir@/lib/libUPnP/Platinum/Source/Core \
           -I@abs_top_srcdir@/lib/libUPnP/Platinum/Source/Platinum \
           -I@abs_top_srcdir@/lib/libUPnP/Platinum/Source/Devices/MediaConnect \
           -I@abs_top_srcdir@/lib/libUPnP/Platinum/Source/Devices/MediaRenderer \
diff --git a/xbmc/network/upnp/UPnP.cpp b/xbmc/network/upnp/UPnP.cpp
index 62801a8064..3331301a46 100644
--- a/xbmc/network/upnp/UPnP.cpp
+++ b/xbmc/network/upnp/UPnP.cpp
@@ -23,6 +23,7 @@
  */
 
 #include <set>
+#include <Platinum/Source/Platinum/Platinum.h>
 
 #include "threads/SystemClock.h"
 #include "UPnP.h"
@@ -35,7 +36,6 @@
 #include "ApplicationMessenger.h"
 #include "network/Network.h"
 #include "utils/log.h"
-#include "Platinum.h"
 #include "URL.h"
 #include "profiles/ProfilesManager.h"
 #include "settings/Settings.h"
diff --git a/xbmc/network/upnp/UPnPInternal.cpp b/xbmc/network/upnp/UPnPInternal.cpp
index d4b5c4eace..2de930cb9c 100644
--- a/xbmc/network/upnp/UPnPInternal.cpp
+++ b/xbmc/network/upnp/UPnPInternal.cpp
@@ -17,10 +17,11 @@
  *  <http://www.gnu.org/licenses/>.
  *
  */
+#include <Platinum/Source/Platinum/Platinum.h>
+
 #include "UPnPInternal.h"
 #include "UPnP.h"
 #include "UPnPServer.h"
-#include "Platinum.h"
 #include "URL.h"
 #include "Util.h"
 #include "settings/AdvancedSettings.h"
diff --git a/xbmc/network/upnp/UPnPInternal.h b/xbmc/network/upnp/UPnPInternal.h
index 8e9c089d14..f0bbf991a5 100644
--- a/xbmc/network/upnp/UPnPInternal.h
+++ b/xbmc/network/upnp/UPnPInternal.h
@@ -18,11 +18,12 @@
  *
  */
 #pragma once
+#include <Neptune/Source/Core/NptTypes.h>
+#include <Neptune/Source/Core/NptReferences.h>
+#include <Neptune/Source/Core/NptStrings.h>
+
 #include "system.h"
 #include "utils/StdString.h"
-#include "NptTypes.h"
-#include "NptReferences.h"
-#include "NptStrings.h"
 #include "FileItem.h"
 
 class CUPnPServer;
diff --git a/xbmc/network/upnp/UPnPPlayer.cpp b/xbmc/network/upnp/UPnPPlayer.cpp
index 4d41d1038e..e7fbf81201 100644
--- a/xbmc/network/upnp/UPnPPlayer.cpp
+++ b/xbmc/network/upnp/UPnPPlayer.cpp
@@ -18,13 +18,13 @@
  *  <http://www.gnu.org/licenses/>.
  *
  */
+#include <Platinum/Source/Platinum/Platinum.h>
+#include <Platinum/Source/Devices/MediaRenderer/PltMediaController.h>
+#include <Platinum/Source/Devices/MediaServer/PltDidl.h>
 
 #include "UPnPPlayer.h"
 #include "UPnP.h"
 #include "UPnPInternal.h"
-#include "Platinum.h"
-#include "PltMediaController.h"
-#include "PltDidl.h"
 #include "FileItem.h"
 #include "threads/Event.h"
 #include "utils/log.h"
diff --git a/xbmc/network/upnp/UPnPRenderer.cpp b/xbmc/network/upnp/UPnPRenderer.cpp
index 213093a121..1a1754a46b 100644
--- a/xbmc/network/upnp/UPnPRenderer.cpp
+++ b/xbmc/network/upnp/UPnPRenderer.cpp
@@ -17,11 +17,12 @@
  *  <http://www.gnu.org/licenses/>.
  *
  */
+#include <Platinum/Source/Platinum/Platinum.h>
+
 #include "network/Network.h"
 #include "UPnPRenderer.h"
 #include "UPnP.h"
 #include "UPnPInternal.h"
-#include "Platinum.h"
 #include "Application.h"
 #include "ApplicationMessenger.h"
 #include "FileItem.h"
diff --git a/xbmc/network/upnp/UPnPRenderer.h b/xbmc/network/upnp/UPnPRenderer.h
index cbb08c39cb..9a7dec284a 100644
--- a/xbmc/network/upnp/UPnPRenderer.h
+++ b/xbmc/network/upnp/UPnPRenderer.h
@@ -18,7 +18,8 @@
  *
  */
 #pragma once
-#include "PltMediaRenderer.h"
+#include <Platinum/Source/Devices/MediaRenderer/PltMediaRenderer.h>
+
 #include "interfaces/IAnnouncer.h"
 
 namespace UPNP
diff --git a/xbmc/network/upnp/UPnPServer.cpp b/xbmc/network/upnp/UPnPServer.cpp
index 6096eeb923..06546b1d2e 100644
--- a/xbmc/network/upnp/UPnPServer.cpp
+++ b/xbmc/network/upnp/UPnPServer.cpp
@@ -17,11 +17,12 @@
  *  <http://www.gnu.org/licenses/>.
  *
  */
+#include <Platinum/Source/Platinum/Platinum.h>
+
 #include "UPnPServer.h"
 #include "UPnPInternal.h"
 #include "Application.h"
 #include "view/GUIViewState.h"
-#include "Platinum.h"
 #include "video/VideoThumbLoader.h"
 #include "music/Artist.h"
 #include "music/MusicThumbLoader.h"
diff --git a/xbmc/network/upnp/UPnPServer.h b/xbmc/network/upnp/UPnPServer.h
index 3ea349a35d..1518be967d 100644
--- a/xbmc/network/upnp/UPnPServer.h
+++ b/xbmc/network/upnp/UPnPServer.h
@@ -18,7 +18,8 @@
  *
  */
 #pragma once
-#include "PltMediaConnect.h"
+#include <Platinum/Source/Devices/MediaConnect/PltMediaConnect.h>
+
 #include "interfaces/IAnnouncer.h"
 #include "FileItem.h"