PyukiWiki CVS Commit
pyuki****@lists*****
2012年 2月 19日 (日) 01:46:10 JST
Index: PyukiWiki-Devel/plugin/playvideo.inc.pl diff -u PyukiWiki-Devel/plugin/playvideo.inc.pl:1.74 PyukiWiki-Devel/plugin/playvideo.inc.pl:1.75 --- PyukiWiki-Devel/plugin/playvideo.inc.pl:1.74 Sun Feb 19 01:38:34 2012 +++ PyukiWiki-Devel/plugin/playvideo.inc.pl Sun Feb 19 01:46:10 2012 @@ -1,6 +1,6 @@ ###################################################################### # playvideo.inc.pl - This is PyukiWiki, yet another Wiki clone. -# $Id: playvideo.inc.pl,v 1.74 2012/02/18 16:38:34 papu Exp $ +# $Id: playvideo.inc.pl,v 1.75 2012/02/18 16:46:10 papu Exp $ # # "playvideo" version 2.2 $$ # Author: Nanami http://nanakochi.daiba.cx/ @@ -421,7 +421,7 @@ if($browserflg+0 eq 1) { $playvideo::playercount++; $html5video=&html5video($fname,$::playvideo_plugin_videopath,$::playvideo_plugin_videourl,%::playvideo_plugin_videourl); - if($html5video ne '') { + if($html5video ne '' && &checkhtml5videosupport eq 1) { if($playvideo::htmlplayer eq 0) { $::htmlmode="html5_plugin"; &init_dtd; @@ -608,33 +608,33 @@ sub checkhtml5videosupport { my $agent=$ENV{HTTP_USER_AGENT}; - my $html5ignoreflg=0; + my $html5supportflg=0; foreach(@HTML5_VIDEO_TARGETS_MP4) { my($arg1,$arg2,$arg3)=split(/ /,$_); if($arg2 eq "") { if($agent=~/$arg1/) { - $html5ignoreflg=1; + $html5supportflg=1; } } elsif($arg3 eq "") { if($agent=~/$arg1[\s|\/](\d+)\./) { if($1 >= $arg2) { - $html5ignoreflg=1; + $html5supportflg=1; } } else { if($agent=~/$arg1[\s|\/](\d+)\./) { if($1 >= $arg2) { - $html5ignoreflg=1; + $html5supportflg=1; } } } if($1 >= $arg2) { - $html5ignoreflg=1; + $html5supportflg=1; } } elsif($agent=~/$arg1/) { if($agent=~/$arg2[\s|\/](\d+)\./) { if($1 >= $arg3) { - $html5ignoreflg=1; + $html5supportflg=1; } } } @@ -645,22 +645,22 @@ if($arg3 eq "") { if($agent=~/$arg1[\s|\/](\d+)\./) { if($1 >= $arg2) { - $html5ignoreflg=1; + $html5supportflg=1; } } else { if($agent=~/$arg1[\s|\/](\d+)\./) { if($1 >= $arg2) { - $html5ignoreflg=1; + $html5supportflg=1; } } } if($1 >= $arg2) { - $html5ignoreflg=1; + $html5supportflg=1; } } elsif($agent=~/$arg1/) { if($agent=~/$arg2[\s|\/](\d+)\./) { if($1 >= $arg3) { - $html5ignoreflg=1; + $html5supportflg=1; } } } @@ -671,27 +671,27 @@ if($arg3 eq "") { if($agent=~/$arg1[\s|\/](\d+)\./) { if($1 >= $arg2) { - $html5ignoreflg=1; + $html5supportflg=1; } } else { if($agent=~/$arg1[\s|\/](\d+)\./) { if($1 >= $arg2) { - $html5ignoreflg=1; + $html5supportflg=1; } } } if($1 >= $arg2) { - $html5ignoreflg=1; + $html5supportflg=1; } } elsif($agent=~/$arg1/) { if($agent=~/$arg2[\s|\/](\d+)\./) { if($1 >= $arg3) { - $html5ignoreflg=1; + $html5supportflg=1; } } } } - return $html5ignoreflg; + return $html5supportflg; } sub init_dtd {
