use ogv / video/ogg

oxdbarchive/cache.py

@@ -63,7 +63,7 @@ def loadOggClip(afile, position):
     outpoint = positions[1]
   else:
     outpoint = -1
-  clip = join(afile.frameFolder, '%s.%s' % (position, 'ogg'))
+  clip = join(afile.frameFolder, '%s.%s' % (position, 'ogv'))
   if not exists(clip):
     afile.extractOggClip(position, outpoint)
   if exists(clip):

oxdbarchive/controllers.py

@@ -38,14 +38,14 @@ class Root(controllers.RootController):
       return f.timeline()
     elif position: #clip / frame
       position = position.replace('.png', '').replace('.jpg', '')
-      position = position.replace('.flv', '').replace('.ogg', '')
+      position = position.replace('.flv', '').replace('.ogv', '')
       position = position.replace('-', ':').replace('.',':')
       if action == 'clip':
         cherrypy.response.headerMap['Content-Type'] = "video/x-flv"
         cherrypy.response.headerMap["Expires"] = httpExpires(60*60*24*15)
         return f.flvClip(position)
-      if action == 'ogg':
-        cherrypy.response.headerMap['Content-Type'] = "video/x-ogg"
+      if action == 'ogv':
+        cherrypy.response.headerMap['Content-Type'] = "video/ogg"
         cherrypy.response.headerMap["Expires"] = httpExpires(60*60*24*15)
         return f.oggClip(position)
       elif action == 'frame':

oxdbarchive/model.py

@@ -475,7 +475,7 @@ class ArchiveFile(SQLObject):
       clip_folder = self.frameFolder
     movie_file = self.mini_movie_file
     position = inpoint.replace(':', '.')
-    clip_movie = join(self.frameFolder, '%s.%s' % (position, 'ogg'))
+    clip_movie = join(self.frameFolder, '%s.%s' % (position, 'ogv'))
     width = 128
     height = int(width / self.frameAspect)
     height = height - height % 2