aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--xbmc/interfaces/legacy/Addon.cpp4
-rw-r--r--xbmc/interfaces/legacy/AddonCallback.h2
-rw-r--r--xbmc/interfaces/legacy/AddonClass.cpp4
-rw-r--r--xbmc/interfaces/legacy/AddonClass.h4
-rw-r--r--xbmc/interfaces/legacy/LanguageHook.cpp6
-rw-r--r--xbmc/interfaces/legacy/LanguageHook.h54
-rw-r--r--xbmc/interfaces/legacy/ModuleXbmc.cpp2
-rw-r--r--xbmc/interfaces/legacy/Monitor.cpp6
-rw-r--r--xbmc/interfaces/legacy/Player.cpp4
-rw-r--r--xbmc/interfaces/legacy/Window.cpp6
-rw-r--r--xbmc/interfaces/python/CallbackHandler.cpp6
-rw-r--r--xbmc/interfaces/python/LanguageHook.cpp38
-rw-r--r--xbmc/interfaces/python/LanguageHook.h40
-rw-r--r--xbmc/interfaces/python/PythonSwig.cpp.template2
-rw-r--r--xbmc/interfaces/python/XBPyThread.cpp14
-rw-r--r--xbmc/interfaces/python/swig.cpp6
16 files changed, 99 insertions, 99 deletions
diff --git a/xbmc/interfaces/legacy/Addon.cpp b/xbmc/interfaces/legacy/Addon.cpp
index bc44dd9473..1c3574aa33 100644
--- a/xbmc/interfaces/legacy/Addon.cpp
+++ b/xbmc/interfaces/legacy/Addon.cpp
@@ -33,9 +33,9 @@ namespace XBMCAddon
{
namespace xbmcaddon
{
- String Addon::getDefaultId() { return languageHook == NULL ? emptyString : languageHook->getAddonId(); }
+ String Addon::getDefaultId() { return languageHook == NULL ? emptyString : languageHook->GetAddonId(); }
- String Addon::getAddonVersion() { return languageHook == NULL ? emptyString : languageHook->getAddonVersion(); }
+ String Addon::getAddonVersion() { return languageHook == NULL ? emptyString : languageHook->GetAddonVersion(); }
Addon::Addon(const char* cid) throw (AddonException) : AddonClass("Addon")
{
diff --git a/xbmc/interfaces/legacy/AddonCallback.h b/xbmc/interfaces/legacy/AddonCallback.h
index 159cb171a4..366fcd63e8 100644
--- a/xbmc/interfaces/legacy/AddonCallback.h
+++ b/xbmc/interfaces/legacy/AddonCallback.h
@@ -45,7 +45,7 @@ namespace XBMCAddon
{
// if there is a LanguageHook, it should be set already.
if (languageHook != NULL)
- setHandler(languageHook->getCallbackHandler());
+ setHandler(languageHook->GetCallbackHandler());
}
virtual ~AddonCallback();
diff --git a/xbmc/interfaces/legacy/AddonClass.cpp b/xbmc/interfaces/legacy/AddonClass.cpp
index eda9a042c4..fb5319ec12 100644
--- a/xbmc/interfaces/legacy/AddonClass.cpp
+++ b/xbmc/interfaces/legacy/AddonClass.cpp
@@ -61,7 +61,7 @@ namespace XBMCAddon
#endif
// check to see if we have a language hook that was prepared for this instantiation
- languageHook = LanguageHook::getLanguageHook();
+ languageHook = LanguageHook::GetLanguageHook();
if (languageHook != NULL)
{
languageHook->Acquire();
@@ -70,7 +70,7 @@ namespace XBMCAddon
// this AddonClass (actually - its subclass - but whatever). So we
// will now reset the Tls. This avoids issues if the constructor of the
// subclass throws an exception.
- LanguageHook::clearLanguageHook();
+ LanguageHook::ClearLanguageHook();
}
}
diff --git a/xbmc/interfaces/legacy/AddonClass.h b/xbmc/interfaces/legacy/AddonClass.h
index 7890ae6b42..ec76bd4748 100644
--- a/xbmc/interfaces/legacy/AddonClass.h
+++ b/xbmc/interfaces/legacy/AddonClass.h
@@ -101,8 +101,8 @@ namespace XBMCAddon
AddonClass(const char* classname);
virtual ~AddonClass();
- inline const String& getClassname() const { return classname; }
- inline LanguageHook* getLanguageHook() { return languageHook; }
+ inline const String& GetClassname() const { return classname; }
+ inline LanguageHook* GetLanguageHook() { return languageHook; }
/**
* This method should be called while holding a Synchronize
diff --git a/xbmc/interfaces/legacy/LanguageHook.cpp b/xbmc/interfaces/legacy/LanguageHook.cpp
index 65db0853a7..3f0af14c8f 100644
--- a/xbmc/interfaces/legacy/LanguageHook.cpp
+++ b/xbmc/interfaces/legacy/LanguageHook.cpp
@@ -33,19 +33,19 @@ namespace XBMCAddon
static bool threadLocalInitilialized = false;
static xbmcutil::InitFlag initer(threadLocalInitilialized);
- void LanguageHook::setLanguageHook(LanguageHook* languageHook)
+ void LanguageHook::SetLanguageHook(LanguageHook* languageHook)
{
TRACE;
languageHook->Acquire();
addonLanguageHookTls.set(languageHook);
}
- LanguageHook* LanguageHook::getLanguageHook()
+ LanguageHook* LanguageHook::GetLanguageHook()
{
return threadLocalInitilialized ? addonLanguageHookTls.get() : NULL;
}
- void LanguageHook::clearLanguageHook()
+ void LanguageHook::ClearLanguageHook()
{
LanguageHook* lh = addonLanguageHookTls.get();
addonLanguageHookTls.set(NULL);
diff --git a/xbmc/interfaces/legacy/LanguageHook.h b/xbmc/interfaces/legacy/LanguageHook.h
index ae671bd162..e6873ada5b 100644
--- a/xbmc/interfaces/legacy/LanguageHook.h
+++ b/xbmc/interfaces/legacy/LanguageHook.h
@@ -58,7 +58,7 @@ namespace XBMCAddon
* Python to run by using Py_BEGIN_ALLOW_THREADS. This is
* the place to put that functionality
*/
- virtual void delayedCallOpen() { }
+ virtual void DelayedCallOpen() { }
/**
* If the scripting language needs special handling for calls
@@ -72,15 +72,15 @@ namespace XBMCAddon
* state using Py_END_ALLOW_THREADS. This is the place to put
* that functionality
*/
- virtual void delayedCallClose() { }
+ virtual void DelayedCallClose() { }
- virtual void makePendingCalls() {}
+ virtual void MakePendingCalls() {}
/**
* For scripting languages that need a global callback handler, this
* method should be overloaded to supply one.
*/
- virtual CallbackHandler* getCallbackHandler() { return NULL; }
+ virtual CallbackHandler* GetCallbackHandler() { return NULL; }
/**
* This is a callback method that can be overriden to receive a callback
@@ -89,7 +89,7 @@ namespace XBMCAddon
* cannot assume the subclasses have been built or that calling a
* virtual function on the AddonClass will work as expected.
*/
- virtual void constructing(AddonClass* beingConstructed) { }
+ virtual void Constructing(AddonClass* beingConstructed) { }
/**
* This is a callback method that can be overriden to receive a callback
@@ -98,7 +98,7 @@ namespace XBMCAddon
* should assume the subclasses have been torn down and that calling a
* virtual function on the AddonClass will not work as expected.
*/
- virtual void destructing(AddonClass* beingDestructed) { }
+ virtual void Destructing(AddonClass* beingDestructed) { }
/**
* This method should be done a different way but since the only other way
@@ -110,23 +110,23 @@ namespace XBMCAddon
* to use scripting language specific calls. So until I figure out a
* better way to do this, this is how I need to retrieve it.
*/
- virtual String getAddonId() { return emptyString; }
- virtual String getAddonVersion() { return emptyString; }
-
- virtual void registerPlayerCallback(IPlayerCallback* player) = 0;
- virtual void unregisterPlayerCallback(IPlayerCallback* player) = 0;
- virtual void registerMonitorCallback(XBMCAddon::xbmc::Monitor* player) = 0;
- virtual void unregisterMonitorCallback(XBMCAddon::xbmc::Monitor* player) = 0;
- virtual bool waitForEvent(CEvent& hEvent, unsigned int milliseconds) = 0;
-
- static void setLanguageHook(LanguageHook* languageHook);
- static LanguageHook* getLanguageHook();
- static void clearLanguageHook();
+ virtual String GetAddonId() { return emptyString; }
+ virtual String GetAddonVersion() { return emptyString; }
+
+ virtual void RegisterPlayerCallback(IPlayerCallback* player) = 0;
+ virtual void UnregisterPlayerCallback(IPlayerCallback* player) = 0;
+ virtual void RegisterMonitorCallback(XBMCAddon::xbmc::Monitor* player) = 0;
+ virtual void UnregisterMonitorCallback(XBMCAddon::xbmc::Monitor* player) = 0;
+ virtual bool WaitForEvent(CEvent& hEvent, unsigned int milliseconds) = 0;
+
+ static void SetLanguageHook(LanguageHook* languageHook);
+ static LanguageHook* GetLanguageHook();
+ static void ClearLanguageHook();
};
/**
- * This class can be used to access the language hook's delayedCallOpen
- * and delayedCallClose. It should be used whenever an API method
+ * This class can be used to access the language hook's DelayedCallOpen
+ * and DelayedCallClose. It should be used whenever an API method
* is written such that it can block for an indefinite amount of time
* since certain scripting languages (like Python) need to do extra
* work for delayed calls (like free the python locks and handle
@@ -139,15 +139,15 @@ namespace XBMCAddon
public:
inline DelayedCallGuard(LanguageHook* languageHook_) : languageHook(languageHook_), clearOnExit(false)
- { if (languageHook) languageHook->delayedCallOpen(); }
+ { if (languageHook) languageHook->DelayedCallOpen(); }
- inline DelayedCallGuard() : languageHook(LanguageHook::getLanguageHook()), clearOnExit(false)
- { if (languageHook) languageHook->delayedCallOpen(); }
+ inline DelayedCallGuard() : languageHook(LanguageHook::GetLanguageHook()), clearOnExit(false)
+ { if (languageHook) languageHook->DelayedCallOpen(); }
inline ~DelayedCallGuard()
{
- if (clearOnExit) LanguageHook::clearLanguageHook();
- if (languageHook) languageHook->delayedCallClose();
+ if (clearOnExit) LanguageHook::ClearLanguageHook();
+ if (languageHook) languageHook->DelayedCallClose();
}
inline LanguageHook* getLanguageHook() { return languageHook; }
@@ -156,8 +156,8 @@ namespace XBMCAddon
class SetLanguageHookGuard
{
public:
- inline SetLanguageHookGuard(LanguageHook* languageHook) { LanguageHook::setLanguageHook(languageHook); }
- inline ~SetLanguageHookGuard() { LanguageHook::clearLanguageHook(); }
+ inline SetLanguageHookGuard(LanguageHook* languageHook) { LanguageHook::SetLanguageHook(languageHook); }
+ inline ~SetLanguageHookGuard() { LanguageHook::ClearLanguageHook(); }
};
}
diff --git a/xbmc/interfaces/legacy/ModuleXbmc.cpp b/xbmc/interfaces/legacy/ModuleXbmc.cpp
index 5369a82117..e03dc76ab2 100644
--- a/xbmc/interfaces/legacy/ModuleXbmc.cpp
+++ b/xbmc/interfaces/legacy/ModuleXbmc.cpp
@@ -155,7 +155,7 @@ namespace XBMCAddon
::Sleep(nextSleep);
}
if (lh != NULL)
- lh->makePendingCalls();
+ lh->MakePendingCalls();
}
}
diff --git a/xbmc/interfaces/legacy/Monitor.cpp b/xbmc/interfaces/legacy/Monitor.cpp
index 53b589c1a0..9cc1bcb0ea 100644
--- a/xbmc/interfaces/legacy/Monitor.cpp
+++ b/xbmc/interfaces/legacy/Monitor.cpp
@@ -29,8 +29,8 @@ namespace XBMCAddon
{
if (languageHook)
{
- Id = languageHook->getAddonId();
- languageHook->registerMonitorCallback(this);
+ Id = languageHook->GetAddonId();
+ languageHook->RegisterMonitorCallback(this);
}
}
@@ -42,7 +42,7 @@ namespace XBMCAddon
if (languageHook)
{
DelayedCallGuard dc;
- languageHook->unregisterMonitorCallback(this);
+ languageHook->UnregisterMonitorCallback(this);
}
}
}
diff --git a/xbmc/interfaces/legacy/Player.cpp b/xbmc/interfaces/legacy/Player.cpp
index 449a24d82d..f644bfb7b3 100644
--- a/xbmc/interfaces/legacy/Player.cpp
+++ b/xbmc/interfaces/legacy/Player.cpp
@@ -50,7 +50,7 @@ namespace XBMCAddon
if (languageHook)
{
DelayedCallGuard dc(languageHook);
- languageHook->registerPlayerCallback(this);
+ languageHook->RegisterPlayerCallback(this);
}
}
@@ -62,7 +62,7 @@ namespace XBMCAddon
if (languageHook)
{
DelayedCallGuard dc(languageHook);
- languageHook->unregisterPlayerCallback(this);
+ languageHook->UnregisterPlayerCallback(this);
}
}
diff --git a/xbmc/interfaces/legacy/Window.cpp b/xbmc/interfaces/legacy/Window.cpp
index 0a577e8af4..aae3631243 100644
--- a/xbmc/interfaces/legacy/Window.cpp
+++ b/xbmc/interfaces/legacy/Window.cpp
@@ -397,7 +397,7 @@ namespace XBMCAddon
{
TRACE;
// DO NOT MAKE THIS A DELAYED CALL!!!!
- bool ret = languageHook == NULL ? m_actionEvent.WaitMSec(milliseconds) : languageHook->waitForEvent(m_actionEvent,milliseconds);
+ bool ret = languageHook == NULL ? m_actionEvent.WaitMSec(milliseconds) : languageHook->WaitForEvent(m_actionEvent,milliseconds);
if (ret)
m_actionEvent.Reset();
return ret;
@@ -706,7 +706,7 @@ namespace XBMCAddon
// Window_Close(self, NULL);
// break;
// }
- languageHook->makePendingCalls(); // MakePendingCalls
+ languageHook->MakePendingCalls(); // MakePendingCalls
bool stillWaiting;
do
@@ -715,7 +715,7 @@ namespace XBMCAddon
DelayedCallGuard dcguard(languageHook);
stillWaiting = WaitForActionEvent(100) ? false : true;
}
- languageHook->makePendingCalls();
+ languageHook->MakePendingCalls();
} while (stillWaiting);
}
}
diff --git a/xbmc/interfaces/python/CallbackHandler.cpp b/xbmc/interfaces/python/CallbackHandler.cpp
index 61b59a9902..01707b964a 100644
--- a/xbmc/interfaces/python/CallbackHandler.cpp
+++ b/xbmc/interfaces/python/CallbackHandler.cpp
@@ -50,8 +50,8 @@ namespace XBMCAddon
if (objectThreadState == state)
{
// make sure the interpreter is still active.
- AddonClass::Ref<XBMCAddon::Python::LanguageHook> lh(XBMCAddon::Python::LanguageHook::getIfExists(state->interp));
- if (lh.isNotNull() && lh->hasRegisteredAddonClassInstance(obj) && lh.get() == obj->getLanguageHook())
+ AddonClass::Ref<XBMCAddon::Python::LanguageHook> lh(XBMCAddon::Python::LanguageHook::GetIfExists(state->interp));
+ if (lh.isNotNull() && lh->HasRegisteredAddonClassInstance(obj) && lh.get() == obj->GetLanguageHook())
return true;
}
return false;
@@ -72,7 +72,7 @@ namespace XBMCAddon
// we also want to remove the callback if the language hook no longer exists.
// this is a belt-and-suspenders cleanup mechanism
- return ! XBMCAddon::Python::LanguageHook::isAddonClassInstanceRegistered(obj);
+ return ! XBMCAddon::Python::LanguageHook::IsAddonClassInstanceRegistered(obj);
}
}
}
diff --git a/xbmc/interfaces/python/LanguageHook.cpp b/xbmc/interfaces/python/LanguageHook.cpp
index 7810ee7fbc..63a4b3932a 100644
--- a/xbmc/interfaces/python/LanguageHook.cpp
+++ b/xbmc/interfaces/python/LanguageHook.cpp
@@ -44,39 +44,39 @@ namespace XBMCAddon
XBMCAddon::LanguageHook::deallocating();
}
- void LanguageHook::makePendingCalls()
+ void LanguageHook::MakePendingCalls()
{
TRACE;
PythonCallbackHandler::makePendingCalls();
}
- void LanguageHook::delayedCallOpen()
+ void LanguageHook::DelayedCallOpen()
{
TRACE;
PyGILLock::releaseGil();
}
- void LanguageHook::delayedCallClose()
+ void LanguageHook::DelayedCallClose()
{
TRACE;
PyGILLock::acquireGil();
}
- void LanguageHook::registerMe()
+ void LanguageHook::RegisterMe()
{
TRACE;
CSingleLock lock(hooksMutex);
hooks[m_interp] = AddonClass::Ref<LanguageHook>(this);
}
- void LanguageHook::unregisterMe()
+ void LanguageHook::UnregisterMe()
{
TRACE;
CSingleLock lock(hooksMutex);
hooks.erase(m_interp);
}
- AddonClass::Ref<LanguageHook> LanguageHook::getIfExists(PyInterpreterState* interp)
+ AddonClass::Ref<LanguageHook> LanguageHook::GetIfExists(PyInterpreterState* interp)
{
TRACE;
CSingleLock lock(hooksMutex);
@@ -84,12 +84,12 @@ namespace XBMCAddon
return iter == hooks.end() ? AddonClass::Ref<LanguageHook>(NULL) : AddonClass::Ref<LanguageHook>(iter->second);
}
- bool LanguageHook::isAddonClassInstanceRegistered(AddonClass* obj)
+ bool LanguageHook::IsAddonClassInstanceRegistered(AddonClass* obj)
{
for (std::map<PyInterpreterState*,AddonClass::Ref<LanguageHook> >::iterator iter = hooks.begin();
iter != hooks.end(); iter++)
{
- if ((iter->second)->hasRegisteredAddonClassInstance(obj))
+ if ((iter->second)->HasRegisteredAddonClassInstance(obj))
return true;
}
return false;
@@ -107,13 +107,13 @@ namespace XBMCAddon
* See PythonCallbackHandler for more details
* See PythonCallbackHandler::PythonCallbackHandler for more details
*/
- XBMCAddon::CallbackHandler* LanguageHook::getCallbackHandler()
+ XBMCAddon::CallbackHandler* LanguageHook::GetCallbackHandler()
{
TRACE;
return new PythonCallbackHandler();
}
- String LanguageHook::getAddonId()
+ String LanguageHook::GetAddonId()
{
TRACE;
const char* id = NULL;
@@ -129,7 +129,7 @@ namespace XBMCAddon
return id;
}
- String LanguageHook::getAddonVersion()
+ String LanguageHook::GetAddonVersion()
{
TRACE;
// Get a reference to the main module
@@ -143,32 +143,32 @@ namespace XBMCAddon
return version;
}
- void LanguageHook::registerPlayerCallback(IPlayerCallback* player) { TRACE; g_pythonParser.RegisterPythonPlayerCallBack(player); }
- void LanguageHook::unregisterPlayerCallback(IPlayerCallback* player) { TRACE; g_pythonParser.UnregisterPythonPlayerCallBack(player); }
- void LanguageHook::registerMonitorCallback(XBMCAddon::xbmc::Monitor* monitor) { TRACE; g_pythonParser.RegisterPythonMonitorCallBack(monitor); }
- void LanguageHook::unregisterMonitorCallback(XBMCAddon::xbmc::Monitor* monitor) { TRACE; g_pythonParser.UnregisterPythonMonitorCallBack(monitor); }
+ void LanguageHook::RegisterPlayerCallback(IPlayerCallback* player) { TRACE; g_pythonParser.RegisterPythonPlayerCallBack(player); }
+ void LanguageHook::UnregisterPlayerCallback(IPlayerCallback* player) { TRACE; g_pythonParser.UnregisterPythonPlayerCallBack(player); }
+ void LanguageHook::RegisterMonitorCallback(XBMCAddon::xbmc::Monitor* monitor) { TRACE; g_pythonParser.RegisterPythonMonitorCallBack(monitor); }
+ void LanguageHook::UnregisterMonitorCallback(XBMCAddon::xbmc::Monitor* monitor) { TRACE; g_pythonParser.UnregisterPythonMonitorCallBack(monitor); }
- bool LanguageHook::waitForEvent(CEvent& hEvent, unsigned int milliseconds)
+ bool LanguageHook::WaitForEvent(CEvent& hEvent, unsigned int milliseconds)
{
TRACE;
return g_pythonParser.WaitForEvent(hEvent,milliseconds);
}
- void LanguageHook::registerAddonClassInstance(AddonClass* obj)
+ void LanguageHook::RegisterAddonClassInstance(AddonClass* obj)
{
TRACE;
Synchronize l(*this);
currentObjects.insert(obj);
}
- void LanguageHook::unregisterAddonClassInstance(AddonClass* obj)
+ void LanguageHook::UnregisterAddonClassInstance(AddonClass* obj)
{
TRACE;
Synchronize l(*this);
currentObjects.erase(obj);
}
- bool LanguageHook::hasRegisteredAddonClassInstance(AddonClass* obj)
+ bool LanguageHook::HasRegisteredAddonClassInstance(AddonClass* obj)
{
TRACE;
Synchronize l(*this);
diff --git a/xbmc/interfaces/python/LanguageHook.h b/xbmc/interfaces/python/LanguageHook.h
index 1214120350..63142d371b 100644
--- a/xbmc/interfaces/python/LanguageHook.h
+++ b/xbmc/interfaces/python/LanguageHook.h
@@ -60,9 +60,9 @@ namespace XBMCAddon
virtual ~LanguageHook();
- virtual void delayedCallOpen();
- virtual void delayedCallClose();
- virtual void makePendingCalls();
+ virtual void DelayedCallOpen();
+ virtual void DelayedCallClose();
+ virtual void MakePendingCalls();
/**
* PythonCallbackHandler expects to be instantiated PER AddonClass instance
@@ -76,31 +76,31 @@ namespace XBMCAddon
* See PythonCallbackHandler for more details
* See PythonCallbackHandler::PythonCallbackHandler for more details
*/
- virtual XBMCAddon::CallbackHandler* getCallbackHandler();
+ virtual XBMCAddon::CallbackHandler* GetCallbackHandler();
- virtual String getAddonId();
- virtual String getAddonVersion();
+ virtual String GetAddonId();
+ virtual String GetAddonVersion();
- virtual void registerPlayerCallback(IPlayerCallback* player);
- virtual void unregisterPlayerCallback(IPlayerCallback* player);
- virtual void registerMonitorCallback(XBMCAddon::xbmc::Monitor* monitor);
- virtual void unregisterMonitorCallback(XBMCAddon::xbmc::Monitor* monitor);
- virtual bool waitForEvent(CEvent& hEvent, unsigned int milliseconds);
+ virtual void RegisterPlayerCallback(IPlayerCallback* player);
+ virtual void UnregisterPlayerCallback(IPlayerCallback* player);
+ virtual void RegisterMonitorCallback(XBMCAddon::xbmc::Monitor* monitor);
+ virtual void UnregisterMonitorCallback(XBMCAddon::xbmc::Monitor* monitor);
+ virtual bool WaitForEvent(CEvent& hEvent, unsigned int milliseconds);
- static AddonClass::Ref<LanguageHook> getIfExists(PyInterpreterState* interp);
- static bool isAddonClassInstanceRegistered(AddonClass* obj);
+ static AddonClass::Ref<LanguageHook> GetIfExists(PyInterpreterState* interp);
+ static bool IsAddonClassInstanceRegistered(AddonClass* obj);
- void registerAddonClassInstance(AddonClass* obj);
- void unregisterAddonClassInstance(AddonClass* obj);
- bool hasRegisteredAddonClassInstance(AddonClass* obj);
- inline bool hasRegisteredAddonClasses() { Synchronize l(*this); return currentObjects.size() > 0; }
+ void RegisterAddonClassInstance(AddonClass* obj);
+ void UnregisterAddonClassInstance(AddonClass* obj);
+ bool HasRegisteredAddonClassInstance(AddonClass* obj);
+ inline bool HasRegisteredAddonClasses() { Synchronize l(*this); return currentObjects.size() > 0; }
// You should hold the lock on the LanguageHook itself if you're
// going to do anything with the set that gets returned.
- inline std::set<AddonClass*>& getRegisteredAddonClasses() { return currentObjects; }
+ inline std::set<AddonClass*>& GetRegisteredAddonClasses() { return currentObjects; }
- void unregisterMe();
- void registerMe();
+ void UnregisterMe();
+ void RegisterMe();
};
}
}
diff --git a/xbmc/interfaces/python/PythonSwig.cpp.template b/xbmc/interfaces/python/PythonSwig.cpp.template
index 8390d21fc3..67efb4e1b5 100644
--- a/xbmc/interfaces/python/PythonSwig.cpp.template
+++ b/xbmc/interfaces/python/PythonSwig.cpp.template
@@ -180,7 +180,7 @@ void doMethod(method, MethodType methodType)
}
// now do the method call itself
if (!destructor) {
- if (constructor || !clazz) { %> XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::LanguageHook::getIfExists(PyThreadState_Get()->interp).get());<% println() }
+ if (constructor || !clazz) { %> XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::LanguageHook::GetIfExists(PyThreadState_Get()->interp).get());<% println() }
%> <%
if (returns != "void") { %>apiResult = (${SwigTypeParser.SwigType_lstr(returns)})<% }
if (clazz && !constructor) {
diff --git a/xbmc/interfaces/python/XBPyThread.cpp b/xbmc/interfaces/python/XBPyThread.cpp
index f8f08bd3b1..82ca80f782 100644
--- a/xbmc/interfaces/python/XBPyThread.cpp
+++ b/xbmc/interfaces/python/XBPyThread.cpp
@@ -160,7 +160,7 @@ void XBPyThread::Process()
PyThreadState_Swap(state);
XBMCAddon::AddonClass::Ref<XBMCAddon::Python::LanguageHook> languageHook(new XBMCAddon::Python::LanguageHook(state->interp));
- languageHook->registerMe();
+ languageHook->RegisterMe();
m_pExecuter->InitializeInterpreter(addon);
@@ -384,20 +384,20 @@ void XBPyThread::Process()
// interpreters until we have no more python objects hanging
// around.
int countLimit;
- for (countLimit = 0; languageHook->hasRegisteredAddonClasses() && countLimit < 10; countLimit++)
+ for (countLimit = 0; languageHook->HasRegisteredAddonClasses() && countLimit < 10; countLimit++)
{
PyThreadState* tmpstate = Py_NewInterpreter();
Py_EndInterpreter(tmpstate);
}
// If necessary and successfull, debug log the results.
- if (countLimit > 0 && !languageHook->hasRegisteredAddonClasses())
+ if (countLimit > 0 && !languageHook->HasRegisteredAddonClasses())
CLog::Log(LOGDEBUG,"It took %d Py_NewInterpreter/Py_EndInterpreter calls"
" to clean up the classes leftover from running \"%s.\"",
countLimit,m_source);
// If not successful, produce an error message detailing what's been left behind
- if (languageHook->hasRegisteredAddonClasses())
+ if (languageHook->HasRegisteredAddonClasses())
{
CStdString message;
message.Format("The python script \"%s\" has left several "
@@ -405,14 +405,14 @@ void XBPyThread::Process()
m_source);
{ XBMCAddon::AddonClass::Synchronize l(*(languageHook.get()));
- std::set<XBMCAddon::AddonClass*>& acs = languageHook->getRegisteredAddonClasses();
+ std::set<XBMCAddon::AddonClass*>& acs = languageHook->GetRegisteredAddonClasses();
bool firstTime = true;
for (std::set<XBMCAddon::AddonClass*>::iterator iter = acs.begin();
iter != acs.end(); iter++)
{
if (!firstTime) message += ",";
else firstTime = false;
- message += (*iter)->getClassname().c_str();
+ message += (*iter)->GetClassname().c_str();
}
}
@@ -420,7 +420,7 @@ void XBPyThread::Process()
}
// unregister the language hook
- languageHook->unregisterMe();
+ languageHook->UnregisterMe();
PyThreadState_Swap(NULL);
PyEval_ReleaseLock();
diff --git a/xbmc/interfaces/python/swig.cpp b/xbmc/interfaces/python/swig.cpp
index 068882ae44..2a7475f160 100644
--- a/xbmc/interfaces/python/swig.cpp
+++ b/xbmc/interfaces/python/swig.cpp
@@ -229,7 +229,7 @@ namespace PythonBindings
if(c) {
c->Acquire();
PyThreadState* state = PyThreadState_Get();
- XBMCAddon::Python::LanguageHook::getIfExists(state->interp)->registerAddonClassInstance(c);
+ XBMCAddon::Python::LanguageHook::GetIfExists(state->interp)->RegisterAddonClassInstance(c);
}
}
@@ -238,8 +238,8 @@ namespace PythonBindings
if(c){
PyThreadState* state = PyThreadState_Get();
XBMCAddon::AddonClass::Ref<XBMCAddon::Python::LanguageHook> lh =
- XBMCAddon::Python::LanguageHook::getIfExists(state->interp);
- if (lh.isNotNull()) lh->unregisterAddonClassInstance(c);
+ XBMCAddon::Python::LanguageHook::GetIfExists(state->interp);
+ if (lh.isNotNull()) lh->UnregisterAddonClassInstance(c);
return true;
}
return false;
generated by cgit v1.2.3 (git 2.26.2) at 2025-03-20 12:00:04 +0000