aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--media/icon-flat-120x120.pngbin14048 -> 0 bytes
-rw-r--r--media/icon-flat-256x256.pngbin34342 -> 0 bytes
-rw-r--r--xbmc/network/upnp/UPnPRenderer.cpp13
-rw-r--r--xbmc/network/upnp/UPnPServer.cpp13
4 files changed, 22 insertions, 4 deletions
diff --git a/media/icon-flat-120x120.png b/media/icon-flat-120x120.png
deleted file mode 100644
index 6e91740e6e..0000000000
--- a/media/icon-flat-120x120.png
+++ /dev/null
Binary files differ
diff --git a/media/icon-flat-256x256.png b/media/icon-flat-256x256.png
deleted file mode 100644
index db04822a6f..0000000000
--- a/media/icon-flat-256x256.png
+++ /dev/null
Binary files differ
diff --git a/xbmc/network/upnp/UPnPRenderer.cpp b/xbmc/network/upnp/UPnPRenderer.cpp
index 3737afff3a..213093a121 100644
--- a/xbmc/network/upnp/UPnPRenderer.cpp
+++ b/xbmc/network/upnp/UPnPRenderer.cpp
@@ -367,10 +367,19 @@ CUPnPRenderer::SetupIcons()
{
NPT_String file_root = CSpecialProtocol::TranslatePath("special://xbmc/media/").c_str();
AddIcon(
- PLT_DeviceIcon("image/png", 256, 256, 24, "/icon-flat-256x256.png"),
+ PLT_DeviceIcon("image/png", 256, 256, 8, "/icon256x256.png"),
file_root);
AddIcon(
- PLT_DeviceIcon("image/png", 120, 120, 24, "/icon-flat-120x120.png"),
+ PLT_DeviceIcon("image/png", 120, 120, 8, "/icon120x120.png"),
+ file_root);
+ AddIcon(
+ PLT_DeviceIcon("image/png", 48, 48, 8, "/icon48x48.png"),
+ file_root);
+ AddIcon(
+ PLT_DeviceIcon("image/png", 32, 32, 8, "/icon32x32.png"),
+ file_root);
+ AddIcon(
+ PLT_DeviceIcon("image/png", 16, 16, 8, "/icon16x16.png"),
file_root);
return NPT_SUCCESS;
}
diff --git a/xbmc/network/upnp/UPnPServer.cpp b/xbmc/network/upnp/UPnPServer.cpp
index 2db72b6056..d8f759b5e1 100644
--- a/xbmc/network/upnp/UPnPServer.cpp
+++ b/xbmc/network/upnp/UPnPServer.cpp
@@ -199,10 +199,19 @@ CUPnPServer::SetupIcons()
{
NPT_String file_root = CSpecialProtocol::TranslatePath("special://xbmc/media/").c_str();
AddIcon(
- PLT_DeviceIcon("image/png", 256, 256, 24, "/icon-flat-256x256.png"),
+ PLT_DeviceIcon("image/png", 256, 256, 8, "/icon256x256.png"),
file_root);
AddIcon(
- PLT_DeviceIcon("image/png", 120, 120, 24, "/icon-flat-120x120.png"),
+ PLT_DeviceIcon("image/png", 120, 120, 8, "/icon120x120.png"),
+ file_root);
+ AddIcon(
+ PLT_DeviceIcon("image/png", 48, 48, 8, "/icon48x48.png"),
+ file_root);
+ AddIcon(
+ PLT_DeviceIcon("image/png", 32, 32, 8, "/icon32x32.png"),
+ file_root);
+ AddIcon(
+ PLT_DeviceIcon("image/png", 16, 16, 8, "/icon16x16.png"),
file_root);
return NPT_SUCCESS;
}