API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Jan 30th, 2013
213
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 6.83 KB | None | 0 0
raw download clone embed print report
  1. diff --git a/Common/ReNamePlugInUtil.h b/Common/ReNamePlugInUtil.h
  2. index 597fec0..102eaf6 100644
  3. --- a/Common/ReNamePlugInUtil.h
  4. +++ b/Common/ReNamePlugInUtil.h
  5. @@ -15,6 +15,7 @@ typedef struct _PLUGIN_RESERVE_INFO{
  6.     WCHAR bonDriverName[256];   //使用BonDriverファイル名
  7.     DWORD bonDriverID;          //EpgTimerSrv内部でのBonDriver識別ID
  8.     DWORD tunerID;              //EpgTimerSrv内部でのチューナー識別ID
  9. +   WCHAR comment[512];         //コメント
  10.  }PLUGIN_RESERVE_INFO;
  11.  
  12.  //PlugInの名前を取得する
  13. diff --git a/EpgTimerSrv/EpgTimerSrv/ReserveManager.cpp b/EpgTimerSrv/EpgTimerSrv/ReserveManager.cpp
  14. index 8a63d30..de38874 100644
  15. --- a/EpgTimerSrv/EpgTimerSrv/ReserveManager.cpp
  16. +++ b/EpgTimerSrv/EpgTimerSrv/ReserveManager.cpp
  17. @@ -1155,6 +1155,7 @@ BOOL CReserveManager::GetReserveDataAll(
  18.             wcscpy_s(info.bonDriverName, 256, itrTune->second.tunerName.c_str());
  19.             info.bonDriverID = (itrTune->second.tunerID & 0xFFFF0000)>>16;
  20.             info.tunerID = itrTune->second.tunerID & 0x0000FFFF;
  21. +           wcscpy_s(info.comment, 512, item->comment.c_str());
  22.  
  23.             EPG_EVENT_INFO* epgInfo = NULL;
  24.             EPGDB_EVENT_INFO* epgDBInfo;
  25. diff --git a/EpgTimerSrv/EpgTimerSrv/TunerBankCtrl.cpp b/EpgTimerSrv/EpgTimerSrv/TunerBankCtrl.cpp
  26. index 8266cf6..460d71d 100644
  27. --- a/EpgTimerSrv/EpgTimerSrv/TunerBankCtrl.cpp
  28. +++ b/EpgTimerSrv/EpgTimerSrv/TunerBankCtrl.cpp
  29. @@ -1584,6 +1584,7 @@ BOOL CTunerBankCtrl::RecStart(LONGLONG nowTime, RESERVE_WORK* reserve, BOOL send
  30.                 wcscpy_s(info.bonDriverName, 256, this->bonFileName.c_str());
  31.                 info.bonDriverID = (this->tunerID & 0xFFFF0000)>>16;
  32.                 info.tunerID = this->tunerID & 0x0000FFFF;
  33. +               wcscpy_s(info.comment, 512, data.comment.c_str());
  34.  
  35.                 EPG_EVENT_INFO* epgInfo = NULL;
  36.                 EPGDB_EVENT_INFO* epgDBInfo;
  37. @@ -1675,6 +1676,7 @@ BOOL CTunerBankCtrl::RecStart(LONGLONG nowTime, RESERVE_WORK* reserve, BOOL send
  38.                             wcscpy_s(info.bonDriverName, 256, this->bonFileName.c_str());
  39.                             info.bonDriverID = (this->tunerID & 0xFFFF0000)>>16;
  40.                             info.tunerID = this->tunerID & 0x0000FFFF;
  41. +                           wcscpy_s(info.comment, 512, data.comment.c_str());
  42.  
  43.                             EPG_EVENT_INFO* epgInfo = NULL;
  44.                             EPGDB_EVENT_INFO* epgDBInfo;
  45. @@ -1736,6 +1738,7 @@ BOOL CTunerBankCtrl::RecStart(LONGLONG nowTime, RESERVE_WORK* reserve, BOOL send
  46.                             wcscpy_s(info.bonDriverName, 256, this->bonFileName.c_str());
  47.                             info.bonDriverID = (this->tunerID & 0xFFFF0000)>>16;
  48.                             info.tunerID = this->tunerID & 0x0000FFFF;
  49. +                           wcscpy_s(info.comment, 512, data.comment.c_str());
  50.  
  51.                             EPG_EVENT_INFO* epgInfo = NULL;
  52.                             EPGDB_EVENT_INFO* epgDBInfo;
  53. diff --git a/Readme_EpgTimer.txt b/Readme_EpgTimer.txt
  54. index dead0c2..035b25d 100644
  55. --- a/Readme_EpgTimer.txt
  56. +++ b/Readme_EpgTimer.txt
  57. @@ -994,7 +994,7 @@ $TitleF$    $Title$
  58.  $Title2F$  $Title2$と同内容でファイル名に使用できない記号が存在した場合全角に変換するもの（バッチのみ）
  59.  $Genre$        番組のジャンル（EPGデータ存在時のみ）（RecName_Macro.dllのみ）
  60.  $Genre2$   番組の詳細ジャンル（EPGデータ存在時のみ）（RecName_Macro.dllのみ）
  61. -$AddKey$   EPG自動予約で登録されたキーワード（バッチのみ）
  62. +$AddKey$   EPG自動予約で登録されたキーワード
  63.  $SubTitle$ サブタイトル（番組内容）（EPGデータ存在時のみ）（RecName_Macro.dllのみ）
  64.  $SubTitle2$    $SubTitle$の内容で「^[#＃第][0-9０１２３４５６７８９]」の検索にヒットした場合のみ（EPGデータ存在時のみ）（RecName_Macro.dllのみ）
  65.  
  66. diff --git a/RecName_Macro/RecName_Macro/ConvertMacro.cpp b/RecName_Macro/RecName_Macro/ConvertMacro.cpp
  67. index 644d559..25cc2fc 100644
  68. --- a/RecName_Macro/RecName_Macro/ConvertMacro.cpp
  69. +++ b/RecName_Macro/RecName_Macro/ConvertMacro.cpp
  70. @@ -77,6 +77,7 @@ BOOL CConvertMacro::Convert(wstring macro, PLUGIN_RESERVE_INFO* info, wstring& c
  71.     wstring strDUS=L"";
  72.     wstring strDUSS=L"";
  73.     wstring strTitle2=L"";
  74. +   wstring strAddKey=L"";
  75.  
  76.     strTitle = info->eventName;
  77.  
  78. @@ -177,6 +178,14 @@ BOOL CConvertMacro::Convert(wstring macro, PLUGIN_RESERVE_INFO* info, wstring& c
  79.         strTitle2 = strSep1;
  80.     }
  81.  
  82. +   strAddKey = info->comment;
  83. +   if( strAddKey.find(L"EPG自動予約(") != wstring::npos ){
  84. +       Replace(strAddKey, L"EPG自動予約(", L"");
  85. +       strAddKey.erase(strAddKey.length()-1, 1);
  86. +   }else{
  87. +       strAddKey = L"";
  88. +   }
  89. +
  90.     Replace(convert, L"$Title$", strTitle);
  91.     Replace(convert, L"$SDYYYY$", strSDYYYY);
  92.     Replace(convert, L"$SDYY$", strSDYY);
  93. @@ -240,6 +249,7 @@ BOOL CConvertMacro::Convert(wstring macro, PLUGIN_RESERVE_INFO* info, wstring& c
  94.     Replace(convert, L"$Title2$", strTitle2);
  95.     Replace(convert, L"$Genre$", L"");
  96.     Replace(convert, L"$Genre2$", L"");
  97. +   Replace(convert, L"$AddKey$", strAddKey);
  98.     Replace(convert, L"$SubTitle$", L"");
  99.     Replace(convert, L"$SubTitle2$", L"");
  100.     Replace(convert, L"¥r¥n", L"");
  101. diff --git a/RecName_Macro/RecName_Macro/ConvertMacro2.cpp b/RecName_Macro/RecName_Macro/ConvertMacro2.cpp
  102. index a2ccb15..cf53b1f 100644
  103. --- a/RecName_Macro/RecName_Macro/ConvertMacro2.cpp
  104. +++ b/RecName_Macro/RecName_Macro/ConvertMacro2.cpp
  105. @@ -91,6 +91,7 @@ BOOL CConvertMacro2::Convert(wstring macro, PLUGIN_RESERVE_INFO* info, EPG_EVENT
  106.     wstring strTitle2=L"";
  107.     wstring strGenre=L"";
  108.     wstring strGenre2=L"";
  109. +   wstring strAddKey=L"";
  110.     wstring strSubTitle=L"";
  111.     wstring strSubTitle2=L"";
  112.  
  113. @@ -193,6 +194,14 @@ BOOL CConvertMacro2::Convert(wstring macro, PLUGIN_RESERVE_INFO* info, EPG_EVENT
  114.         strTitle2 = strSep1;
  115.     }
  116.  
  117. +   strAddKey = info->comment;
  118. +   if( strAddKey.find(L"EPG自動予約(") != wstring::npos ){
  119. +       Replace(strAddKey, L"EPG自動予約(", L"");
  120. +       strAddKey.erase(strAddKey.length()-1, 1);
  121. +   }else{
  122. +       strAddKey = L"";
  123. +   }
  124. +
  125.     if(epgInfo != NULL ){
  126.         if( epgInfo->contentInfo != NULL ){
  127.             if( epgInfo->contentInfo->listSize > 0 ){
  128. @@ -274,6 +283,7 @@ BOOL CConvertMacro2::Convert(wstring macro, PLUGIN_RESERVE_INFO* info, EPG_EVENT
  129.     Replace(convert, L"$Title2$", strTitle2);
  130.     Replace(convert, L"$Genre$", strGenre);
  131.     Replace(convert, L"$Genre2$", strGenre2);
  132. +   Replace(convert, L"$AddKey$", strAddKey);
  133.     Replace(convert, L"$SubTitle$", strSubTitle);
  134.     Replace(convert, L"$SubTitle2$", strSubTitle2);
  135.     Replace(convert, L"¥r¥n", L"");
  136. diff --git a/RecName_Macro/RecName_Macro/RecName_PlugIn.h b/RecName_Macro/RecName_Macro/RecName_PlugIn.h
  137. index 3dda291..6f25843 100644
  138. --- a/RecName_Macro/RecName_Macro/RecName_PlugIn.h
  139. +++ b/RecName_Macro/RecName_Macro/RecName_PlugIn.h
  140. @@ -16,6 +16,7 @@ typedef struct _PLUGIN_RESERVE_INFO{
  141.     WCHAR bonDriverName[256];   //使用BonDriverファイル名
  142.     DWORD bonDriverID;          //EpgTimerSrv内部でのBonDriver識別ID
  143.     DWORD tunerID;              //EpgTimerSrv内部でのチューナー識別ID
  144. +   WCHAR comment[512];         //コメント
  145.  }PLUGIN_RESERVE_INFO;
  146.  
  147.  //PlugInの名前を取得する
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!