Mercurial > epgrec.yaz
changeset 69:1033324d7ecc
Merge branch 'origin/testing'
author | yoneda <yoneda@recorder.localnet.mda.or.jp> |
---|---|
date | Tue, 03 Nov 2009 14:54:40 +0900 |
parents | 25736d81c66d (diff) 3d6e7c606896 (current diff) |
children | 1363ac056197 |
files | Settings.class.php templates/envSetting.html |
diffstat | 6 files changed, 136 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/Settings.class.php Tue Nov 03 14:51:44 2009 +0900 +++ b/Settings.class.php Tue Nov 03 14:54:40 2009 +0900 @@ -41,6 +41,9 @@ if(defined("GR_TUNERS")) $xml->gr_tuners = GR_TUNERS; else $xml->gr_tuners = 1; + + if(defined("CS_REC_FLG")) $xml->cs_rec_flg = CS_REC_FLG; + else $xml->cs_rec_flg = 0; if(defined("USE_KUROBON")) $xml->use_kurobon = USE_KUROBON ? 1 : 0; else $xml->use_kurobon = 0;
--- a/config.php.sample Tue Nov 03 14:51:44 2009 +0900 +++ b/config.php.sample Tue Nov 03 14:54:40 2009 +0900 @@ -101,6 +101,91 @@ ); } +// 全国用CSデジタルチャンネルマップ +$CS_CHANNEL_MAP = array( + "1002.ontvjapan.com" => "CS2", // 237, // "スターchプラス" + "1086.ontvjapan.com" => "CS2", // 239, // "日本映画専門chHD" + "306ch.epgdata.ontvjapan" => "CS2", // 306, // "フジテレビCSHD" + + "100ch.epgdata.ontvjapan" => "CS4", // 100, // "e2プロモ" + "1025.ontvjapan.com" => "CS4", // 256, // "Jスポーツ ESPN" + "1016.ontvjapan.com" => "CS4", // 312, // "FOX" + "1018.ontvjapan.com" => "CS4", // 322, // "スペースシャワーTV" + "1046.ontvjapan.com" => "CS4", // 331, // "カートゥーン ネット" + "194ch.epgdata.ontvjapan" => "CS4", // 194, // "インターローカルTV" + "1213.ontvjapan.com" => "CS4", // 334, // "トゥーン・ディズニー" + + "1010.ontvjapan.com" => "CS6", // 221, // "東映チャンネル" + "1005.ontvjapan.com" => "CS6", // 222, // "衛星劇場" + "1008.ontvjapan.com" => "CS6", // 223, // "チャンネルNECO" + "1009.ontvjapan.com" => "CS6", // 224, // "洋画★シネフィル" + "1133.ontvjapan.com" => "CS6", // 292, // "時代劇専門チャンネル" + "1003.ontvjapan.com" => "CS6", // 238, // "スター・クラシック" + "1006.ontvjapan.com" => "CS6", // 310, // "スーパードラマ" + "1014.ontvjapan.com" => "CS6", // 311, // "AXN" + "1204.ontvjapan.com" => "CS6", // 343, // "ナショジオチャンネル" + + "1059.ontvjapan.com" => "CS8", // 55, // "ショップチャンネル" + + "1217.ontvjapan.com" => "CS10", // 228, // "ザ・シネマ" + "800ch.epgdata.ontvjapan" => "CS10", // 800, // "スカチャンHD800" + "801ch.epgdata.ontvjapan" => "CS10", // 801, // "スカチャン801" + "802ch.epgdata.ontvjapan" => "CS10", // 802, // "スカチャン802" + + "1028.ontvjapan.com" => "CS12", // 260, // "ゴルフチャンネル" + "1092.ontvjapan.com" => "CS12", // 303, // "テレ朝チャンネル" + "1019.ontvjapan.com" => "CS12", // 323, // "MTV" + "1024.ontvjapan.com" => "CS12", // 324, // "ミュージック・エア" + "1067.ontvjapan.com" => "CS12", // 352, // "朝日ニュースター" + "1070.ontvjapan.com" => "CS12", // 353, // "BBCワールド" + "1069.ontvjapan.com" => "CS12", // 354, // "CNNj" + "361ch.epgdata.ontvjapan" => "CS12", // 361, // "ジャスト・アイ" + + "1041.ontvjapan.com" => "CS14", // 251, // "Jスポーツ 1" + "1042.ontvjapan.com" => "CS14", // 252, // "Jスポーツ 2" + "1043.ontvjapan.com" => "CS14", // 253, // "JスポーツPlusH" + "1026.ontvjapan.com" => "CS14", // 254, // "GAORA" + "1040.ontvjapan.com" => "CS14", // 255, // "sky・Aスポーツ+" + + "305ch.epgdata.ontvjapan" => "CS16", // 305, // "チャンネル銀河" + "1201.ontvjapan.com" => "CS16", // 333, // "AT-X" + "1050.ontvjapan.com" => "CS16", // 342, // "ヒストリーチャンネル" + "803ch.epgdata.ontvjapan" => "CS16", // 803, // "スカチャン803" + "804ch.epgdata.ontvjapan" => "CS16", // 804, // "スカチャン804" + "1207.ontvjapan.com" => "CS16", // 290, // "SKY・STAGE" + + "1007.ontvjapan.com" => "CS18", // 240, // "ムービープラスHD" + "1027.ontvjapan.com" => "CS18", // 262, // "ゴルフネットワーク" + "1074.ontvjapan.com" => "CS18", // 314, // "LaLa HD" + + "1073.ontvjapan.com" => "CS20", // 258, // "フジテレビ739" + "1072.ontvjapan.com" => "CS20", // 302, // "フジテレビ721" + "1047.ontvjapan.com" => "CS20", // 332, // "アニマックス" + "1062.ontvjapan.com" => "CS20", // 340, // "ディスカバリー" + "1193.ontvjapan.com" => "CS20", // 341, // "アニマルプラネット" + + "160ch.epgdata.ontvjapan" => "CS22", // 160, // "C-TBSウエルカム" + //"1120.ontvjapan.com" => "CS22", // 161, // "QVC" + "185ch.epgdata.ontvjapan" => "CS22", // 185, // "プライム365.TV" + "1015.ontvjapan.com" => "CS22", // 293, // "ファミリー劇場" + "3201.ontvjapan.com" => "CS22", // 301, // "TBSチャンネル" + "1090.ontvjapan.com" => "CS22", // 304, // "ディズニーチャンネル" + "1022.ontvjapan.com" => "CS22", // 325, // "MUSIC ON! TV" + "1045.ontvjapan.com" => "CS22", // 330, // "キッズステーション" + "1076.ontvjapan.com" => "CS22", // 351, // "TBSニュースバード" + + "1068.ontvjapan.com" => "CS24", // 257, // "日テレG+" + "5004.ontvjapan.com" => "CS24", // 291, // "fashion TV" + "300ch.epgdata.ontvjapan" => "CS24", // 300, // "日テレプラス" + "1023.ontvjapan.com" => "CS24", // 320, // "エコミュージックTV" + "1208.ontvjapan.com" => "CS24", // 321, // "Music Japan TV" + "2002.ontvjapan.com" => "CS24", // 350, // "日テレNEWS24" + /* + "110ch.epgdata.ontvjapan" => "CS22", 110, // "ワンテンポータル" + "101ch.epgdata.ontvjapan" => "CS22", 101, // "宝塚プロモチャンネル" + "147ch.epgdata.ontvjapan" => "CS22", 147, // "CS日本番組ガイド" + */ +); // DBテーブル情報 以下は変更しないでください
--- a/getepg.php Tue Nov 03 14:51:44 2009 +0900 +++ b/getepg.php Tue Nov 03 14:54:40 2009 +0900 @@ -23,6 +23,25 @@ storeProgram( "BS", $settings->temp_xml ); if( file_exists( $settings->temp_data ) ) @unlink( $settings->temp_data ); if( file_exists( $settings->temp_xml ) ) @unlink( $settings->temp_xml ); + + // CS + if ($settings->cs_rec_flg != 0) { + $cmdline = "CHANNEL=CS8 DURATION=120 TYPE=CS TUNER=0 MODE=0 OUTPUT=".$settings->temp_data." ".DO_RECORD . " >/dev/null 2>&1"; + exec( $cmdline ); + $cmdline = $settings->epgdump." /CS ".$settings->temp_data." ".$settings->temp_xml; + exec( $cmdline ); + storeProgram( "CS", $settings->temp_xml ); + if( file_exists( $settings->temp_data ) ) @unlink( $settings->temp_data ); + if( file_exists( $settings->temp_xml ) ) @unlink( $settings->temp_xml ); + + $cmdline = "CHANNEL=CS24 DURATION=120 TYPE=CS TUNER=0 MODE=0 OUTPUT=".$settings->temp_data." ".DO_RECORD . " >/dev/null 2>&1"; + exec( $cmdline ); + $cmdline = $settings->epgdump." /CS ".$settings->temp_data." ".$settings->temp_xml; + exec( $cmdline ); + storeProgram( "CS", $settings->temp_xml ); + if( file_exists( $settings->temp_data ) ) @unlink( $settings->temp_data ); + if( file_exists( $settings->temp_xml ) ) @unlink( $settings->temp_xml ); + } } } @@ -69,11 +88,12 @@ exit(); function storeProgram( $type, $xmlfile ) { - global $BS_CHANNEL_MAP, $GR_CHANNEL_MAP; + global $BS_CHANNEL_MAP, $GR_CHANNEL_MAP, $CS_CHANNEL_MAP; // チャンネルマップファイルの準備 $map = array(); if( $type == "BS" ) $map = $BS_CHANNEL_MAP; else if( $type == "GR") $map = $GR_CHANNEL_MAP; + else if( $type == "CS") $map = $CS_CHANNEL_MAP; // XML parse $xml = @simplexml_load_file( $xmlfile );
--- a/index.php Tue Nov 03 14:51:44 2009 +0900 +++ b/index.php Tue Nov 03 14:54:40 2009 +0900 @@ -47,6 +47,7 @@ $programs = array(); if( $type == "BS" ) $channel_map = $BS_CHANNEL_MAP; else if( $type == "GR" ) $channel_map = $GR_CHANNEL_MAP; + else if( $type == "CS" ) $channel_map = $CS_CHANNEL_MAP; $st = 0; $prec = new DBRecord(PROGRAM_TBL); foreach( $channel_map as $channel_disc => $channel ) { @@ -151,6 +152,14 @@ $types[$i]['link'] = $_SERVER['SCRIPT_NAME'] . "?type=BS&length=".$program_length."&time=".date( "YmdH", $top_time); $types[$i]['name'] = "BS"; $i++; + + // CS + if ($settings->cs_rec_flg != 0) { + $types[$i]['selected'] = $type == "CS" ? 'class="selected"' : ""; + $types[$i]['link'] = $_SERVER['SCRIPT_NAME'] . "?type=CS&length=".$program_length."&time=".date( "YmdH", $top_time); + $types[$i]['name'] = "CS"; + $i++; + } } if( $settings->gr_tuners != 0 ) { $types[$i]['selected'] = $type == "GR" ? 'class="selected"' : "";
--- a/programTable.php Tue Nov 03 14:51:44 2009 +0900 +++ b/programTable.php Tue Nov 03 14:54:40 2009 +0900 @@ -110,6 +110,15 @@ $arr['value'] = "BS"; $arr['selected'] = $type == "BS" ? "selected" : ""; array_push( $types, $arr ); + + // CS + if ($settings->cs_rec_flg != 0) { + $arr = array(); + $arr['name'] = "CS"; + $arr['value'] = "CS"; + $arr['selected'] = $type == "CS" ? "selected" : ""; + array_push( $types, $arr ); + } } $k_station_name = "";
--- a/templates/envSetting.html Tue Nov 03 14:51:44 2009 +0900 +++ b/templates/envSetting.html Tue Nov 03 14:54:40 2009 +0900 @@ -74,6 +74,15 @@ <input type="text" name="bs_tuners" value="{$settings->bs_tuners}" size="3" class="required digits" /> </div> +<h3>CS録画の有無</h3> +<div class="setting"> +<div class="caption">この設定を「行う」にするとCS放送を加味した動作となります。CS放送を使用しない方は「使わない」に設定してください。</div> +<select name="cs_rec_flg" id="id_cs_rec_flg" > + <option value="0" {if $settings->cs_rec_flg == 0} selected {/if}>行わない</option> + <option value="1" {if $settings->cs_rec_flg == 1} selected {/if}>行う</option> +</select> +</div> + <h2>録画関連設定</h2>