Permalink
Browse files

Instrument the pre-codegenerated python api.

  • Loading branch information...
1 parent e86af54 commit b2e23330c91ebc827480ef35acac980ee82b739a Jim Carroll committed Sep 12, 2012
Showing with 572 additions and 512 deletions.
  1. +14 −14 xbmc/interfaces/python/xbmcmodule/GUIPythonWindow.cpp
  2. +1 −0 xbmc/interfaces/python/xbmcmodule/GUIPythonWindow.h
  3. +5 −5 xbmc/interfaces/python/xbmcmodule/GUIPythonWindowDialog.cpp
  4. +3 −3 xbmc/interfaces/python/xbmcmodule/GUIPythonWindowDialog.h
  5. +31 −31 xbmc/interfaces/python/xbmcmodule/GUIPythonWindowXML.cpp
  6. +5 −5 xbmc/interfaces/python/xbmcmodule/GUIPythonWindowXMLDialog.cpp
  7. +4 −4 xbmc/interfaces/python/xbmcmodule/GUIPythonWindowXMLDialog.h
  8. +10 −10 xbmc/interfaces/python/xbmcmodule/PythonAddon.cpp
  9. +13 −13 xbmc/interfaces/python/xbmcmodule/PythonMonitor.cpp
  10. +17 −17 xbmc/interfaces/python/xbmcmodule/PythonPlayer.cpp
  11. +9 −8 xbmc/interfaces/python/xbmcmodule/action.cpp
  12. +19 −19 xbmc/interfaces/python/xbmcmodule/control.cpp
  13. +8 −8 xbmc/interfaces/python/xbmcmodule/controlbutton.cpp
  14. +8 −8 xbmc/interfaces/python/xbmcmodule/controlcheckmark.cpp
  15. +8 −8 xbmc/interfaces/python/xbmcmodule/controledit.cpp
  16. +6 −6 xbmc/interfaces/python/xbmcmodule/controlfadelabel.cpp
  17. +4 −4 xbmc/interfaces/python/xbmcmodule/controlgroup.cpp
  18. +6 −6 xbmc/interfaces/python/xbmcmodule/controlimage.cpp
  19. +6 −6 xbmc/interfaces/python/xbmcmodule/controllabel.cpp
  20. +19 −19 xbmc/interfaces/python/xbmcmodule/controllist.cpp
  21. +6 −6 xbmc/interfaces/python/xbmcmodule/controlprogress.cpp
  22. +8 −8 xbmc/interfaces/python/xbmcmodule/controlradiobutton.cpp
  23. +6 −6 xbmc/interfaces/python/xbmcmodule/controlslider.cpp
  24. +5 −5 xbmc/interfaces/python/xbmcmodule/controlspin.cpp
  25. +7 −7 xbmc/interfaces/python/xbmcmodule/controltextbox.cpp
  26. +14 −14 xbmc/interfaces/python/xbmcmodule/dialog.cpp
  27. +19 −19 xbmc/interfaces/python/xbmcmodule/infotagmusic.cpp
  28. +23 −23 xbmc/interfaces/python/xbmcmodule/infotagvideo.cpp
  29. +9 −9 xbmc/interfaces/python/xbmcmodule/keyboard.cpp
  30. +18 −18 xbmc/interfaces/python/xbmcmodule/listitem.cpp
  31. +8 −8 xbmc/interfaces/python/xbmcmodule/monitor.cpp
  32. +35 −35 xbmc/interfaces/python/xbmcmodule/player.cpp
  33. +19 −19 xbmc/interfaces/python/xbmcmodule/pyplaylist.cpp
  34. +11 −11 xbmc/interfaces/python/xbmcmodule/pyrendercapture.cpp
  35. +11 −11 xbmc/interfaces/python/xbmcmodule/pyutil.cpp
  36. +2 −0 xbmc/interfaces/python/xbmcmodule/pyutil.h
  37. +41 −0 xbmc/interfaces/python/xbmcmodule/t.cpp
  38. +15 −0 xbmc/interfaces/python/xbmcmodule/t.h
  39. +29 −29 xbmc/interfaces/python/xbmcmodule/window.cpp
  40. +10 −10 xbmc/interfaces/python/xbmcmodule/winxml.cpp
  41. +2 −2 xbmc/interfaces/python/xbmcmodule/winxmldialog.cpp
  42. +3 −3 xbmc/interfaces/python/xbmcmodule/xbmcaddonmodule.cpp
  43. +7 −7 xbmc/interfaces/python/xbmcmodule/xbmcguimodule.cpp
  44. +35 −35 xbmc/interfaces/python/xbmcmodule/xbmcmodule.cpp
  45. +14 −14 xbmc/interfaces/python/xbmcmodule/xbmcplugin.cpp
  46. +19 −19 xbmc/interfaces/python/xbmcmodule/xbmcvfsmodule.cpp
@@ -33,7 +33,7 @@ using namespace PYXBMC;
PyXBMCAction::PyXBMCAction(void*& callback)
: param(0), pCallbackWindow(NULL), pObject(NULL), controlId(0), type(0)
-{
+{ TRACE;
// this is ugly, but we can't grab python lock
// while holding gfx, that will potentially deadlock
CSingleExit ex(g_graphicsContext);
@@ -50,26 +50,26 @@ PyXBMCAction::PyXBMCAction(void*& callback)
PyEval_ReleaseLock();
}
-PyXBMCAction::~PyXBMCAction() {
+PyXBMCAction::~PyXBMCAction() { TRACE;
Py_XDECREF((PyObject*)pObject);
Py_XDECREF((PyObject*)pCallbackWindow);
}
CGUIPythonWindow::CGUIPythonWindow(int id)
: CGUIWindow(id, ""), m_actionEvent(true)
-{
+{ TRACE;
pCallbackWindow = NULL;
m_threadState = NULL;
m_loadType = LOAD_ON_GUI_INIT;
m_destroyAfterDeinit = false;
}
CGUIPythonWindow::~CGUIPythonWindow(void)
-{
+{ TRACE;
}
bool CGUIPythonWindow::OnAction(const CAction &action)
-{
+{ TRACE;
// call the base class first, then call python
bool ret = CGUIWindow::OnAction(action);
@@ -92,15 +92,15 @@ bool CGUIPythonWindow::OnAction(const CAction &action)
}
bool CGUIPythonWindow::OnBack(int actionID)
-{
+{ TRACE;
// if we have a callback window then python handles the closing
if (!pCallbackWindow)
return CGUIWindow::OnBack(actionID);
return true;
}
bool CGUIPythonWindow::OnMessage(CGUIMessage& message)
-{
+{ TRACE;
switch (message.GetMessage())
{
case GUI_MSG_WINDOW_DEINIT:
@@ -164,31 +164,31 @@ bool CGUIPythonWindow::OnMessage(CGUIMessage& message)
}
void CGUIPythonWindow::OnDeinitWindow(int nextWindowID /*= 0*/)
-{
+{ TRACE;
CGUIWindow::OnDeinitWindow(nextWindowID);
if (m_destroyAfterDeinit)
g_windowManager.Delete(GetID());
}
void CGUIPythonWindow::SetDestroyAfterDeinit(bool destroy /*= true*/)
-{
+{ TRACE;
m_destroyAfterDeinit = destroy;
}
void CGUIPythonWindow::SetCallbackWindow(void *state, void *object)
-{
+{ TRACE;
pCallbackWindow = object;
m_threadState = state;
}
void CGUIPythonWindow::WaitForActionEvent()
-{
+{ TRACE;
g_pythonParser.WaitForEvent(m_actionEvent);
m_actionEvent.Reset();
}
void CGUIPythonWindow::PulseActionEvent()
-{
+{ TRACE;
m_actionEvent.Set();
}
@@ -248,7 +248,7 @@ void Py_MakePendingActionCalls()
* called from python library!
*/
int Py_XBMC_Event_OnControl(void* arg)
-{
+{ TRACE;
if(!arg)
return 0;
@@ -269,7 +269,7 @@ int Py_XBMC_Event_OnControl(void* arg)
* called from python library!
*/
int Py_XBMC_Event_OnAction(void* arg)
-{
+{ TRACE;
if(!arg)
return 0;
@@ -21,6 +21,7 @@
*
*/
+#include "t.h"
#include "guilib/GUIWindow.h"
#include "threads/Event.h"
@@ -25,16 +25,16 @@
CGUIPythonWindowDialog::CGUIPythonWindowDialog(int id)
:CGUIPythonWindow(id)
-{
+{ TRACE;
m_loadType = LOAD_ON_GUI_INIT;
}
CGUIPythonWindowDialog::~CGUIPythonWindowDialog(void)
-{
+{ TRACE;
}
bool CGUIPythonWindowDialog::OnMessage(CGUIMessage& message)
-{
+{ TRACE;
switch(message.GetMessage())
{
case GUI_MSG_WINDOW_INIT:
@@ -56,7 +56,7 @@ bool CGUIPythonWindowDialog::OnMessage(CGUIMessage& message)
}
void CGUIPythonWindowDialog::Show_Internal(bool show /* = true */)
-{
+{ TRACE;
if (show)
{
g_windowManager.RouteToWindow(this);
@@ -71,7 +71,7 @@ void CGUIPythonWindowDialog::Show_Internal(bool show /* = true */)
}
void CGUIPythonWindowDialog::OnDeinitWindow(int nextWindowID)
-{
+{ TRACE;
g_windowManager.RemoveDialog(GetID());
CGUIPythonWindow::OnDeinitWindow(nextWindowID);
}
@@ -31,9 +31,9 @@ class CGUIPythonWindowDialog : public CGUIPythonWindow
CGUIPythonWindowDialog(int id);
virtual ~CGUIPythonWindowDialog(void);
virtual bool OnMessage(CGUIMessage& message);
- virtual bool IsDialogRunning() const { return m_active; }
- virtual bool IsDialog() const { return true;};
- virtual bool IsModalDialog() const { return true; };
+ virtual bool IsDialogRunning() const { TRACE; return m_active; }
+ virtual bool IsDialog() const { TRACE; return true;};
+ virtual bool IsModalDialog() const { TRACE; return true; };
protected:
friend class CApplicationMessenger;
Oops, something went wrong.

0 comments on commit b2e2333

Please sign in to comment.