Changeset 946

Timestamp:

02/19/08 11:05:57 (10 months ago)

Author:

ArcRiley

Message:

#932 : Implemented working TransportLoop, currently a bit slow to start loading however

Location:

trunk/pysoy/src

Files:

• _core/_Transports.pxi (deleted)
• _core/_coreLoop.pxi (modified) (1 diff)
• _core/soy._core.pyx (modified) (1 diff)
• transports/Transport.pxi (modified) (5 diffs)
• transports/soy.transports.pxd (modified) (2 diffs)
• transports/soy.transports.pyx (modified) (1 diff)

trunk/pysoy/src/_core/_coreLoop.pxi

@@ -28 +28 @@
   _scenes = <soy._internals.Children> soy.scenes._getScenes()
   while (1) :
-    _transports.lock()
-    for i from 0 <= i < _transports.current :
-      (<soy.transports.Transport> _transports.list[i])._coreProcess()
-    _transports.unlock()
-    #
     _screens.lock()
     for i from 0 <= i < _screens.current :

trunk/pysoy/src/_core/soy._core.pyx

@@ -39 +39 @@
 cimport soy.widgets
 
-include "_Transports.pxi"
-
 IF UNAME_SYSNAME == "Windows" :
   include "_windowproc.pxi"

trunk/pysoy/src/transports/Transport.pxi

@@ -18 +18 @@
 # $Id$
 
-cimport soy.textures
-
-cdef class Transport :
+cdef class Transport (soy._internals.Loopable) :
   '''PySoy Transport
 
@@ -27 +25 @@
   def __init__(self, path, loop=1, *args, **keywords) :
     cdef char _magic[4]
-    cdef soy._internals.Children _transports
     self._objs = <Stored *> py.PyMem_Malloc(sizeof(Stored) * 4)
     self._mobj = 4
@@ -41 +38 @@
             raise TypeError('unsupported soy version %d' % _magic[3])
         elif _magic[:4] == 'OggS' :
-          self._loop = loop
+          self._oggLoop = loop
           self._headOgg()
         else :
           self._vers = -10
           raise TypeError('unsupported file type')
-    
-    # This is a hack, coreloop must have _transports to process files
-    _transports = <soy._internals.Children> \
-                  py.PyCObject_AsVoidPtr(__import__('soy._core', [], [], 
-                             ['_Transports']).__dict__['_Transports']())
-    _transports.lock()
-    _transports.append(<void *> self)
-    _transports.unlock()
+    _transports._append(<void*> self)
 
 
   def __dealloc__(self) :
-    cdef soy._internals.Children _transports
-    if self._vers > -10 :
-      _transports = <soy._internals.Children> \
-                    py.PyCObject_AsVoidPtr(__import__('soy._core', [], [], 
-                               ['_Transports']).__dict__['_Transports']())
-      _transports.lock()
-      _transports.remove(<void *> self)
-      _transports.unlock()
+    _transports._remove(<void*> self)
     py.PyMem_Free(self._objs)
 
 
-  # This is called by _coreLoop()
-  cdef void _coreProcess(self) :
-    if self._mode == 0 :
-      return
+  cdef int _loop(self) :
+    if self._mode == 0 :
+      return 1
     elif self._mode == 1 :
       if self._vers == 0 :
@@ -79 +61 @@
     # If finished loading/saving, decref just before returning
       #py.Py_DECREF(self)
+    return 1
 
 
@@ -255 +238 @@
         (<soy._internals.Loadable> self._objs[i].object)._coreLoad(&_page, 0)
     else :
-      if self._loop :
+      if self._oggLoop :
         self._rewind()
       else :

trunk/pysoy/src/transports/soy.transports.pxd

@@ -31 +31 @@
 
 
-cdef class Transport :
+cdef class Transport (soy._internals.Loopable) :
   cdef Stored                 *_objs
   cdef object                  _dict
@@ -39 +39 @@
   cdef int                     _mode      # 0 = idle, 1 = load, 2 = save
   # for Ogg
-  cdef int                     _loop
+  cdef int                     _oggLoop
   cdef ogg.ogg_sync_state      _sync
   #
   # General Functions
-  cdef void  _coreProcess(self)
   cdef int   _initObjt(self, int, object, object)
   cdef int   _findName(self, char*, unsigned char)

trunk/pysoy/src/transports/soy.transports.pyx

@@ -24 +24 @@
 __version__ = 'Trunk (r'+'$Rev$'[6:-2]+')'
 
+cimport soy.textures
+
+cdef soy._internals.LoopThread _transports
+_transports = soy._internals.LoopThread('TransportLoop')
+
 include "Transport.pxi"
 include "File.pxi"