Changeset 2767:7fd79e763135 for admin

Timestamp:

11/06/14 09:55:37 (11 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

HTML5 audio and video basic support (further improvements should coming next)

Location:

admin

Files:

• media.php (modified) (1 diff)
• media_item.php (modified) (5 diffs)

admin/media.php

@@ -645 +645 @@
      $lst .= ($act != '' ? '<li class="media-action">&nbsp;'.$act.'</li>' : '');
 
-     if ($f->type == 'audio/mpeg3') {
-          $lst .= '<li>'.dcMedia::mp3player($f->file_url,$core->adminurl->get("admin.home",array('pf' => 'player_mp3.swf'))).'</li>';
+     // Show player if relevant
+     $file_type = explode('/',$f->type);
+     if ($file_type[0] == 'audio')
+     {
+          $lst .= '<li>'.dcMedia::audioPlayer($f->type,$f->file_url,$core->adminurl->get("admin.home",array('pf' => 'player_mp3.swf'))).'</li>';
      }
 

admin/media_item.php

@@ -248 +248 @@
 }
 
+# Get major file type (first part of mime type)
+$file_type = explode('/',$file->type);
+
 # Insertion popup
 if ($popup)
@@ -323 +326 @@
           '</div>';
      }
-     elseif ($file->type == 'audio/mpeg3')
+//   elseif ($file->type == 'audio/mpeg3')
+     elseif ($file_type == 'audio')
      {
           $media_type = 'mp3';
@@ -346 +350 @@
 
           $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::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));
           echo '</p>';
           echo '</div>';
      }
-     elseif ($file->type == 'video/x-flv' || $file->type == 'video/mp4' || $file->type == 'video/x-m4v')
+//   elseif ($file->type == 'video/x-flv' || $file->type == 'video/mp4' || $file->type == 'video/x-m4v')
+     elseif ($file_type == 'video')
      {
           $media_type = 'flv';
@@ -386 +392 @@
 
           $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::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));
           echo '</p>';
@@ -468 +475 @@
 }
 
-if ($file->type == 'audio/mpeg3')
-{
-     echo dcMedia::mp3player($file->file_url,$core->adminurl->get("admin.home",array('pf' => 'player_mp3.swf')));
-}
-
-if ($file->type == 'video/x-flv' || $file->type == 'video/mp4' || $file->type == 'video/x-m4v')
-{
-     echo dcMedia::flvplayer($file->file_url,$core->adminurl->get("admin.home",array('pf' => 'player_flv.swf')));
+// Show player if relevant
+if ($file_type[0] == 'audio')
+{
+     echo dcMedia::audioPlayer($file->type,$file->file_url,$core->adminurl->get("admin.home",array('pf' => 'player_mp3.swf')));
+}
+if ($file_type[0] == 'video')
+{
+     echo dcMedia::videoPlayer($file->type,$file->file_url,$core->adminurl->get("admin.home",array('pf' => 'player_flv.swf')));
 }