Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff -ur RecTask_0.1.4_Src/BonTsEngine/BufferedFileWriter.cpp RecTask/BonTsEngine/BufferedFileWriter.cpp
- --- RecTask_0.1.4_Src/BonTsEngine/BufferedFileWriter.cpp 2011-09-22 21:28:44 +0900
- +++ RecTask/BonTsEngine/BufferedFileWriter.cpp 2012-06-22 01:13:14 +0900
- @@ -96,6 +96,7 @@
- // 一旦閉じる
- CloseFile();
- + ClearQueue();
- m_WriteSize = 0;
- m_WriteCount = 0;
- diff -ur RecTask_0.1.4_Src/BonTsEngine/TsSelector.h RecTask/BonTsEngine/TsSelector.h
- --- RecTask_0.1.4_Src/BonTsEngine/TsSelector.h 2011-09-22 21:28:44 +0900
- +++ RecTask/BonTsEngine/TsSelector.h 2012-06-22 01:13:14 +0900
- @@ -26,7 +26,7 @@
- STREAM_DATACARROUSEL = 0x00000008UL,
- STREAM_AAC = 0x00000010UL,
- STREAM_H264 = 0x00000020UL,
- - STREAM_ALL = 0xFFFFFFFFUL
- + STREAM_ALL = 0x0000FFFFUL
- };
- bool SetTargetServiceID(WORD ServiceID=0, DWORD Stream=STREAM_ALL);
- WORD GetTargetServiceID() const { return m_TargetServiceID; }
- diff -ur RecTask_0.1.4_Src/Common/BasicMessage.cpp RecTask/Common/BasicMessage.cpp
- --- RecTask_0.1.4_Src/Common/BasicMessage.cpp 2011-09-24 22:56:00 +0900
- +++ RecTask/Common/BasicMessage.cpp 2012-06-22 01:13:14 +0900
- @@ -500,6 +500,7 @@
- ((ULONGLONG)Info.StartTime.dwHighDateTime<<32) | (ULONGLONG)Info.StartTime.dwLowDateTime);
- pMessage->SetPropertyInt(MESSAGE_PROPERTY_StartTickCount,
- Info.StartTickCount);
- + pMessage->SetProperty(MESSAGE_PROPERTY_FilePath,Info.FilePaths.front());
- }
- return true;
- @@ -538,6 +539,9 @@
- else
- pInfo->StartTickCount=0;
- + String FilePath;
- + if (pMessage->GetProperty(MESSAGE_PROPERTY_FilePath,&FilePath))
- + pInfo->FilePaths.push_back(FilePath);
- return true;
- }
- diff -ur RecTask_0.1.4_Src/RecTask/RecTask.cpp RecTask/RecTask/RecTask.cpp
- --- RecTask_0.1.4_Src/RecTask/RecTask.cpp 2011-09-27 20:17:54 +0900
- +++ RecTask/RecTask/RecTask.cpp 2012-06-22 01:13:14 +0900
- @@ -131,6 +131,24 @@
- m_Core.EnableEMMProcess(m_CurSettings.General.GetEMMProcess());
- m_Core.SetDescramble(m_CurSettings.General.GetDescrambleType());
- + if (!m_CommandLine.m_BonDriverFileName.empty()) {
- + OutLog(LOG_VERBOSE,L"コマンドラインで指定された BonDriver \"%s\" をロードします。",
- + m_CommandLine.m_BonDriverFileName.c_str());
- +
- + String BonDriverPath;
- +
- + if (PathUtility::IsRelative(m_CommandLine.m_BonDriverFileName)) {
- + String Dir;
- + if (!m_CurSettings.BonDriver.GetLoadDirectoryAbsolute(&Dir)
- + || !PathUtility::RelativeToAbsolute(&BonDriverPath,Dir,m_CommandLine.m_BonDriverFileName))
- + BonDriverPath=m_CommandLine.m_BonDriverFileName;
- + } else {
- + BonDriverPath=m_CommandLine.m_BonDriverFileName;
- + }
- + if (m_Core.LoadBonDriver(BonDriverPath.c_str()))
- + m_Core.OpenTuner();
- + }
- +
- m_RecTaskWindow.Initialize(m_hInstance);
- if (!m_TaskIdentity.Initialize(TASK_TYPE_SERVER,m_CurSettings.General.GetTaskID())) {
- @@ -204,83 +222,66 @@
- OpenCasCard();
- }
- - if (!m_CommandLine.m_BonDriverFileName.empty()) {
- - OutLog(LOG_VERBOSE,L"コマンドラインで指定された BonDriver \"%s\" をロードします。",
- - m_CommandLine.m_BonDriverFileName.c_str());
- -
- - String BonDriverPath;
- + //BonDriver_PT-T.dll は OpenTuner() ~ SetChannel() が早すぎると選局失敗する(SDKのバグ?)
- + if (m_Core.IsTunerOpened()) {
- + if (m_CommandLine.m_Channel>=0) {
- + m_Core.SetChannelByIndex(m_CommandLine.m_TuningSpace>=0?m_CommandLine.m_TuningSpace:0,
- + m_CommandLine.m_Channel,
- + m_CommandLine.m_ServiceID);
- + } else if (m_CommandLine.m_TuningSpace>=0) {
- + if (m_CommandLine.m_RemoteControlKeyID!=0
- + || m_CommandLine.m_NetworkID!=0
- + || m_CommandLine.m_TransportStreamID!=0
- + || m_CommandLine.m_ServiceID!=0) {
- + CChannelList ChannelList;
- - if (PathUtility::IsRelative(m_CommandLine.m_BonDriverFileName)) {
- - String Dir;
- - if (!m_CurSettings.BonDriver.GetLoadDirectoryAbsolute(&Dir)
- - || !PathUtility::RelativeToAbsolute(&BonDriverPath,Dir,m_CommandLine.m_BonDriverFileName))
- - BonDriverPath=m_CommandLine.m_BonDriverFileName;
- - } else {
- - BonDriverPath=m_CommandLine.m_BonDriverFileName;
- - }
- + if (m_Core.GetScannedChannelList(m_CommandLine.m_TuningSpace,&ChannelList)) {
- + int Channel;
- - if (m_Core.LoadBonDriver(BonDriverPath.c_str())) {
- - if (m_Core.OpenTuner()) {
- - if (m_CommandLine.m_Channel>=0) {
- - m_Core.SetChannelByIndex(m_CommandLine.m_TuningSpace>=0?m_CommandLine.m_TuningSpace:0,
- - m_CommandLine.m_Channel,
- - m_CommandLine.m_ServiceID);
- - } else if (m_CommandLine.m_TuningSpace>=0) {
- - if (m_CommandLine.m_RemoteControlKeyID!=0
- - || m_CommandLine.m_NetworkID!=0
- - || m_CommandLine.m_TransportStreamID!=0
- - || m_CommandLine.m_ServiceID!=0) {
- - CChannelList ChannelList;
- -
- - if (m_Core.GetScannedChannelList(m_CommandLine.m_TuningSpace,&ChannelList)) {
- - int Channel;
- -
- - if (m_CommandLine.m_RemoteControlKeyID!=0) {
- - Channel=ChannelList.FindRemoteControlKeyID(m_CommandLine.m_RemoteControlKeyID);
- - } else {
- - Channel=ChannelList.FindByIDs(m_CommandLine.m_NetworkID,
- - m_CommandLine.m_TransportStreamID,
- - m_CommandLine.m_ServiceID);
- - }
- - if (Channel>=0) {
- - m_Core.SetChannelByScanned(m_CommandLine.m_TuningSpace,Channel);
- - } else {
- - OutLog(LOG_ERROR,L"コマンドラインでの指定に一致するチャンネルがありません。");
- - }
- - } else {
- - OutLog(LOG_ERROR,L"コマンドラインで指定されたチューニング空間(%d)のチャンネルがありません。",
- - m_CommandLine.m_TuningSpace);
- - }
- + if (m_CommandLine.m_RemoteControlKeyID!=0) {
- + Channel=ChannelList.FindRemoteControlKeyID(m_CommandLine.m_RemoteControlKeyID);
- } else {
- - OutLog(LOG_ERROR,L"コマンドラインでチューニング空間のみの指定はできません。");
- - }
- - } else if (m_CommandLine.m_NetworkID!=0
- - || m_CommandLine.m_TransportStreamID!=0
- - || m_CommandLine.m_ServiceID!=0) {
- - m_Core.SetChannelByIDs(m_CommandLine.m_NetworkID,
- - m_CommandLine.m_TransportStreamID,
- - m_CommandLine.m_ServiceID);
- - } else if (m_CommandLine.m_RemoteControlKeyID!=0) {
- - CChannelList ChannelList;
- - bool fFound=false;
- -
- - for (int i=0;m_Core.GetScannedChannelList(i,&ChannelList);i++) {
- - int Channel=ChannelList.FindRemoteControlKeyID(m_CommandLine.m_RemoteControlKeyID);
- - if (Channel>=0) {
- - m_Core.SetChannelByScanned(m_CommandLine.m_TuningSpace,Channel);
- - fFound=true;
- - break;
- - }
- + Channel=ChannelList.FindByIDs(m_CommandLine.m_NetworkID,
- + m_CommandLine.m_TransportStreamID,
- + m_CommandLine.m_ServiceID);
- }
- - if (!fFound) {
- - OutLog(LOG_ERROR,L"コマンドラインで指定されたリモコン番号(%d)のチャンネルがありません。",
- - m_CommandLine.m_RemoteControlKeyID);
- + if (Channel>=0) {
- + m_Core.SetChannelByScanned(m_CommandLine.m_TuningSpace,Channel);
- + } else {
- + OutLog(LOG_ERROR,L"コマンドラインでの指定に一致するチャンネルがありません。");
- }
- + } else {
- + OutLog(LOG_ERROR,L"コマンドラインで指定されたチューニング空間(%d)のチャンネルがありません。",
- + m_CommandLine.m_TuningSpace);
- }
- } else {
- - //m_Core.UnloadBonDriver();
- + OutLog(LOG_ERROR,L"コマンドラインでチューニング空間のみの指定はできません。");
- + }
- + } else if (m_CommandLine.m_NetworkID!=0
- + || m_CommandLine.m_TransportStreamID!=0
- + || m_CommandLine.m_ServiceID!=0) {
- + m_Core.SetChannelByIDs(m_CommandLine.m_NetworkID,
- + m_CommandLine.m_TransportStreamID,
- + m_CommandLine.m_ServiceID);
- + } else if (m_CommandLine.m_RemoteControlKeyID!=0) {
- + CChannelList ChannelList;
- + bool fFound=false;
- +
- + for (int i=0;m_Core.GetScannedChannelList(i,&ChannelList);i++) {
- + int Channel=ChannelList.FindRemoteControlKeyID(m_CommandLine.m_RemoteControlKeyID);
- + if (Channel>=0) {
- + m_Core.SetChannelByScanned(m_CommandLine.m_TuningSpace,Channel);
- + fFound=true;
- + break;
- + }
- + }
- + if (!fFound) {
- + OutLog(LOG_ERROR,L"コマンドラインで指定されたリモコン番号(%d)のチャンネルがありません。",
- + m_CommandLine.m_RemoteControlKeyID);
- }
- }
- + } else {
- + //m_Core.UnloadBonDriver();
- }
- if (m_CommandLine.m_fRecord) {
- diff -ur RecTask_0.1.4_Src/RecTask/RecTaskCore.cpp RecTask/RecTask/RecTaskCore.cpp
- --- RecTask_0.1.4_Src/RecTask/RecTaskCore.cpp 2011-09-27 20:56:34 +0900
- +++ RecTask/RecTask/RecTaskCore.cpp 2012-06-22 01:13:14 +0900
- @@ -1424,11 +1424,7 @@
- if ((Info.Streams & STREAM_1SEG)!=0) {
- OutLog(LOG_VERBOSE,L"ワンセグサービスを送信対象に設定します。");
- m_DtvEngine.SetSendCurServiceOnly(false, Info.Streams & STREAM_ALL);
- - if (!m_DtvEngine.SetSendStream(::CDtvEngine::SID_1SEG,Info.Streams & STREAM_ALL)) {
- - OutLog(LOG_ERROR,L"ワンセグサービスを選択できません。");
- - m_StreamingMutex.Close();
- - return false;
- - }
- + m_DtvEngine.SetSendStream(::CDtvEngine::SID_1SEG,Info.Streams & STREAM_ALL);
- } else {
- OutLog(LOG_VERBOSE,L"%sサービスを送信対象に設定します。",
- fCurServiceOnly?L"指定":L"全ての");
- diff -ur RecTask_0.1.4_Src/RecTaskCentre/RecTaskCentreCore.cpp RecTask/RecTaskCentre/RecTaskCentreCore.cpp
- --- RecTask_0.1.4_Src/RecTaskCentre/RecTaskCentreCore.cpp 2011-09-27 22:37:40 +0900
- +++ RecTask/RecTaskCentre/RecTaskCentreCore.cpp 2012-06-22 01:13:14 +0900
- @@ -223,7 +223,8 @@
- bool GetRecordingInfo()
- {
- if (m_RecordingInfoStatus==INFO_STATUS_NOT_READY) {
- - if (m_Core.GetRecTaskManager().GetRecordingInfo(m_TaskID,&m_RecordingInfo))
- + m_Core.GetRecTaskManager().GetRecordingInfo(m_TaskID,&m_RecordingInfo);
- + if (m_RecordingInfo.State)
- m_RecordingInfoStatus=INFO_STATUS_SUCCEEDED;
- else
- m_RecordingInfoStatus=INFO_STATUS_FAILED;
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement