summaryrefslogtreecommitdiff
path: root/modules/gallery/models
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2013-03-03 14:23:18 -0800
committerBharat Mediratta <bharat@menalto.com>2013-03-03 14:23:18 -0800
commit8d05571fa3314dc1b7c3abc4e8e20d8bd4886109 (patch)
tree58e3a892e5f10052bd62c079094505b5d6cb4bb2 /modules/gallery/models
parentd213ef3d3f79819571d42c69a75307dc7e19aaa7 (diff)
parent9d7d6c50bb7713038231232f433ae28f6f117b95 (diff)
Merge pull request #178 from shadlaws/fix_2033
#2033 - Add Flowplayer 5 to play HTML5 videos.
Diffstat (limited to 'modules/gallery/models')
-rw-r--r--modules/gallery/models/item.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
index 43b9a292..01da010e 100644
--- a/modules/gallery/models/item.php
+++ b/modules/gallery/models/item.php
@@ -751,7 +751,7 @@ class Item_Model_Core extends ORM_MPTT {
// Not set correctly, likely because ffmpeg isn't available. Making the window 0x0 causes the
// video to be effectively unviewable. So, let's guess: set width to max_size and guess a
// height (using 4:3 aspect ratio). Once the video metadata is loaded, js in
- // movieplayer.html.php will correct these values.
+ // movieplayer-flash.html.php will correct these values.
$width = $max_size;
$height = ceil($width * 3/4);
}
@@ -784,7 +784,7 @@ class Item_Model_Core extends ORM_MPTT {
if (in_array(strtolower(pathinfo($this->name, PATHINFO_EXTENSION)),
array("flv", "mp4", "m4v", "mov", "f4v"))) {
// Filetype supported by Flowplayer v3 - use it (default)
- $view = new View("movieplayer.html");
+ $view = new View("movieplayer-flash.html");
$view->max_size = $movie_img->max_size;
$view->width = $movie_img->width;
$view->height = $movie_img->height;