186 changes: 0 additions & 186 deletions xbmc/music/dialogs/GUIDialogMusicScan.cpp

This file was deleted.

54 changes: 0 additions & 54 deletions xbmc/music/dialogs/GUIDialogMusicScan.h

This file was deleted.

1 change: 0 additions & 1 deletion xbmc/music/dialogs/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
SRCS=GUIDialogMusicInfo.cpp \
GUIDialogMusicOSD.cpp \
GUIDialogMusicOverlay.cpp \
GUIDialogMusicScan.cpp \
GUIDialogSongInfo.cpp \
GUIDialogVisualisationPresetList.cpp \

Expand Down
5 changes: 0 additions & 5 deletions xbmc/music/infoscanner/MusicInfoScanner.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
14 changes: 0 additions & 14 deletions xbmc/music/infoscanner/MusicInfoScanner.h
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -59,7 +46,6 @@ class CMusicInfoScanner : CThread, public IRunnable
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; }
Expand Down
2 changes: 1 addition & 1 deletion xbmc/music/windows/GUIWindowMusicBase.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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;
Expand Down