[xiph-commits] r3926 - in arkaiv/trunk/arkaiv: . config controllers lib model

[dcrowdy at svn.annodex.net]

Author: dcrowdy
Date: 2009-05-14 21:00:08 -0700 (Thu, 14 May 2009)
New Revision: 3926

Removed:
   arkaiv/trunk/arkaiv/__init__.pyc
Modified:
   arkaiv/trunk/arkaiv/config/__init__.pyc
   arkaiv/trunk/arkaiv/config/environment.pyc
   arkaiv/trunk/arkaiv/config/middleware.pyc
   arkaiv/trunk/arkaiv/config/routing.pyc
   arkaiv/trunk/arkaiv/controllers/page.py
   arkaiv/trunk/arkaiv/controllers/page.pyc
   arkaiv/trunk/arkaiv/lib/__init__.pyc
   arkaiv/trunk/arkaiv/lib/app_globals.pyc
   arkaiv/trunk/arkaiv/lib/helpers.pyc
   arkaiv/trunk/arkaiv/model/framer.py
Log:
import gobject and init threads per instructions at http://gstreamer.freedesktop.org/wiki/FAQ and see if that fixes the dreaded "Fatal Python error: GC object already tracked"


Deleted: arkaiv/trunk/arkaiv/__init__.pyc
===================================================================
(Binary files differ)

Modified: arkaiv/trunk/arkaiv/config/__init__.pyc
===================================================================
(Binary files differ)

Modified: arkaiv/trunk/arkaiv/config/environment.pyc
===================================================================
(Binary files differ)

Modified: arkaiv/trunk/arkaiv/config/middleware.pyc
===================================================================
(Binary files differ)

Modified: arkaiv/trunk/arkaiv/config/routing.pyc
===================================================================
(Binary files differ)

Modified: arkaiv/trunk/arkaiv/controllers/page.py
===================================================================
--- arkaiv/trunk/arkaiv/controllers/page.py	2009-05-12 02:14:55 UTC (rev 3925)
+++ arkaiv/trunk/arkaiv/controllers/page.py	2009-05-15 04:00:08 UTC (rev 3926)
@@ -134,14 +134,30 @@
         for clip in clips:
             if (clip != None):
                 item = model.getitemforclip(clip['index'])
+                clip['name'] = item.name  #name of the item the clip belongs to
                 sourceid = model.getsourcesforitem(item.ixi)
                 oggsource = model.getsourcepath(sourceid)
                 cmmlfile = model.getitemcmmlfile(item.ixi)
                 urlpath = split(cmmlfile, path_base)
                 # Now split off the extension
                 urlpath = os.path.splitext(urlpath[1])[0]
-                clip['url'] = media_url_base + urlpath + ".anx" + "?id=" + clip['id']
-        
+                #clip['url'] = media_url_base + urlpath + ".anx" + "?id=" + clip['id']
+                o = OggzInfo(oggsource)
+                if (o.has_video()):
+                    clip['has_video'] = "Yes"
+                else:
+                    clip['has_video'] = "No"
+                    
+                if (o.has_audio()):
+                    clip['has_audio'] = "Yes"
+                else:
+                    clip['has_audio'] = "No" 
+ 
+                if clip['end'] == 0:
+                  clip['url'] = media_url_base + urlpath + ".ogg" + "?t=" + str(clip['start'])
+                else:
+                  clip['url'] = media_url_base + urlpath + ".ogg" + "?t=" + str(clip['start']) + "/" + str(clip['end'])
+                   
         for item in items:
             sourceid = model.getsourcesforitem(item['index'])
             oggsource = model.getsourcepath(sourceid)
@@ -150,7 +166,8 @@
             urlpath = os.path.splitext(urlpath[1])[0]
             #clipimageurl = media_url_base + os.path.dirname(urlpath) + "/"
             item['id'] = ""    # a dummy to match clip info
-            item['url'] = media_url_base + urlpath + ".anx" + "?id=0"
+            #item['url'] = media_url_base + urlpath + ".anx" + "?id=0"
+            item['url'] = media_url_base + urlpath + ".ogg"
             clips.append(item)
 
         c.clips = clips 

Modified: arkaiv/trunk/arkaiv/controllers/page.pyc
===================================================================
(Binary files differ)

Modified: arkaiv/trunk/arkaiv/lib/__init__.pyc
===================================================================
(Binary files differ)

Modified: arkaiv/trunk/arkaiv/lib/app_globals.pyc
===================================================================
(Binary files differ)

Modified: arkaiv/trunk/arkaiv/lib/helpers.pyc
===================================================================
(Binary files differ)

Modified: arkaiv/trunk/arkaiv/model/framer.py
===================================================================
--- arkaiv/trunk/arkaiv/model/framer.py	2009-05-12 02:14:55 UTC (rev 3925)
+++ arkaiv/trunk/arkaiv/model/framer.py	2009-05-15 04:00:08 UTC (rev 3926)
@@ -32,6 +32,8 @@
     getShot = False
     def __init__ (self, source, png_frame, seconds):
         global Image, pygst, gst
+        import gobject
+        gobject.threads_init ()
         import Image
         import pygst
         pygst.require('0.10')