*** ConvertMacro2.cpp.org Sun Sep 11 22:32:28 2011 --- ConvertMacro2.cpp Wed Nov 7 18:05:45 2012 *************** *** 93,98 **** --- 93,99 ---- wstring strGenre2=L""; wstring strSubTitle=L""; wstring strSubTitle2=L""; + wstring strSubTitle3=L""; strTitle = info->eventName; *************** *** 203,213 **** --- 204,218 ---- if( epgInfo->shortInfo != NULL ){ strSubTitle = epgInfo->shortInfo->text_char; strSubTitle2 = epgInfo->shortInfo->text_char; + strSubTitle3 = epgInfo->shortInfo->text_char; wstring r; Separate(strSubTitle2, L"\r\n", strSubTitle2, r); if( IsFindKey(strSubTitle2, L"^[#][0-9OPQRSTUVWX]") == FALSE ){ strSubTitle2 = L""; } + if( IsFindKey(strSubTitle3, L"^[#][0-9OPQRSTUVWX]") == FALSE ){ + strSubTitle3 = L""; + } } } *************** *** 276,281 **** --- 281,287 ---- Replace(convert, L"$Genre2$", strGenre2); Replace(convert, L"$SubTitle$", strSubTitle); Replace(convert, L"$SubTitle2$", strSubTitle2); + Replace(convert, L"$SubTitle3$", strSubTitle3); Replace(convert, L"\r\n", L""); return TRUE;