# HG changeset patch # User Sushi-k # Date 1248774512 -32400 # Node ID a701aaf6d216c7b2cc75e9a5d7c10ff1849ceb73 # Parent 3983b003ae40508794ac43f7d67e8fbfadcdf611 add: gen-thumbnail.sh diff -r 3983b003ae40 -r a701aaf6d216 Reservation.class.php --- a/Reservation.class.php Tue Jul 28 17:22:55 2009 +0900 +++ b/Reservation.class.php Tue Jul 28 18:48:32 2009 +0900 @@ -235,6 +235,7 @@ $filename = mb_convert_encoding( $filename, FILESYSTEM_ENCODING, "UTF-8" ); } $filename .= $RECORD_MODE[$mode]['suffix']; + $thumbname = $filename.".jpg"; // ファイル名生成終了 @@ -267,6 +268,9 @@ "TYPE" => $crec->type, "TUNER" => $tuner, "MODE" => $mode, + "THUMB" => INSTALL_PATH.$settings->thumbs."/".$thumbname, + "FORMER" => "".$settings->former_time, + "FFMPEG" => "".$settings->ffmpeg, ); // ATで予約する @@ -276,9 +280,7 @@ fwrite($pipes[0], DO_RECORD . "\n" ); fwrite($pipes[0], COMPLETE_CMD." ".$rrec->id."\n" ); if( $settings->use_thumbs ) { - // サムネール生成 - $ffmpeg_cmd = $settings->ffmpeg." -i \${OUTPUT} -r 1 -s 160x90 -ss ".($settings->former_time + 2)." -vframes 1 -f image2 ".INSTALL_PATH.$settings->thumbs."/".$filename.".jpg\n"; - fwrite($pipes[0], $ffmpeg_cmd ); + fwrite($pipes[0], GEN_THUMBNAIL."\n" ); } fclose($pipes[0]); // 標準エラーを取る diff -r 3983b003ae40 -r a701aaf6d216 config.php.sample --- a/config.php.sample Tue Jul 28 17:22:55 2009 +0900 +++ b/config.php.sample Tue Jul 28 18:48:32 2009 +0900 @@ -64,6 +64,7 @@ define( "PADDING_TIME", 180 ); // 詰め物時間 define( "DO_RECORD", INSTALL_PATH . "/do-record.sh" ); // レコードスクリプト define( "COMPLETE_CMD", INSTALL_PATH . "/recomplete.php" ); // 録画終了コマンド +define( "GEN_THUMBNAIL", INSTALL_PATH . "/gen-thumbnail.sh" ); // サムネール生成スクリプト // 全国用BSデジタルチャンネルマップ $BS_CHANNEL_MAP = array( diff -r 3983b003ae40 -r a701aaf6d216 gen-thumbnail.sh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gen-thumbnail.sh Tue Jul 28 18:48:32 2009 +0900 @@ -0,0 +1,8 @@ +#!/bin/sh + +# サムネールを取る時間をFORMER_TIME+αだけずらします +# お好きな時間だけずらしてください + +offset=`expr ${FORMER} + 2` + +${FFMPEG} -i ${OUTPUT} -r 1 -s 160x90 -ss ${offset} -vframes 1 -f image2 ${THUMB} diff -r 3983b003ae40 -r a701aaf6d216 install/step1.php --- a/install/step1.php Tue Jul 28 17:22:55 2009 +0900 +++ b/install/step1.php Tue Jul 28 18:48:32 2009 +0900 @@ -43,6 +43,7 @@ DO_RECORD, COMPLETE_CMD, INSTALL_PATH."/getepg.php", + GEN_THUMBNAIL, ); echo "

ディレクトリのパーミッションチェック(777)

"; @@ -85,4 +86,4 @@ echo '

以上を確認し次の設定に進む

'; -?> \ No newline at end of file +?>