From: Guillaume Pellerin Date: Thu, 15 Jan 2015 16:21:03 +0000 (+0100) Subject: back to flash player by default (seeking bug with HTML5) X-Git-Tag: 1.5.0rc6~4 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=6c1da6da24f52bc2a921435c6434fb882adfaf10;p=telemeta.git back to flash player by default (seeking bug with HTML5) --- diff --git a/telemeta/models/media.py b/telemeta/models/media.py index 7c54e076..c2d21e89 100644 --- a/telemeta/models/media.py +++ b/telemeta/models/media.py @@ -779,7 +779,7 @@ class PlaylistResource(ModelCore): "Playlist components" RESOURCE_TYPE_CHOICES = (('item', 'item'), ('collection', 'collection'), ('marker', 'marker'), ('fonds', 'fonds'), ('corpus', 'corpus')) - element_type = 'playlist_resource' + element_type = 'playlist_resource' public_id = CharField(_('public_id'), required=True) playlist = ForeignKey('Playlist', related_name="resources", verbose_name=_('playlist')) resource_type = CharField(_('resource_type'), choices=RESOURCE_TYPE_CHOICES, required=True) diff --git a/telemeta/templates/telemeta/mediaitem_detail.html b/telemeta/templates/telemeta/mediaitem_detail.html index 91033ad9..be0b9869 100644 --- a/telemeta/templates/telemeta/mediaitem_detail.html +++ b/telemeta/templates/telemeta/mediaitem_detail.html @@ -34,7 +34,7 @@ soundManager.url = "{{ STATIC_URL }}timeside/swf/"; soundManager.debugMode = false; soundManager.allowPolling = true; - soundManager.useHTML5Audio = true; + soundManager.useHTML5Audio = false; soundManager.preferFlash = false; //initializing the visualizers to be passed to the player