Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add OnDatabaseScanStarted() to xbmc.Monitor() #2173

Merged
merged 3 commits into from Feb 3, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 11 additions & 1 deletion xbmc/interfaces/legacy/Monitor.h
Expand Up @@ -44,6 +44,7 @@ namespace XBMCAddon
inline void OnScreensaverActivated() { TRACE; invokeCallback(new CallbackFunction<Monitor>(this,&Monitor::onScreensaverActivated)); }
inline void OnScreensaverDeactivated() { TRACE; invokeCallback(new CallbackFunction<Monitor>(this,&Monitor::onScreensaverDeactivated)); }
inline void OnDatabaseUpdated(const String &database) { TRACE; invokeCallback(new CallbackFunction<Monitor,const String>(this,&Monitor::onDatabaseUpdated,database)); }
inline void OnDatabaseScanStarted(const String &database) { TRACE; invokeCallback(new CallbackFunction<Monitor,const String>(this,&Monitor::onDatabaseScanStarted,database)); }
inline void OnAbortRequested() { TRACE; invokeCallback(new CallbackFunction<Monitor>(this,&Monitor::onAbortRequested)); }
#endif

Expand Down Expand Up @@ -71,12 +72,21 @@ namespace XBMCAddon
/**
* onDatabaseUpdated(database) -- onDatabaseUpdated method.
*
* database - video/music as stri
* database - video/music as string
*
* Will be called when database gets updated and return video or music to indicate which DB has been changed
*/
virtual void onDatabaseUpdated(const String database) { TRACE; }

/**
* onDatabaseScanStarted(database) -- onDatabaseScanStarted method.
*
* database - video/music as string
*
* Will be called when database update starts and return video or music to indicate which DB is being updated
*/
virtual void onDatabaseScanStarted(const String database) { TRACE; }

/**
* onAbortRequested() -- onAbortRequested method.
*
Expand Down
23 changes: 21 additions & 2 deletions xbmc/interfaces/python/XBPython.cpp
Expand Up @@ -100,12 +100,16 @@ void XBPython::Announce(AnnouncementFlag flag, const char *sender, const char *m
if (flag & VideoLibrary)
{
if (strcmp(message, "OnScanFinished") == 0)
OnDatabaseUpdated("video");
OnDatabaseUpdated("video");
else if (strcmp(message, "OnScanStarted") == 0)
OnDatabaseScanStarted("video");
}
else if (flag & AudioLibrary)
{
if (strcmp(message, "OnScanFinished") == 0)
OnDatabaseUpdated("music");
OnDatabaseUpdated("music");
else if (strcmp(message, "OnScanStarted") == 0)
OnDatabaseScanStarted("music");
}
else if (flag & GUI)
{
Expand Down Expand Up @@ -346,6 +350,21 @@ void XBPython::OnDatabaseUpdated(const std::string &database)
}
}

void XBPython::OnDatabaseScanStarted(const std::string &database)
{
TRACE;
CSingleLock lock(m_critSection);
if (m_bInitialized)
{
MonitorCallbackList::iterator it = m_vecMonitorCallbackList.begin();
while (it != m_vecMonitorCallbackList.end())
{
((XBMCAddon::xbmc::Monitor*)(*it))->OnDatabaseScanStarted(database);
it++;
}
}
}

void XBPython::OnAbortRequested(const CStdString &ID)
{
TRACE;
Expand Down
1 change: 1 addition & 0 deletions xbmc/interfaces/python/XBPython.h
Expand Up @@ -79,6 +79,7 @@ class XBPython :
void OnScreensaverActivated();
void OnScreensaverDeactivated();
void OnDatabaseUpdated(const std::string &database);
void OnDatabaseScanStarted(const std::string &database);
void OnAbortRequested(const CStdString &ID="");
void Initialize();
void FinalizeScript();
Expand Down