[Pyukiwiki-cvs 0006188] CVS update: PyukiWiki-Devel/plugin

Back to archive index

PyukiWiki CVS Commit pyuki****@lists*****
2012年 2月 19日 (日) 02:39:14 JST


Index: PyukiWiki-Devel/plugin/playvideo.inc.pl
diff -u PyukiWiki-Devel/plugin/playvideo.inc.pl:1.77 PyukiWiki-Devel/plugin/playvideo.inc.pl:1.78
--- PyukiWiki-Devel/plugin/playvideo.inc.pl:1.77	Sun Feb 19 02:23:57 2012
+++ PyukiWiki-Devel/plugin/playvideo.inc.pl	Sun Feb 19 02:39:14 2012
@@ -1,6 +1,6 @@
 ######################################################################
 # playvideo.inc.pl - This is PyukiWiki, yet another Wiki clone.
-# $Id: playvideo.inc.pl,v 1.77 2012/02/18 17:23:57 papu Exp $
+# $Id: playvideo.inc.pl,v 1.78 2012/02/18 17:39:14 papu Exp $
 #
 # "playvideo" version 2.2 $$
 # Author: Nanami http://nanakochi.daiba.cx/
@@ -430,6 +430,10 @@
 				$flvpath=&checkurl($fname,$mp4,$videopath,$videourl,%::playvideo_plugin_videourl)
 					if($flvpath eq '');
 				$playvideo::flvplayer++;
+				my $js_flv_noauto='flowplayer("player",swf,{clip:{url:flv,autoPlay:false,autoBuffering:true,scaling:"fit"},canvas:{backgroundColor:"#000000",backgroundGradient:"none"},plugins:{controls:{height:24,play:true,stop:true,volume:true,mute:true,time:true,fullscreen:true,volumeSliderColor:"#000000",tooltipColor:"#5F747C",progressColor:"#112233",bufferColor:"#445566",buttonColor:"#5F747C",sliderColor:"#000000",backgroundGradient:"high",durationColor:"#ffffff",backgroundColor:"#222222",progressGradient:"medium",borderRadius:"0",buttonOverColor:"#728B94",bufferGradient:"none",timeBgColor:"#555555",sliderGradient:"none",volumeSliderGradient:"none",tooltipTextColor:"#ffffff",timeColor:"#01DAFF"}}});';
+				my $js_flv_noauto_loop='flowplayer("player",swf,{clip:{url:flv,autoPlay:false,autoBuffering:true,scaling:"fit"},canvas:{backgroundColor:"#000000",backgroundGradient:"none"},plugins:{controls:{height:24,play:true,stop:true,volume:true,mute:true,time:true,loop:true,fullscreen:true,volumeSliderColor:"#000000",tooltipColor:"#5F747C",progressColor:"#112233",bufferColor:"#445566",buttonColor:"#5F747C",sliderColor:"#000000",backgroundGradient:"high",durationColor:"#ffffff",backgroundColor:"#222222",progressGradient:"medium",borderRadius:"0",buttonOverColor:"#728B94",bufferGradient:"none",timeBgColor:"#555555",sliderGradient:"none",volumeSliderGradient:"none",tooltipTextColor:"#ffffff",timeColor:"#01DAFF"}}});';
+				my $js_flv='flowplayer("player",swf,{clip:{url:flv,autoPlay:true,autoBuffering:true,scaling:"fit"},canvas:{backgroundColor:"#000000",backgroundGradient:"none"},plugins:{controls:{height:24,play:true,stop:true,volume:true,mute:true,time:true,fullscreen:true,volumeSliderColor:"#000000",tooltipColor:"#5F747C",progressColor:"#112233",bufferColor:"#445566",buttonColor:"#5F747C",sliderColor:"#000000",backgroundGradient:"high",durationColor:"#ffffff",backgroundColor:"#222222",progressGradient:"medium",borderRadius:"0",buttonOverColor:"#728B94",bufferGradient:"none",timeBgColor:"#555555",sliderGradient:"none",volumeSliderGradient:"none",tooltipTextColor:"#ffffff",timeColor:"#01DAFF"}}});';
+				my $js_flv_loop='flowplayer("player",swf,{clip:{url:flv,autoPlay:true,autoBuffering:true,scaling:"fit"},canvas:{backgroundColor:"#000000",backgroundGradient:"none"},plugins:{controls:{height:24,play:true,stop:true,volume:true,mute:true,time:true,loop:true,fullscreen:true,volumeSliderColor:"#000000",tooltipColor:"#5F747C",progressColor:"#112233",bufferColor:"#445566",buttonColor:"#5F747C",sliderColor:"#000000",backgroundGradient:"high",durationColor:"#ffffff",backgroundColor:"#222222",progressGradient:"medium",borderRadius:"0",buttonOverColor:"#728B94",bufferGradient:"none",timeBgColor:"#555555",sliderGradient:"none",volumeSliderGradient:"none",tooltipTextColor:"#ffffff",timeColor:"#01DAFF"}}});';
 				$body.=<<EOM;
 <div id="page">
 <div style="width:@{[$width]};height:@{[$height]}px" id="player"></div>
@@ -439,11 +443,12 @@
 window.focus();
 @{[$params{autostart}+0 eq 0
 	? @{[$params{loop}+0 eq 0
-		? 'flowplayer("player",swf,{clip:{url:flv,autoPlay:false,autoBuffering:true,scaling:"fit"},canvas:{backgroundColor:"#000000",backgroundGradient:"none"},plugins:{controls:{height:24,play:true,stop:true,volume:true,mute:true,time:true,fullscreen:true,volumeSliderColor:"#000000",tooltipColor:"#5F747C",progressColor:"#112233",bufferColor:"#445566",buttonColor:"#5F747C",sliderColor:"#000000",backgroundGradient:"high",durationColor:"#ffffff",backgroundColor:"#222222",progressGradient:"medium",borderRadius:"0",buttonOverColor:"#728B94",bufferGradient:"none",timeBgColor:"#555555",sliderGradient:"none",volumeSliderGradient:"none",tooltipTextColor:"#ffffff",timeColor:"#01DAFF"}}});'
-		: 'flowplayer("player",swf,{clip:{url:flv,autoPlay:false,autoBuffering:true,scaling:"fit"},canvas:{backgroundColor:"#000000",backgroundGradient:"none"},plugins:{controls:{height:24,play:true,stop:true,volume:true,mute:true,time:true,loop:true,fullscreen:true,volumeSliderColor:"#000000",tooltipColor:"#5F747C",progressColor:"#112233",bufferColor:"#445566",buttonColor:"#5F747C",sliderColor:"#000000",backgroundGradient:"high",durationColor:"#ffffff",backgroundColor:"#222222",progressGradient:"medium",borderRadius:"0",buttonOverColor:"#728B94",bufferGradient:"none",timeBgColor:"#555555",sliderGradient:"none",volumeSliderGradient:"none",tooltipTextColor:"#ffffff",timeColor:"#01DAFF"}}});'
+		? $js_flv_noauto : $js_flv_noauto_loop
+	  ]}
 	: @{[$params{loop}+0 eq 0
-		? 'flowplayer("player",swf,{clip:{url:flv,autoPlay:true,autoBuffering:true,scaling:"fit"},canvas:{backgroundColor:"#000000",backgroundGradient:"none"},plugins:{controls:{height:24,play:true,stop:true,volume:true,mute:true,time:true,fullscreen:true,volumeSliderColor:"#000000",tooltipColor:"#5F747C",progressColor:"#112233",bufferColor:"#445566",buttonColor:"#5F747C",sliderColor:"#000000",backgroundGradient:"high",durationColor:"#ffffff",backgroundColor:"#222222",progressGradient:"medium",borderRadius:"0",buttonOverColor:"#728B94",bufferGradient:"none",timeBgColor:"#555555",sliderGradient:"none",volumeSliderGradient:"none",tooltipTextColor:"#ffffff",timeColor:"#01DAFF"}}});'
-		: 'flowplayer("player",swf,{clip:{url:flv,autoPlay:true,autoBuffering:true,scaling:"fit"},canvas:{backgroundColor:"#000000",backgroundGradient:"none"},plugins:{controls:{height:24,play:true,stop:true,volume:true,mute:true,time:true,loop:true,fullscreen:true,volumeSliderColor:"#000000",tooltipColor:"#5F747C",progressColor:"#112233",bufferColor:"#445566",buttonColor:"#5F747C",sliderColor:"#000000",backgroundGradient:"high",durationColor:"#ffffff",backgroundColor:"#222222",progressGradient:"medium",borderRadius:"0",buttonOverColor:"#728B94",bufferGradient:"none",timeBgColor:"#555555",sliderGradient:"none",volumeSliderGradient:"none",tooltipTextColor:"#ffffff",timeColor:"#01DAFF"}}});']}
+		? $js_flv : $js_flv_loop
+	  ]}
+]}
 //--></script>
 </div>
 EOM
Index: PyukiWiki-Devel/plugin/playvideo_v_cgi.pl
diff -u PyukiWiki-Devel/plugin/playvideo_v_cgi.pl:1.1 PyukiWiki-Devel/plugin/playvideo_v_cgi.pl:1.2
--- PyukiWiki-Devel/plugin/playvideo_v_cgi.pl:1.1	Sun Feb 19 02:23:57 2012
+++ PyukiWiki-Devel/plugin/playvideo_v_cgi.pl	Sun Feb 19 02:39:14 2012
@@ -1,6 +1,6 @@
 ######################################################################
 # playvideo_v_cgi.pl - This is PyukiWiki, yet another Wiki clone.
-# $Id: playvideo_v_cgi.pl,v 1.1 2012/02/18 17:23:57 papu Exp $
+# $Id: playvideo_v_cgi.pl,v 1.2 2012/02/18 17:39:14 papu Exp $
 #
 # "playvideo" version 2.2 $$
 # Author: Nanami http://nanakochi.daiba.cx/
@@ -71,6 +71,9 @@
 $PLUGIN="playvideo";
 $VERSION="2.2";
 
+use CGI qw(:standard);
+use CGI::Carp qw(fatalsToBrowser);
+
 %::functions = (
 	"load_module" => \&load_module,
 );



Pyukiwiki-cvs メーリングリストの案内
Back to archive index