チェンジセット 97: trunk

コミット日時:

2010/04/02 22:58:58 (14 年前)

コミッタ:

sorshi

ログメッセージ:

radiko録音対応

ファイル:

• trunk/install/perl/db/Pg.pl (更新) (1 diff)
• trunk/install/perl/deletemovie.pl (更新) (1 diff)
• trunk/install/perl/ipodtranscode.pl (更新) (4 diffs)
• trunk/install/perl/recwrap.pl (更新) (5 diffs)
• trunk/install/perl/updatem2pfiletable.pl (更新) (2 diffs)
• trunk/install/php/deletemovie.php (更新) (4 diffs)
• trunk/install/php/m.php (更新) (2 diffs)

trunk/install/perl/db/Pg.pl

@@ -54 +54 @@
-'recwrap.6' => "INSERT into foltia_mp4files VALUES (?, ?)",
-'recwrap.7' => "SELECT foltia_subtitle.tid,foltia_subtitle.countno,foltia_subtitle.subtitle,foltia_subtitle.startdatetime ,foltia_subtitle.enddatetime ,foltia_subtitle.lengthmin ,foltia_tvrecord.bitrate , foltia_subtitle.startoffset , foltia_subtitle.pid ,foltia_tvrecord.digital FROM foltia_subtitle ,foltia_tvrecord WHERE foltia_tvrecord.tid = foltia_subtitle.tid AND foltia_tvrecord.tid = ? AND foltia_subtitle.startdatetime = ? AND foltia_tvrecord.digital = 1",
+'recwrap.8' => "SELECT stationid,stationname,stationrecch,tunertype FROM foltia_station WHERE stationid = ? ",
-
-'schedulecheck.1' => "SELECT count(*) FROM foltia_tvrecord",

trunk/install/perl/deletemovie.pl

@@ -32 +32 @@
-
-#ファイル名正当性チェック
-
+|.aac$
-
-}else{

trunk/install/perl/ipodtranscode.pl

@@ -134 +134 @@
-}
-
-
-$filenamebody = $inputmpeg2 ;
-
+|.aac$
-
-#デジタルかアナログか
-
-
-
+
-
-if ($filestatus <= $FILESTATUSTRANSCODETSSPLITTING){
@@ -237 +234 @@
-}
-if ($filestatus <= $FILESTATUSTRANSCODEMP4BOX){
+
+unlink("${filenamebody}.base.mp4");
+
+#デジタルラジオなら
+if ($inputmpeg2 =~ /aac$/i){
+        if (-e "$toolpath/perl/tool/MP4Box"){
+                &writelog("ipodtranscode MP4Box $filenamebody");
+                system ("cd $recfolderpath ;$toolpath/perl/tool/MP4Box -add $filenamebody.aac  -new $filenamebody.base.mp4");
+        $exit_value = $? >> 8;
+        $signal_num = $? & 127;
+        $dumped_core = $? & 128;
+        &writelog("ipodtranscode DEBUG MP4Box -add $filenamebody.aac  -new $filenamebody.base.mp4:$exit_value:$signal_num:$dumped_core");
+        }else{
+                &writelog("ipodtranscode WARN; Pls. install $toolpath/perl/tool/MP4Box");
+        }
+}else{
-        # MP4ビルド
-        unlink("${filenamebody}.base.mp4");
-        if (-e "$toolpath/perl/tool/MP4Box"){
-                &changefilestatus($pid,$FILESTATUSTRANSCODEMP4BOX);
-                &writelog("ipodtranscode MP4Box $filenamebody");
-
-
+
-        $exit_value = $? >> 8;
-        $signal_num = $? & 127;
-        $dumped_core = $? & 128;
-        &writelog("ipodtranscode DEBUG MP4Box -fps 29.97 -add $filenamebody.264 -new $filenamebody.base.mp4:$exit_value:$signal_num:$dumped_core");
-
-        
-                if (-e "$filenamebody.base.mp4"){
-#               system ("cd $recfolderpath ; MP4Box -add $filenamebody.aac $filenamebody.base.mp4");
-                system ("cd $recfolderpath ;$toolpath/perl/tool/MP4Box -add $filenamebody.aac $filenamebody.base.mp4");
-        $exit_value = $? >> 8;
@@ -265 +273 @@
-                &writelog("ipodtranscode WARN; Pls. install $toolpath/perl/tool/MP4Box");
-        }
+unlink("$filenamebody.aac");
+}#endif #デジタルラジオなら
+        
-#}
-
@@ -299 +310 @@
-        unlink("$filenamebody.264");
-        unlink("$filenamebody.wav");
-        unlink("$filenamebody.aac");
-        unlink("$filenamebody.base.mp4");
-        

trunk/install/perl/recwrap.pl

@@ -54 +54 @@
-}else{
-        $extension = ".m2p";#MPEG2の拡張子
+}
+if ($recch == -2 ){ #ラジオ局
+        $extension = ".aac";#MPEG2の拡張子
-}
-
@@ -71 +74 @@
-        }
-}
+
+if ($recch == -2 ){ #ラジオ局
+# stationIDからradiko識別子を取得
+$sth = $dbh->prepare($stmt{'recwrap.8'});
+$sth->execute($stationid);
+ @stationline= $sth->fetchrow_array;
+$radikostationname = $stationline[3];
+
+$oserr = system("$toolpath/perl/digitalradiorecording.pl $radikostationname $reclength $outputfilename");
+$oserr = $oserr / 256;
+&writelog("recwrap DEBUG radiko rec finished. $oserr");
+
+# aacファイル名をfoltia_subtitlePIDレコードに書き込み
+$sth = $dbh->prepare($stmt{'recwrap.1'});
+$sth->execute($outputfilename, $pid);
+&writelog("recwrap DEBUG UPDATEDB $stmt{'recwrap.1'}");
+&changefilestatus($pid,$FILESTATUSTRANSCODEMP4BOX);
+
+# aacファイル名をfoltia_m2pfilesPIDレコードに書き込み
+$sth = $dbh->prepare($stmt{'recwrap.2'});
+$sth->execute($outputfilename);
+&writelog("recwrap DEBUG UPDATEDB $stmt{'recwrap.2'}");
+
+
+}else{#非ラジオ局なら
-
-if ($usedigital == 1){
@@ -96 +124 @@
-exit ;
-}
-
+ # NOT $usedigital == 1
-#リモコン操作
-# $haveirdaunit = 1;リモコンつないでるかどうか確認
@@ -176 +204 @@
-&changefilestatus($pid,$FILESTATUSCAPEND);
-}
-
+
-
-# MPEG4 ------------------------------------------------------
@@ -184 +212 @@
- @psptrcn= $sth->fetchrow_array;
-if ($psptrcn[0]  == 1 ){#トラコン番組
-
-
-
+       
+       
+       
-}#PSPトラコンあり
-

trunk/install/perl/updatem2pfiletable.pl

@@ -31 +31 @@
-$sth = $dbh->prepare($stmt{'updatem2pfiletable.1'});
-        $sth->execute();
-
-while ($file = glob("$recfolderpath/*.m2?")) {
-$file =~ s/$recfolderpath\///;
@@ -38 +37 @@
-# print "$file\n";
-}#while
+while ($file = glob("$recfolderpath/*.aac")) {
+$file =~ s/$recfolderpath\///;
+    $sth = $dbh->prepare($stmt{'updatem2pfiletable.2'});
+    $sth->execute($file);
+# print "$file\n";
+}#while
+
-$oserr = $dbh->commit;
-

trunk/install/php/deletemovie.php

@@ -82 +82 @@
-                $filesplit = split("-",$fName);
-        
+/*
-if ($filesplit[1] == ""){
-$query = "
@@ -90 +91 @@
- AND foltia_subtitle.tid = ? 
-";
-//$rs = m_query($con, $query, "DBクエリに失敗しました");
-$rs = sql_query($con, $query, "DBクエリに失敗しました",array($filesplit[0]));
-                                $rall = $rs->fetchAll();
-
-//print" $fName./$rowdata[1]//$rowdata[2]<BR>\n"
+//
+                               $rowdata = $rall[0]
-$title = $rowdata[1];
-$subtitle = "";
-$count = "";
-
+
+
-
-$query = "
-
-
-
-
-
-
+
+
+
+
-";
+
-//$rs = m_query($con, $query, "DBクエリに失敗しました");
-
+
+
-                                $rall = $rs->fetchAll();
-
+
+
-//print" $fName./$rowdata[1]/$rowdata[2]/$rowdata[3]<BR>\n";
-$title = $rowdata[1];
@@ -117 +119 @@
-$subtitle = $rowdata[3];
-
-
+//
-
-$tid = htmlspecialchars($rowdata[0]);
@@ -127 +129 @@
-<tr>
-<td>$fName<br></td>
-
+
+
+
+
+
+
+
+
+
-<td>$count<br></td>
-<td>$subtitle<br></td>

trunk/install/php/m.php

@@ -239 +239 @@
-FROM  foltia_station 
-WHERE digitalch > 0 
+UNION
+SELECT DISTINCT  stationid,stationname,stationrecch ,digitalch 
+FROM  foltia_station 
+WHERE stationrecch = -2 
-ORDER BY x ASC";
-
@@ -248 +252 @@
-                        if ($recstid == $rowdata[0]){
-                        print " <input name=\"recstid\" type=\"radio\" value=\"$rowdata[0]\" checked />  $rowdata[1] ($rowdata[2]ch / $rowdata[3]ch)　\n";
+                        }elseif( $rowdata[2] == -2){
+                        print " <input name=\"recstid\" type=\"radio\" value=\"$rowdata[0]\" checked />  $rowdata[1] (<!-- $rowdata[2]ch / $rowdata[3]ch -->RADIKO)　\n";
-                        }else{
-                                print " <input name=\"recstid\" type=\"radio\" value=\"$rowdata[0]\" />  $rowdata[1] ($rowdata[2]ch / $rowdata[3]ch)　\n";