=== modified file 'install/perl/digitaltvrecording.pl'
--- install/perl/digitaltvrecording.pl	2010-06-06 15:35:27 +0000
+++ install/perl/digitaltvrecording.pl	2010-07-17 16:07:51 +0000
@@ -149,70 +149,30 @@
 my $oserr = 0;
 my $originalrecch = $recch;
 my $errorflag = 0;
-if ($bandtype == 0){
-# 地デジ friio
-}elsif($bandtype == 1){
-# BS/CS friio
-		#recfriiobs用チャンネルリマップ
-		if ($recch == 101) {
-			$bssplitflag = $recch;
-			$recch = "b10";#22 : NHK BS1/BS2 
-		}elsif($recch == 102){
-			$bssplitflag = $recch;
-			$recch = "b10";#22 : NHK BS1/BS2 
-		}elsif($recch == 103){
-			$recch = "b11";#23 : NHK hi  
-		}elsif($recch == 141){
-			$recch = "b8";# 20 : BS-NTV  
-		}elsif($recch == 151){
-			$recch = "b1";#13 : BS-Asahi 
-		}elsif($recch == 161){
-			$recch = "b2";#14 : BS-i  
-		}elsif($recch == 171){
-			$recch = "b4";#16 : BS-Japan 
-		}elsif($recch == 181){
-			$recch = "b9";#21 : BS-Fuji 
-		}elsif($recch == 191){
-			$recch = "b3";#15 : WOWOW 
-		}elsif($recch == 192){
-			$recch = "b3";#15 : WOWOW 
-		}elsif($recch == 193){
-			$recch = "b3";#15 : WOWOW 
-		}elsif($recch == 211){
-			$recch = "b5";#17 : BS11  
-		}else{
-			$recch = "b7";#19 : TwellV 
-		}
-		# b6 # Star Channel
-
-}elsif($bandtype == 2){
-# recpt1でのみ動作確認
-		if ($recch == 333) {
-			$recch = "CS16";#333ch：アニメシアターX(AT-X) 
-		}elsif($recch == 330){
-			$recch = "CS22";#330ch：キッズステーション 
-		}elsif($recch == 332){
-			$recch = "CS20";#332ch：アニマックス 
-		}else{
-			$recch = "CS16";#333ch：アニメシアターX(AT-X) 
-		}
-
-
-}else{
-	&writelog("digitaltvrecording :ERROR :Unsupported and type (digital CS).");
-	exit 3;
-}
 
 # PT1
 # b25,recpt1があるか確認
 	if  (-e "$toolpath/perl/tool/recpt1"){
-		if ($bandtype >= 1){ #BS/CSなら
+		if ($bandtype == 2){ #CSなら
+				if ($recch == 333) {
+					$recch = "CS16";#333ch：アニメシアターX(AT-X) 
+				}elsif($recch == 330){
+					$recch = "CS22";#330ch：キッズステーション 
+				}elsif($recch == 332){
+					$recch = "CS20";#332ch：アニマックス 
+				}else{
+					$recch = "CS16";#333ch：アニメシアターX(AT-X) 
+				}
 		#[foltia@velvia tool]$ ./recpt1 --b25 --sid 333 CS16 180 ~/php/tv/atxtest.m2t
 		&writelog("digitaltvrecording DEBUGrecpt1 --b25 --sid $originalrecch  $recch $reclengthsec $outputfile   ");
 		$oserr = system("$toolpath/perl/tool/recpt1 --b25 --sid $originalrecch  $recch $reclengthsec $outputfile  ");
-		}else{ 
+		}elsif($bandtype == 0 || $bandtype == 1){ #地デジ or BS
 		&writelog("digitaltvrecording DEBUG recpt1 --b25  $originalrecch $reclengthsec $outputfile  ");
 		$oserr = system("$toolpath/perl/tool/recpt1 --b25  $originalrecch $reclengthsec $outputfile  ");
+		}else{
+		&writelog("digitaltvrecording :ERROR :Unsupported and type (digital CS).");
+		exit 3;
 		}
 		$oserr = $oserr >> 8;
 			if ($oserr > 0){
@@ -234,6 +194,60 @@
 		system("chmod 775 $toolpath/perl/tool/friiodetect");
 		&writelog("digitaltvrecording :DEBUG make lock file.$toolpath/perl/tool/friiodetect");
 	}
+
+	if ($bandtype == 0){
+	# 地デジ friio
+	}elsif($bandtype == 1){
+	# BS/CS friio
+			#recfriiobs用チャンネルリマップ
+			if ($recch == 101) {
+				$bssplitflag = $recch;
+				$recch = "b10";#22 : NHK BS1/BS2 
+			}elsif($recch == 102){
+				$bssplitflag = $recch;
+				$recch = "b10";#22 : NHK BS1/BS2 
+			}elsif($recch == 103){
+				$recch = "b11";#23 : NHK hi  
+			}elsif($recch == 141){
+				$recch = "b8";# 20 : BS-NTV  
+			}elsif($recch == 151){
+				$recch = "b1";#13 : BS-Asahi 
+			}elsif($recch == 161){
+				$recch = "b2";#14 : BS-i  
+			}elsif($recch == 171){
+				$recch = "b4";#16 : BS-Japan 
+			}elsif($recch == 181){
+				$recch = "b9";#21 : BS-Fuji 
+			}elsif($recch == 191){
+				$recch = "b3";#15 : WOWOW 
+			}elsif($recch == 192){
+				$recch = "b3";#15 : WOWOW 
+			}elsif($recch == 193){
+				$recch = "b3";#15 : WOWOW 
+			}elsif($recch == 211){
+				$recch = "b5";#17 : BS11  
+			}else{
+				$recch = "b7";#19 : TwellV 
+			}
+			# b6 # Star Channel
+
+	}elsif($bandtype == 2){
+	# recpt1でのみ動作確認
+			if ($recch == 333) {
+				$recch = "CS16";#333ch：アニメシアターX(AT-X) 
+			}elsif($recch == 330){
+				$recch = "CS22";#330ch：キッズステーション 
+			}elsif($recch == 332){
+				$recch = "CS20";#332ch：アニマックス 
+			}else{
+				$recch = "CS16";#333ch：アニメシアターX(AT-X) 
+			}
+	}else{
+		&writelog("digitaltvrecording :ERROR :Unsupported and type (digital CS).");
+		exit 3;
+	}
+
+
 		&writelog("digitaltvrecording DEBUG recfriio --b25 --lockfile $toolpath/perl/tool/friiodetect $recch $reclengthsec $outputfile  ");
 		$oserr = system("$toolpath/perl/tool/recfriio --b25 --lockfile $toolpath/perl/tool/friiodetect $recch $reclengthsec $outputfile  ");
 		$oserr = $oserr >> 8;
@@ -241,46 +255,49 @@
 			&writelog("digitaltvrecording :ERROR :friio is BUSY.$oserr");
 			exit 2;
 			}
+
+		#BS1/BS2などのスプリットを
+		if ($bssplitflag == 101){
+			if (-e "$toolpath/perl/tool/TsSplitter.exe"){
+			# BS1		
+			system("wine $toolpath/perl/tool/TsSplitter.exe  -EIT -ECM  -EMM  -OUT \"$outputpath\" -HD  -SD2 -SD3 -1SEG  -LOGFILE -WAIT2 $outputfile");
+			$splitfile = $outputfile;
+			$splitfile =~ s/\.m2t$/_SD1.m2t/;
+				if (-e "$splitfile"){
+				system("rm -rf $outputfile ; mv $splitfile $outputfile");
+				&writelog("digitaltvrecording DEBUG rm -rf $outputfile ; mv $splitfile $outputfile: $?.");
+				}else{
+				&writelog("digitaltvrecording ERROR File not found:$splitfile.");
+				}
+			}else{
+			&writelog("digitaltvrecording ERROR $toolpath/perl/tool/TsSplitter.exe not found.");
+			}
+		}elsif($bssplitflag == 102){
+			if (-e "$toolpath/perl/tool/TsSplitter.exe"){
+			# BS2		
+			system("wine $toolpath/perl/tool/TsSplitter.exe  -EIT -ECM  -EMM  -OUT \"$outputpath\" -HD  -SD1 -SD3 -1SEG  -LOGFILE -WAIT2 $outputfile");
+			$splitfile = $outputfile;
+			$splitfile =~ s/\.m2t$/_SD2.m2t/;
+				if (-e "$splitfile"){
+				system("rm -rf $outputfile ; mv $splitfile $outputfile");
+				&writelog("digitaltvrecording DEBUG rm -rf $outputfile ; mv $splitfile $outputfile: $?.");
+				}else{
+				&writelog("digitaltvrecording ERROR File not found:$splitfile.");
+				}
+			}else{
+			&writelog("digitaltvrecording ERROR $toolpath/perl/tool/TsSplitter.exe not found.");
+			}
+		}else{
+			&writelog("digitaltvrecording DEBUG not split TS.$bssplitflag");
+		}# endif #BS1/BS2などのスプリットを
+
+
 	}else{ # エラー recfriioがありません
 		&writelog("digitaltvrecording :ERROR :recfriio  not found. You must install $toolpath/perl/tool/b25 and $toolpath/perl/tool/recfriio.");
 	exit 1;
 	}
 }#end if errorflag
 
-#BS1/BS2などのスプリットを
-if ($bssplitflag == 101){
-	if (-e "$toolpath/perl/tool/TsSplitter.exe"){
-	# BS1		
-	system("wine $toolpath/perl/tool/TsSplitter.exe  -EIT -ECM  -EMM  -OUT \"$outputpath\" -HD  -SD2 -SD3 -1SEG  -LOGFILE -WAIT2 $outputfile");
-	$splitfile = $outputfile;
-	$splitfile =~ s/\.m2t$/_SD1.m2t/;
-		if (-e "$splitfile"){
-		system("rm -rf $outputfile ; mv $splitfile $outputfile");
-		&writelog("digitaltvrecording DEBUG rm -rf $outputfile ; mv $splitfile $outputfile: $?.");
-		}else{
-		&writelog("digitaltvrecording ERROR File not found:$splitfile.");
-		}
-	}else{
-	&writelog("digitaltvrecording ERROR $toolpath/perl/tool/TsSplitter.exe not found.");
-	}
-}elsif($bssplitflag == 102){
-	if (-e "$toolpath/perl/tool/TsSplitter.exe"){
-	# BS2		
-	system("wine $toolpath/perl/tool/TsSplitter.exe  -EIT -ECM  -EMM  -OUT \"$outputpath\" -HD  -SD1 -SD3 -1SEG  -LOGFILE -WAIT2 $outputfile");
-	$splitfile = $outputfile;
-	$splitfile =~ s/\.m2t$/_SD2.m2t/;
-		if (-e "$splitfile"){
-		system("rm -rf $outputfile ; mv $splitfile $outputfile");
-		&writelog("digitaltvrecording DEBUG rm -rf $outputfile ; mv $splitfile $outputfile: $?.");
-		}else{
-		&writelog("digitaltvrecording ERROR File not found:$splitfile.");
-		}
-	}else{
-	&writelog("digitaltvrecording ERROR $toolpath/perl/tool/TsSplitter.exe not found.");
-	}
-}else{
-	&writelog("digitaltvrecording DEBUG not split TS.$bssplitflag");
-}# endif #BS1/BS2などのスプリットを
 
 }#end calldigitalrecorder