Mercurial > epgrec.yaz

comparison Reservation.class.php @ 87:36ac7c416bd7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merged with upstream
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Mon, 01 Mar 2010 20:51:36 +0900
parents 11f63ae04a96 6eabffb0ccac
children e2c37cc736db
comparison
equal deleted inserted replaced
75:11f63ae04a96 87:36ac7c416bd7
233 // 文字コード変換 233 // 文字コード変換
234 if( defined("FILESYSTEM_ENCODING") ) { 234 if( defined("FILESYSTEM_ENCODING") ) {
235 // $filename = mb_convert_encoding( $filename, FILESYSTEM_ENCODING, "UTF-8" ); 235 // $filename = mb_convert_encoding( $filename, FILESYSTEM_ENCODING, "UTF-8" );
236 $filename = mb_convert_encoding( $filename, FILESYSTEM_ENCODING, "auto" ); 236 $filename = mb_convert_encoding( $filename, FILESYSTEM_ENCODING, "auto" );
237 } 237 }
238 $filename .= $RECORD_MODE[$mode]['suffix']; 238 $filename .= $RECORD_MODE["$mode"]['suffix'];
239 $thumbname = $filename.".jpg"; 239 $thumbname = $filename.".jpg";
240 240
241 // サムネール 241 // サムネール
242 $gen_thumbnail = INSTALL_PATH."/gen-thumbnail.sh"; 242 $gen_thumbnail = INSTALL_PATH."/gen-thumbnail.sh";
243 if( defined("GEN_THUMBNAIL") ) 243 if( defined("GEN_THUMBNAIL") )
275 "TUNER" => $tuner, 275 "TUNER" => $tuner,
276 "MODE" => $mode, 276 "MODE" => $mode,
277 "THUMB" => INSTALL_PATH.$settings->thumbs."/".$thumbname, 277 "THUMB" => INSTALL_PATH.$settings->thumbs."/".$thumbname,
278 "FORMER" => "".$settings->former_time, 278 "FORMER" => "".$settings->former_time,
279 "FFMPEG" => "".$settings->ffmpeg, 279 "FFMPEG" => "".$settings->ffmpeg,
280 "SID" => $crec->sid,
280 ); 281 );
281 282
282 // ATで予約する 283 // ATで予約する
283 $process = proc_open( $cmdline , $descriptor, $pipes, INSTALL_PATH.$settings->spool, $env ); 284 $process = proc_open( $cmdline , $descriptor, $pipes, INSTALL_PATH.$settings->spool, $env );
284 if( is_resource( $process ) ) { 285 if( is_resource( $process ) ) {