F56C7B4C131EC155000AD0F6 /* GUIDialogVideoInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7785131EC154000AD0F6 /* GUIDialogVideoInfo.cpp */; };
F56C7B4D131EC155000AD0F6 /* GUIDialogVideoOSD.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7787131EC154000AD0F6 /* GUIDialogVideoOSD.cpp */; };
F56C7B4E131EC155000AD0F6 /* GUIDialogVideoOverlay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7789131EC154000AD0F6 /* GUIDialogVideoOverlay.cpp */; };
- F56C7B4F131EC155000AD0F6 /* GUIDialogVideoScan.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C778B131EC154000AD0F6 /* GUIDialogVideoScan.cpp */; };
F56C7B50131EC155000AD0F6 /* GUIDialogVideoSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C778D131EC154000AD0F6 /* GUIDialogVideoSettings.cpp */; };
F56C7B51131EC155000AD0F6 /* GUIWindowFullScreen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7790131EC154000AD0F6 /* GUIWindowFullScreen.cpp */; };
F56C7B52131EC155000AD0F6 /* GUIWindowVideoBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7792131EC154000AD0F6 /* GUIWindowVideoBase.cpp */; };
F56C7788131EC154000AD0F6 /* GUIDialogVideoOSD.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogVideoOSD.h; sourceTree = "<group>"; };
F56C7789131EC154000AD0F6 /* GUIDialogVideoOverlay.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogVideoOverlay.cpp; sourceTree = "<group>"; };
F56C778A131EC154000AD0F6 /* GUIDialogVideoOverlay.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogVideoOverlay.h; sourceTree = "<group>"; };
- F56C778B131EC154000AD0F6 /* GUIDialogVideoScan.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogVideoScan.cpp; sourceTree = "<group>"; };
- F56C778C131EC154000AD0F6 /* GUIDialogVideoScan.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogVideoScan.h; sourceTree = "<group>"; };
F56C778D131EC154000AD0F6 /* GUIDialogVideoSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogVideoSettings.cpp; sourceTree = "<group>"; };
F56C778E131EC154000AD0F6 /* GUIDialogVideoSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogVideoSettings.h; sourceTree = "<group>"; };
F56C7790131EC154000AD0F6 /* GUIWindowFullScreen.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIWindowFullScreen.cpp; sourceTree = "<group>"; };
F56C7788131EC154000AD0F6 /* GUIDialogVideoOSD.h */,
F56C7789131EC154000AD0F6 /* GUIDialogVideoOverlay.cpp */,
F56C778A131EC154000AD0F6 /* GUIDialogVideoOverlay.h */,
- F56C778B131EC154000AD0F6 /* GUIDialogVideoScan.cpp */,
- F56C778C131EC154000AD0F6 /* GUIDialogVideoScan.h */,
F56C778D131EC154000AD0F6 /* GUIDialogVideoSettings.cpp */,
F56C778E131EC154000AD0F6 /* GUIDialogVideoSettings.h */,
);
F56C7B4C131EC155000AD0F6 /* GUIDialogVideoInfo.cpp in Sources */,
F56C7B4D131EC155000AD0F6 /* GUIDialogVideoOSD.cpp in Sources */,
F56C7B4E131EC155000AD0F6 /* GUIDialogVideoOverlay.cpp in Sources */,
- F56C7B4F131EC155000AD0F6 /* GUIDialogVideoScan.cpp in Sources */,
F56C7B50131EC155000AD0F6 /* GUIDialogVideoSettings.cpp in Sources */,
F56C7B51131EC155000AD0F6 /* GUIWindowFullScreen.cpp in Sources */,
F56C7B52131EC155000AD0F6 /* GUIWindowVideoBase.cpp in Sources */,
F56C8B3B131F42ED000AD0F6 /* GUIDialogVideoInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C8774131F42EC000AD0F6 /* GUIDialogVideoInfo.cpp */; };
F56C8B3C131F42ED000AD0F6 /* GUIDialogVideoOSD.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C8776131F42EC000AD0F6 /* GUIDialogVideoOSD.cpp */; };
F56C8B3D131F42ED000AD0F6 /* GUIDialogVideoOverlay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C8778131F42EC000AD0F6 /* GUIDialogVideoOverlay.cpp */; };
- F56C8B3E131F42ED000AD0F6 /* GUIDialogVideoScan.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C877A131F42EC000AD0F6 /* GUIDialogVideoScan.cpp */; };
F56C8B3F131F42ED000AD0F6 /* GUIDialogVideoSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C877C131F42EC000AD0F6 /* GUIDialogVideoSettings.cpp */; };
F56C8B40131F42ED000AD0F6 /* GUIWindowFullScreen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C877F131F42EC000AD0F6 /* GUIWindowFullScreen.cpp */; };
F56C8B41131F42ED000AD0F6 /* GUIWindowVideoBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C8781131F42EC000AD0F6 /* GUIWindowVideoBase.cpp */; };
F56C8777131F42EC000AD0F6 /* GUIDialogVideoOSD.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogVideoOSD.h; sourceTree = "<group>"; };
F56C8778131F42EC000AD0F6 /* GUIDialogVideoOverlay.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogVideoOverlay.cpp; sourceTree = "<group>"; };
F56C8779131F42EC000AD0F6 /* GUIDialogVideoOverlay.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogVideoOverlay.h; sourceTree = "<group>"; };
- F56C877A131F42EC000AD0F6 /* GUIDialogVideoScan.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogVideoScan.cpp; sourceTree = "<group>"; };
- F56C877B131F42EC000AD0F6 /* GUIDialogVideoScan.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogVideoScan.h; sourceTree = "<group>"; };
F56C877C131F42EC000AD0F6 /* GUIDialogVideoSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogVideoSettings.cpp; sourceTree = "<group>"; };
F56C877D131F42EC000AD0F6 /* GUIDialogVideoSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogVideoSettings.h; sourceTree = "<group>"; };
F56C877F131F42EC000AD0F6 /* GUIWindowFullScreen.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIWindowFullScreen.cpp; sourceTree = "<group>"; };
F56C8777131F42EC000AD0F6 /* GUIDialogVideoOSD.h */,
F56C8778131F42EC000AD0F6 /* GUIDialogVideoOverlay.cpp */,
F56C8779131F42EC000AD0F6 /* GUIDialogVideoOverlay.h */,
- F56C877A131F42EC000AD0F6 /* GUIDialogVideoScan.cpp */,
- F56C877B131F42EC000AD0F6 /* GUIDialogVideoScan.h */,
F56C877C131F42EC000AD0F6 /* GUIDialogVideoSettings.cpp */,
F56C877D131F42EC000AD0F6 /* GUIDialogVideoSettings.h */,
);
F56C8B3B131F42ED000AD0F6 /* GUIDialogVideoInfo.cpp in Sources */,
F56C8B3C131F42ED000AD0F6 /* GUIDialogVideoOSD.cpp in Sources */,
F56C8B3D131F42ED000AD0F6 /* GUIDialogVideoOverlay.cpp in Sources */,
- F56C8B3E131F42ED000AD0F6 /* GUIDialogVideoScan.cpp in Sources */,
F56C8B3F131F42ED000AD0F6 /* GUIDialogVideoSettings.cpp in Sources */,
F56C8B40131F42ED000AD0F6 /* GUIWindowFullScreen.cpp in Sources */,
F56C8B41131F42ED000AD0F6 /* GUIWindowVideoBase.cpp in Sources */,
E38E209A0D25F9FD00618676 /* GUIDialogSongInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17DA0D25F9FA00618676 /* GUIDialogSongInfo.cpp */; };
E38E209B0D25F9FD00618676 /* GUIDialogSubMenu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17DC0D25F9FA00618676 /* GUIDialogSubMenu.cpp */; };
E38E209D0D25F9FD00618676 /* GUIDialogVideoBookmarks.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17E00D25F9FA00618676 /* GUIDialogVideoBookmarks.cpp */; };
- E38E209E0D25F9FD00618676 /* GUIDialogVideoScan.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17E20D25F9FA00618676 /* GUIDialogVideoScan.cpp */; };
E38E20A00D25F9FD00618676 /* GUIDialogVisualisationPresetList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17E60D25F9FA00618676 /* GUIDialogVisualisationPresetList.cpp */; };
E38E20A20D25F9FD00618676 /* GUIDialogVolumeBar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17EA0D25F9FA00618676 /* GUIDialogVolumeBar.cpp */; };
E38E20A30D25F9FD00618676 /* GUIDialogYesNo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17EC0D25F9FA00618676 /* GUIDialogYesNo.cpp */; };
E38E17DD0D25F9FA00618676 /* GUIDialogSubMenu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogSubMenu.h; sourceTree = "<group>"; };
E38E17E00D25F9FA00618676 /* GUIDialogVideoBookmarks.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogVideoBookmarks.cpp; sourceTree = "<group>"; };
E38E17E10D25F9FA00618676 /* GUIDialogVideoBookmarks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogVideoBookmarks.h; sourceTree = "<group>"; };
- E38E17E20D25F9FA00618676 /* GUIDialogVideoScan.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogVideoScan.cpp; sourceTree = "<group>"; };
- E38E17E30D25F9FA00618676 /* GUIDialogVideoScan.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogVideoScan.h; sourceTree = "<group>"; };
E38E17E60D25F9FA00618676 /* GUIDialogVisualisationPresetList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogVisualisationPresetList.cpp; sourceTree = "<group>"; };
E38E17E70D25F9FA00618676 /* GUIDialogVisualisationPresetList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogVisualisationPresetList.h; sourceTree = "<group>"; };
E38E17EA0D25F9FA00618676 /* GUIDialogVolumeBar.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogVolumeBar.cpp; sourceTree = "<group>"; };
E38E181E0D25F9FA00618676 /* GUIDialogVideoOSD.h */,
E38E18430D25F9FA00618676 /* GUIDialogVideoOverlay.cpp */,
E38E18440D25F9FA00618676 /* GUIDialogVideoOverlay.h */,
- E38E17E20D25F9FA00618676 /* GUIDialogVideoScan.cpp */,
- E38E17E30D25F9FA00618676 /* GUIDialogVideoScan.h */,
18B7C90B129427A6009E7A26 /* GUIDialogVideoSettings.cpp */,
18B7C90C129427A6009E7A26 /* GUIDialogVideoSettings.h */,
);
E38E209A0D25F9FD00618676 /* GUIDialogSongInfo.cpp in Sources */,
E38E209B0D25F9FD00618676 /* GUIDialogSubMenu.cpp in Sources */,
E38E209D0D25F9FD00618676 /* GUIDialogVideoBookmarks.cpp in Sources */,
- E38E209E0D25F9FD00618676 /* GUIDialogVideoScan.cpp in Sources */,
E38E20A00D25F9FD00618676 /* GUIDialogVisualisationPresetList.cpp in Sources */,
E38E20A20D25F9FD00618676 /* GUIDialogVolumeBar.cpp in Sources */,
E38E20A30D25F9FD00618676 /* GUIDialogYesNo.cpp in Sources */,
+++ /dev/null
-<window id="133">
- <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="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="405">
- <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>
- </control>
- <control type="progress" id="404">
- <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
<ClCompile Include="..\..\xbmc\video\dialogs\GUIDialogVideoInfo.cpp" />
<ClCompile Include="..\..\xbmc\video\dialogs\GUIDialogVideoOSD.cpp" />
<ClCompile Include="..\..\xbmc\video\dialogs\GUIDialogVideoOverlay.cpp" />
- <ClCompile Include="..\..\xbmc\video\dialogs\GUIDialogVideoScan.cpp" />
<ClCompile Include="..\..\xbmc\video\dialogs\GUIDialogVideoSettings.cpp" />
<ClCompile Include="..\..\xbmc\video\GUIViewStateVideo.cpp" />
<ClCompile Include="..\..\xbmc\video\Teletext.cpp" />
<ClInclude Include="..\..\xbmc\video\dialogs\GUIDialogVideoInfo.h" />
<ClInclude Include="..\..\xbmc\video\dialogs\GUIDialogVideoOSD.h" />
<ClInclude Include="..\..\xbmc\video\dialogs\GUIDialogVideoOverlay.h" />
- <ClInclude Include="..\..\xbmc\video\dialogs\GUIDialogVideoScan.h" />
<ClInclude Include="..\..\xbmc\video\dialogs\GUIDialogVideoSettings.h" />
<ClInclude Include="..\..\xbmc\video\GUIViewStateVideo.h" />
<ClInclude Include="..\..\xbmc\video\Teletext.h" />
</VisualStudio>
</ProjectExtensions>
<Import Project="$(SolutionDir)\$(ProjectFileName).targets.user" Condition="Exists('$(SolutionDir)\$(ProjectFileName).targets.user')" />
-</Project>
\ No newline at end of file
+</Project>
<ClCompile Include="..\..\xbmc\video\dialogs\GUIDialogVideoOverlay.cpp">
<Filter>video\dialogs</Filter>
</ClCompile>
- <ClCompile Include="..\..\xbmc\video\dialogs\GUIDialogVideoScan.cpp">
- <Filter>video\dialogs</Filter>
- </ClCompile>
<ClCompile Include="..\..\xbmc\video\dialogs\GUIDialogVideoSettings.cpp">
<Filter>video\dialogs</Filter>
</ClCompile>
<ClInclude Include="..\..\xbmc\video\dialogs\GUIDialogVideoOverlay.h">
<Filter>video\dialogs</Filter>
</ClInclude>
- <ClInclude Include="..\..\xbmc\video\dialogs\GUIDialogVideoScan.h">
- <Filter>video\dialogs</Filter>
- </ClInclude>
<ClInclude Include="..\..\xbmc\video\dialogs\GUIDialogVideoSettings.h">
<Filter>video\dialogs</Filter>
</ClInclude>
<Filter>interfaces\swig</Filter>
</None>
</ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
#include "video/dialogs/GUIDialogVideoOSD.h"
#include "music/dialogs/GUIDialogMusicOverlay.h"
#include "video/dialogs/GUIDialogVideoOverlay.h"
+#include "video/VideoInfoScanner.h"
// Dialog includes
#include "music/dialogs/GUIDialogMusicOSD.h"
#include "settings/GUIDialogProfileSettings.h"
#include "settings/GUIDialogLockSettings.h"
#include "settings/GUIDialogContentSettings.h"
-#include "video/dialogs/GUIDialogVideoScan.h"
#include "dialogs/GUIDialogBusy.h"
#include "dialogs/GUIDialogKeyboardGeneric.h"
#include "dialogs/GUIDialogYesNo.h"
g_windowManager.Add(new CGUIDialogNetworkSetup); // window id = 128
g_windowManager.Add(new CGUIDialogMediaSource); // window id = 129
g_windowManager.Add(new CGUIDialogProfileSettings); // window id = 130
- g_windowManager.Add(new CGUIDialogVideoScan); // window id = 133
g_windowManager.Add(new CGUIDialogFavourites); // window id = 134
g_windowManager.Add(new CGUIDialogSongInfo); // window id = 135
g_windowManager.Add(new CGUIDialogSmartPlaylistEditor); // window id = 136
g_windowManager.Delete(WINDOW_DIALOG_VIDEO_OSD_SETTINGS);
g_windowManager.Delete(WINDOW_DIALOG_AUDIO_OSD_SETTINGS);
g_windowManager.Delete(WINDOW_DIALOG_VIDEO_BOOKMARKS);
- g_windowManager.Delete(WINDOW_DIALOG_VIDEO_SCAN);
g_windowManager.Delete(WINDOW_DIALOG_CONTENT_SETTINGS);
g_windowManager.Delete(WINDOW_DIALOG_FAVOURITES);
g_windowManager.Delete(WINDOW_DIALOG_SONG_INFO);
#include "guilib/GUIKeyboardFactory.h"
#include "GUIDialogFileBrowser.h"
#include "video/windows/GUIWindowVideoBase.h"
-#include "video/dialogs/GUIDialogVideoScan.h"
#include "guilib/GUIWindowManager.h"
#include "Util.h"
#include "utils/URIUtils.h"
#define WINDOW_DIALOG_PROFILE_SETTINGS 10130
#define WINDOW_DIALOG_LOCK_SETTINGS 10131
#define WINDOW_DIALOG_CONTENT_SETTINGS 10132
-#define WINDOW_DIALOG_VIDEO_SCAN 10133
#define WINDOW_DIALOG_FAVOURITES 10134
#define WINDOW_DIALOG_SONG_INFO 10135
#define WINDOW_DIALOG_SMART_PLAYLIST_EDITOR 10136
{"profilesettings" , WINDOW_DIALOG_PROFILE_SETTINGS},
{"locksettings" , WINDOW_DIALOG_LOCK_SETTINGS},
{"contentsettings" , WINDOW_DIALOG_CONTENT_SETTINGS},
- {"videoscan" , WINDOW_DIALOG_VIDEO_SCAN},
{"songinformation" , WINDOW_DIALOG_SONG_INFO},
{"smartplaylisteditor" , WINDOW_DIALOG_SMART_PLAYLIST_EDITOR},
{"smartplaylistrule" , WINDOW_DIALOG_SMART_PLAYLIST_RULE},
bool exclude; /* exclude this path from scraping */
} SScanSettings;
- enum SCAN_STATE { PREPARING = 0, REMOVING_OLD, CLEANING_UP_DATABASE, FETCHING_MOVIE_INFO, FETCHING_MUSICVIDEO_INFO, FETCHING_TVSHOW_INFO, COMPRESSING_DATABASE, WRITING_CHANGES };
-
- class IVideoInfoScannerObserver
- {
- public:
- virtual ~IVideoInfoScannerObserver() { }
- 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 OnSetCurrentProgress(int currentItem, int itemCount)=0;
- virtual void OnSetTitle(const CStdString& strTitle) = 0;
- virtual void OnFinished() = 0;
- };
-
/*! \brief return values from the information lookup functions
*/
enum INFO_RET { INFO_CANCELLED,
+++ /dev/null
-/*
- * 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 "GUIDialogVideoScan.h"
-#include "guilib/GUIProgressControl.h"
-#include "GUIUserMessages.h"
-#include "Util.h"
-#include "guilib/GUIWindowManager.h"
-#include "settings/GUISettings.h"
-#include "ApplicationMessenger.h"
-#include "threads/SingleLock.h"
-#include "utils/log.h"
-#include "URL.h"
-
-#define CONTROL_LABELSTATUS 401
-#define CONTROL_LABELDIRECTORY 402
-#define CONTROL_PROGRESS 403
-#define CONTROL_CURRENT_PROGRESS 404
-#define CONTROL_LABELTITLE 405
-
-using namespace VIDEO;
-
-CGUIDialogVideoScan::CGUIDialogVideoScan(void)
-: CGUIDialog(WINDOW_DIALOG_VIDEO_SCAN, "DialogVideoScan.xml")
-{
- m_loadType = KEEP_IN_MEMORY;
-}
-
-CGUIDialogVideoScan::~CGUIDialogVideoScan(void)
-{
-}
-
-bool CGUIDialogVideoScan::OnMessage(CGUIMessage& message)
-{
- switch ( message.GetMessage() )
- {
- case GUI_MSG_WINDOW_INIT:
- {
- CGUIDialog::OnMessage(message);
-
- m_strCurrentDir.Empty();
- m_strTitle.Empty();
-
- m_fPercentDone=-1.0f;
- m_fCurrentPercentDone=-1.0f;
-
- UpdateState();
- return true;
- }
- break;
- }
-
- return CGUIDialog::OnMessage(message);
-}
-
-void CGUIDialogVideoScan::FrameMove()
-{
- if (m_active)
- UpdateState();
-
- CGUIDialog::FrameMove();
-}
-
-void CGUIDialogVideoScan::OnDirectoryChanged(const CStdString& strDirectory)
-{
- CSingleLock lock (m_critical);
-
- m_strCurrentDir = strDirectory;
-}
-
-void CGUIDialogVideoScan::OnStateChanged(SCAN_STATE state)
-{
- CSingleLock lock (m_critical);
-
- m_ScanState = state;
-}
-
-void CGUIDialogVideoScan::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 CGUIDialogVideoScan::OnSetCurrentProgress(int currentItem, int itemCount)
-{
- CSingleLock lock (m_critical);
-
- m_fCurrentPercentDone=(float)((currentItem*100)/itemCount);
- if (m_fCurrentPercentDone>100.0F) m_fCurrentPercentDone=100.0F;
-}
-
-void CGUIDialogVideoScan::OnSetTitle(const CStdString& strTitle)
-{
- CSingleLock lock (m_critical);
-
- m_strTitle = strTitle;
-}
-
-void CGUIDialogVideoScan::ShowScan()
-{
- m_ScanState = PREPARING;
- Show();
-}
-
-void CGUIDialogVideoScan::OnDirectoryScanned(const CStdString& strDirectory)
-{
- CGUIMessage msg(GUI_MSG_DIRECTORY_SCANNED, 0, 0, 0);
- msg.SetStringParam(strDirectory);
- g_windowManager.SendThreadMessage(msg);
-}
-
-void CGUIDialogVideoScan::OnFinished()
-{
- // clear cache
- CUtil::DeleteVideoDatabaseDirectoryCache();
-
- // send message
- CGUIMessage msg(GUI_MSG_SCAN_FINISHED, 0, 0, 0);
- g_windowManager.SendThreadMessage(msg);
-
- // be sure to restore the settings
- CLog::Log(LOGINFO,"Video scan was stopped or finished ... restoring FindRemoteThumbs");
-
- if (!g_guiSettings.GetBool("videolibrary.backgroundupdate"))
- {
- CApplicationMessenger::Get().Close(this,false,false);
- }
-}
-
-void CGUIDialogVideoScan::UpdateState()
-{
- CSingleLock lock (m_critical);
-
- SET_CONTROL_LABEL(CONTROL_LABELSTATUS, GetStateString());
-
- if (m_ScanState == FETCHING_MOVIE_INFO || m_ScanState == FETCHING_MUSICVIDEO_INFO || m_ScanState == FETCHING_TVSHOW_INFO || m_ScanState == CLEANING_UP_DATABASE)
- {
- CURL url(m_strCurrentDir);
- CStdString strStrippedPath = url.GetWithoutUserDetails();
- CURL::Decode(strStrippedPath);
-
- SET_CONTROL_LABEL(CONTROL_LABELDIRECTORY, strStrippedPath);
- SET_CONTROL_LABEL(CONTROL_LABELTITLE, m_strTitle);
-
- if (m_fCurrentPercentDone>-1.0f)
- {
- SET_CONTROL_VISIBLE(CONTROL_CURRENT_PROGRESS);
- CGUIProgressControl* pProgressCtrl=(CGUIProgressControl*)GetControl(CONTROL_CURRENT_PROGRESS);
- if (pProgressCtrl) pProgressCtrl->SetPercentage(m_fCurrentPercentDone);
- }
- else
- SET_CONTROL_HIDDEN(CONTROL_CURRENT_PROGRESS);
-
- 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_HIDDEN(CONTROL_PROGRESS);
- }
- else
- {
- SET_CONTROL_LABEL(CONTROL_LABELDIRECTORY, "");
- SET_CONTROL_LABEL(CONTROL_LABELTITLE, "");
- SET_CONTROL_HIDDEN(CONTROL_PROGRESS);
- SET_CONTROL_HIDDEN(CONTROL_CURRENT_PROGRESS);
- }
-}
-
-int CGUIDialogVideoScan::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 == FETCHING_MOVIE_INFO)
- return 20374;
- else if (m_ScanState == FETCHING_MUSICVIDEO_INFO)
- return 20408;
- else if (m_ScanState == FETCHING_TVSHOW_INFO)
- return 20409;
- else if (m_ScanState == COMPRESSING_DATABASE)
- return 331;
- else if (m_ScanState == WRITING_CHANGES)
- return 328;
-
- return -1;
-}
+++ /dev/null
-#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 "video/VideoInfoScanner.h"
-#include "threads/CriticalSection.h"
-
-class CGUIDialogVideoScan: public CGUIDialog, public VIDEO::IVideoInfoScannerObserver
-{
-public:
- CGUIDialogVideoScan(void);
- virtual ~CGUIDialogVideoScan(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(VIDEO::SCAN_STATE state);
- virtual void OnSetProgress(int currentItem, int itemCount);
- virtual void OnSetCurrentProgress(int currentItem, int itemCount);
- virtual void OnSetTitle(const CStdString& strTitle);
-
- VIDEO::SCAN_STATE m_ScanState;
- CStdString m_strCurrentDir;
- CStdString m_strTitle;
-
- CCriticalSection m_critical;
-
- float m_fPercentDone;
- float m_fCurrentPercentDone;
- int m_currentItem;
- int m_itemCount;
-};
GUIDialogVideoInfo.cpp \
GUIDialogVideoOSD.cpp \
GUIDialogVideoOverlay.cpp \
- GUIDialogVideoScan.cpp \
GUIDialogVideoSettings.cpp \
LIB=videodialogs.a
#include "GUIWindowVideoBase.h"
#include "Util.h"
#include "video/VideoInfoDownloader.h"
+#include "video/VideoInfoScanner.h"
#include "utils/RegExp.h"
#include "utils/Variant.h"
#include "addons/AddonManager.h"
#include "addons/IAddon.h"
#include "video/dialogs/GUIDialogVideoInfo.h"
#include "GUIWindowVideoNav.h"
-#include "video/dialogs/GUIDialogVideoScan.h"
#include "dialogs/GUIDialogSmartPlaylistEditor.h"
#include "dialogs/GUIDialogProgress.h"
#include "dialogs/GUIDialogYesNo.h"
#include "dialogs/GUIDialogFileBrowser.h"
#include "filesystem/VideoDatabaseDirectory.h"
#include "playlists/PlayListFactory.h"
-#include "video/dialogs/GUIDialogVideoScan.h"
#include "dialogs/GUIDialogOK.h"
#include "addons/AddonManager.h"
#include "PartyModeManager.h"
#include "utils/StringUtils.h"
#include "TextureCache.h"
#include "guilib/GUIKeyboardFactory.h"
+#include "video/VideoInfoScanner.h"
using namespace XFILE;
using namespace VIDEODATABASEDIRECTORY;
projects / vuplus_xbmc / commitdiff