Changeset 2768:9309864ed407

Timestamp:

11/06/14 10:58:39 (11 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Cope with given dimensions for video, bugfix (HTML5 audio and video)

Files:

• admin/media_item.php (modified) (4 diffs)
• inc/core/class.dc.media.php (modified) (4 diffs)
• plugins/dcLegacyEditor/js/jsToolBar/popup_media.js (modified) (2 diffs)

admin/media_item.php

@@ -326 +326 @@
           '</div>';
      }
-//   elseif ($file->type == 'audio/mpeg3')
-     elseif ($file_type == 'audio')
+     elseif ($file_type[0] == 'audio')
      {
           $media_type = 'mp3';
@@ -350 +349 @@
 
           $public_player_style = unserialize($core->blog->settings->themes->mp3player_style);
-//        $public_player = dcMedia::mp3player($file->file_url,$core->blog->getQmarkURL().'pf=player_mp3.swf',$public_player_style);
           $public_player = dcMedia::audioPlayer($file->type,$file->file_url,$core->blog->getQmarkURL().'pf=player_mp3.swf',$public_player_style);
           echo form::hidden('public_player',html::escapeHTML($public_player));
@@ -356 +354 @@
           echo '</div>';
      }
-//   elseif ($file->type == 'video/x-flv' || $file->type == 'video/mp4' || $file->type == 'video/x-m4v')
-     elseif ($file_type == 'video')
+     elseif ($file_type[0] == 'video')
      {
           $media_type = 'flv';
@@ -392 +389 @@
 
           $public_player_style = unserialize($core->blog->settings->themes->flvplayer_style);
-//        $public_player = dcMedia::flvplayer($file->file_url,$core->blog->getQmarkURL().'pf=player_flv.swf',$public_player_style);
           $public_player = dcMedia::videoPlayer($file->type,$file->file_url,$core->blog->getQmarkURL().'pf=player_flv.swf',$public_player_style);
           echo form::hidden('public_player',html::escapeHTML($public_player));

inc/core/class.dc.media.php

@@ -1062 +1062 @@
      {
           $audio =
-               '<audio controls preload="auto">'."\n".
-               '<source src="'.$url.'">'."\n";
+               '<audio controls preload="auto">'.
+               '<source src="'.$url.'">';
 
           if ($type == 'audio/mpeg3') {
@@ -1108 +1108 @@
                     '<param name="FlashVars" value="'.implode('&amp;',$vars).'" />'.
                     __('Embedded Audio Player').
-                    '</object>'."\n";
+                    '</object>';
           }
 
           $audio .=
-               '</audio>'."\n";
+               '</audio>';
 
           return $audio;
@@ -1129 +1129 @@
      {
           $video = '';
+
+          // Cope with width and height, if given
+          $width = 400;
+          $height = 300;
+          if (is_array($args)) {
+               if (!empty($args['width']) && $args['width']) {
+                    $width = (int) $args['width'];
+               }
+               if (!empty($args['height']) && $args['height']) {
+                    $height = (int) $args['height'];
+               }
+          }
+
           if ($type != 'video/x-flv') {
                $video =
-                    '<video controls preload="auto">'."\n".
-                    '<source src="'.$url.'">'."\n";
+                    '<video controls preload="auto"'.($width ? ' width="'.$width.'"' : '').($height ? ' height="'.$height.'"' : '').'>'.
+                    '<source src="'.$url.'">';
           }
 
@@ -1179 +1192 @@
                     '<param name="FlashVars" value="'.implode('&amp;',$vars).'" />'.
                     __('Embedded Video Player').
-                    '</object>'."\n";
+                    '</object>';
           }
 
           if ($type != 'video/x-flv') {
                $video .=
-                    '</video>'."\n";
+                    '</video>';
           }
 

plugins/dcLegacyEditor/js/jsToolBar/popup_media.js

@@ -49 +49 @@
                tb.elements.mp3_insert.fncall[tb.mode].call(tb);
           }
-          else if (type == 'flv')
+          else if (type == 'flv') // may be all video media, not only flv
           {
                var oplayer = $('<div>'+$('#public_player').val()+'</div>');
@@ -56 +56 @@
                var align = $('input[name="alignment"]:checked',insert_form).val();
                var title = insert_form.elements.title.value;
+
+               $('video',oplayer).attr('width',$('#video_w').val());
+               $('video',oplayer).attr('height',$('#video_h').val());
 
                if (title) {