11 files changed, 71 insertions, 7 deletions
diff --git a/addons/screensaver.rsxs.euphoria/addon.xml b/addons/screensaver.rsxs.euphoria/addon.xml
index 588d4f52ae..fa133172ca 100644
--- a/addons/screensaver.rsxs.euphoria/addon.xml
+++ b/addons/screensaver.rsxs.euphoria/addon.xml
@@ -9,5 +9,5 @@
   </requires>
   <extension
     point="xbmc.ui.screensaver"
-    library="Euphoria.xbs"/>
+    library_linux="Euphoria.xbs"/>
 </addon>
diff --git a/addons/screensaver.rsxs.plasma/addon.xml b/addons/screensaver.rsxs.plasma/addon.xml
index 71864fafcc..f7af900310 100644
--- a/addons/screensaver.rsxs.plasma/addon.xml
+++ b/addons/screensaver.rsxs.plasma/addon.xml
@@ -9,5 +9,5 @@
   </requires>
   <extension
     point="xbmc.ui.screensaver"
-    library="Plasma.xbs"/>
+    library_linux="Plasma.xbs"/>
 </addon>
diff --git a/addons/screensaver.rsxs.solarwinds/addon.xml b/addons/screensaver.rsxs.solarwinds/addon.xml
index efcb37e774..ce180750f0 100644
--- a/addons/screensaver.rsxs.solarwinds/addon.xml
+++ b/addons/screensaver.rsxs.solarwinds/addon.xml
@@ -9,5 +9,5 @@
   </requires>
   <extension
     point="xbmc.ui.screensaver"
-    library="Solarwinds.xbs"/>
+    library_linux="Solarwinds.xbs"/>
 </addon>
diff --git a/addons/visualization.dxspectrum/addon.xml b/addons/visualization.dxspectrum/addon.xml
new file mode 100644
index 0000000000..ab02224685
--- /dev/null
+++ b/addons/visualization.dxspectrum/addon.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<addon
+  id="visualization.dxspectrum"
+  version="1.0.0"
+  name="DirextX Spectrum"
+  provider-name="Team XBMC">
+  <extension
+    point="xbmc.player.musicviz"
+    library_windx="Spectrum_win32dx.vis"/>
+</addon>
diff --git a/addons/visualization.glspectrum/addon.xml b/addons/visualization.glspectrum/addon.xml
new file mode 100644
index 0000000000..03f2c53ee9
--- /dev/null
+++ b/addons/visualization.glspectrum/addon.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<addon
+  id="visualization.glspectrum"
+  version="1.0.0"
+  name="OpenGL Spectrum"
+  provider-name="Team XBMC">
+  <extension
+    point="xbmc.player.musicviz"
+    library_linux="opengl_spectrum.vis"/>
+</addon>
diff --git a/addons/visualization.itunes/addon.xml b/addons/visualization.itunes/addon.xml
new file mode 100644
index 0000000000..81fc99fdef
--- /dev/null
+++ b/addons/visualization.itunes/addon.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<addon
+  id="visualization.itunes"
+  version="1.0.0"
+  name="iTunes Visualizations"
+  provider-name="Team XBMC">
+  <extension
+    point="xbmc.player.musicviz"
+    library_osx="iTunes.mvis"/>
+</addon>
diff --git a/addons/visualization.milkdrop/addon.xml b/addons/visualization.milkdrop/addon.xml
new file mode 100644
index 0000000000..fdf181c8c5
--- /dev/null
+++ b/addons/visualization.milkdrop/addon.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<addon
+  id="visualization.milkdrop"
+  version="1.0.0"
+  name="MilkDrop"
+  provider-name="Team XBMC">
+  <extension
+    point="xbmc.player.musicviz"
+    library_windx="MilkDrop_win32dx.vis"/>
+</addon>
diff --git a/addons/visualization.projectm/addon.xml b/addons/visualization.projectm/addon.xml
new file mode 100644
index 0000000000..d1bd608d1c
--- /dev/null
+++ b/addons/visualization.projectm/addon.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<addon
+  id="visualization.projectm"
+  version="1.0.0"
+  name="projectM"
+  provider-name="Team XBMC">
+  <extension
+    point="xbmc.player.musicviz"
+    library_linux="projectM.vis"
+    library_wingl="projectM_win32.vis"/>
+</addon>
diff --git a/addons/visualization.waveform/addon.xml b/addons/visualization.waveform/addon.xml
new file mode 100644
index 0000000000..35267fc0ad
--- /dev/null
+++ b/addons/visualization.waveform/addon.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<addon
+  id="visualization.waveform"
+  version="1.0.0"
+  name="Waveform"
+  provider-name="MrC">
+  <extension
+    point="xbmc.player.musicviz"
+    library_linux="Waveform.vis"
+    library_wingl="Waveform_win32.vis"
+    library_osx="Waveform_osx.vis"/>
+</addon>
diff --git a/xbmc/addons/Addon.cpp b/xbmc/addons/Addon.cpp
index 765a69c368..642516095a 100644
--- a/xbmc/addons/Addon.cpp
+++ b/xbmc/addons/Addon.cpp
@@ -119,7 +119,7 @@ const CStdString TranslateType(const ADDON::TYPE &type, bool pretty/*=false*/)
     {
       if (pretty)
         return g_localizeStrings.Get(24010);
-      return "visualization";
+      return "xbmc.player.musicviz";
     }
     case ADDON::ADDON_VIZ_LIBRARY:
     {
@@ -166,7 +166,7 @@ const ADDON::TYPE TranslateType(const CStdString &string)
   else if (string.Equals("scraper")) return ADDON_SCRAPER;
   else if (string.Equals("scraper-library")) return ADDON_SCRAPER_LIBRARY;
   else if (string.Equals("xbmc.ui.screensaver")) return ADDON_SCREENSAVER;
-  else if (string.Equals("visualization")) return ADDON_VIZ;
+  else if (string.Equals("xbmc.player.musicviz")) return ADDON_VIZ;
   else if (string.Equals("visualization-library")) return ADDON_VIZ_LIBRARY;
   else if (string.Equals("plugin")) return ADDON_PLUGIN;
   else if (string.Equals("script")) return ADDON_SCRIPT;
diff --git a/xbmc/addons/AddonManager.cpp b/xbmc/addons/AddonManager.cpp
index 4f237bc0fd..94835d4e2a 100644
--- a/xbmc/addons/AddonManager.cpp
+++ b/xbmc/addons/AddonManager.cpp
@@ -256,7 +256,7 @@ bool CAddonMgr::GetAddons(const TYPE &type, VECADDONS &addons, const CONTENT_TYP
 {
   CSingleLock lock(m_critSection);
   addons.clear();
-  if (type == ADDON_SCREENSAVER || type == ADDON_SKIN)
+  if (type == ADDON_SCREENSAVER || type == ADDON_SKIN || type == ADDON_VIZ)
   {
     cp_status_t status;
     int num;
@@ -296,10 +296,11 @@ bool CAddonMgr::GetAddon(const CStdString &str, AddonPtr &addon, const TYPE &typ
   if (type != ADDON_UNKNOWN
       && type != ADDON_SCREENSAVER
       && type != ADDON_SKIN
+      && type != ADDON_VIZ
       && m_addons.find(type) == m_addons.end())
     return false;
 
-  if (type == ADDON_SCREENSAVER || type == ADDON_SKIN)
+  if (type == ADDON_SCREENSAVER || type == ADDON_SKIN || type == ADDON_VIZ)
   {
     cp_status_t status;
     cp_plugin_info_t *cpaddon = NULL;