Skip to content

Commit

Permalink
fix many replace player_config
Browse files Browse the repository at this point in the history
  • Loading branch information
TigorC committed Dec 12, 2012
1 parent 00d393a commit 0a98e91
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions flowplayer/templatetags/flowplayer_tags.py
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -33,17 +33,16 @@ def __init__(self, media, player_class, player_id=None):
else: else:
self.player_url = "%sflowplayer/FlowPlayerLight.swf" % (settings.MEDIA_URL) self.player_url = "%sflowplayer/FlowPlayerLight.swf" % (settings.MEDIA_URL)


def render(self, context):
# Import the configuration settings to set on the player output # Import the configuration settings to set on the player output
# Configuration is defined in the settings (multiple types of player) # Configuration is defined in the settings (multiple types of player)
if 'default' in settings.FLOWPLAYER_CONFIG: if 'default' in settings.FLOWPLAYER_CONFIG:
self.player_config = settings.FLOWPLAYER_CONFIG['default'] self.player_config = settings.FLOWPLAYER_CONFIG['default']
else: else:
self.player_config = dict() self.player_config = dict()


if player_class in settings.FLOWPLAYER_CONFIG: if self.player_class in settings.FLOWPLAYER_CONFIG:
self.player_config.update(settings.FLOWPLAYER_CONFIG[player_class]) self.player_config.update(settings.FLOWPLAYER_CONFIG[self.player_class])

def render(self, context):


if 'flowplayer_iterator' in context: if 'flowplayer_iterator' in context:
context['flowplayer_iterator'] += 1 context['flowplayer_iterator'] += 1
Expand Down

0 comments on commit 0a98e91

Please sign in to comment.