From 8ddd8c9104ed08f53459ea359869fc2af7d8e7e7 Mon Sep 17 00:00:00 2001 From: xy Date: Mon, 10 Sep 2012 21:28:32 +0800 Subject: [PATCH] Fix naming. --- src/filters/transform/vsfilter/Copy.cpp | 6 +- src/filters/transform/vsfilter/DirectVobSub.cpp | 34 +++++----- src/filters/transform/vsfilter/DirectVobSub.h | 12 ++-- .../transform/vsfilter/DirectVobSubFilter.cpp | 28 ++++---- .../transform/vsfilter/DirectVobSubPropPage.cpp | 78 +++++++++++----------- .../transform/vsfilter/DirectVobSubPropPage.h | 2 +- src/filters/transform/vsfilter/IDirectVobSubXy.h | 2 +- src/filters/transform/vsfilter/plugins.cpp | 2 +- src/subpic/SimpleSubPicProviderImpl.cpp | 2 +- 9 files changed, 83 insertions(+), 83 deletions(-) diff --git a/src/filters/transform/vsfilter/Copy.cpp b/src/filters/transform/vsfilter/Copy.cpp index 0a1de91..aa43731 100644 --- a/src/filters/transform/vsfilter/Copy.cpp +++ b/src/filters/transform/vsfilter/Copy.cpp @@ -28,7 +28,7 @@ #include "xy_logger.h" -using namespace DirectVobSubXyIntOptions; +using namespace DirectVobSubXyOptions; static void LogSubPicStartStop( const REFERENCE_TIME& rtStart, const REFERENCE_TIME& rtStop, const CString& msg) { @@ -585,8 +585,8 @@ void CDirectVobSubFilter::PrintMessages(BYTE* pOut) CachesInfo *caches_info = NULL; XyFlyWeightInfo *xy_fw_info = NULL; int tmp_size; - XyGetBin(DirectVobSubXyIntOptions::BIN_CACHES_INFO, reinterpret_cast(&caches_info), &tmp_size); - XyGetBin(DirectVobSubXyIntOptions::BIN_XY_FLY_WEIGHT_INFO, reinterpret_cast(&xy_fw_info), &tmp_size); + XyGetBin(DirectVobSubXyOptions::BIN_CACHES_INFO, reinterpret_cast(&caches_info), &tmp_size); + XyGetBin(DirectVobSubXyOptions::BIN_XY_FLY_WEIGHT_INFO, reinterpret_cast(&xy_fw_info), &tmp_size); ASSERT(caches_info); ASSERT(xy_fw_info); tmp.Format( diff --git a/src/filters/transform/vsfilter/DirectVobSub.cpp b/src/filters/transform/vsfilter/DirectVobSub.cpp index d4df8ba..a533266 100644 --- a/src/filters/transform/vsfilter/DirectVobSub.cpp +++ b/src/filters/transform/vsfilter/DirectVobSub.cpp @@ -23,7 +23,7 @@ #include "DirectVobSub.h" #include "VSFilter.h" -using namespace DirectVobSubXyIntOptions; +using namespace DirectVobSubXyOptions; CDirectVobSub::CDirectVobSub() { @@ -956,7 +956,7 @@ UINT CDirectVobSub::GetCompatibleProfileInt( LPCTSTR lpszSection, LPCTSTR lpszEn STDMETHODIMP CDirectVobSub::XyGetBool( int field, bool *value ) { CAutoLock cAutoLock(&m_propsLock); - if (field<0 || field>=DirectVobSubXyIntOptions::BOOL_COUNT) + if (field<0 || field>=DirectVobSubXyOptions::BOOL_COUNT) { return E_NOTIMPL; } @@ -966,7 +966,7 @@ STDMETHODIMP CDirectVobSub::XyGetBool( int field, bool *value ) STDMETHODIMP CDirectVobSub::XyGetInt( int field, int *value ) { CAutoLock cAutoLock(&m_propsLock); - if (field<0 || field>=DirectVobSubXyIntOptions::INT_COUNT) + if (field<0 || field>=DirectVobSubXyOptions::INT_COUNT) { return E_NOTIMPL; } @@ -976,7 +976,7 @@ STDMETHODIMP CDirectVobSub::XyGetInt( int field, int *value ) STDMETHODIMP CDirectVobSub::XyGetSize( int field, SIZE *value ) { CAutoLock cAutoLock(&m_propsLock); - if (field<0 || field>=DirectVobSubXyIntOptions::SIZE_COUNT) + if (field<0 || field>=DirectVobSubXyOptions::SIZE_COUNT) { return E_NOTIMPL; } @@ -987,21 +987,21 @@ STDMETHODIMP CDirectVobSub::XyGetSize( int field, SIZE *value ) switch(field) { case SIZE_LAYOUT_WITH: - switch(m_xy_int_opt[DirectVobSubXyIntOptions::INT_LAYOUT_SIZE_OPT]) + switch(m_xy_int_opt[DirectVobSubXyOptions::INT_LAYOUT_SIZE_OPT]) { case LAYOUT_SIZE_OPT_FOLLOW_ORIGINAL_VIDEO_SIZE: - *value = m_xy_size_opt[DirectVobSubXyIntOptions::SIZE_ORIGINAL_VIDEO]; + *value = m_xy_size_opt[DirectVobSubXyOptions::SIZE_ORIGINAL_VIDEO]; break; case LAYOUT_SIZE_OPT_USER_SPECIFIED: - *value = m_xy_size_opt[DirectVobSubXyIntOptions::SIZE_USER_SPECIFIED_LAYOUT_SIZE]; + *value = m_xy_size_opt[DirectVobSubXyOptions::SIZE_USER_SPECIFIED_LAYOUT_SIZE]; break; default: - *value = m_xy_size_opt[DirectVobSubXyIntOptions::SIZE_ASS_PLAY_RESOLUTION]; + *value = m_xy_size_opt[DirectVobSubXyOptions::SIZE_ASS_PLAY_RESOLUTION]; break; } if (value->cx * value->cy == 0) { - *value = m_xy_size_opt[DirectVobSubXyIntOptions::SIZE_ORIGINAL_VIDEO]; + *value = m_xy_size_opt[DirectVobSubXyOptions::SIZE_ORIGINAL_VIDEO]; } break; default: @@ -1034,7 +1034,7 @@ STDMETHODIMP CDirectVobSub::XyGetString( int field, LPWSTR *value, int *chars ) STDMETHODIMP CDirectVobSub::XyGetBin( int field, LPVOID *value, int *size ) { CAutoLock cAutoLock(&m_propsLock); - if (field<0 || field>=DirectVobSubXyIntOptions::BIN_COUNT) + if (field<0 || field>=DirectVobSubXyOptions::BIN_COUNT) { return E_NOTIMPL; } @@ -1100,7 +1100,7 @@ STDMETHODIMP CDirectVobSub::XyGetBin( int field, LPVOID *value, int *size ) STDMETHODIMP CDirectVobSub::XySetBool( int field, bool value ) { - if (field<0 || field>=DirectVobSubXyIntOptions::BOOL_COUNT) + if (field<0 || field>=DirectVobSubXyOptions::BOOL_COUNT) { return E_NOTIMPL; } @@ -1115,14 +1115,14 @@ STDMETHODIMP CDirectVobSub::XySetBool( int field, bool value ) STDMETHODIMP CDirectVobSub::XySetInt( int field, int value ) { - if (field<0 || field>=DirectVobSubXyIntOptions::INT_COUNT) + if (field<0 || field>=DirectVobSubXyOptions::INT_COUNT) { return E_NOTIMPL; } switch (field) { - case DirectVobSubXyIntOptions::INT_LAYOUT_SIZE_OPT: - if (value<0 || value>=DirectVobSubXyIntOptions::LAYOUT_SIZE_OPT_COUNT) + case DirectVobSubXyOptions::INT_LAYOUT_SIZE_OPT: + if (value<0 || value>=DirectVobSubXyOptions::LAYOUT_SIZE_OPT_COUNT) { return E_INVALIDARG; } @@ -1138,13 +1138,13 @@ STDMETHODIMP CDirectVobSub::XySetInt( int field, int value ) STDMETHODIMP CDirectVobSub::XySetSize( int field, SIZE value ) { - if (field<0 || field>=DirectVobSubXyIntOptions::SIZE_COUNT) + if (field<0 || field>=DirectVobSubXyOptions::SIZE_COUNT) { return E_NOTIMPL; } switch (field) { - case DirectVobSubXyIntOptions::SIZE_LAYOUT_WITH: + case DirectVobSubXyOptions::SIZE_LAYOUT_WITH: return E_INVALIDARG; } @@ -1179,7 +1179,7 @@ STDMETHODIMP CDirectVobSub::XySetString( int field, LPWSTR value, int chars ) STDMETHODIMP CDirectVobSub::XySetBin( int field, LPVOID value, int size ) { CAutoLock cAutoLock(&m_propsLock); - if (field<0 || field>=DirectVobSubXyIntOptions::BIN_COUNT) + if (field<0 || field>=DirectVobSubXyOptions::BIN_COUNT) { return E_NOTIMPL; } diff --git a/src/filters/transform/vsfilter/DirectVobSub.h b/src/filters/transform/vsfilter/DirectVobSub.h index 335ca2f..b6a2331 100644 --- a/src/filters/transform/vsfilter/DirectVobSub.h +++ b/src/filters/transform/vsfilter/DirectVobSub.h @@ -46,9 +46,9 @@ public: static const int REQUIRED_CONFIG_VERSION = 39; static const int CUR_SUPPORTED_FILTER_VERSION = 39; - typedef DirectVobSubXyIntOptions::CachesInfo CachesInfo; - typedef DirectVobSubXyIntOptions::XyFlyWeightInfo XyFlyWeightInfo; - typedef DirectVobSubXyIntOptions::ColorSpaceOpt ColorSpaceOpt; + typedef DirectVobSubXyOptions::CachesInfo CachesInfo; + typedef DirectVobSubXyOptions::XyFlyWeightInfo XyFlyWeightInfo; + typedef DirectVobSubXyOptions::ColorSpaceOpt ColorSpaceOpt; protected: CDirectVobSub(); virtual ~CDirectVobSub(); @@ -92,9 +92,9 @@ protected: CComPtr m_pSubClock; bool m_fForced; - int m_xy_int_opt[DirectVobSubXyIntOptions::INT_COUNT]; - bool m_xy_bool_opt[DirectVobSubXyIntOptions::BOOL_COUNT]; - CSize m_xy_size_opt[DirectVobSubXyIntOptions::SIZE_COUNT]; + int m_xy_int_opt[DirectVobSubXyOptions::INT_COUNT]; + bool m_xy_bool_opt[DirectVobSubXyOptions::BOOL_COUNT]; + CSize m_xy_size_opt[DirectVobSubXyOptions::SIZE_COUNT]; public: // IDirectVobSubXy diff --git a/src/filters/transform/vsfilter/DirectVobSubFilter.cpp b/src/filters/transform/vsfilter/DirectVobSubFilter.cpp index 9562290..a115407 100644 --- a/src/filters/transform/vsfilter/DirectVobSubFilter.cpp +++ b/src/filters/transform/vsfilter/DirectVobSubFilter.cpp @@ -52,7 +52,7 @@ bool g_RegOK = true;//false; // doesn't work with the dvd graph builder EXTERN_C IMAGE_DOS_HEADER __ImageBase; #endif -using namespace DirectVobSubXyIntOptions; +using namespace DirectVobSubXyOptions; //////////////////////////////////////////////////////////////////////////// // @@ -761,7 +761,7 @@ void CDirectVobSubFilter::InitSubPicQueue() if(FAILED(hr)) m_simple_provider = NULL; - XySetSize(DirectVobSubXyIntOptions::SIZE_ORIGINAL_VIDEO, CSize(m_w, m_h)); + XySetSize(DirectVobSubXyOptions::SIZE_ORIGINAL_VIDEO, CSize(m_w, m_h)); UpdateSubtitle(false); if(m_hbm) {DeleteObject(m_hbm); m_hbm = NULL;} @@ -2311,7 +2311,7 @@ STDMETHODIMP CDirectVobSubFilter::XySetBool( int field, bool value ) } switch(field) { - case DirectVobSubXyIntOptions::BOOL_FOLLOW_UPSTREAM_PREFERRED_ORDER: + case DirectVobSubXyOptions::BOOL_FOLLOW_UPSTREAM_PREFERRED_ORDER: m_donot_follow_upstream_preferred_order = !m_xy_bool_opt[BOOL_FOLLOW_UPSTREAM_PREFERRED_ORDER]; break; default: @@ -2331,35 +2331,35 @@ STDMETHODIMP CDirectVobSubFilter::XySetInt( int field, int value ) } switch(field) { - case DirectVobSubXyIntOptions::INT_COLOR_SPACE: - case DirectVobSubXyIntOptions::INT_YUV_RANGE: + case DirectVobSubXyOptions::INT_COLOR_SPACE: + case DirectVobSubXyOptions::INT_YUV_RANGE: SetYuvMatrix(); break; - case DirectVobSubXyIntOptions::INT_OVERLAY_CACHE_MAX_ITEM_NUM: + case DirectVobSubXyOptions::INT_OVERLAY_CACHE_MAX_ITEM_NUM: CacheManager::GetOverlayMruCache()->SetMaxItemNum(m_xy_int_opt[field]); break; - case DirectVobSubXyIntOptions::INT_SCAN_LINE_DATA_CACHE_MAX_ITEM_NUM: + case DirectVobSubXyOptions::INT_SCAN_LINE_DATA_CACHE_MAX_ITEM_NUM: CacheManager::GetScanLineData2MruCache()->SetMaxItemNum(m_xy_int_opt[field]); break; - case DirectVobSubXyIntOptions::INT_PATH_DATA_CACHE_MAX_ITEM_NUM: + case DirectVobSubXyOptions::INT_PATH_DATA_CACHE_MAX_ITEM_NUM: CacheManager::GetPathDataMruCache()->SetMaxItemNum(m_xy_int_opt[field]); break; - case DirectVobSubXyIntOptions::INT_OVERLAY_NO_BLUR_CACHE_MAX_ITEM_NUM: + case DirectVobSubXyOptions::INT_OVERLAY_NO_BLUR_CACHE_MAX_ITEM_NUM: CacheManager::GetOverlayNoBlurMruCache()->SetMaxItemNum(m_xy_int_opt[field]); break; - case DirectVobSubXyIntOptions::INT_BITMAP_MRU_CACHE_ITEM_NUM: + case DirectVobSubXyOptions::INT_BITMAP_MRU_CACHE_ITEM_NUM: CacheManager::GetBitmapMruCache()->SetMaxItemNum(m_xy_int_opt[field]); break; - case DirectVobSubXyIntOptions::INT_CLIPPER_MRU_CACHE_ITEM_NUM: + case DirectVobSubXyOptions::INT_CLIPPER_MRU_CACHE_ITEM_NUM: CacheManager::GetClipperAlphaMaskMruCache()->SetMaxItemNum(m_xy_int_opt[field]); break; - case DirectVobSubXyIntOptions::INT_TEXT_INFO_CACHE_ITEM_NUM: + case DirectVobSubXyOptions::INT_TEXT_INFO_CACHE_ITEM_NUM: CacheManager::GetTextInfoCache()->SetMaxItemNum(m_xy_int_opt[field]); break; - case DirectVobSubXyIntOptions::INT_ASS_TAG_LIST_CACHE_ITEM_NUM: + case DirectVobSubXyOptions::INT_ASS_TAG_LIST_CACHE_ITEM_NUM: CacheManager::GetAssTagListMruCache()->SetMaxItemNum(m_xy_int_opt[field]); break; - case DirectVobSubXyIntOptions::INT_SUBPIXEL_POS_LEVEL: + case DirectVobSubXyOptions::INT_SUBPIXEL_POS_LEVEL: SubpixelPositionControler::GetGlobalControler().SetSubpixelLevel( static_cast(m_xy_int_opt[field]) ); break; default: diff --git a/src/filters/transform/vsfilter/DirectVobSubPropPage.cpp b/src/filters/transform/vsfilter/DirectVobSubPropPage.cpp index c96ba44..f7062b8 100644 --- a/src/filters/transform/vsfilter/DirectVobSubPropPage.cpp +++ b/src/filters/transform/vsfilter/DirectVobSubPropPage.cpp @@ -388,7 +388,7 @@ void CDVSMainPPage::UpdateObjectData(bool fSave) m_pDirectVobSub->put_VobSubSettings(true, m_fOnlyShowForcedVobSubs, false); m_pDirectVobSub->put_TextSettings(&m_defStyle); m_pDirectVobSub->put_AspectRatioSettings(&m_ePARCompensationType); - m_pDirectVobSubXy->XySetBool(DirectVobSubXyIntOptions::BOOL_HIDE_TRAY_ICON, m_fHideTrayIcon); + m_pDirectVobSubXy->XySetBool(DirectVobSubXyOptions::BOOL_HIDE_TRAY_ICON, m_fHideTrayIcon); } else { @@ -402,7 +402,7 @@ void CDVSMainPPage::UpdateObjectData(bool fSave) m_pDirectVobSub->get_VobSubSettings(NULL, &m_fOnlyShowForcedVobSubs, NULL); m_pDirectVobSub->get_TextSettings(&m_defStyle); m_pDirectVobSub->get_AspectRatioSettings(&m_ePARCompensationType); - m_pDirectVobSubXy->XyGetBool(DirectVobSubXyIntOptions::BOOL_HIDE_TRAY_ICON, &m_fHideTrayIcon); + m_pDirectVobSubXy->XyGetBool(DirectVobSubXyOptions::BOOL_HIDE_TRAY_ICON, &m_fHideTrayIcon); } } @@ -636,8 +636,8 @@ void CDVSMiscPPage::UpdateObjectData(bool fSave) m_pDirectVobSub->put_HideSubtitles(m_fHideSubtitles); m_pDirectVobSub->put_OSD(m_fOSD); m_pDirectVobSub->put_PreBuffering(m_fDoPreBuffering); - m_pDirectVobSubXy->XySetInt(DirectVobSubXyIntOptions::INT_COLOR_SPACE, m_colorSpace); - m_pDirectVobSubXy->XySetInt(DirectVobSubXyIntOptions::INT_YUV_RANGE, m_yuvRange); + m_pDirectVobSubXy->XySetInt(DirectVobSubXyOptions::INT_COLOR_SPACE, m_colorSpace); + m_pDirectVobSubXy->XySetInt(DirectVobSubXyOptions::INT_YUV_RANGE, m_yuvRange); m_pDirectVobSub->put_SubtitleReloader(m_fReloaderDisabled); m_pDirectVobSub->put_SaveFullPath(m_fSaveFullPath); } @@ -647,8 +647,8 @@ void CDVSMiscPPage::UpdateObjectData(bool fSave) m_pDirectVobSub->get_HideSubtitles(&m_fHideSubtitles); m_pDirectVobSub->get_OSD(&m_fOSD); m_pDirectVobSub->get_PreBuffering(&m_fDoPreBuffering); - m_pDirectVobSubXy->XyGetInt(DirectVobSubXyIntOptions::INT_COLOR_SPACE, &m_colorSpace); - m_pDirectVobSubXy->XyGetInt(DirectVobSubXyIntOptions::INT_YUV_RANGE, &m_yuvRange); + m_pDirectVobSubXy->XyGetInt(DirectVobSubXyOptions::INT_COLOR_SPACE, &m_colorSpace); + m_pDirectVobSubXy->XyGetInt(DirectVobSubXyOptions::INT_YUV_RANGE, &m_yuvRange); m_pDirectVobSub->get_SubtitleReloader(&m_fReloaderDisabled); m_pDirectVobSub->get_SaveFullPath(&m_fSaveFullPath); } @@ -855,11 +855,11 @@ bool CDVSMorePPage::OnMessage(UINT uMsg, WPARAM wParam, LPARAM lParam) { AFX_MANAGE_STATE(AfxGetStaticModuleState()); - DirectVobSubXyIntOptions::CachesInfo *caches_info = NULL; - DirectVobSubXyIntOptions::XyFlyWeightInfo *xy_fw_info = NULL; + DirectVobSubXyOptions::CachesInfo *caches_info = NULL; + DirectVobSubXyOptions::XyFlyWeightInfo *xy_fw_info = NULL; int tmp; - m_pDirectVobSubXy->XyGetBin(DirectVobSubXyIntOptions::BIN_CACHES_INFO, reinterpret_cast(&caches_info), &tmp); - m_pDirectVobSubXy->XyGetBin(DirectVobSubXyIntOptions::BIN_XY_FLY_WEIGHT_INFO, reinterpret_cast(&xy_fw_info), &tmp); + m_pDirectVobSubXy->XyGetBin(DirectVobSubXyOptions::BIN_CACHES_INFO, reinterpret_cast(&caches_info), &tmp); + m_pDirectVobSubXy->XyGetBin(DirectVobSubXyOptions::BIN_XY_FLY_WEIGHT_INFO, reinterpret_cast(&xy_fw_info), &tmp); ASSERT(caches_info); ASSERT(xy_fw_info); CString msg; @@ -920,25 +920,25 @@ void CDVSMorePPage::UpdateObjectData(bool fSave) { if(fSave) { - m_pDirectVobSubXy->XySetInt(DirectVobSubXyIntOptions::INT_OVERLAY_CACHE_MAX_ITEM_NUM, m_overlay_cache_max_item_num); - m_pDirectVobSubXy->XySetInt(DirectVobSubXyIntOptions::INT_OVERLAY_NO_BLUR_CACHE_MAX_ITEM_NUM, m_overlay_no_blur_cache_max_item_num); - m_pDirectVobSubXy->XySetInt(DirectVobSubXyIntOptions::INT_SCAN_LINE_DATA_CACHE_MAX_ITEM_NUM, m_scan_line_data_cache_max_item_num); - m_pDirectVobSubXy->XySetInt(DirectVobSubXyIntOptions::INT_PATH_DATA_CACHE_MAX_ITEM_NUM, m_path_cache_max_item_num); - m_pDirectVobSubXy->XySetInt(DirectVobSubXyIntOptions::INT_SUBPIXEL_POS_LEVEL, m_subpixel_pos_level); - - m_pDirectVobSubXy->XySetInt(DirectVobSubXyIntOptions::INT_LAYOUT_SIZE_OPT, m_layout_size_opt); - m_pDirectVobSubXy->XySetSize(DirectVobSubXyIntOptions::SIZE_USER_SPECIFIED_LAYOUT_SIZE, m_layout_size); + m_pDirectVobSubXy->XySetInt(DirectVobSubXyOptions::INT_OVERLAY_CACHE_MAX_ITEM_NUM, m_overlay_cache_max_item_num); + m_pDirectVobSubXy->XySetInt(DirectVobSubXyOptions::INT_OVERLAY_NO_BLUR_CACHE_MAX_ITEM_NUM, m_overlay_no_blur_cache_max_item_num); + m_pDirectVobSubXy->XySetInt(DirectVobSubXyOptions::INT_SCAN_LINE_DATA_CACHE_MAX_ITEM_NUM, m_scan_line_data_cache_max_item_num); + m_pDirectVobSubXy->XySetInt(DirectVobSubXyOptions::INT_PATH_DATA_CACHE_MAX_ITEM_NUM, m_path_cache_max_item_num); + m_pDirectVobSubXy->XySetInt(DirectVobSubXyOptions::INT_SUBPIXEL_POS_LEVEL, m_subpixel_pos_level); + + m_pDirectVobSubXy->XySetInt(DirectVobSubXyOptions::INT_LAYOUT_SIZE_OPT, m_layout_size_opt); + m_pDirectVobSubXy->XySetSize(DirectVobSubXyOptions::SIZE_USER_SPECIFIED_LAYOUT_SIZE, m_layout_size); } else { - m_pDirectVobSubXy->XyGetInt(DirectVobSubXyIntOptions::INT_OVERLAY_CACHE_MAX_ITEM_NUM, &m_overlay_cache_max_item_num); - m_pDirectVobSubXy->XyGetInt(DirectVobSubXyIntOptions::INT_OVERLAY_NO_BLUR_CACHE_MAX_ITEM_NUM, &m_overlay_no_blur_cache_max_item_num); - m_pDirectVobSubXy->XyGetInt(DirectVobSubXyIntOptions::INT_SCAN_LINE_DATA_CACHE_MAX_ITEM_NUM, &m_scan_line_data_cache_max_item_num); - m_pDirectVobSubXy->XyGetInt(DirectVobSubXyIntOptions::INT_PATH_DATA_CACHE_MAX_ITEM_NUM, &m_path_cache_max_item_num); - m_pDirectVobSubXy->XyGetInt(DirectVobSubXyIntOptions::INT_SUBPIXEL_POS_LEVEL, &m_subpixel_pos_level); - - m_pDirectVobSubXy->XyGetInt(DirectVobSubXyIntOptions::INT_LAYOUT_SIZE_OPT, &m_layout_size_opt); - m_pDirectVobSubXy->XyGetSize(DirectVobSubXyIntOptions::SIZE_USER_SPECIFIED_LAYOUT_SIZE, &m_layout_size); + m_pDirectVobSubXy->XyGetInt(DirectVobSubXyOptions::INT_OVERLAY_CACHE_MAX_ITEM_NUM, &m_overlay_cache_max_item_num); + m_pDirectVobSubXy->XyGetInt(DirectVobSubXyOptions::INT_OVERLAY_NO_BLUR_CACHE_MAX_ITEM_NUM, &m_overlay_no_blur_cache_max_item_num); + m_pDirectVobSubXy->XyGetInt(DirectVobSubXyOptions::INT_SCAN_LINE_DATA_CACHE_MAX_ITEM_NUM, &m_scan_line_data_cache_max_item_num); + m_pDirectVobSubXy->XyGetInt(DirectVobSubXyOptions::INT_PATH_DATA_CACHE_MAX_ITEM_NUM, &m_path_cache_max_item_num); + m_pDirectVobSubXy->XyGetInt(DirectVobSubXyOptions::INT_SUBPIXEL_POS_LEVEL, &m_subpixel_pos_level); + + m_pDirectVobSubXy->XyGetInt(DirectVobSubXyOptions::INT_LAYOUT_SIZE_OPT, &m_layout_size_opt); + m_pDirectVobSubXy->XyGetSize(DirectVobSubXyOptions::SIZE_USER_SPECIFIED_LAYOUT_SIZE, &m_layout_size); } } @@ -966,7 +966,7 @@ void CDVSMorePPage::UpdateControlData(bool fSave) } else { - m_layout_size_opt = DirectVobSubXyIntOptions::LAYOUT_SIZE_OPT_FOLLOW_ORIGINAL_VIDEO_SIZE; + m_layout_size_opt = DirectVobSubXyOptions::LAYOUT_SIZE_OPT_FOLLOW_ORIGINAL_VIDEO_SIZE; } m_layout_size.cx = m_layout_size_x.GetPos32(); m_layout_size.cy = m_layout_size_y.GetPos32(); @@ -1000,20 +1000,20 @@ void CDVSMorePPage::UpdateControlData(bool fSave) switch(m_layout_size_opt) { - default: - case DirectVobSubXyIntOptions::LAYOUT_SIZE_OPT_FOLLOW_ORIGINAL_VIDEO_SIZE: + default: + case DirectVobSubXyOptions::LAYOUT_SIZE_OPT_FOLLOW_ORIGINAL_VIDEO_SIZE: temp = 0; break; - case DirectVobSubXyIntOptions::LAYOUT_SIZE_OPT_USER_SPECIFIED: - temp = 1; + case DirectVobSubXyOptions::LAYOUT_SIZE_OPT_USER_SPECIFIED: + temp = 1; break; } m_combo_layout_size_opt.ResetContent(); m_combo_layout_size_opt.AddString( CString(_T("Use Original Video Size")) ); - m_combo_layout_size_opt.SetItemData(0, DirectVobSubXyIntOptions::LAYOUT_SIZE_OPT_FOLLOW_ORIGINAL_VIDEO_SIZE); + m_combo_layout_size_opt.SetItemData(0, DirectVobSubXyOptions::LAYOUT_SIZE_OPT_FOLLOW_ORIGINAL_VIDEO_SIZE); m_combo_layout_size_opt.AddString( CString(_T("Customize ...")) ); - m_combo_layout_size_opt.SetItemData(1, DirectVobSubXyIntOptions::LAYOUT_SIZE_OPT_USER_SPECIFIED); + m_combo_layout_size_opt.SetItemData(1, DirectVobSubXyOptions::LAYOUT_SIZE_OPT_USER_SPECIFIED); m_combo_layout_size_opt.SetCurSel( temp ); m_layout_size_x.SetRange32(1, 12800); @@ -1222,17 +1222,17 @@ void CDVSColorPPage::UpdateObjectData(bool fSave) { if(fSave) { - m_pDirectVobSubXy->XySetBool(DirectVobSubXyIntOptions::BOOL_FOLLOW_UPSTREAM_PREFERRED_ORDER, m_fFollowUpstream); - m_pDirectVobSubXy->XySetBin(DirectVobSubXyIntOptions::BIN_OUTPUT_COLOR_FORMAT, m_outputColorSpace, m_outputColorSpaceCount); - m_pDirectVobSubXy->XySetBin(DirectVobSubXyIntOptions::BIN_INPUT_COLOR_FORMAT, m_inputColorSpace, m_inputColorSpaceCount); + m_pDirectVobSubXy->XySetBool(DirectVobSubXyOptions::BOOL_FOLLOW_UPSTREAM_PREFERRED_ORDER, m_fFollowUpstream); + m_pDirectVobSubXy->XySetBin(DirectVobSubXyOptions::BIN_OUTPUT_COLOR_FORMAT, m_outputColorSpace, m_outputColorSpaceCount); + m_pDirectVobSubXy->XySetBin(DirectVobSubXyOptions::BIN_INPUT_COLOR_FORMAT, m_inputColorSpace, m_inputColorSpaceCount); } else { delete []m_outputColorSpace; m_outputColorSpace=NULL; delete []m_inputColorSpace; m_inputColorSpace=NULL; - m_pDirectVobSubXy->XyGetBool(DirectVobSubXyIntOptions::BOOL_FOLLOW_UPSTREAM_PREFERRED_ORDER, &m_fFollowUpstream); - m_pDirectVobSubXy->XyGetBin(DirectVobSubXyIntOptions::BIN_OUTPUT_COLOR_FORMAT, reinterpret_cast(&m_outputColorSpace), &m_outputColorSpaceCount); - m_pDirectVobSubXy->XyGetBin(DirectVobSubXyIntOptions::BIN_INPUT_COLOR_FORMAT, reinterpret_cast(&m_inputColorSpace), &m_inputColorSpaceCount); + m_pDirectVobSubXy->XyGetBool(DirectVobSubXyOptions::BOOL_FOLLOW_UPSTREAM_PREFERRED_ORDER, &m_fFollowUpstream); + m_pDirectVobSubXy->XyGetBin(DirectVobSubXyOptions::BIN_OUTPUT_COLOR_FORMAT, reinterpret_cast(&m_outputColorSpace), &m_outputColorSpaceCount); + m_pDirectVobSubXy->XyGetBin(DirectVobSubXyOptions::BIN_INPUT_COLOR_FORMAT, reinterpret_cast(&m_inputColorSpace), &m_inputColorSpaceCount); } } diff --git a/src/filters/transform/vsfilter/DirectVobSubPropPage.h b/src/filters/transform/vsfilter/DirectVobSubPropPage.h index c78f449..5064ccf 100644 --- a/src/filters/transform/vsfilter/DirectVobSubPropPage.h +++ b/src/filters/transform/vsfilter/DirectVobSubPropPage.h @@ -210,7 +210,7 @@ class CDVSColorPPage : public CDVSBasePPage static const int MAX_COLOR_SPACE = 256; - typedef DirectVobSubXyIntOptions::ColorSpaceOpt ColorSpaceOpt; + typedef DirectVobSubXyOptions::ColorSpaceOpt ColorSpaceOpt; ColorSpaceOpt *m_outputColorSpace; int m_outputColorSpaceCount; diff --git a/src/filters/transform/vsfilter/IDirectVobSubXy.h b/src/filters/transform/vsfilter/IDirectVobSubXy.h index 0bd3c1a..a33d126 100644 --- a/src/filters/transform/vsfilter/IDirectVobSubXy.h +++ b/src/filters/transform/vsfilter/IDirectVobSubXy.h @@ -5,7 +5,7 @@ #ifdef __cplusplus extern "C" { #endif - namespace DirectVobSubXyIntOptions + namespace DirectVobSubXyOptions { enum//int { diff --git a/src/filters/transform/vsfilter/plugins.cpp b/src/filters/transform/vsfilter/plugins.cpp index 6534e24..b8101b2 100644 --- a/src/filters/transform/vsfilter/plugins.cpp +++ b/src/filters/transform/vsfilter/plugins.cpp @@ -33,7 +33,7 @@ #include "DirectVobSub.h" #include "vfr.h" -using namespace DirectVobSubXyIntOptions; +using namespace DirectVobSubXyOptions; // // Generic interface diff --git a/src/subpic/SimpleSubPicProviderImpl.cpp b/src/subpic/SimpleSubPicProviderImpl.cpp index 9a39cc4..c276310 100644 --- a/src/subpic/SimpleSubPicProviderImpl.cpp +++ b/src/subpic/SimpleSubPicProviderImpl.cpp @@ -242,7 +242,7 @@ HRESULT SimpleSubPicProvider::RenderTo( IXySubRenderFrame** pSubPic, REFERENCE_T CComPtr sub_render_frame; SIZE size_render_with; ASSERT(m_consumer); - hr = m_consumer->XyGetSize(DirectVobSubXyIntOptions::SIZE_LAYOUT_WITH, &size_render_with); + hr = m_consumer->XyGetSize(DirectVobSubXyOptions::SIZE_LAYOUT_WITH, &size_render_with); if (FAILED(hr)) { return hr; -- 2.11.4.GIT