Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/Common/ReNamePlugInUtil.h b/Common/ReNamePlugInUtil.h
- index 597fec0..102eaf6 100644
- --- a/Common/ReNamePlugInUtil.h
- +++ b/Common/ReNamePlugInUtil.h
- @@ -15,6 +15,7 @@ typedef struct _PLUGIN_RESERVE_INFO{
- WCHAR bonDriverName[256]; //使用BonDriverファイル名
- DWORD bonDriverID; //EpgTimerSrv内部でのBonDriver識別ID
- DWORD tunerID; //EpgTimerSrv内部でのチューナー識別ID
- + WCHAR comment[512]; //コメント
- }PLUGIN_RESERVE_INFO;
- //PlugInの名前を取得する
- diff --git a/Document/Readme_EpgTimer.txt b/Document/Readme_EpgTimer.txt
- index 1bd9b6e..280e343 100644
- --- a/Document/Readme_EpgTimer.txt
- +++ b/Document/Readme_EpgTimer.txt
- @@ -1003,7 +1003,7 @@ $TitleF$ $Title$
- $Title2F$ $Title2$と同内容でファイル名に使用できない記号が存在した場合全角に変換するもの(バッチのみ)
- $Genre$ 番組のジャンル(EPGデータ存在時のみ)(RecName_Macro.dllのみ)
- $Genre2$ 番組の詳細ジャンル(EPGデータ存在時のみ)(RecName_Macro.dllのみ)
- -$AddKey$ EPG自動予約で登録されたキーワード(バッチのみ)
- +$AddKey$ EPG自動予約で登録されたキーワード
- $SubTitle$ サブタイトル(番組内容)(EPGデータ存在時のみ)(RecName_Macro.dllのみ)
- $SubTitle2$ $SubTitle$の内容で「^[##第][0-90123456789]」の検索にヒットした場合のみ(EPGデータ存在時のみ)(RecName_Macro.dllのみ)
- diff --git a/EpgTimerSrv/EpgTimerSrv/ReserveManager.cpp b/EpgTimerSrv/EpgTimerSrv/ReserveManager.cpp
- index c99f900..cfa191c 100644
- --- a/EpgTimerSrv/EpgTimerSrv/ReserveManager.cpp
- +++ b/EpgTimerSrv/EpgTimerSrv/ReserveManager.cpp
- @@ -1101,6 +1101,7 @@ BOOL CReserveManager::GetReserveDataAll(
- wcscpy_s(info.bonDriverName, 256, itrTune->second.tunerName.c_str());
- info.bonDriverID = (itrTune->second.tunerID & 0xFFFF0000)>>16;
- info.tunerID = itrTune->second.tunerID & 0x0000FFFF;
- + wcscpy_s(info.comment, 512, item->comment.c_str());
- EPG_EVENT_INFO* epgInfo = NULL;
- EPGDB_EVENT_INFO epgDBInfo;
- diff --git a/EpgTimerSrv/EpgTimerSrv/TunerBankCtrl.cpp b/EpgTimerSrv/EpgTimerSrv/TunerBankCtrl.cpp
- index dfe3d50..92cdf4c 100644
- --- a/EpgTimerSrv/EpgTimerSrv/TunerBankCtrl.cpp
- +++ b/EpgTimerSrv/EpgTimerSrv/TunerBankCtrl.cpp
- @@ -1567,6 +1567,7 @@ BOOL CTunerBankCtrl::RecStart(LONGLONG nowTime, RESERVE_WORK* reserve, BOOL send
- wcscpy_s(info.bonDriverName, 256, this->bonFileName.c_str());
- info.bonDriverID = (this->tunerID & 0xFFFF0000)>>16;
- info.tunerID = this->tunerID & 0x0000FFFF;
- + wcscpy_s(info.comment, 512, data.comment.c_str());
- EPG_EVENT_INFO* epgInfo = NULL;
- EPGDB_EVENT_INFO epgDBInfo;
- @@ -1658,6 +1659,7 @@ BOOL CTunerBankCtrl::RecStart(LONGLONG nowTime, RESERVE_WORK* reserve, BOOL send
- wcscpy_s(info.bonDriverName, 256, this->bonFileName.c_str());
- info.bonDriverID = (this->tunerID & 0xFFFF0000)>>16;
- info.tunerID = this->tunerID & 0x0000FFFF;
- + wcscpy_s(info.comment, 512, data.comment.c_str());
- EPG_EVENT_INFO* epgInfo = NULL;
- EPGDB_EVENT_INFO epgDBInfo;
- @@ -1719,6 +1721,7 @@ BOOL CTunerBankCtrl::RecStart(LONGLONG nowTime, RESERVE_WORK* reserve, BOOL send
- wcscpy_s(info.bonDriverName, 256, this->bonFileName.c_str());
- info.bonDriverID = (this->tunerID & 0xFFFF0000)>>16;
- info.tunerID = this->tunerID & 0x0000FFFF;
- + wcscpy_s(info.comment, 512, data.comment.c_str());
- EPG_EVENT_INFO* epgInfo = NULL;
- EPGDB_EVENT_INFO epgDBInfo;
- diff --git a/RecName_Macro/RecName_Macro/ConvertMacro2.cpp b/RecName_Macro/RecName_Macro/ConvertMacro2.cpp
- index 1d77345..3a56024 100644
- --- a/RecName_Macro/RecName_Macro/ConvertMacro2.cpp
- +++ b/RecName_Macro/RecName_Macro/ConvertMacro2.cpp
- @@ -164,6 +164,14 @@ static BOOL ExpandMacro(wstring var, PLUGIN_RESERVE_INFO* info, EPG_EVENT_INFO*
- if( epgInfo != NULL && epgInfo->contentInfo != NULL && epgInfo->contentInfo->listSize > 0 ){
- GetGenreName(epgInfo->contentInfo->nibbleList[0].content_nibble_level_1, epgInfo->contentInfo->nibbleList[0].content_nibble_level_2, ret);
- }
- + }else if( var == L"AddKey" ){
- + ret = info->comment;
- + if( ret.find(L"EPG自動予約(") != wstring::npos ){
- + Replace(ret, L"EPG自動予約(", L"");
- + ret.erase(ret.length()-1, 1);
- + }else{
- + ret = L"";
- + }
- }else if( var == L"SubTitle" ){
- if( epgInfo != NULL && epgInfo->shortInfo != NULL ){
- ret = epgInfo->shortInfo->text_char;
- diff --git a/RecName_Macro/RecName_Macro/RecName_PlugIn.h b/RecName_Macro/RecName_Macro/RecName_PlugIn.h
- index 3dda291..6f25843 100644
- --- a/RecName_Macro/RecName_Macro/RecName_PlugIn.h
- +++ b/RecName_Macro/RecName_Macro/RecName_PlugIn.h
- @@ -16,6 +16,7 @@ typedef struct _PLUGIN_RESERVE_INFO{
- WCHAR bonDriverName[256]; //使用BonDriverファイル名
- DWORD bonDriverID; //EpgTimerSrv内部でのBonDriver識別ID
- DWORD tunerID; //EpgTimerSrv内部でのチューナー識別ID
- + WCHAR comment[512]; //コメント
- }PLUGIN_RESERVE_INFO;
- //PlugInの名前を取得する
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement