TvTest a7823822fc orig to unko diff

diff -crN ./src_orig\AppCore.cpp ./src_unko\AppCore.cpp
*** ./src_orig\AppCore.cpp  Sat Nov 22 04:36:26 2014
--- ./src_unko\AppCore.cpp  Sun Nov 30 08:25:54 2014
***************
*** 823,829 ****
        m_App.CoreEngine.CloseTuner();
    }

!   if (m_App.CoreEngine.IsCasCardOpen()) {
        LPCTSTR pszOldDriver=m_App.CoreEngine.GetDriverFileName();
        if (m_App.DriverOptions.IsNoDescramble(pszFileName)
                || m_App.CasLibraryManager.GetCasDeviceNameByTunerName(pszFileName)!=
--- 823,829 ----
        m_App.CoreEngine.CloseTuner();
    }

!   if (m_App.CoreEngine.IsCasCardOpen() || m_App.CoreEngine.IsDriverCardReader()) {
        LPCTSTR pszOldDriver=m_App.CoreEngine.GetDriverFileName();
        if (m_App.DriverOptions.IsNoDescramble(pszFileName)
                || m_App.CasLibraryManager.GetCasDeviceNameByTunerName(pszFileName)!=
diff -crN ./src_orig\BonTsEngine\CasProcessor.cpp ./src_unko\BonTsEngine\CasProcessor.cpp
*** ./src_orig\BonTsEngine\CasProcessor.cpp Sat Nov 22 04:36:26 2014
--- ./src_unko\BonTsEngine\CasProcessor.cpp Sat Sep 22 17:34:04 2012
***************
*** 2,16 ****
  //
  //////////////////////////////////////////////////////////////////////

- /*
-   このクラスはstubです
-   CAS処理は実装されていません
- */
-
  #include "stdafx.h"
  #include "Common.h"
  #include "CasProcessor.h"
  #include "TsStream.h"

  #ifdef _DEBUG
  #undef THIS_FILE
--- 2,12 ----
  //
  //////////////////////////////////////////////////////////////////////

  #include "stdafx.h"
  #include "Common.h"
  #include "CasProcessor.h"
  #include "TsStream.h"
+ #include "StdUtil.h"

  #ifdef _DEBUG
  #undef THIS_FILE
***************
*** 25,30 ****
--- 21,33 ----

  CCasProcessor::CCasProcessor(IEventHandler *pEventHandler)
    : CMediaDecoder(pEventHandler, 1UL, 1UL)
+   , m_hCasLib(NULL)
+   , m_pCasManager(NULL)
+
+   , m_bEnableDescramble(true)
+   , m_bEnableContract(false)
+   , m_Instruction(0)
+
    , m_InputPacketCount(0)
    , m_ScramblePacketCount(0)
  {
***************
*** 39,44 ****
--- 42,50 ----
  {
    CBlockLock Lock(&m_DecoderLock);

+   if (m_pCasManager != NULL)
+       m_pCasManager->Reset();
+
    m_InputPacketCount = 0;
    m_ScramblePacketCount = 0;
  }
***************
*** 51,58 ****

    CTsPacket *pPacket = static_cast<CTsPacket *>(pMediaData);

!   if (pPacket->IsScrambled())
!       m_ScramblePacketCount++;

    // パケットを下流デコーダにデータを渡す
    OutputMedia(pMediaData);
--- 57,69 ----

    CTsPacket *pPacket = static_cast<CTsPacket *>(pMediaData);

!   if (m_pCasManager != NULL) {
!       m_pCasManager->ProcessPacket(pPacket->GetData(), pPacket->GetSize());
!       pPacket->m_Header.byTransportScramblingCtrl = pPacket->GetAt(3) >> 6;
!   } else {
!       if (pPacket->IsScrambled() && m_bEnableDescramble)
!           m_ScramblePacketCount++;
!   }

    // パケットを下流デコーダにデータを渡す
    OutputMedia(pMediaData);
***************
*** 62,173 ****

  bool CCasProcessor::LoadCasLibrary(LPCTSTR pszFileName)
  {
!   SetError(TEXT("Unimplemented"));

!   return false;
  }

  bool CCasProcessor::FreeCasLibrary()
  {
    return true;
  }

  bool CCasProcessor::IsCasLibraryLoaded() const
  {
!   return false;
  }

  bool CCasProcessor::GetCasModuleInfo(CasModuleInfo *pInfo) const
  {
!   return false;
  }

  bool CCasProcessor::EnableDescramble(bool bEnable)
  {
!   return false;
  }

  bool CCasProcessor::EnableContract(bool bEnable)
  {
!   return false;
  }

  int CCasProcessor::GetCasDeviceCount() const
  {
!   return 0;
  }

  bool CCasProcessor::GetCasDeviceInfo(int Device, CasDeviceInfo *pInfo) const
  {
!   return false;
  }

  bool CCasProcessor::GetCasDeviceCardList(int Device, StringList *pList)
  {
!   return false;
  }

  bool CCasProcessor::IsCasDeviceAvailable(int Device)
  {
!   return false;
  }

  bool CCasProcessor::CheckCasDeviceAvailability(int Device, bool *pbAvailable, LPWSTR pszMessage, int MaxLength)
  {
    if (pszMessage == NULL || MaxLength < 1)
        return false;
!   pszMessage[0] = L'\0';
!   return false;
  }

  int CCasProcessor::GetDefaultCasDevice()
  {
!   return -1;
  }

  int CCasProcessor::GetCasDeviceByID(DWORD DeviceID) const
  {
!   return -1;
  }

  int CCasProcessor::GetCasDeviceByName(LPCWSTR pszName) const
  {
!   return -1;
  }

  bool CCasProcessor::OpenCasCard(int Device, LPCWSTR pszName)
  {
!   return false;
  }

  bool CCasProcessor::CloseCasCard()
  {
!   return false;
  }

  bool CCasProcessor::IsCasCardOpen() const
  {
!   return false;
  }

  int CCasProcessor::GetCasDevice() const
  {
!   return -1;
  }

  int CCasProcessor::GetCasCardName(LPWSTR pszName, int MaxName) const
  {
!   return 0;
  }

  bool CCasProcessor::GetCasCardInfo(CasCardInfo *pInfo) const
  {
!   return false;
  }

  bool CCasProcessor::SendCasCommand(const void *pSendData, DWORD SendSize, void *pRecvData, DWORD *pRecvSize)
  {
!   return false;
  }

  ULONGLONG CCasProcessor::GetInputPacketCount() const
--- 73,355 ----

  bool CCasProcessor::LoadCasLibrary(LPCTSTR pszFileName)
  {
!   if (pszFileName == NULL || pszFileName[0] == '\0') {
!       SetError(TEXT("CASライブラリのファイル名が指定されていません。"));
!       return false;
!   }
!
!   CBlockLock Lock(&m_DecoderLock);
!
!   FreeCasLibrary();
!
!   m_hCasLib = ::LoadLibrary(pszFileName);
!   if (m_hCasLib == NULL) {
!       const DWORD ErrorCode = ::GetLastError();
!       TCHAR szText[MAX_PATH + 32];
!       StdUtil::snprintf(szText, _countof(szText),
!           TEXT("CASライブラリ \"%s\" をロードできません。"), pszFileName);
!       SetError(szText);
!       switch (ErrorCode) {
!       case ERROR_MOD_NOT_FOUND:
!           SetErrorAdvise(TEXT("ファイルが見つかりません。"));
!           break;
!       case ERROR_BAD_EXE_FORMAT:
!           SetErrorAdvise(
! #ifndef _WIN64
!               TEXT("32")
! #else
!               TEXT("64")
! #endif
!               TEXT("ビット用のDLLではないか、ファイルが破損している可能性があります。"));
!           break;
!       default:
!           StdUtil::snprintf(szText, _countof(szText), TEXT("エラーコード: 0x%x"), ErrorCode);
!           SetErrorAdvise(szText);
!       }
!       return false;
!   }
!
!   TVCAS::GetModuleInfoFunc pGetModuleInfo = TVCAS::Helper::Module::GetModuleInfo(m_hCasLib);
!   if (pGetModuleInfo == NULL
!           || !pGetModuleInfo(&m_CasModuleInfo)
!           || m_CasModuleInfo.LibVersion != TVCAS::LIB_VERSION) {
!       FreeCasLibrary();
!       SetError(
!           pGetModuleInfo == NULL ?
!           TEXT("指定されたDLLがCASライブラリではありません。") :
!           TEXT("CASライブラリのバージョンが非対応です。"));
!       return false;
!   }
!
!   TVCAS::CreateInstanceFunc pCreateInstance = TVCAS::Helper::Module::CreateInstance(m_hCasLib);
!   if (pCreateInstance == NULL) {
!       FreeCasLibrary();
!       SetError(TEXT("CASライブラリから必要な関数を取得できません。"));
!       return false;
!   }
!
!   m_pCasManager = static_cast<TVCAS::ICasManager *>(pCreateInstance(__uuidof(TVCAS::ICasManager)));
!   if (m_pCasManager == NULL) {
!       FreeCasLibrary();
!       SetError(TEXT("CASマネージャのインスタンスを作成できません。"));
!       return false;
!   }
!
!   if (!m_pCasManager->Initialize(this)) {
!       FreeCasLibrary();
!       SetError(TEXT("CASマネージャの初期化ができません。"));
!       return false;
!   }
!
!   m_pCasManager->EnableDescramble(m_bEnableDescramble);
!   m_pCasManager->EnableContract(m_bEnableContract);
!   m_pCasManager->SetInstruction(m_Instruction & m_pCasManager->GetAvailableInstructions());

!   ClearError();
!
!   return true;
  }

  bool CCasProcessor::FreeCasLibrary()
  {
+   CBlockLock Lock(&m_DecoderLock);
+
+   if (m_pCasManager != NULL) {
+       m_pCasManager->Release();
+       m_pCasManager = NULL;
+   }
+
+   if (m_hCasLib != NULL) {
+       ::FreeLibrary(m_hCasLib);
+       m_hCasLib = NULL;
+   }
+
    return true;
  }

  bool CCasProcessor::IsCasLibraryLoaded() const
  {
!   return m_hCasLib != NULL;
  }

  bool CCasProcessor::GetCasModuleInfo(CasModuleInfo *pInfo) const
  {
!   if (m_pCasManager == NULL || pInfo == NULL)
!       return false;
!
!   *pInfo = m_CasModuleInfo;
!
!   return true;
  }

  bool CCasProcessor::EnableDescramble(bool bEnable)
  {
!   CBlockLock Lock(&m_DecoderLock);
!
!   if (m_pCasManager != NULL) {
!       if (!m_pCasManager->EnableDescramble(bEnable))
!           return false;
!   }
!
!   m_bEnableDescramble = bEnable;
!
!   return true;
  }

  bool CCasProcessor::EnableContract(bool bEnable)
  {
!   CBlockLock Lock(&m_DecoderLock);
!
!   if (m_pCasManager != NULL) {
!       if (!m_pCasManager->EnableContract(bEnable))
!           return false;
!   }
!
!   m_bEnableContract = bEnable;
!
!   return true;
  }

  int CCasProcessor::GetCasDeviceCount() const
  {
!   if (m_pCasManager == NULL)
!       return 0;
!
!   return m_pCasManager->GetCasDeviceCount();
  }

  bool CCasProcessor::GetCasDeviceInfo(int Device, CasDeviceInfo *pInfo) const
  {
!   if (m_pCasManager == NULL)
!       return false;
!
!   return m_pCasManager->GetCasDeviceInfo(Device, pInfo);
  }

  bool CCasProcessor::GetCasDeviceCardList(int Device, StringList *pList)
  {
!   if (m_pCasManager == NULL || pList == NULL)
!       return false;
!
!   pList->clear();
!
!   TVCAS::ICasDevice *pDevice = m_pCasManager->OpenCasDevice(Device);
!   if (pDevice == NULL)
!       return false;
!
!   WCHAR szName[256];
!   for (int i = 0; pDevice->GetCardName(i, szName, _countof(szName)); i++) {
!       pList->push_back(szName);
!   }
!
!   pDevice->Release();
!
!   return true;
  }

  bool CCasProcessor::IsCasDeviceAvailable(int Device)
  {
!   if (m_pCasManager == NULL)
!       return false;
!
!   return m_pCasManager->IsCasDeviceAvailable(Device);
  }

  bool CCasProcessor::CheckCasDeviceAvailability(int Device, bool *pbAvailable, LPWSTR pszMessage, int MaxLength)
  {
    if (pszMessage == NULL || MaxLength < 1)
        return false;
!   if (m_pCasManager == NULL) {
!       pszMessage[0] = L'\0';
!       return false;
!   }
!
!   return m_pCasManager->CheckCasDeviceAvailability(Device, pbAvailable, pszMessage, MaxLength);
  }

  int CCasProcessor::GetDefaultCasDevice()
  {
!   if (m_pCasManager == NULL)
!       return -1;
!
!   return m_pCasManager->GetDefaultCasDevice();
  }

  int CCasProcessor::GetCasDeviceByID(DWORD DeviceID) const
  {
!   if (m_pCasManager == NULL)
!       return -1;
!
!   return m_pCasManager->GetCasDeviceByID(DeviceID);
  }

  int CCasProcessor::GetCasDeviceByName(LPCWSTR pszName) const
  {
!   if (m_pCasManager == NULL)
!       return -1;
!
!   return m_pCasManager->GetCasDeviceByName(pszName);
  }

  bool CCasProcessor::OpenCasCard(int Device, LPCWSTR pszName)
  {
!   if (m_pCasManager == NULL)
!       return false;
!
!   ClearError();
!
!   if (!m_pCasManager->OpenCasCard(Device, pszName))
!       return false;
!
!   return true;
  }

  bool CCasProcessor::CloseCasCard()
  {
!   if (m_pCasManager == NULL)
!       return false;
!
!   return m_pCasManager->CloseCasCard();
  }

  bool CCasProcessor::IsCasCardOpen() const
  {
!   if (m_pCasManager == NULL)
!       return false;
!
!   return m_pCasManager->IsCasCardOpen();
  }

  int CCasProcessor::GetCasDevice() const
  {
!   if (m_pCasManager == NULL)
!       return -1;
!
!   return m_pCasManager->GetCasDevice();
  }

  int CCasProcessor::GetCasCardName(LPWSTR pszName, int MaxName) const
  {
!   if (m_pCasManager == NULL)
!       return 0;
!
!   return m_pCasManager->GetCasCardName(pszName, MaxName);
  }

  bool CCasProcessor::GetCasCardInfo(CasCardInfo *pInfo) const
  {
!   if (m_pCasManager == NULL)
!       return false;
!
!   return m_pCasManager->GetCasCardInfo(pInfo);
  }

  bool CCasProcessor::SendCasCommand(const void *pSendData, DWORD SendSize, void *pRecvData, DWORD *pRecvSize)
  {
!   if (m_pCasManager == NULL)
!       return false;
!
!   return m_pCasManager->SendCasCommand(pSendData, SendSize, pRecvData, pRecvSize);
  }

  ULONGLONG CCasProcessor::GetInputPacketCount() const
***************
*** 177,241 ****

  ULONGLONG CCasProcessor::GetScramblePacketCount() const
  {
!   return m_ScramblePacketCount;
  }

  void CCasProcessor::ResetScramblePacketCount()
  {
    m_ScramblePacketCount = 0;
  }

  bool CCasProcessor::SetTargetServiceID(WORD ServiceID)
  {
!   return false;
  }

  WORD CCasProcessor::GetTargetServiceID() const
  {
!   return 0;
  }

  WORD CCasProcessor::GetEcmPIDByServiceID(WORD ServiceID) const
  {
!   return 0xFFFF;
  }

  CCasProcessor::ContractStatus CCasProcessor::GetContractStatus(WORD NetworkID, WORD ServiceID, const SYSTEMTIME *pTime)
  {
!   return CONTRACT_ERROR;
  }

  CCasProcessor::ContractStatus CCasProcessor::GetContractPeriod(WORD NetworkID, WORD ServiceID, SYSTEMTIME *pTime)
  {
!   return CONTRACT_ERROR;
  }

  bool CCasProcessor::HasContractInfo(WORD NetworkID, WORD ServiceID) const
  {
!   return false;
  }

  int CCasProcessor::GetInstructionName(int Instruction, LPWSTR pszName, int MaxName) const
  {
!   return 0;
  }

  UINT CCasProcessor::GetAvailableInstructions() const
  {
!   return 0;
  }

  bool CCasProcessor::SetInstruction(int Instruction)
  {
!   return false;
  }

  int CCasProcessor::GetInstruction() const
  {
!   return 0;
  }

  bool CCasProcessor::DescrambleBenchmarkTest(int Instruction, DWORD Round, DWORD *pTime)
  {
!   return false;
  }
--- 359,510 ----

  ULONGLONG CCasProcessor::GetScramblePacketCount() const
  {
!   ULONGLONG Count = m_ScramblePacketCount;
!
!   if (m_pCasManager != NULL)
!       Count += m_pCasManager->GetScramblePacketCount();
!
!   return Count;
  }

  void CCasProcessor::ResetScramblePacketCount()
  {
    m_ScramblePacketCount = 0;
+
+   if (m_pCasManager != NULL)
+       m_pCasManager->ResetScramblePacketCount();
  }

  bool CCasProcessor::SetTargetServiceID(WORD ServiceID)
  {
!   if (m_pCasManager == NULL)
!       return false;
!
!   return m_pCasManager->SetDescrambleServiceID(ServiceID);
  }

  WORD CCasProcessor::GetTargetServiceID() const
  {
!   if (m_pCasManager == NULL)
!       return 0;
!
!   return m_pCasManager->GetDescrambleServiceID();
  }

  WORD CCasProcessor::GetEcmPIDByServiceID(WORD ServiceID) const
  {
!   if (m_pCasManager == NULL)
!       return 0xFFFF;
!
!   return m_pCasManager->GetEcmPIDByServiceID(ServiceID);
  }

  CCasProcessor::ContractStatus CCasProcessor::GetContractStatus(WORD NetworkID, WORD ServiceID, const SYSTEMTIME *pTime)
  {
!   if (m_pCasManager == NULL)
!       return CONTRACT_ERROR;
!
!   return (ContractStatus)m_pCasManager->GetContractStatus(NetworkID, ServiceID, pTime);
  }

  CCasProcessor::ContractStatus CCasProcessor::GetContractPeriod(WORD NetworkID, WORD ServiceID, SYSTEMTIME *pTime)
  {
!   if (m_pCasManager == NULL)
!       return CONTRACT_ERROR;
!
!   return (ContractStatus)m_pCasManager->GetContractPeriod(NetworkID, ServiceID, pTime);
  }

  bool CCasProcessor::HasContractInfo(WORD NetworkID, WORD ServiceID) const
  {
!   if (m_pCasManager == NULL)
!       return false;
!
!   return m_pCasManager->HasContractInfo(NetworkID, ServiceID);
  }

  int CCasProcessor::GetInstructionName(int Instruction, LPWSTR pszName, int MaxName) const
  {
!   if (m_pCasManager == NULL)
!       return 0;
!
!   return m_pCasManager->GetInstructionName(Instruction, pszName, MaxName);
  }

  UINT CCasProcessor::GetAvailableInstructions() const
  {
!   if (m_pCasManager == NULL)
!       return 0;
!
!   return m_pCasManager->GetAvailableInstructions();
  }

  bool CCasProcessor::SetInstruction(int Instruction)
  {
!   if (m_pCasManager != NULL)
!       return m_pCasManager->SetInstruction(Instruction);
!
!   m_Instruction = Instruction;
!
!   return true;
  }

  int CCasProcessor::GetInstruction() const
  {
!   if (m_pCasManager != NULL)
!       return m_pCasManager->GetInstruction();
!
!   return m_Instruction;
  }

  bool CCasProcessor::DescrambleBenchmarkTest(int Instruction, DWORD Round, DWORD *pTime)
  {
!   if (m_pCasManager == NULL)
!       return false;
!
!   return m_pCasManager->DescrambleBenchmarkTest(Instruction, Round, pTime);
! }
!
! LPCWSTR CCasProcessor::GetName() const
! {
!   return L"CasProcessor";
! }
!
! LRESULT CCasProcessor::OnEvent(UINT Event, void *pParam)
! {
!   switch (Event) {
!   case TVCAS::EVENT_EMM_PROCESSED:
!       SendDecoderEvent(EVENT_EMM_PROCESSED);
!       return 0;
!
!   case TVCAS::EVENT_EMM_ERROR:
!       SendDecoderEvent(EVENT_EMM_ERROR, pParam);
!       return 0;
!
!   case TVCAS::EVENT_ECM_ERROR:
!       SendDecoderEvent(EVENT_ECM_ERROR, pParam);
!       return 0;
!
!   case TVCAS::EVENT_ECM_REFUSED:
!       SendDecoderEvent(EVENT_ECM_REFUSED, pParam);
!       return 0;
!
!   case TVCAS::EVENT_CARD_READER_HUNG:
!       SendDecoderEvent(EVENT_CARD_READER_HUNG);
!       return 0;
!   }
!
!   return 0;
! }
!
! LRESULT CCasProcessor::OnError(const TVCAS::ErrorInfo *pInfo)
! {
!   SetError(pInfo->Code, pInfo->pszText, pInfo->pszAdvise, pInfo->pszSystemMessage);
!
!   return 0;
! }
!
! void CCasProcessor::OutLog(TVCAS::LogType Type, LPCWSTR pszMessage)
! {
!   Trace(pszMessage);
  }
diff -crN ./src_orig\BonTsEngine\CasProcessor.h ./src_unko\BonTsEngine\CasProcessor.h
*** ./src_orig\BonTsEngine\CasProcessor.h   Sat Nov 22 04:36:26 2014
--- ./src_unko\BonTsEngine\CasProcessor.h   Sat Sep 22 17:34:05 2012
***************
*** 2,22 ****
  //
  //////////////////////////////////////////////////////////////////////

- /*
-   このクラスはstubです
-   CAS処理は実装されていません
- */
-
  #pragma once


  #include <vector>
  #include <string>
  #include "MediaDecoder.h"


  class CCasProcessor
    : public CMediaDecoder
  {
  public:
    enum {
--- 2,21 ----
  //
  //////////////////////////////////////////////////////////////////////

  #pragma once


  #include <vector>
  #include <string>
  #include "MediaDecoder.h"
+ #include "TsUtilClass.h"
+ #include "TVCAS.h"


  class CCasProcessor
    : public CMediaDecoder
+   , public TVCAS::ICasClient
+   , protected TVCAS::Helper::CBaseImplNoRef
  {
  public:
    enum {
***************
*** 27,78 ****
        EVENT_CARD_READER_HUNG = 0x00000005UL
    };

!   enum
!   {
!       MAX_DEVICE_NAME = 64,
!       MAX_DEVICE_TEXT = 64
!   };
!
!   struct CasModuleInfo
!   {
!       DWORD LibVersion;
!       DWORD Flags;
!       LPCWSTR Name;
!       LPCWSTR Version;
!   };
!
!   struct CasDeviceInfo
!   {
!       DWORD DeviceID;
!       DWORD Flags;
!       WCHAR Name[MAX_DEVICE_NAME];
!       WCHAR Text[MAX_DEVICE_TEXT];
!   };
!
!   struct CasCardInfo
!   {
!       WORD CASystemID;
!       BYTE CardID[6];
!       BYTE CardType;
!       BYTE MessagePartitionLength;
!       BYTE SystemKey[32];
!       BYTE InitialCBC[8];
!       BYTE CardManufacturerID;
!       BYTE CardVersion;
!       WORD CheckCode;
!       WCHAR CardIDText[32];
!   };
!
!   struct EcmErrorInfo
!   {
!       LPCWSTR pszText;
!       WORD EcmPID;
!   };
!
!   struct EmmErrorInfo
!   {
!       LPCWSTR pszText;
!   };

    enum ContractStatus {
        CONTRACT_CONTRACTED,
--- 26,36 ----
        EVENT_CARD_READER_HUNG = 0x00000005UL
    };

!   typedef TVCAS::ModuleInfo CasModuleInfo;
!   typedef TVCAS::EcmErrorInfo EcmErrorInfo;
!   typedef TVCAS::EmmErrorInfo EmmErrorInfo;
!   typedef TVCAS::CasDeviceInfo CasDeviceInfo;
!   typedef TVCAS::CasCardInfo CasCardInfo;

    enum ContractStatus {
        CONTRACT_CONTRACTED,
***************
*** 135,140 ****
--- 93,115 ----
    bool DescrambleBenchmarkTest(int Instruction, DWORD Round, DWORD *pTime);

  protected:
+ // TVCAS::IBase
+   TVCAS_DECLARE_BASE
+   LPCWSTR GetName() const override;
+
+ // TVCAS::ICasClient
+   LRESULT OnEvent(UINT Event, void *pParam) override;
+   LRESULT OnError(const TVCAS::ErrorInfo *pInfo) override;
+   void OutLog(TVCAS::LogType Type, LPCWSTR pszMessage) override;
+
+   HMODULE m_hCasLib;
+   TVCAS::ICasManager *m_pCasManager;
+   CasModuleInfo m_CasModuleInfo;
+
+   bool m_bEnableDescramble;
+   bool m_bEnableContract;
+   int m_Instruction;
+
    ULONGLONG m_InputPacketCount;
    ULONGLONG m_ScramblePacketCount;
  };
diff -crN ./src_orig\BonTsEngine\TVCAS.h ./src_unko\BonTsEngine\TVCAS.h
*** ./src_orig\BonTsEngine\TVCAS.h  Thu Jan 01 09:00:00 1970
--- ./src_unko\BonTsEngine\TVCAS.h  Sat Sep 15 19:00:00 2012
***************
*** 0 ****
--- 1,259 ----
+ #ifndef TV_CAS_H
+ #define TV_CAS_H
+
+
+ #include <pshpack1.h>
+
+
+ namespace TVCAS
+ {
+
+   enum
+   {
+       LIB_VERSION = 0x00000001UL,
+
+       MAX_DEVICE_NAME = 64,
+       MAX_DEVICE_TEXT = 64
+   };
+
+   struct ModuleInfo
+   {
+       DWORD LibVersion;
+       DWORD Flags;
+       LPCWSTR Name;
+       LPCWSTR Version;
+   };
+
+   struct CasDeviceInfo
+   {
+       DWORD DeviceID;
+       DWORD Flags;
+       WCHAR Name[MAX_DEVICE_NAME];
+       WCHAR Text[MAX_DEVICE_TEXT];
+   };
+
+   struct CasCardInfo
+   {
+       WORD CASystemID;
+       BYTE CardID[6];
+       BYTE CardType;
+       BYTE MessagePartitionLength;
+       BYTE SystemKey[32];
+       BYTE InitialCBC[8];
+       BYTE CardManufacturerID;
+       BYTE CardVersion;
+       WORD CheckCode;
+       WCHAR CardIDText[32];
+   };
+
+   enum
+   {
+       EVENT_EMM_PROCESSED     = 0x00000001U,
+       EVENT_EMM_ERROR         = 0x00000002U,
+       EVENT_ECM_ERROR         = 0x00000003U,
+       EVENT_ECM_REFUSED       = 0x00000004U,
+       EVENT_CARD_READER_HUNG  = 0x00000005U
+   };
+
+   enum LogType
+   {
+       LOG_VERBOSE,
+       LOG_INFO,
+       LOG_WARNING,
+       LOG_ERROR
+   };
+
+   struct ErrorInfo
+   {
+       int Code;
+       LPCWSTR pszText;
+       LPCWSTR pszAdvise;
+       LPCWSTR pszSystemMessage;
+   };
+
+   struct EcmErrorInfo
+   {
+       LPCWSTR pszText;
+       WORD EcmPID;
+   };
+
+   struct EmmErrorInfo
+   {
+       LPCWSTR pszText;
+   };
+
+   enum ContractStatus
+   {
+       CONTRACT_CONTRACTED,
+       CONTRACT_UNCONTRACTED,
+       CONTRACT_UNKNOWN,
+       CONTRACT_ERROR
+   };
+
+   __interface __declspec(uuid("C19221E8-CBB1-4BEF-96A8-3F294244CBB0")) IBase
+   {
+       void Refer();
+       void Release();
+       LPCWSTR GetName() const;
+       IBase * GetInterface(REFIID riid);
+       bool GetProperty(LPCWSTR pszName, void *pProperty, SIZE_T *pSize) const;
+       bool SetProperty(LPCWSTR pszName, const void *pProperty, SIZE_T Size);
+   };
+
+   __interface __declspec(uuid("973B85B2-CF36-4DF5-A2E8-663550B3BAEA")) ICasClient : public IBase
+   {
+       LRESULT OnEvent(UINT Event, void *pParam);
+       LRESULT OnError(const ErrorInfo *pInfo);
+       void OutLog(LogType Type, LPCWSTR pszMessage);
+   };
+
+   __interface __declspec(uuid("BC023720-CB97-462E-A142-ED37CE396FB3")) ICasDevice : public IBase
+   {
+       bool GetDeviceInfo(CasDeviceInfo *pInfo) const;
+       int GetCardCount() const;
+       bool GetCardName(int Index, LPWSTR pszName, int MaxName) const;
+       bool IsCardAvailable(LPCWSTR pszName);
+   };
+
+   __interface __declspec(uuid("080EDD04-8215-4037-8B66-E03954FD81BD")) ICasManager : public IBase
+   {
+       bool Initialize(ICasClient *pClient);
+       bool Reset();
+
+       bool EnableDescramble(bool Enable);
+       bool IsDescrambleEnabled() const;
+       bool EnableContract(bool Enable);
+       bool IsContractEnabled() const;
+
+       int GetCasDeviceCount() const;
+       bool GetCasDeviceInfo(int Device, CasDeviceInfo *pInfo) const;
+       ICasDevice * OpenCasDevice(int Device);
+       bool IsCasDeviceAvailable(int Device);
+       bool CheckCasDeviceAvailability(int Device, bool *pAvailable, LPWSTR pszMessage, int MaxLength);
+       int GetDefaultCasDevice();
+       int GetCasDeviceByID(DWORD DeviceID) const;
+       int GetCasDeviceByName(LPCWSTR pszName) const;
+
+       bool OpenCasCard(int Device, LPCWSTR pszName = NULL);
+       bool CloseCasCard();
+       bool IsCasCardOpen() const;
+       int GetCasDevice() const;
+       int GetCasCardName(LPWSTR pszName, int MaxName) const;
+       bool GetCasCardInfo(CasCardInfo *pInfo) const;
+       bool SendCasCommand(const void *pSendData, DWORD SendSize, void *pRecvData, DWORD *pRecvSize);
+
+       bool ProcessStream(const void *pSrcData, const DWORD SrcSize,
+                          void **ppDstData, DWORD *pDstSize);
+       bool ProcessPacket(void *pData, DWORD PacketSize);
+
+       ULONGLONG GetInputPacketCount() const;
+       ULONGLONG GetScramblePacketCount() const;
+       void ResetScramblePacketCount();
+
+       bool SetDescrambleServiceID(WORD ServiceID);
+       WORD GetDescrambleServiceID() const;
+       bool SetDescrambleServices(const WORD *pServiceIDList, int ServiceCount);
+       bool GetDescrambleServices(WORD *pServiceIDList, int *pServiceCount) const;
+       WORD GetEcmPIDByServiceID(WORD ServiceID) const;
+
+       ContractStatus GetContractStatus(WORD NetworkID, WORD ServiceID, const SYSTEMTIME *pTime = NULL);
+       ContractStatus GetContractPeriod(WORD NetworkID, WORD ServiceID, SYSTEMTIME *pTime);
+       bool HasContractInfo(WORD NetworkID, WORD ServiceID) const;
+
+       int GetInstructionName(int Instruction, LPWSTR pszName, int MaxName) const;
+       UINT GetAvailableInstructions() const;
+       bool SetInstruction(int Instruction);
+       int GetInstruction() const;
+       bool DescrambleBenchmarkTest(int Instruction, DWORD Round, DWORD *pTime);
+   };
+
+   typedef BOOL (WINAPI *GetModuleInfoFunc)(ModuleInfo *pInfo);
+   typedef IBase * (WINAPI *CreateInstanceFunc)(REFIID riid);
+
+
+   namespace Helper
+   {
+
+       namespace Module
+       {
+
+           inline GetModuleInfoFunc GetModuleInfo(HMODULE hLib)
+           {
+               return reinterpret_cast<GetModuleInfoFunc>(::GetProcAddress(hLib, "TVCAS_GetModuleInfo"));
+           }
+
+           inline CreateInstanceFunc CreateInstance(HMODULE hLib)
+           {
+               return reinterpret_cast<CreateInstanceFunc>(::GetProcAddress(hLib, "TVCAS_CreateInstance"));
+           }
+
+       }
+
+ #if (__cplusplus >= 201103L) || (defined(_MSC_VER) && (_MSC_VER >= 1700))
+ #define TVCAS_FINAL override final
+ #elif defined(_MSC_VER)
+ #define TVCAS_FINAL override
+ #else
+ #define TVCAS_FINAL
+ #endif
+
+       class CBaseImplNoRef
+       {
+       protected:
+           virtual void ReferImpl() {}
+           virtual void ReleaseImpl() {}
+
+           virtual IBase * GetInterfaceImpl(REFIID riid)
+           {
+               return NULL;
+           }
+
+           virtual bool GetPropertyImpl(LPCWSTR pszName, void *pProperty, SIZE_T *pSize) const
+           {
+               return false;
+           }
+
+           virtual bool SetPropertyImpl(LPCWSTR pszName, const void *pProperty, SIZE_T Size)
+           {
+               return false;
+           }
+       };
+
+       class CBaseImpl : public CBaseImplNoRef
+       {
+       public:
+           CBaseImpl() : m_RefCount(1) {}
+           virtual ~CBaseImpl() {}
+
+       protected:
+           void ReferImpl() TVCAS_FINAL
+           {
+               ::InterlockedIncrement(&m_RefCount);
+           }
+
+           void ReleaseImpl() TVCAS_FINAL
+           {
+               if (::InterlockedDecrement(&m_RefCount) == 0)
+                   delete this;
+           }
+
+       private:
+           LONG m_RefCount;
+       };
+
+ #define TVCAS_DECLARE_BASE \
+   void Refer() TVCAS_FINAL { ReferImpl(); } \
+   void Release() TVCAS_FINAL { ReleaseImpl(); } \
+   TVCAS::IBase * GetInterface(REFIID riid) TVCAS_FINAL { return GetInterfaceImpl(riid); } \
+   bool GetProperty(LPCWSTR pszName, void *pProperty, SIZE_T *pSize) const TVCAS_FINAL { return GetPropertyImpl(pszName, pProperty, pSize); } \
+   bool SetProperty(LPCWSTR pszName, const void *pProperty, SIZE_T Size) TVCAS_FINAL { return SetPropertyImpl(pszName, pProperty, Size); }
+
+   }   // namespace Helper
+
+ } // namespace TVCAS
+
+
+ #include <poppack.h>
+
+
+ #endif
diff -crN ./src_orig\CoreEngine.cpp ./src_unko\CoreEngine.cpp
*** ./src_orig\CoreEngine.cpp   Sat Nov 22 04:36:26 2014
--- ./src_unko\CoreEngine.cpp   Sat Oct 11 03:15:17 2014
***************
*** 79,93 ****
        ↓
    CTsAnalyzer
        ↓
    CMediaTee──────┐
        ↓               │
!   (CEventManager)  CCasProcessor
        ↓               ↓
!   CLogoDownloader  CCaptionDecoder
        ↓               ↓
!   CTsSelector      CMediaGrabber
!       ↓               ↓
!   CTsRecorder      CMediaViewer
    */

    struct {
--- 79,95 ----
        ↓
    CTsAnalyzer
        ↓
+   CCasProcessor
+       ↓
    CMediaTee──────┐
        ↓               │
!   (CEventManager)  CCaptionDecoder
        ↓               ↓
!   CLogoDownloader  CMediaGrabber
        ↓               ↓
!   CTsSelector      CMediaViewer
!       ↓
!   CTsRecorder
    */

    struct {
***************
*** 106,111 ****
--- 108,115 ----
    ConnectionList.Add(CDtvEngine::DECODER_ID_TsPacketParser,
                       CDtvEngine::DECODER_ID_TsAnalyzer);
    ConnectionList.Add(CDtvEngine::DECODER_ID_TsAnalyzer,
+                      CDtvEngine::DECODER_ID_CasProcessor);
+   ConnectionList.Add(CDtvEngine::DECODER_ID_CasProcessor,
                       CDtvEngine::DECODER_ID_MediaTee);
    if (!m_fNoEpg) {
        ConnectionList.Add(CDtvEngine::DECODER_ID_MediaTee,
***************
*** 117,129 ****
                           CDtvEngine::DECODER_ID_LogoDownloader,0);
    }
    ConnectionList.Add(CDtvEngine::DECODER_ID_MediaTee,
!                      CDtvEngine::DECODER_ID_CasProcessor,1);
    ConnectionList.Add(CDtvEngine::DECODER_ID_LogoDownloader,
                       CDtvEngine::DECODER_ID_TsSelector);
    ConnectionList.Add(CDtvEngine::DECODER_ID_TsSelector,
                       CDtvEngine::DECODER_ID_TsRecorder);
-   ConnectionList.Add(CDtvEngine::DECODER_ID_CasProcessor,
-                      CDtvEngine::DECODER_ID_CaptionDecoder);
    ConnectionList.Add(CDtvEngine::DECODER_ID_CaptionDecoder,
                       CDtvEngine::DECODER_ID_MediaGrabber);
    ConnectionList.Add(CDtvEngine::DECODER_ID_MediaGrabber,
--- 121,131 ----
                           CDtvEngine::DECODER_ID_LogoDownloader,0);
    }
    ConnectionList.Add(CDtvEngine::DECODER_ID_MediaTee,
!                      CDtvEngine::DECODER_ID_CaptionDecoder,1);
    ConnectionList.Add(CDtvEngine::DECODER_ID_LogoDownloader,
                       CDtvEngine::DECODER_ID_TsSelector);
    ConnectionList.Add(CDtvEngine::DECODER_ID_TsSelector,
                       CDtvEngine::DECODER_ID_TsRecorder);
    ConnectionList.Add(CDtvEngine::DECODER_ID_CaptionDecoder,
                       CDtvEngine::DECODER_ID_MediaGrabber);
    ConnectionList.Add(CDtvEngine::DECODER_ID_MediaGrabber,
***************
*** 366,371 ****
--- 368,388 ----

  bool CCoreEngine::OpenCasCard(int Device,LPCTSTR pszName)
  {
+   if (Device==0 && IsStringEmpty(pszName) && IsDriverSpecified()) {
+       // 現在の BonDriver 専用の winscard.dll があればそれを利用する
+       TCHAR szFileName[MAX_PATH];
+
+       GetDriverPath(szFileName,lengthof(szFileName));
+       ::PathRenameExtension(szFileName,TEXT(".scard"));
+       if (::PathFileExists(szFileName)) {
+           if (!m_DtvEngine.OpenCasCard(Device,szFileName)) {
+               SetError(m_DtvEngine.GetLastErrorException());
+               return false;
+           }
+           return true;
+       }
+   }
+
    if (!SetDescramble(Device>=0))
        return false;
    if (!m_DtvEngine.OpenCasCard(Device,pszName)) {
***************
*** 385,390 ****
--- 402,417 ----
  bool CCoreEngine::IsCasCardOpen() const
  {
    return m_DtvEngine.m_CasProcessor.IsCasCardOpen();
+ }
+
+
+ // ある BonDriver 専用の winscard.dll を使用しているか取得する
+ bool CCoreEngine::IsDriverCardReader() const
+ {
+   TCHAR szName[MAX_PATH];
+
+   return m_DtvEngine.m_CasProcessor.GetCasCardName(szName,lengthof(szName))>0
+       && ::PathMatchSpec(szName,TEXT("*.scard"));
  }


diff -crN ./src_orig\CoreEngine.h ./src_unko\CoreEngine.h
*** ./src_orig\CoreEngine.h Sat Nov 22 04:36:26 2014
--- ./src_unko\CoreEngine.h Sat Oct 11 03:16:04 2014
***************
*** 67,72 ****
--- 67,73 ----
    bool OpenCasCard(int Device,LPCTSTR pszName=NULL);
    bool CloseCasCard();
    bool IsCasCardOpen() const;
+   bool IsDriverCardReader() const;
    bool SetDescramble(bool fDescramble);
    bool GetDescramble() const { return m_fDescramble; }
    bool GetCasDeviceList(CasDeviceList *pList);
diff -crN ./src_orig\Record.cpp ./src_unko\Record.cpp
*** ./src_orig\Record.cpp   Sat Nov 22 04:36:26 2014
--- ./src_unko\Record.cpp   Wed Nov 12 12:56:59 2014
***************
*** 19,24 ****
--- 19,25 ----
  CRecordingSettings::CRecordingSettings()
    : m_fCurServiceOnly(false)
    , m_SaveStream(CTsSelector::STREAM_ALL)
+   , m_fDescrambleCurServiceOnly(false)
    , m_BufferSize(DEFAULT_BUFFER_SIZE)
    , m_PreAllocationUnit(0)
    , m_fTimeShift(false)
***************
*** 132,137 ****
--- 133,140 ----
    DWORD OldWriteStream;
    pDtvEngine->GetWriteStream(NULL,&OldWriteStream);
    pDtvEngine->SetWriteCurServiceOnly(Settings.m_fCurServiceOnly,Settings.m_SaveStream);
+   bool fDescrambleCurOnly=pDtvEngine->GetDescrambleCurServiceOnly();
+   pDtvEngine->SetDescrambleCurServiceOnly(Settings.m_fDescrambleCurServiceOnly);
    pDtvEngine->m_TsRecorder.SetBufferSize(Settings.m_BufferSize);
    pDtvEngine->m_TsRecorder.SetPreAllocationUnit(Settings.m_PreAllocationUnit);
    if (!Settings.m_fTimeShift)
***************
*** 165,170 ****
--- 168,174 ----
        ::FreeLibrary(hWriteLib);
    if (!fResult) {
        pDtvEngine->SetWriteCurServiceOnly(fOldWriteCurOnly,OldWriteStream);
+       pDtvEngine->SetDescrambleCurServiceOnly(fDescrambleCurOnly);
        return false;
    }

***************
*** 1494,1499 ****
--- 1498,1510 ----
  bool CRecordManager::SetSaveStream(DWORD Stream)
  {
    m_Settings.m_SaveStream=Stream;
+   return true;
+ }
+
+
+ bool CRecordManager::SetDescrambleCurServiceOnly(bool fOnly)
+ {
+   m_Settings.m_fDescrambleCurServiceOnly=fOnly;
    return true;
  }

diff -crN ./src_orig\Record.h ./src_unko\Record.h
*** ./src_orig\Record.h Sat Nov 22 04:36:26 2014
--- ./src_unko\Record.h Wed Nov 12 12:57:58 2014
***************
*** 13,18 ****
--- 13,19 ----

    bool m_fCurServiceOnly;
    DWORD m_SaveStream;
+   bool m_fDescrambleCurServiceOnly;
    TVTest::String m_WritePlugin;
    DWORD m_BufferSize;
    ULONGLONG m_PreAllocationUnit;
***************
*** 181,186 ****
--- 182,189 ----
    bool SetCurServiceOnly(bool fOnly);
    bool GetCurServiceOnly() const { return m_Settings.m_fCurServiceOnly; }
    bool SetSaveStream(DWORD Stream);
+   bool SetDescrambleCurServiceOnly(bool fOnly);
+   bool GetDescrambleCurServiceOnly() const { return m_Settings.m_fDescrambleCurServiceOnly; }
    bool SetWritePlugin(LPCTSTR pszPlugin);
    LPCTSTR GetWritePlugin() const;
    bool SetBufferSize(DWORD BufferSize);
diff -crN ./src_orig\RecordOptions.cpp ./src_unko\RecordOptions.cpp
*** ./src_orig\RecordOptions.cpp    Sat Nov 22 04:36:26 2014
--- ./src_unko\RecordOptions.cpp    Wed Oct 15 11:03:32 2014
***************
*** 45,50 ****
--- 45,51 ----
    , m_fConfirmExit(true)
    , m_fConfirmStop(false)
    , m_fConfirmStopStatusBarOnly(false)
+   , m_fDescrambleCurServiceOnly(false)
    , m_fAlertLowFreeSpace(true)
    , m_LowFreeSpaceThreshold(2048)
    , m_TimeShiftBufferSize(TIMESHIFT_BUFFER_SIZE_DEFAULT)
***************
*** 134,139 ****
--- 135,141 ----
    if (Settings.Read(TEXT("RecordDataCarrousel"),&f))
        m_Settings.SetSaveDataCarrousel(f);
    Settings.Read(TEXT("WritePlugin"),&m_Settings.m_WritePlugin);
+   Settings.Read(TEXT("RecordDescrambleCurServiceOnly"),&m_Settings.m_fDescrambleCurServiceOnly);
    if (Settings.Read(TEXT("RecordBufferSize"),&Value))
        m_Settings.m_BufferSize=CLAMP(Value,WRITE_BUFFER_SIZE_MIN,WRITE_BUFFER_SIZE_MAX);
    Settings.Read(TEXT("AlertLowFreeSpace"),&m_fAlertLowFreeSpace);
***************
*** 172,177 ****
--- 174,180 ----
    Settings.Write(TEXT("RecordSubtitle"),m_Settings.IsSaveCaption());
    Settings.Write(TEXT("RecordDataCarrousel"),m_Settings.IsSaveDataCarrousel());
    Settings.Write(TEXT("WritePlugin"),m_Settings.m_WritePlugin);
+   Settings.Write(TEXT("RecordDescrambleCurServiceOnly"),m_Settings.m_fDescrambleCurServiceOnly);
    Settings.Write(TEXT("RecordBufferSize"),static_cast<unsigned int>(m_Settings.m_BufferSize));
    Settings.Write(TEXT("AlertLowFreeSpace"),m_fAlertLowFreeSpace);
    Settings.Write(TEXT("LowFreeSpaceThreshold"),m_LowFreeSpaceThreshold);
***************
*** 375,380 ****
--- 378,385 ----
                              m_Settings.IsSaveCaption());
            DlgCheckBox_Check(hDlg,IDC_RECORDOPTIONS_SAVEDATACARROUSEL,
                              m_Settings.IsSaveDataCarrousel());
+           DlgCheckBox_Check(hDlg,IDC_RECORDOPTIONS_DESCRAMBLECURSERVICEONLY,
+                             m_Settings.m_fDescrambleCurServiceOnly);

            // 保存プラグイン
            DlgComboBox_AddString(hDlg,IDC_RECORDOPTIONS_WRITEPLUGIN,TEXT("使用しない (TS出力)"));
***************
*** 576,581 ****
--- 581,591 ----
                if (m_Settings.IsSaveDataCarrousel()!=f) {
                    m_Settings.SetSaveDataCarrousel(f);
                    fOptionChanged=true;
+               }
+               f = DlgCheckBox_IsChecked(hDlg, IDC_RECORDOPTIONS_DESCRAMBLECURSERVICEONLY);
+               if (m_Settings.m_fDescrambleCurServiceOnly!=f) {
+                   m_Settings.m_fDescrambleCurServiceOnly=f;
+                   fOptionChanged=true;
                }
                if (fOptionChanged)
                    SetUpdateFlag(UPDATE_RECORDSTREAM);
diff -crN ./src_orig\RecordOptions.h ./src_unko\RecordOptions.h
*** ./src_orig\RecordOptions.h  Sat Nov 22 04:36:26 2014
--- ./src_unko\RecordOptions.h  Sat Oct 11 03:47:26 2014
***************
*** 14,19 ****
--- 14,20 ----
    bool m_fConfirmExit;
    bool m_fConfirmStop;
    bool m_fConfirmStopStatusBarOnly;
+   bool m_fDescrambleCurServiceOnly;
    bool m_fAlertLowFreeSpace;
    unsigned int m_LowFreeSpaceThreshold;
    unsigned int m_TimeShiftBufferSize;
diff -crN ./src_orig\resource.h ./src_unko\resource.h
*** ./src_orig\resource.h   Sat Nov 22 04:36:26 2014
--- ./src_unko\resource.h   Sun Nov 30 08:32:51 2014
***************
*** 756,769 ****
  #define IDC_RECORDOPTIONS_CURSERVICEONLY              1015
  #define IDC_RECORDOPTIONS_SAVESUBTITLE                    1016
  #define IDC_RECORDOPTIONS_SAVEDATACARROUSEL               1017
! #define IDC_RECORDOPTIONS_WRITEPLUGIN                 1018
! #define IDC_RECORDOPTIONS_WRITEPLUGINSETTING          1019
! #define IDC_RECORDOPTIONS_TIMESHIFTBUFFERSIZE         1020
! #define IDC_RECORDOPTIONS_TIMESHIFTBUFFERSIZE_SPIN        1021
! #define IDC_RECORDOPTIONS_BUFFERSIZE                  1022
! #define IDC_RECORDOPTIONS_BUFFERSIZE_UD                   1023
! #define IDC_RECORDOPTIONS_MAXPENDINGSIZE              1024
! #define IDC_RECORDOPTIONS_MAXPENDINGSIZE_SPIN         1025

  #define IDC_CAPTUREOPTIONS_SAVEFOLDER         1000
  #define IDC_CAPTUREOPTIONS_SAVEFOLDER_BROWSE  1001
--- 756,770 ----
  #define IDC_RECORDOPTIONS_CURSERVICEONLY              1015
  #define IDC_RECORDOPTIONS_SAVESUBTITLE                    1016
  #define IDC_RECORDOPTIONS_SAVEDATACARROUSEL               1017
! #define IDC_RECORDOPTIONS_DESCRAMBLECURSERVICEONLY        1018
! #define IDC_RECORDOPTIONS_WRITEPLUGIN                 1019
! #define IDC_RECORDOPTIONS_WRITEPLUGINSETTING          1020
! #define IDC_RECORDOPTIONS_TIMESHIFTBUFFERSIZE         1021
! #define IDC_RECORDOPTIONS_TIMESHIFTBUFFERSIZE_SPIN        1022
! #define IDC_RECORDOPTIONS_BUFFERSIZE                  1023
! #define IDC_RECORDOPTIONS_BUFFERSIZE_UD                   1024
! #define IDC_RECORDOPTIONS_MAXPENDINGSIZE              1025
! #define IDC_RECORDOPTIONS_MAXPENDINGSIZE_SPIN         1026

  #define IDC_CAPTUREOPTIONS_SAVEFOLDER         1000
  #define IDC_CAPTUREOPTIONS_SAVEFOLDER_BROWSE  1001
diff -crN ./src_orig\TVTest.rc ./src_unko\TVTest.rc
*** ./src_orig\TVTest.rc    Sat Nov 22 04:36:26 2014
--- ./src_unko\TVTest.rc    Sun Nov 30 08:34:20 2014
***************
*** 1195,1216 ****
    AUTOCHECKBOX "現在のサービスのみ保存する(&V)",IDC_RECORDOPTIONS_CURSERVICEONLY,8,144,120,9
    AUTOCHECKBOX "字幕データを保存する(&U)",IDC_RECORDOPTIONS_SAVESUBTITLE,8,156,96,9
    AUTOCHECKBOX "データ放送を保存する(&A)",IDC_RECORDOPTIONS_SAVEDATACARROUSEL,8,168,96,9
!   LTEXT "保存プラグイン(&L):",-1,8,182,64,8
!   COMBOBOX IDC_RECORDOPTIONS_WRITEPLUGIN,76,180,136,80,WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST
!   PUSHBUTTON "設定...",IDC_RECORDOPTIONS_WRITEPLUGINSETTING,216,179,32,14,WS_DISABLED

!   RTEXT "さかのぼり録画のメモリサイズ(&H):",-1,8,202,108,8
!   EDITTEXT IDC_RECORDOPTIONS_TIMESHIFTBUFFERSIZE,120,200,32,12,ES_NUMBER | ES_AUTOHSCROLL
!   CONTROL "",IDC_RECORDOPTIONS_TIMESHIFTBUFFERSIZE_SPIN,"msctls_updown32",WS_CHILD | WS_VISIBLE | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_NOTHOUSANDS | UDS_SETBUDDYINT,142,200,10,12
!   LTEXT "MiB (1～1024)",-1,154,202,52,8
!   RTEXT "ファイル書き出し単位(&B):",-1,8,218,108,8
!   EDITTEXT IDC_RECORDOPTIONS_BUFFERSIZE,120,216,32,12,ES_NUMBER | ES_AUTOHSCROLL
!   CONTROL "",IDC_RECORDOPTIONS_BUFFERSIZE_UD,"msctls_updown32",WS_CHILD | WS_VISIBLE | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_NOTHOUSANDS | UDS_SETBUDDYINT,142,216,10,12
!   LTEXT "KiB (1～32768)",-1,154,218,56,8
!   RTEXT "書き出し待ちのサイズ制限(&P):",-1,8,234,108,8
!   EDITTEXT IDC_RECORDOPTIONS_MAXPENDINGSIZE,120,232,32,12,ES_NUMBER | ES_AUTOHSCROLL
!   CONTROL "",IDC_RECORDOPTIONS_MAXPENDINGSIZE_SPIN,"msctls_updown32",WS_CHILD | WS_VISIBLE | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_NOTHOUSANDS | UDS_SETBUDDYINT,142,232,10,12
!   LTEXT "MiB (32～1024)",-1,154,234,56,8
  END

  IDD_OPTIONS_CAPTURE DIALOG DISCARDABLE 0,0,256,288
--- 1195,1217 ----
    AUTOCHECKBOX "現在のサービスのみ保存する(&V)",IDC_RECORDOPTIONS_CURSERVICEONLY,8,144,120,9
    AUTOCHECKBOX "字幕データを保存する(&U)",IDC_RECORDOPTIONS_SAVESUBTITLE,8,156,96,9
    AUTOCHECKBOX "データ放送を保存する(&A)",IDC_RECORDOPTIONS_SAVEDATACARROUSEL,8,168,96,9
!   AUTOCHECKBOX "現在のサービスのみスクランブル解除する(&D)",IDC_RECORDOPTIONS_DESCRAMBLECURSERVICEONLY,8,180,156,9
!   LTEXT "保存プラグイン(&L):",-1,8,194,64,8
!   COMBOBOX IDC_RECORDOPTIONS_WRITEPLUGIN,76,192,136,80,WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST
!   PUSHBUTTON "設定...",IDC_RECORDOPTIONS_WRITEPLUGINSETTING,216,191,32,14,WS_DISABLED

!   RTEXT "さかのぼり録画のメモリサイズ(&H):",-1,8,214,108,8
!   EDITTEXT IDC_RECORDOPTIONS_TIMESHIFTBUFFERSIZE,120,212,32,12,ES_NUMBER | ES_AUTOHSCROLL
!   CONTROL "",IDC_RECORDOPTIONS_TIMESHIFTBUFFERSIZE_SPIN,"msctls_updown32",WS_CHILD | WS_VISIBLE | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_NOTHOUSANDS | UDS_SETBUDDYINT,142,212,10,12
!   LTEXT "MiB (1～1024)",-1,154,214,52,8
!   RTEXT "ファイル書き出し単位(&B):",-1,8,230,108,8
!   EDITTEXT IDC_RECORDOPTIONS_BUFFERSIZE,120,228,32,12,ES_NUMBER | ES_AUTOHSCROLL
!   CONTROL "",IDC_RECORDOPTIONS_BUFFERSIZE_UD,"msctls_updown32",WS_CHILD | WS_VISIBLE | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_NOTHOUSANDS | UDS_SETBUDDYINT,142,228,10,12
!   LTEXT "KiB (1～32768)",-1,154,230,56,8
!   RTEXT "書き出し待ちのサイズ制限(&P):",-1,8,246,108,8
!   EDITTEXT IDC_RECORDOPTIONS_MAXPENDINGSIZE,120,244,32,12,ES_NUMBER | ES_AUTOHSCROLL
!   CONTROL "",IDC_RECORDOPTIONS_MAXPENDINGSIZE_SPIN,"msctls_updown32",WS_CHILD | WS_VISIBLE | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_NOTHOUSANDS | UDS_SETBUDDYINT,142,244,10,12
!   LTEXT "MiB (32～1024)",-1,154,246,56,8
  END

  IDD_OPTIONS_CAPTURE DIALOG DISCARDABLE 0,0,256,288
diff -crN ./src_orig\TVTest.sln ./src_unko\TVTest.sln
*** ./src_orig\TVTest.sln   Sat Nov 22 04:36:26 2014
--- ./src_unko\TVTest.sln   Tue Jun 10 12:09:43 2014
***************
*** 1,6 ****
  ・ｿ
! Microsoft Visual Studio Solution File, Format Version 11.00
! # Visual Studio 2010
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TVTest", "TVTest.vcxproj", "{88CAD0EE-D7F6-412D-8691-D1FF19534587}"
    ProjectSection(ProjectDependencies) = postProject
        {BC3EFE27-9015-4C9C-AD3C-72B3B7ED2114} = {BC3EFE27-9015-4C9C-AD3C-72B3B7ED2114}
--- 1,6 ----
  ・ｿ
! Microsoft Visual Studio Solution File, Format Version 12.00
! # Visual Studio 2012
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TVTest", "TVTest.vcxproj", "{88CAD0EE-D7F6-412D-8691-D1FF19534587}"
    ProjectSection(ProjectDependencies) = postProject
        {BC3EFE27-9015-4C9C-AD3C-72B3B7ED2114} = {BC3EFE27-9015-4C9C-AD3C-72B3B7ED2114}
***************
*** 9,22 ****
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BaseClasses", "BaseClasses\BaseClasses.vcxproj", "{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}"
  EndProject
! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libfaad", "faad2\libfaad.vcxproj", "{BC3EFE27-9015-4C9C-AD3C-72B3B7ED2114}"
  EndProject
  Global
    GlobalSection(SolutionConfigurationPlatforms) = preSolution
        Debug|Win32 = Debug|Win32
        Debug|x64 = Debug|x64
-       Release_MD|Win32 = Release_MD|Win32
-       Release_MD|x64 = Release_MD|x64
        Release|Win32 = Release|Win32
        Release|x64 = Release|x64
    EndGlobalSection
--- 9,20 ----
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BaseClasses", "BaseClasses\BaseClasses.vcxproj", "{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}"
  EndProject
! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libfaad", "libfaad\libfaad.vcxproj", "{BC3EFE27-9015-4C9C-AD3C-72B3B7ED2114}"
  EndProject
  Global
    GlobalSection(SolutionConfigurationPlatforms) = preSolution
        Debug|Win32 = Debug|Win32
        Debug|x64 = Debug|x64
        Release|Win32 = Release|Win32
        Release|x64 = Release|x64
    EndGlobalSection
***************
*** 25,34 ****
        {88CAD0EE-D7F6-412D-8691-D1FF19534587}.Debug|Win32.Build.0 = Debug|Win32
        {88CAD0EE-D7F6-412D-8691-D1FF19534587}.Debug|x64.ActiveCfg = Debug|x64
        {88CAD0EE-D7F6-412D-8691-D1FF19534587}.Debug|x64.Build.0 = Debug|x64
-       {88CAD0EE-D7F6-412D-8691-D1FF19534587}.Release_MD|Win32.ActiveCfg = Release_MD|Win32
-       {88CAD0EE-D7F6-412D-8691-D1FF19534587}.Release_MD|Win32.Build.0 = Release_MD|Win32
-       {88CAD0EE-D7F6-412D-8691-D1FF19534587}.Release_MD|x64.ActiveCfg = Release_MD|x64
-       {88CAD0EE-D7F6-412D-8691-D1FF19534587}.Release_MD|x64.Build.0 = Release_MD|x64
        {88CAD0EE-D7F6-412D-8691-D1FF19534587}.Release|Win32.ActiveCfg = Release|Win32
        {88CAD0EE-D7F6-412D-8691-D1FF19534587}.Release|Win32.Build.0 = Release|Win32
        {88CAD0EE-D7F6-412D-8691-D1FF19534587}.Release|x64.ActiveCfg = Release|x64
--- 23,28 ----
***************
*** 37,46 ****
        {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug|Win32.Build.0 = Debug|Win32
        {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug|x64.ActiveCfg = Debug|x64
        {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug|x64.Build.0 = Debug|x64
-       {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release_MD|Win32.ActiveCfg = Release_MD|Win32
-       {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release_MD|Win32.Build.0 = Release_MD|Win32
-       {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release_MD|x64.ActiveCfg = Release_MD|x64
-       {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release_MD|x64.Build.0 = Release_MD|x64
        {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release|Win32.ActiveCfg = Release|Win32
        {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release|Win32.Build.0 = Release|Win32
        {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release|x64.ActiveCfg = Release|x64
--- 31,36 ----
***************
*** 49,58 ****
        {BC3EFE27-9015-4C9C-AD3C-72B3B7ED2114}.Debug|Win32.Build.0 = Debug|Win32
        {BC3EFE27-9015-4C9C-AD3C-72B3B7ED2114}.Debug|x64.ActiveCfg = Debug|x64
        {BC3EFE27-9015-4C9C-AD3C-72B3B7ED2114}.Debug|x64.Build.0 = Debug|x64
-       {BC3EFE27-9015-4C9C-AD3C-72B3B7ED2114}.Release_MD|Win32.ActiveCfg = Release_MD|Win32
-       {BC3EFE27-9015-4C9C-AD3C-72B3B7ED2114}.Release_MD|Win32.Build.0 = Release_MD|Win32
-       {BC3EFE27-9015-4C9C-AD3C-72B3B7ED2114}.Release_MD|x64.ActiveCfg = Release_MD|x64
-       {BC3EFE27-9015-4C9C-AD3C-72B3B7ED2114}.Release_MD|x64.Build.0 = Release_MD|x64
        {BC3EFE27-9015-4C9C-AD3C-72B3B7ED2114}.Release|Win32.ActiveCfg = Release|Win32
        {BC3EFE27-9015-4C9C-AD3C-72B3B7ED2114}.Release|Win32.Build.0 = Release|Win32
        {BC3EFE27-9015-4C9C-AD3C-72B3B7ED2114}.Release|x64.ActiveCfg = Release|x64
--- 39,44 ----
diff -crN ./src_orig\TVTest.vcxproj ./src_unko\TVTest.vcxproj
*** ./src_orig\TVTest.vcxproj   Sat Nov 22 04:36:26 2014
--- ./src_unko\TVTest.vcxproj   Sat Nov 29 09:44:50 2014
***************
*** 9,22 ****
        <Configuration>Debug</Configuration>
        <Platform>x64</Platform>
      </ProjectConfiguration>
-     <ProjectConfiguration Include="Release_MD|Win32">
-       <Configuration>Release_MD</Configuration>
-       <Platform>Win32</Platform>
-     </ProjectConfiguration>
-     <ProjectConfiguration Include="Release_MD|x64">
-       <Configuration>Release_MD</Configuration>
-       <Platform>x64</Platform>
-     </ProjectConfiguration>
      <ProjectConfiguration Include="Release|Win32">
        <Configuration>Release</Configuration>
        <Platform>Win32</Platform>
--- 9,14 ----
***************
*** 37,70 ****
      <UseOfMfc>false</UseOfMfc>
      <CharacterSet>Unicode</CharacterSet>
      <WholeProgramOptimization>true</WholeProgramOptimization>
!   </PropertyGroup>
!   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_MD|Win32'" Label="Configuration">
!     <ConfigurationType>Application</ConfigurationType>
!     <UseOfMfc>false</UseOfMfc>
!     <CharacterSet>Unicode</CharacterSet>
!     <WholeProgramOptimization>true</WholeProgramOptimization>
    </PropertyGroup>
    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
      <ConfigurationType>Application</ConfigurationType>
      <UseOfMfc>false</UseOfMfc>
      <CharacterSet>Unicode</CharacterSet>
    </PropertyGroup>
    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
      <ConfigurationType>Application</ConfigurationType>
      <UseOfMfc>false</UseOfMfc>
      <CharacterSet>Unicode</CharacterSet>
      <WholeProgramOptimization>true</WholeProgramOptimization>
!   </PropertyGroup>
!   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_MD|x64'" Label="Configuration">
!     <ConfigurationType>Application</ConfigurationType>
!     <UseOfMfc>false</UseOfMfc>
!     <CharacterSet>Unicode</CharacterSet>
!     <WholeProgramOptimization>true</WholeProgramOptimization>
    </PropertyGroup>
    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
      <ConfigurationType>Application</ConfigurationType>
      <UseOfMfc>false</UseOfMfc>
      <CharacterSet>Unicode</CharacterSet>
    </PropertyGroup>
    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
    <ImportGroup Label="ExtensionSettings">
--- 29,54 ----
      <UseOfMfc>false</UseOfMfc>
      <CharacterSet>Unicode</CharacterSet>
      <WholeProgramOptimization>true</WholeProgramOptimization>
!     <PlatformToolset>v110</PlatformToolset>
    </PropertyGroup>
    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
      <ConfigurationType>Application</ConfigurationType>
      <UseOfMfc>false</UseOfMfc>
      <CharacterSet>Unicode</CharacterSet>
+     <PlatformToolset>v110</PlatformToolset>
    </PropertyGroup>
    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
      <ConfigurationType>Application</ConfigurationType>
      <UseOfMfc>false</UseOfMfc>
      <CharacterSet>Unicode</CharacterSet>
      <WholeProgramOptimization>true</WholeProgramOptimization>
!     <PlatformToolset>v110</PlatformToolset>
    </PropertyGroup>
    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
      <ConfigurationType>Application</ConfigurationType>
      <UseOfMfc>false</UseOfMfc>
      <CharacterSet>Unicode</CharacterSet>
+     <PlatformToolset>v110</PlatformToolset>
    </PropertyGroup>
    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
    <ImportGroup Label="ExtensionSettings">
***************
*** 72,89 ****
    <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
      <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    </ImportGroup>
-   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_MD|Win32'" Label="PropertySheets">
-     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-   </ImportGroup>
    <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
      <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    </ImportGroup>
    <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
      <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    </ImportGroup>
-   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_MD|x64'" Label="PropertySheets">
-     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-   </ImportGroup>
    <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
      <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    </ImportGroup>
--- 56,67 ----
***************
*** 97,113 ****
      <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
      <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
      <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release_MD|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
      <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
-     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release_MD|Win32'">$(Platform)\$(Configuration)\</IntDir>
      <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release_MD|Win32'">false</LinkIncremental>
      <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release_MD|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
      <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
-     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release_MD|x64'">$(Platform)\$(Configuration)\</IntDir>
      <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release_MD|x64'">false</LinkIncremental>
      <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
      <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
      <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
--- 75,85 ----
***************
*** 115,131 ****
      <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
      <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
      <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release_MD|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
      <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release_MD|Win32'" />
      <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release_MD|Win32'" />
      <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release_MD|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
      <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release_MD|x64'" />
      <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release_MD|x64'" />
    </PropertyGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
      <Midl>
--- 87,97 ----
***************
*** 279,395 ****
        <EnableDPIAwareness>true</EnableDPIAwareness>
      </Manifest>
    </ItemDefinitionGroup>
-   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_MD|Win32'">
-     <Midl>
-       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-       <MkTypLibCompatible>false</MkTypLibCompatible>
-       <ValidateAllParameters>false</ValidateAllParameters>
-     </Midl>
-     <ClCompile>
-       <Optimization>Full</Optimization>
-       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-       <IntrinsicFunctions>false</IntrinsicFunctions>
-       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-       <AdditionalIncludeDirectories>.\;.\Include;.\BonTsEngine;.\HelperClass;.\DirectShowFilter;.\DtvEngine;.\BaseClasses;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-       <StringPooling>true</StringPooling>
-       <MinimalRebuild>false</MinimalRebuild>
-       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-       <BufferSecurityCheck>false</BufferSecurityCheck>
-       <FunctionLevelLinking>true</FunctionLevelLinking>
-       <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
-       <PrecompiledHeader>NotUsing</PrecompiledHeader>
-       <WarningLevel>Level3</WarningLevel>
-       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-       <CompileAs>Default</CompileAs>
-       <FloatingPointModel>Fast</FloatingPointModel>
-     </ClCompile>
-     <ResourceCompile>
-       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-       <Culture>0x0411</Culture>
-       <AdditionalIncludeDirectories>$(IntDir);Resource;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-     </ResourceCompile>
-     <Link>
-       <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-       <AdditionalLibraryDirectories>$(IntDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-       <EnableUAC>false</EnableUAC>
-       <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
-       <GenerateDebugInformation>false</GenerateDebugInformation>
-       <SubSystem>Windows</SubSystem>
-       <StackReserveSize>2097152</StackReserveSize>
-       <LargeAddressAware>true</LargeAddressAware>
-       <OptimizeReferences>true</OptimizeReferences>
-       <EnableCOMDATFolding>true</EnableCOMDATFolding>
-       <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-       <RandomizedBaseAddress>false</RandomizedBaseAddress>
-       <DataExecutionPrevention>
-       </DataExecutionPrevention>
-       <TargetMachine>MachineX86</TargetMachine>
-       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-     </Link>
-     <Manifest>
-       <AdditionalManifestFiles>$(SolutionDir)Resource\compatibility.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
-       <OutputManifestFile>$(IntDir)$(TargetName)$(TargetExt).embed.manifest</OutputManifestFile>
-       <EnableDPIAwareness>true</EnableDPIAwareness>
-     </Manifest>
-   </ItemDefinitionGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-     <Midl>
-       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-       <MkTypLibCompatible>false</MkTypLibCompatible>
-       <TargetEnvironment>X64</TargetEnvironment>
-     </Midl>
-     <ClCompile>
-       <Optimization>Full</Optimization>
-       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-       <IntrinsicFunctions>false</IntrinsicFunctions>
-       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-       <AdditionalIncludeDirectories>.\;.\Include;.\BonTsEngine;.\HelperClass;.\DirectShowFilter;.\DtvEngine;.\BaseClasses;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-       <PreprocessorDefinitions>WIN32;WIN64;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-       <StringPooling>true</StringPooling>
-       <MinimalRebuild>false</MinimalRebuild>
-       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-       <BufferSecurityCheck>false</BufferSecurityCheck>
-       <FunctionLevelLinking>true</FunctionLevelLinking>
-       <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
-       <PrecompiledHeader>NotUsing</PrecompiledHeader>
-       <WarningLevel>Level3</WarningLevel>
-       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-       <CompileAs>Default</CompileAs>
-       <FloatingPointModel>Fast</FloatingPointModel>
-     </ClCompile>
-     <ResourceCompile>
-       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-       <Culture>0x0411</Culture>
-       <AdditionalIncludeDirectories>$(IntDir);Resource;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-     </ResourceCompile>
-     <Link>
-       <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-       <AdditionalLibraryDirectories>$(IntDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-       <EnableUAC>false</EnableUAC>
-       <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
-       <GenerateDebugInformation>false</GenerateDebugInformation>
-       <SubSystem>Windows</SubSystem>
-       <StackReserveSize>2097152</StackReserveSize>
-       <LargeAddressAware>true</LargeAddressAware>
-       <OptimizeReferences>true</OptimizeReferences>
-       <EnableCOMDATFolding>true</EnableCOMDATFolding>
-       <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-       <RandomizedBaseAddress>false</RandomizedBaseAddress>
-       <DataExecutionPrevention>
-       </DataExecutionPrevention>
-       <TargetMachine>MachineX64</TargetMachine>
-       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-     </Link>
-     <Manifest>
-       <AdditionalManifestFiles>$(SolutionDir)Resource\compatibility.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
-       <OutputManifestFile>$(IntDir)$(TargetName)$(TargetExt).embed.manifest</OutputManifestFile>
-       <EnableDPIAwareness>true</EnableDPIAwareness>
-     </Manifest>
-   </ItemDefinitionGroup>
-   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_MD|x64'">
      <Midl>
        <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
        <MkTypLibCompatible>false</MkTypLibCompatible>
--- 245,251 ----