diff options
| -rw-r--r-- | template/assemblies/player/audio.phtml (renamed from template/assemblies/players/audio.phtml) | 0 | ||||
| -rw-r--r-- | template/assemblies/player/slides.phtml (renamed from template/assemblies/players/slides.phtml) | 0 | ||||
| -rw-r--r-- | template/assemblies/player/video.phtml (renamed from template/assemblies/players/video.phtml) | 14 | ||||
| -rw-r--r-- | template/room.phtml | 2 |
4 files changed, 7 insertions, 9 deletions
diff --git a/template/assemblies/players/audio.phtml b/template/assemblies/player/audio.phtml index f9993c1..f9993c1 100644 --- a/template/assemblies/players/audio.phtml +++ b/template/assemblies/player/audio.phtml diff --git a/template/assemblies/players/slides.phtml b/template/assemblies/player/slides.phtml index f9993c1..f9993c1 100644 --- a/template/assemblies/players/slides.phtml +++ b/template/assemblies/player/slides.phtml diff --git a/template/assemblies/players/video.phtml b/template/assemblies/player/video.phtml index ca0e87b..03026f7 100644 --- a/template/assemblies/players/video.phtml +++ b/template/assemblies/player/video.phtml @@ -1,10 +1,3 @@ -<pre><?=print_r(array( - 'file' => basename(__FILE__), - 'room' => $room, - 'language' => $language, - 'format' => $format -), true)?></pre> - <video autoplay="autoplay" controls="controls" @@ -27,11 +20,16 @@ /> <object - data="/assets/js/lib/flashmediaelement.swf" + data="assets/js/lib/flashmediaelement.swf" type="application/x-shockwave-flash" width="<?=h($width)?>" height="<?=h($height)?>" > + <param name="movie" value="assets/js/lib/flashmediaelement.swf" /> + <param name="flashvars" value="controls=true&file=<?=h(link_stream('rtmp', $room, $format, $translated))?>" /> + <param name="allowFullScreen" value="true"> + + <pre>Sorry, Lynx is not supported.</pre> </object> </video> diff --git a/template/room.phtml b/template/room.phtml index 81e3af8..1060652 100644 --- a/template/room.phtml +++ b/template/room.phtml @@ -15,7 +15,7 @@ <div class="tab-content"> - <? include("assemblies/players/$type.phtml") ?> + <? include("assemblies/player/$type.phtml") ?> <div class="switcher"> <? include("assemblies/switcher/$type.phtml") ?> </div> |