Permalink
Browse files

changed: remove now unused CGUIDialogMusicScan

  • Loading branch information...
1 parent 41dcd4d commit a724e0e7803c3c42e0a29dda65d78db74c81c87c spiff committed Oct 6, 2012
@@ -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 */,
@@ -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 */,
@@ -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 */,
@@ -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>
@@ -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" />
@@ -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>
View
@@ -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);
View
@@ -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
@@ -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},
Oops, something went wrong.

0 comments on commit a724e0e

Please sign in to comment.