[Ap-python-commits] python/src pyplaylistinterface.cpp,1.6,1.7 pyplaylistinterface.h,1.4,1.5

[<sj...@us...>]

Update of /cvsroot/ap-python/python/src
In directory usw-pr-cvs1:/tmp/cvs-serv23403

Modified Files:
	pyplaylistinterface.cpp pyplaylistinterface.h 
Log Message:
Remove CbLock/CbUnlock callbacks.

Index: pyplaylistinterface.cpp
===================================================================
RCS file: /cvsroot/ap-python/python/src/pyplaylistinterface.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** pyplaylistinterface.cpp	2 Jun 2002 09:46:38 -0000	1.6
--- pyplaylistinterface.cpp	26 Jul 2002 06:18:58 -0000	1.7
***************
*** 60,113 ****
  }
  
- // ------------------------- LOCK ----------------------------------
- void PyPlaylistInterfaceWrapper::CbLock ()
- {
-     BLOCK_THREADS
- 
-     // get python callback
-     if (PyObject_HasAttrString (pyobject, "cb_lock")) {
- 	PyObject *cb = PyObject_GetAttrString (pyobject, "cb_lock");
- 
- 	// call 
- 	PyObject *arglist = Py_BuildValue ("()");
- 	PyObject *result = PyEval_CallObject (cb, arglist);
- 	if (!result) {
- 	    PyErr_Print ();
- 	} else
- 	   Py_DECREF (result);
- 
- 	// decrease references
- 	Py_DECREF (arglist);
- 	Py_DECREF (cb);
-     }
- 
-     UNBLOCK_THREADS
- }
- 
- // ------------------------- UNLOCK -------------------------------
- void PyPlaylistInterfaceWrapper::CbUnlock ()
- {
-     BLOCK_THREADS
- 
-     // get python callback
-     if (PyObject_HasAttrString (pyobject, "cb_unlock")) {
- 	PyObject *cb = PyObject_GetAttrString (pyobject, "cb_unlock");
- 
- 	// call 
- 	PyObject *arglist = Py_BuildValue ("()");
- 	PyObject *result = PyEval_CallObject (cb, arglist);
- 	if (!result) {
- 	    PyErr_Print ();
- 	} else
- 	    Py_DECREF (result);
- 
- 	// decrease references
- 	Py_DECREF (arglist);
- 	Py_DECREF (cb);
-     }
- 
-     UNBLOCK_THREADS
- }
- 
  // ------------------------- INSERT ----------------------------------
  void PyPlaylistInterfaceWrapper::CbInsert(std::vector<PlayItem> &items,
--- 60,63 ----

Index: pyplaylistinterface.h
===================================================================
RCS file: /cvsroot/ap-python/python/src/pyplaylistinterface.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** pyplaylistinterface.h	2 Jun 2002 09:46:38 -0000	1.4
--- pyplaylistinterface.h	26 Jul 2002 06:18:58 -0000	1.5
***************
*** 12,17 ****
  	virtual ~PyPlaylistInterfaceWrapper ();
  	void CbSetCurrent(unsigned pos);
- 	void CbLock();
- 	void CbUnlock();
  	void CbInsert(std::vector<PlayItem> &items, unsigned pos);
  	void CbRemove(unsigned start, unsigned end);
--- 12,15 ----