changed: remove now unused CGUIDialogMusicScan

15 files changed, 2 insertions, 341 deletions

diff --git a/XBMC-ATV2.xcodeproj/project.pbxproj b/XBMC-ATV2.xcodeproj/project.pbxproj
index 5434385952..353676b41d 100644
--- a/XBMC-ATV2.xcodeproj/project.pbxproj
+++ b/XBMC-ATV2.xcodeproj/project.pbxproj
@@ -631,7 +631,6 @@
 		F56C7A80131EC155000AD0F6 /* GUIDialogMusicInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C75C7131EC153000AD0F6 /* GUIDialogMusicInfo.cpp */; };
 		F56C7A81131EC155000AD0F6 /* GUIDialogMusicOSD.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C75C9131EC153000AD0F6 /* GUIDialogMusicOSD.cpp */; };
 		F56C7A82131EC155000AD0F6 /* GUIDialogMusicOverlay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C75CB131EC153000AD0F6 /* GUIDialogMusicOverlay.cpp */; };
-		F56C7A83131EC155000AD0F6 /* GUIDialogMusicScan.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C75CD131EC153000AD0F6 /* GUIDialogMusicScan.cpp */; };
 		F56C7A84131EC155000AD0F6 /* GUIDialogSongInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C75CF131EC153000AD0F6 /* GUIDialogSongInfo.cpp */; };
 		F56C7A85131EC155000AD0F6 /* GUIDialogVisualisationPresetList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C75D1131EC153000AD0F6 /* GUIDialogVisualisationPresetList.cpp */; };
 		F56C7A86131EC155000AD0F6 /* MusicAlbumInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C75D4131EC153000AD0F6 /* MusicAlbumInfo.cpp */; };
@@ -2450,8 +2449,6 @@
 		F56C75CA131EC153000AD0F6 /* GUIDialogMusicOSD.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogMusicOSD.h; sourceTree = "<group>"; };
 		F56C75CB131EC153000AD0F6 /* GUIDialogMusicOverlay.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogMusicOverlay.cpp; sourceTree = "<group>"; };
 		F56C75CC131EC153000AD0F6 /* GUIDialogMusicOverlay.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogMusicOverlay.h; sourceTree = "<group>"; };
-		F56C75CD131EC153000AD0F6 /* GUIDialogMusicScan.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogMusicScan.cpp; sourceTree = "<group>"; };
-		F56C75CE131EC153000AD0F6 /* GUIDialogMusicScan.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogMusicScan.h; sourceTree = "<group>"; };
 		F56C75CF131EC153000AD0F6 /* GUIDialogSongInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogSongInfo.cpp; sourceTree = "<group>"; };
 		F56C75D0131EC153000AD0F6 /* GUIDialogSongInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogSongInfo.h; sourceTree = "<group>"; };
 		F56C75D1131EC153000AD0F6 /* GUIDialogVisualisationPresetList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogVisualisationPresetList.cpp; sourceTree = "<group>"; };
@@ -5275,8 +5272,6 @@
 				F56C75CA131EC153000AD0F6 /* GUIDialogMusicOSD.h */,
 				F56C75CB131EC153000AD0F6 /* GUIDialogMusicOverlay.cpp */,
 				F56C75CC131EC153000AD0F6 /* GUIDialogMusicOverlay.h */,
-				F56C75CD131EC153000AD0F6 /* GUIDialogMusicScan.cpp */,
-				F56C75CE131EC153000AD0F6 /* GUIDialogMusicScan.h */,
 				F56C75CF131EC153000AD0F6 /* GUIDialogSongInfo.cpp */,
 				F56C75D0131EC153000AD0F6 /* GUIDialogSongInfo.h */,
 				F56C75D1131EC153000AD0F6 /* GUIDialogVisualisationPresetList.cpp */,
@@ -7068,7 +7063,6 @@
 				F56C7A80131EC155000AD0F6 /* GUIDialogMusicInfo.cpp in Sources */,
 				F56C7A81131EC155000AD0F6 /* GUIDialogMusicOSD.cpp in Sources */,
 				F56C7A82131EC155000AD0F6 /* GUIDialogMusicOverlay.cpp in Sources */,
-				F56C7A83131EC155000AD0F6 /* GUIDialogMusicScan.cpp in Sources */,
 				F56C7A84131EC155000AD0F6 /* GUIDialogSongInfo.cpp in Sources */,
 				F56C7A85131EC155000AD0F6 /* GUIDialogVisualisationPresetList.cpp in Sources */,
 				F56C7A86131EC155000AD0F6 /* MusicAlbumInfo.cpp in Sources */,
diff --git a/XBMC-IOS.xcodeproj/project.pbxproj b/XBMC-IOS.xcodeproj/project.pbxproj
index 1272092ad5..cee3db0ca5 100644
--- a/XBMC-IOS.xcodeproj/project.pbxproj
+++ b/XBMC-IOS.xcodeproj/project.pbxproj
@@ -716,7 +716,6 @@
 		F56C8A6A131F42ED000AD0F6 /* GUIDialogMusicInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C85AA131F42EA000AD0F6 /* GUIDialogMusicInfo.cpp */; };
 		F56C8A6B131F42ED000AD0F6 /* GUIDialogMusicOSD.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C85AC131F42EA000AD0F6 /* GUIDialogMusicOSD.cpp */; };
 		F56C8A6C131F42ED000AD0F6 /* GUIDialogMusicOverlay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C85AE131F42EA000AD0F6 /* GUIDialogMusicOverlay.cpp */; };
-		F56C8A6D131F42ED000AD0F6 /* GUIDialogMusicScan.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C85B0131F42EA000AD0F6 /* GUIDialogMusicScan.cpp */; };
 		F56C8A6E131F42ED000AD0F6 /* GUIDialogSongInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C85B2131F42EA000AD0F6 /* GUIDialogSongInfo.cpp */; };
 		F56C8A6F131F42ED000AD0F6 /* GUIDialogVisualisationPresetList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C85B4131F42EA000AD0F6 /* GUIDialogVisualisationPresetList.cpp */; };
 		F56C8A70131F42ED000AD0F6 /* MusicAlbumInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C85B7131F42EA000AD0F6 /* MusicAlbumInfo.cpp */; };
@@ -2637,8 +2636,6 @@
 		F56C85AD131F42EA000AD0F6 /* GUIDialogMusicOSD.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogMusicOSD.h; sourceTree = "<group>"; };
 		F56C85AE131F42EA000AD0F6 /* GUIDialogMusicOverlay.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogMusicOverlay.cpp; sourceTree = "<group>"; };
 		F56C85AF131F42EA000AD0F6 /* GUIDialogMusicOverlay.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogMusicOverlay.h; sourceTree = "<group>"; };
-		F56C85B0131F42EA000AD0F6 /* GUIDialogMusicScan.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogMusicScan.cpp; sourceTree = "<group>"; };
-		F56C85B1131F42EA000AD0F6 /* GUIDialogMusicScan.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogMusicScan.h; sourceTree = "<group>"; };
 		F56C85B2131F42EA000AD0F6 /* GUIDialogSongInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogSongInfo.cpp; sourceTree = "<group>"; };
 		F56C85B3131F42EA000AD0F6 /* GUIDialogSongInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogSongInfo.h; sourceTree = "<group>"; };
 		F56C85B4131F42EA000AD0F6 /* GUIDialogVisualisationPresetList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogVisualisationPresetList.cpp; sourceTree = "<group>"; };
@@ -5637,8 +5634,6 @@
 				F56C85AD131F42EA000AD0F6 /* GUIDialogMusicOSD.h */,
 				F56C85AE131F42EA000AD0F6 /* GUIDialogMusicOverlay.cpp */,
 				F56C85AF131F42EA000AD0F6 /* GUIDialogMusicOverlay.h */,
-				F56C85B0131F42EA000AD0F6 /* GUIDialogMusicScan.cpp */,
-				F56C85B1131F42EA000AD0F6 /* GUIDialogMusicScan.h */,
 				F56C85B2131F42EA000AD0F6 /* GUIDialogSongInfo.cpp */,
 				F56C85B3131F42EA000AD0F6 /* GUIDialogSongInfo.h */,
 				F56C85B4131F42EA000AD0F6 /* GUIDialogVisualisationPresetList.cpp */,
@@ -7180,7 +7175,6 @@
 				F56C8A6A131F42ED000AD0F6 /* GUIDialogMusicInfo.cpp in Sources */,
 				F56C8A6B131F42ED000AD0F6 /* GUIDialogMusicOSD.cpp in Sources */,
 				F56C8A6C131F42ED000AD0F6 /* GUIDialogMusicOverlay.cpp in Sources */,
-				F56C8A6D131F42ED000AD0F6 /* GUIDialogMusicScan.cpp in Sources */,
 				F56C8A6E131F42ED000AD0F6 /* GUIDialogSongInfo.cpp in Sources */,
 				F56C8A6F131F42ED000AD0F6 /* GUIDialogVisualisationPresetList.cpp in Sources */,
 				F56C8A70131F42ED000AD0F6 /* MusicAlbumInfo.cpp in Sources */,
diff --git a/XBMC.xcodeproj/project.pbxproj b/XBMC.xcodeproj/project.pbxproj
index 57ef511503..19c841cb31 100644
--- a/XBMC.xcodeproj/project.pbxproj
+++ b/XBMC.xcodeproj/project.pbxproj
@@ -647,7 +647,6 @@
 		E38E20830D25F9FD00618676 /* GUIDialogGamepad.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17AC0D25F9FA00618676 /* GUIDialogGamepad.cpp */; };
 		E38E20890D25F9FD00618676 /* GUIDialogMediaSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17B80D25F9FA00618676 /* GUIDialogMediaSource.cpp */; };
 		E38E208A0D25F9FD00618676 /* GUIDialogMusicOSD.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17BA0D25F9FA00618676 /* GUIDialogMusicOSD.cpp */; };
-		E38E208B0D25F9FD00618676 /* GUIDialogMusicScan.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17BC0D25F9FA00618676 /* GUIDialogMusicScan.cpp */; };
 		E38E208C0D25F9FD00618676 /* GUIDialogMuteBug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17BE0D25F9FA00618676 /* GUIDialogMuteBug.cpp */; };
 		E38E208D0D25F9FD00618676 /* GUIDialogNetworkSetup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17C00D25F9FA00618676 /* GUIDialogNetworkSetup.cpp */; };
 		E38E208E0D25F9FD00618676 /* GUIDialogNumeric.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17C20D25F9FA00618676 /* GUIDialogNumeric.cpp */; };
@@ -2448,8 +2447,6 @@
 		E38E17B90D25F9FA00618676 /* GUIDialogMediaSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogMediaSource.h; sourceTree = "<group>"; };
 		E38E17BA0D25F9FA00618676 /* GUIDialogMusicOSD.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogMusicOSD.cpp; sourceTree = "<group>"; };
 		E38E17BB0D25F9FA00618676 /* GUIDialogMusicOSD.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogMusicOSD.h; sourceTree = "<group>"; };
-		E38E17BC0D25F9FA00618676 /* GUIDialogMusicScan.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogMusicScan.cpp; sourceTree = "<group>"; };
-		E38E17BD0D25F9FA00618676 /* GUIDialogMusicScan.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogMusicScan.h; sourceTree = "<group>"; };
 		E38E17BE0D25F9FA00618676 /* GUIDialogMuteBug.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogMuteBug.cpp; sourceTree = "<group>"; };
 		E38E17BF0D25F9FA00618676 /* GUIDialogMuteBug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogMuteBug.h; sourceTree = "<group>"; };
 		E38E17C00D25F9FA00618676 /* GUIDialogNetworkSetup.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogNetworkSetup.cpp; sourceTree = "<group>"; };
@@ -3778,8 +3775,6 @@
 				E38E17BB0D25F9FA00618676 /* GUIDialogMusicOSD.h */,
 				E38E18130D25F9FA00618676 /* GUIDialogMusicOverlay.cpp */,
 				E38E18140D25F9FA00618676 /* GUIDialogMusicOverlay.h */,
-				E38E17BC0D25F9FA00618676 /* GUIDialogMusicScan.cpp */,
-				E38E17BD0D25F9FA00618676 /* GUIDialogMusicScan.h */,
 				E38E17DA0D25F9FA00618676 /* GUIDialogSongInfo.cpp */,
 				E38E17DB0D25F9FA00618676 /* GUIDialogSongInfo.h */,
 				E38E17E60D25F9FA00618676 /* GUIDialogVisualisationPresetList.cpp */,
@@ -6882,7 +6877,6 @@
 				E38E20830D25F9FD00618676 /* GUIDialogGamepad.cpp in Sources */,
 				E38E20890D25F9FD00618676 /* GUIDialogMediaSource.cpp in Sources */,
 				E38E208A0D25F9FD00618676 /* GUIDialogMusicOSD.cpp in Sources */,
-				E38E208B0D25F9FD00618676 /* GUIDialogMusicScan.cpp in Sources */,
 				E38E208C0D25F9FD00618676 /* GUIDialogMuteBug.cpp in Sources */,
 				E38E208D0D25F9FD00618676 /* GUIDialogNetworkSetup.cpp in Sources */,
 				E38E208E0D25F9FD00618676 /* GUIDialogNumeric.cpp in Sources */,
diff --git a/addons/skin.confluence/720p/DialogMusicScan.xml b/addons/skin.confluence/720p/DialogMusicScan.xml
deleted file mode 100644
index 096061557e..0000000000
--- a/addons/skin.confluence/720p/DialogMusicScan.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<window id="112">
-	<defaultcontrol></defaultcontrol>
-		<animation effect="slide" start="0,-70" end="0,0" time="100">WindowOpen</animation>
-		<animation effect="slide" start="0,0" end="0,-70" delay="400" time="100">WindowClose</animation>
-	<controls>
-		<control type="group">
-			<posx>720</posx>
-			<posy>0</posy>
-			<animation effect="slide" end="-400,0" time="200" condition="Window.IsVisible(133)">conditional</animation>
-			<animation effect="slide" end="0,-80" time="200" condition="Window.IsVisible(FullscreenVideo) | Window.IsVisible(Visualisation)">conditional</animation>
-			<control type="image">
-				<posx>0</posx>
-				<posy>-10</posy>
-				<width>400</width>
-				<height>70</height>
-				<texture flipy="true" border="20,20,20,2">InfoMessagePanel.png</texture>
-			</control>
-			<control type="label" id="401">
-				<description>Caption Label</description>
-				<posx>15</posx>
-				<posy>4</posy>
-				<width>370</width>
-				<height>18</height>
-				<font>font10_title</font>
-				<textcolor>selected</textcolor>
-				<align>left</align>
-				<aligny>center</aligny>
-			</control>
-			<control type="label" id="402">
-				<description>Current Directory Label</description>
-				<posx>15</posx>
-				<posy>20</posy>
-				<width>370</width>
-				<height>20</height>
-				<font>font10</font>
-				<align>left</align>
-				<aligny>center</aligny>
-				<haspath>true</haspath>
-			</control>
-			<control type="progress" id="403">
-				<description>progress control</description>
-				<posx>15</posx>
-				<posy>42</posy>
-				<width>370</width>
-				<height>8</height>
-			</control>
-		</control>
-	</controls>
-</window>
\ No newline at end of file
diff --git a/project/VS2010Express/XBMC.vcxproj b/project/VS2010Express/XBMC.vcxproj
index f968aad8b6..bf2d3ea6dd 100644
--- a/project/VS2010Express/XBMC.vcxproj
+++ b/project/VS2010Express/XBMC.vcxproj
@@ -772,7 +772,6 @@
     <ClCompile Include="..\..\xbmc\music\dialogs\GUIDialogMusicInfo.cpp" />
     <ClCompile Include="..\..\xbmc\music\dialogs\GUIDialogMusicOSD.cpp" />
     <ClCompile Include="..\..\xbmc\music\dialogs\GUIDialogMusicOverlay.cpp" />
-    <ClCompile Include="..\..\xbmc\music\dialogs\GUIDialogMusicScan.cpp" />
     <ClCompile Include="..\..\xbmc\music\dialogs\GUIDialogSongInfo.cpp" />
     <ClCompile Include="..\..\xbmc\music\dialogs\GUIDialogVisualisationPresetList.cpp" />
     <ClCompile Include="..\..\xbmc\music\GUIViewStateMusic.cpp" />
@@ -2158,7 +2157,6 @@
     <ClInclude Include="..\..\xbmc\music\dialogs\GUIDialogMusicInfo.h" />
     <ClInclude Include="..\..\xbmc\music\dialogs\GUIDialogMusicOSD.h" />
     <ClInclude Include="..\..\xbmc\music\dialogs\GUIDialogMusicOverlay.h" />
-    <ClInclude Include="..\..\xbmc\music\dialogs\GUIDialogMusicScan.h" />
     <ClInclude Include="..\..\xbmc\music\dialogs\GUIDialogSongInfo.h" />
     <ClInclude Include="..\..\xbmc\music\dialogs\GUIDialogVisualisationPresetList.h" />
     <ClInclude Include="..\..\xbmc\music\GUIViewStateMusic.h" />
diff --git a/project/VS2010Express/XBMC.vcxproj.filters b/project/VS2010Express/XBMC.vcxproj.filters
index a6f3666365..5ffdba4189 100644
--- a/project/VS2010Express/XBMC.vcxproj.filters
+++ b/project/VS2010Express/XBMC.vcxproj.filters
@@ -1258,9 +1258,6 @@
     <ClCompile Include="..\..\xbmc\music\dialogs\GUIDialogMusicOverlay.cpp">
       <Filter>music\dialogs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\music\dialogs\GUIDialogMusicScan.cpp">
-      <Filter>music\dialogs</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\xbmc\music\dialogs\GUIDialogSongInfo.cpp">
       <Filter>music\dialogs</Filter>
     </ClCompile>
@@ -4113,9 +4110,6 @@
     <ClInclude Include="..\..\xbmc\music\dialogs\GUIDialogMusicOverlay.h">
       <Filter>music\dialogs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\music\dialogs\GUIDialogMusicScan.h">
-      <Filter>music\dialogs</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\xbmc\music\dialogs\GUIDialogSongInfo.h">
       <Filter>music\dialogs</Filter>
     </ClInclude>
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
index 38367391be..f85326ec5d 100644
--- a/xbmc/Application.cpp
+++ b/xbmc/Application.cpp
@@ -178,6 +178,7 @@
 #include "peripherals/dialogs/GUIDialogPeripheralManager.h"
 #include "peripherals/dialogs/GUIDialogPeripheralSettings.h"
 #include "peripherals/devices/PeripheralImon.h"
+#include "music/infoscanner/MusicInfoScanner.h"
 
 // Windows includes
 #include "guilib/GUIWindowManager.h"
@@ -251,7 +252,6 @@
 #include "dialogs/GUIDialogFavourites.h"
 #include "dialogs/GUIDialogButtonMenu.h"
 #include "dialogs/GUIDialogContextMenu.h"
-#include "music/dialogs/GUIDialogMusicScan.h"
 #include "dialogs/GUIDialogPlayerControls.h"
 #include "music/dialogs/GUIDialogSongInfo.h"
 #include "dialogs/GUIDialogSmartPlaylistEditor.h"
@@ -1262,7 +1262,6 @@ bool CApplication::Initialize()
     g_windowManager.Add(new CGUIDialogNumeric);            // window id = 109
     g_windowManager.Add(new CGUIDialogGamepad);            // window id = 110
     g_windowManager.Add(new CGUIDialogButtonMenu);         // window id = 111
-    g_windowManager.Add(new CGUIDialogMusicScan);          // window id = 112
     g_windowManager.Add(new CGUIDialogMuteBug);            // window id = 113
     g_windowManager.Add(new CGUIDialogPlayerControls);     // window id = 114
 #ifdef HAS_KARAOKE
@@ -3449,7 +3448,6 @@ bool CApplication::Cleanup()
     g_windowManager.Delete(WINDOW_DIALOG_SUB_MENU);
     g_windowManager.Delete(WINDOW_DIALOG_BUTTON_MENU);
     g_windowManager.Delete(WINDOW_DIALOG_CONTEXT_MENU);
-    g_windowManager.Delete(WINDOW_DIALOG_MUSIC_SCAN);
     g_windowManager.Delete(WINDOW_DIALOG_PLAYER_CONTROLS);
     g_windowManager.Delete(WINDOW_DIALOG_KARAOKE_SONGSELECT);
     g_windowManager.Delete(WINDOW_DIALOG_KARAOKE_SELECTOR);
diff --git a/xbmc/guilib/Key.h b/xbmc/guilib/Key.h
index 2b35ccab4b..98634de45e 100644
--- a/xbmc/guilib/Key.h
+++ b/xbmc/guilib/Key.h
@@ -355,7 +355,6 @@
 #define WINDOW_DIALOG_NUMERIC             10109
 #define WINDOW_DIALOG_GAMEPAD             10110
 #define WINDOW_DIALOG_BUTTON_MENU         10111
-#define WINDOW_DIALOG_MUSIC_SCAN          10112
 #define WINDOW_DIALOG_MUTE_BUG            10113
 #define WINDOW_DIALOG_PLAYER_CONTROLS     10114
 #define WINDOW_DIALOG_SEEK_BAR            10115
diff --git a/xbmc/input/ButtonTranslator.cpp b/xbmc/input/ButtonTranslator.cpp
index 7f6c4fd0fb..b8894f24ab 100644
--- a/xbmc/input/ButtonTranslator.cpp
+++ b/xbmc/input/ButtonTranslator.cpp
@@ -282,7 +282,6 @@ static const ActionMapping windows[] =
         {"numericinput"             , WINDOW_DIALOG_NUMERIC},
         {"gamepadinput"             , WINDOW_DIALOG_GAMEPAD},
         {"shutdownmenu"             , WINDOW_DIALOG_BUTTON_MENU},
-        {"musicscan"                , WINDOW_DIALOG_MUSIC_SCAN},
         {"mutebug"                  , WINDOW_DIALOG_MUTE_BUG},
         {"playercontrols"           , WINDOW_DIALOG_PLAYER_CONTROLS},
         {"seekbar"                  , WINDOW_DIALOG_SEEK_BAR},
diff --git a/xbmc/music/dialogs/GUIDialogMusicScan.cpp b/xbmc/music/dialogs/GUIDialogMusicScan.cpp
deleted file mode 100644
index a49bd1e523..0000000000
--- a/xbmc/music/dialogs/GUIDialogMusicScan.cpp
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- *      Copyright (C) 2005-2012 Team XBMC
- *      http://www.xbmc.org
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, see
- *  <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "GUIDialogMusicScan.h"
-#include "guilib/GUIProgressControl.h"
-#include "Application.h"
-#include "ApplicationMessenger.h"
-#include "Util.h"
-#include "URL.h"
-#include "guilib/GUIWindowManager.h"
-#include "settings/GUISettings.h"
-#include "GUIUserMessages.h"
-#include "threads/SingleLock.h"
-#include "utils/log.h"
-
-using namespace MUSIC_INFO;
-
-#define CONTROL_LABELSTATUS     401
-#define CONTROL_LABELDIRECTORY  402
-#define CONTROL_PROGRESS        403
-
-CGUIDialogMusicScan::CGUIDialogMusicScan(void)
-: CGUIDialog(WINDOW_DIALOG_MUSIC_SCAN, "DialogMusicScan.xml")
-{
-  m_loadType = KEEP_IN_MEMORY;
-}
-
-CGUIDialogMusicScan::~CGUIDialogMusicScan(void)
-{
-}
-
-bool CGUIDialogMusicScan::OnMessage(CGUIMessage& message)
-{
-  switch ( message.GetMessage() )
-  {
-  case GUI_MSG_WINDOW_INIT:
-    {
-      CGUIDialog::OnMessage(message);
-
-      m_strCurrentDir.Empty();
-
-      m_fPercentDone=-1.0F;
-
-      UpdateState();
-      return true;
-    }
-    break;
-  }
-
-  return CGUIDialog::OnMessage(message);
-}
-
-void CGUIDialogMusicScan::FrameMove()
-{
-  if (m_active)
-    UpdateState();
-
-  CGUIDialog::FrameMove();
-}
-
-void CGUIDialogMusicScan::OnDirectoryChanged(const CStdString& strDirectory)
-{
-  CSingleLock lock (m_critical);
-
-  m_strCurrentDir = strDirectory;
-}
-
-void CGUIDialogMusicScan::OnStateChanged(SCAN_STATE state)
-{
-  CSingleLock lock (m_critical);
-
-  m_ScanState = state;
-}
-
-void CGUIDialogMusicScan::OnSetProgress(int currentItem, int itemCount)
-{
-  CSingleLock lock (m_critical);
-
-  m_fPercentDone=(float)((currentItem*100)/itemCount);
-  if (m_fPercentDone>100.0F) m_fPercentDone=100.0F;
-}
-
-void CGUIDialogMusicScan::ShowScan()
-{
-  m_ScanState = PREPARING;
-  Show();
-}
-
-void CGUIDialogMusicScan::OnDirectoryScanned(const CStdString& strDirectory)
-{
-  CGUIMessage msg(GUI_MSG_DIRECTORY_SCANNED, 0, 0, 0);
-  msg.SetStringParam(strDirectory);
-  g_windowManager.SendThreadMessage(msg);
-}
-
-void CGUIDialogMusicScan::OnFinished()
-{
-  // clear cache
-  CUtil::DeleteMusicDatabaseDirectoryCache();
-
-  // send message
-  CGUIMessage msg(GUI_MSG_SCAN_FINISHED, 0, 0, 0);
-  g_windowManager.SendThreadMessage(msg);
-
-  if (!g_guiSettings.GetBool("musiclibrary.backgroundupdate"))
-  {
-    CApplicationMessenger::Get().Close(this, false, false);
-  }
-}
-
-void CGUIDialogMusicScan::UpdateState()
-{
-  CSingleLock lock (m_critical);
-
-  SET_CONTROL_LABEL(CONTROL_LABELSTATUS, GetStateString());
-
-  if (m_ScanState == READING_MUSIC_INFO)
-  {
-    CURL url(m_strCurrentDir);
-    CStdString strStrippedPath = url.GetWithoutUserDetails();
-    CURL::Decode(strStrippedPath);
-
-    SET_CONTROL_LABEL(CONTROL_LABELDIRECTORY, strStrippedPath);
-
-    if (m_fPercentDone>-1.0F)
-    {
-      SET_CONTROL_VISIBLE(CONTROL_PROGRESS);
-      CGUIProgressControl* pProgressCtrl=(CGUIProgressControl*)GetControl(CONTROL_PROGRESS);
-      if (pProgressCtrl) pProgressCtrl->SetPercentage(m_fPercentDone);
-    }
-  }
-  else if (m_ScanState == DOWNLOADING_ALBUM_INFO || m_ScanState == DOWNLOADING_ARTIST_INFO)
-  {
-    SET_CONTROL_LABEL(CONTROL_LABELDIRECTORY, m_strCurrentDir);
-    if (m_fPercentDone>-1.0F)
-    {
-      SET_CONTROL_VISIBLE(CONTROL_PROGRESS);
-      CGUIProgressControl* pProgressCtrl=(CGUIProgressControl*)GetControl(CONTROL_PROGRESS);
-      if (pProgressCtrl) pProgressCtrl->SetPercentage(m_fPercentDone);
-    }
-  }
-  else
-  {
-    SET_CONTROL_LABEL(CONTROL_LABELDIRECTORY, "");
-    SET_CONTROL_HIDDEN(CONTROL_PROGRESS);
-  }
-}
-
-int CGUIDialogMusicScan::GetStateString()
-{
-  if (m_ScanState == PREPARING)
-    return 314;
-  else if (m_ScanState == REMOVING_OLD)
-    return 701;
-  else if (m_ScanState == CLEANING_UP_DATABASE)
-    return 700;
-  else if (m_ScanState == READING_MUSIC_INFO)
-    return 505;
-  else if (m_ScanState == COMPRESSING_DATABASE)
-    return 331;
-  else if (m_ScanState == WRITING_CHANGES)
-    return 328;
-  else if (m_ScanState == DOWNLOADING_ALBUM_INFO)
-    return 21885;
-  else if (m_ScanState == DOWNLOADING_ARTIST_INFO)
-    return 21886;
-
-  return -1;
-}
diff --git a/xbmc/music/dialogs/GUIDialogMusicScan.h b/xbmc/music/dialogs/GUIDialogMusicScan.h
deleted file mode 100644
index f1c60cafea..0000000000
--- a/xbmc/music/dialogs/GUIDialogMusicScan.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#pragma once
-
-/*
- *      Copyright (C) 2005-2012 Team XBMC
- *      http://www.xbmc.org
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, see
- *  <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "guilib/GUIDialog.h"
-#include "music/infoscanner/MusicInfoScanner.h"
-#include "threads/CriticalSection.h"
-
-class CGUIDialogMusicScan: public CGUIDialog, public MUSIC_INFO::IMusicInfoScannerObserver
-{
-public:
-  CGUIDialogMusicScan(void);
-  virtual ~CGUIDialogMusicScan(void);
-  virtual bool OnMessage(CGUIMessage& message);
-  virtual void FrameMove();
-
-  void ShowScan();
-
-  void UpdateState();
-protected:
-  int GetStateString();
-  virtual void OnDirectoryChanged(const CStdString& strDirectory);
-  virtual void OnDirectoryScanned(const CStdString& strDirectory);
-  virtual void OnFinished();
-  virtual void OnStateChanged(MUSIC_INFO::SCAN_STATE state);
-  virtual void OnSetProgress(int currentItem, int itemCount);
-
-  MUSIC_INFO::SCAN_STATE m_ScanState;
-  CStdString m_strCurrentDir;
-
-  CCriticalSection m_critical;
-
-  float m_fPercentDone;
-  int m_currentItem;
-  int m_itemCount;
-};
diff --git a/xbmc/music/dialogs/Makefile b/xbmc/music/dialogs/Makefile
index f58bea69a4..44cdc079c1 100644
--- a/xbmc/music/dialogs/Makefile
+++ b/xbmc/music/dialogs/Makefile
@@ -1,7 +1,6 @@
 SRCS=GUIDialogMusicInfo.cpp \
      GUIDialogMusicOSD.cpp \
      GUIDialogMusicOverlay.cpp \
-     GUIDialogMusicScan.cpp \
      GUIDialogSongInfo.cpp \
      GUIDialogVisualisationPresetList.cpp \
 
diff --git a/xbmc/music/infoscanner/MusicInfoScanner.cpp b/xbmc/music/infoscanner/MusicInfoScanner.cpp
index f673c84575..c627d522d2 100644
--- a/xbmc/music/infoscanner/MusicInfoScanner.cpp
+++ b/xbmc/music/infoscanner/MusicInfoScanner.cpp
@@ -360,11 +360,6 @@ void CMusicInfoScanner::Stop()
   StopThread();
 }
 
-void CMusicInfoScanner::SetObserver(IMusicInfoScannerObserver* pObserver)
-{
-  m_pObserver = pObserver;
-}
-
 static void OnDirectoryScanned(const CStdString& strDirectory)
 {
   CGUIMessage msg(GUI_MSG_DIRECTORY_SCANNED, 0, 0, 0);
diff --git a/xbmc/music/infoscanner/MusicInfoScanner.h b/xbmc/music/infoscanner/MusicInfoScanner.h
index eb439c6899..2bd78e0fac 100644
--- a/xbmc/music/infoscanner/MusicInfoScanner.h
+++ b/xbmc/music/infoscanner/MusicInfoScanner.h
@@ -28,19 +28,6 @@ class CGUIDialogProgressBarHandle;
 
 namespace MUSIC_INFO
 {
-enum SCAN_STATE { PREPARING = 0, REMOVING_OLD, CLEANING_UP_DATABASE, READING_MUSIC_INFO, DOWNLOADING_ALBUM_INFO, DOWNLOADING_ARTIST_INFO, COMPRESSING_DATABASE, WRITING_CHANGES };
-
-class IMusicInfoScannerObserver
-{
-public:
-  virtual ~IMusicInfoScannerObserver() {}
-  virtual void OnStateChanged(SCAN_STATE state) = 0;
-  virtual void OnDirectoryChanged(const CStdString& strDirectory) = 0;
-  virtual void OnDirectoryScanned(const CStdString& strDirectory) = 0;
-  virtual void OnSetProgress(int currentItem, int itemCount)=0;
-  virtual void OnFinished() = 0;
-};
-
 class CMusicInfoScanner : CThread, public IRunnable
 {
 public:
@@ -59,7 +46,6 @@ public:
   void FetchArtistInfo(const CStdString& strDirectory, bool refresh=false);
   bool IsScanning();
   void Stop();
-  void SetObserver(IMusicInfoScannerObserver* pObserver);
 
   //! \brief Set whether or not to show a progress dialog
   void ShowDialog(bool show) { m_showDialog = show; }
diff --git a/xbmc/music/windows/GUIWindowMusicBase.cpp b/xbmc/music/windows/GUIWindowMusicBase.cpp
index 1de6231c91..2e7a2e9af1 100644
--- a/xbmc/music/windows/GUIWindowMusicBase.cpp
+++ b/xbmc/music/windows/GUIWindowMusicBase.cpp
@@ -37,7 +37,6 @@
 #include "cdrip/CDDARipper.h"
 #endif
 #include "GUIPassword.h"
-#include "music/dialogs/GUIDialogMusicScan.h"
 #include "dialogs/GUIDialogMediaSource.h"
 #include "PartyModeManager.h"
 #include "GUIInfoManager.h"
@@ -66,6 +65,7 @@
 #include "utils/StringUtils.h"
 #include "ThumbLoader.h"
 #include "URL.h"
+#include "music/infoscanner/MusicInfoScanner.h"
 
 using namespace std;
 using namespace XFILE;