switch to new get api results

pandora/0xdb.json

@@ -549,5 +549,9 @@
         },
         "username": ""
     },
-    "userLevels": ["guest", "member", "staff", "admin"]
+    "userLevels": ["guest", "member", "staff", "admin"],
+    "video": {
+        "formats": ["webm", "h264"],
+        "resolutions": [96]
+    }
 }

pandora/annotation/models.py

@@ -121,8 +121,10 @@ class Annotation(models.Model):
                 if key in j:
                     _j[key] = j[key]
             j = _j
-            if 'aspectRatio' in keys:
-                j['aspectRatio'] = self.item.stream_aspect
+            if 'videoRatio' in keys:
+                streams = self.item.streams()
+                if streams:
+                    j['videoRatio'] = streams[0].aspect_ratio
             if 'item' in keys:
                 j['item'] = self.item.itemId
         return j

pandora/app/models.py

@@ -34,9 +34,6 @@ def site_config():
         site_config['site']['sectionName'] = settings.SITENAME
         site_config['site']['url'] = settings.URL
 
-        site_config['formats'] = settings.VIDEO_FORMATS
-        site_config['resolutions'] = settings.VIDEO_RESOLUTIONS
-
         site_config['keys'] = {}
         for key in site_config['itemKeys']:
             site_config['keys'][key['id']] = key

pandora/padma.json

@@ -444,5 +444,9 @@
         },
         "username": ""
     },
-    "userLevels": ["guest", "member", "staff", "admin"]
+    "userLevels": ["guest", "member", "staff", "admin"],
+    "video": {
+        "formats": ["webm", "h264"],
+        "resolutions": [480, 240, 96]
+    }
 }