From 93b2daff3db922541e3cd1cb59081f15025439c8 Mon Sep 17 00:00:00 2001
From: root
Date: Mon, 15 Sep 2014 00:43:22 +0200
Subject: fixed typos and improved usability

---
 func.php | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

(limited to 'func.php')

diff --git a/func.php b/func.php
index e1bf9bb..0a626c0 100644
--- a/func.php
+++ b/func.php
@@ -68,15 +68,21 @@ function video_xt_audio($VIDEO, $CACHEDIR, $FILENAME){
 	return true;
 }
 
-function convert_video($FILENAME){
+function convert_video($CACHEDIR, $FILENAME){
 	$fp=fopen($CACHEDIR."/".$FILENAME.".webm.txt", "w");
 	$content="extracting audio: ".$FILENAME."\n";
 	fputs($fp, $content);
 	fclose($fp);
-	if(file_exists($FILENAME.".mp4") || file_exists($FILENAME.".webm"))
-		return;
+	/*
+	$fp=fopen($CACHEDIR."/".$FILENAME.".block.txt", "w");
+	$content="blocked because of extracting audio: ".$FILENAME."\n";
+	fputs($fp, $content);
+	fclose($fp);
+	*/
+	if(file_exists($CACHEDIR . "/" . $FILENAME.".webm"))
+		return true;
 	rename($CACHEDIR . "/" . $FILENAME, $CACHEDIR . "/" . $FILENAME. ".mp4");
-	exec("ffmpeg -i " . $CACHEDIR . "/" . $VID . ".mp4 " .  $CACHEDIR . "/" . $VID . ".webm", $pid, $ret);
+	exec("ffmpeg -i " . $CACHEDIR . "/" . $FILENAME. ".mp4 " .  $CACHEDIR . "/" . $FILENAME. ".webm", $pid, $ret);
 	rename($CACHEDIR . "/" . $FILENAME . ".mp4", $CACHEDIR . "/" . $FILENAME);
 	if($ret != 0){
 		return false;
@@ -88,6 +94,9 @@ function convert_video($FILENAME){
 function pr_player($file, $thumb, $mime, $title, $vid, $html5 = false){
 if($html5)
 	$WEBMVIDEO = "<source src=\"/".htmlentities($file.".webm")."\" type='video/webm' />";
+else 
+	$WEBMVIDEO = "";
+
 echo "
 <h1>".htmlentities($title)."</h1>
 <br>
-- 
cgit v1.2.3