Menu
▾
▴
[Bdadev-cvs] CleverTelly MainDlg.cpp,1.5,1.6 MainDlg.h,1.4,1.5
|
From: <ad...@us...> - 2003-02-26 08:18:14
|
Update of /cvsroot/bdadev/CleverTelly
In directory sc8-pr-cvs1:/tmp/cvs-serv25906
Modified Files:
MainDlg.cpp MainDlg.h
Log Message:
Bug Fixes
Index: MainDlg.cpp
===================================================================
RCS file: /cvsroot/bdadev/CleverTelly/MainDlg.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** MainDlg.cpp 25 Feb 2003 17:23:17 -0000 1.5
--- MainDlg.cpp 26 Feb 2003 08:17:55 -0000 1.6
***************
*** 27,33 ****
_ATL_FUNC_INFO OnDblClickInfo = {CC_STDCALL, VT_EMPTY, 0};
_ATL_FUNC_INFO OnErrorInfo = {CC_STDCALL, VT_EMPTY, 7, {VT_I2, VT_PTR, VT_I4, VT_BSTR, VT_BSTR, VT_I4, VT_PTR} };
! _ATL_FUNC_INFO OnKeyDownInfo = {CC_STDCALL, VT_EMPTY, 2, {VT_PTR, VT_I2} };
_ATL_FUNC_INFO OnKeyPressInfo = {CC_STDCALL, VT_EMPTY, 2, {VT_PTR} };
! _ATL_FUNC_INFO OnKeyUpInfo = {CC_STDCALL, VT_EMPTY, 2, {VT_PTR, VT_I2} };
_ATL_FUNC_INFO OnMouseDownInfo = {CC_STDCALL, VT_EMPTY, 4, {VT_I2, VT_I2, VT_I4, VT_I4} };
_ATL_FUNC_INFO OnMouseMoveInfo = {CC_STDCALL, VT_EMPTY, 4, {VT_I2, VT_I2, VT_I4, VT_I4} };
--- 27,33 ----
_ATL_FUNC_INFO OnDblClickInfo = {CC_STDCALL, VT_EMPTY, 0};
_ATL_FUNC_INFO OnErrorInfo = {CC_STDCALL, VT_EMPTY, 7, {VT_I2, VT_PTR, VT_I4, VT_BSTR, VT_BSTR, VT_I4, VT_PTR} };
! _ATL_FUNC_INFO OnKeyDownInfo = {CC_STDCALL, VT_EMPTY, 2, {VT_I2|VT_BYREF, VT_I2} };
_ATL_FUNC_INFO OnKeyPressInfo = {CC_STDCALL, VT_EMPTY, 2, {VT_PTR} };
! _ATL_FUNC_INFO OnKeyUpInfo = {CC_STDCALL, VT_EMPTY, 2, {VT_I2|VT_BYREF, VT_I2} };
_ATL_FUNC_INFO OnMouseDownInfo = {CC_STDCALL, VT_EMPTY, 4, {VT_I2, VT_I2, VT_I4, VT_I4} };
_ATL_FUNC_INFO OnMouseMoveInfo = {CC_STDCALL, VT_EMPTY, 4, {VT_I2, VT_I2, VT_I4, VT_I4} };
***************
*** 118,123 ****
if(pVidRenderer)
{
! pVidRenderer->put_UsingOverlay(m_UseOverlay?VARIANT_TRUE:VARIANT_FALSE);
}
// create the Tune Request store
--- 118,126 ----
if(pVidRenderer)
{
! CHECK(pVidRenderer->put_UsingOverlay(m_UseOverlay?VARIANT_TRUE:VARIANT_FALSE));
}
+ OLE_COLOR Black(0);
+ CHECK(m_pVidControl->put_BackColor(Black));
+ CHECK(m_pVidControl->put_ColorKey(Black));
// create the Tune Request store
***************
*** 126,130 ****
{
ATLTRACE("CreateTuneReqStore Returned %8x\n", Result);
- return FALSE;
}
--- 129,132 ----
***************
*** 135,152 ****
if(m_TuneRequestStore)
{
! long Count(0);
! CHECK(m_TuneRequestStore->get_Count(&Count));
! if(Count == 0)
{
! Result = LoadUpDefaultTuneRequest();
! if(FAILED(Result))
! {
! ATLTRACE("LoadUpDefaultTuneRequest Returned %8x\n", Result);
! return FALSE;
! }
}
! else
{
! Result = TuneToChannel(1);
if(FAILED(Result))
{
--- 137,151 ----
if(m_TuneRequestStore)
{
! Result = LoadUpDefaultTuneRequest();
! if(FAILED(Result))
{
! ATLTRACE("LoadUpDefaultTuneRequest Returned %8x\n", Result);
! return FALSE;
}
! long Count(0);
! CHECK(m_TuneRequestStore->get_Count(&Count));
! if(Count > 0)
{
! Result = TuneToChannel(8);
if(FAILED(Result))
{
***************
*** 188,191 ****
--- 187,191 ----
SetWindowRgn(NULL,TRUE);
}
+ SetupAspectRatio();
m_FullScreen = !m_FullScreen;
return 0;
***************
*** 208,219 ****
}
-
- if(m_pVidControl)
- {
- m_pVidControl->Stop();
- m_pVidControl.Release();
- }
-
-
if(m_TuneRequestStore)
{
--- 208,211 ----
***************
*** 227,230 ****
--- 219,230 ----
}
+
+ if(m_pVidControl)
+ {
+ m_pVidControl->Stop();
+ m_pVidControl.Release();
+ }
+
+
DestroyWindow();
PostQuitMessage(wID);
***************
*** 239,242 ****
--- 239,243 ----
GetClientRect(&WinRect);
hwndVC.MoveWindow(&WinRect, TRUE);
+ SetupAspectRatio();
}
***************
*** 291,294 ****
--- 292,297 ----
{
ATLTRACE("OnClick\n");
+ TuneToChannel(8);
+ m_pVidControl->Run();
}
***************
*** 319,322 ****
--- 322,326 ----
void __stdcall CMainDlg::OnKeyDown(short* pKeyCode, short Shift)
{
+ ATLTRACE("OnKeyDown %04x\n", *pKeyCode);
}
***************
*** 328,331 ****
--- 332,336 ----
void __stdcall CMainDlg::OnKeyUp(short* pKeyCode, short Shift)
{
+ ATLTRACE("OnKeyUp %04x\n", *pKeyCode);
}
***************
*** 432,436 ****
CComPtr<ITuningSpaceContainer> TuningSpaceContainer;
! TuningSpaceContainer.CoCreateInstance(CLSID_SystemTuningSpaces);
// Try to match any tuning spaces named "Local (something) Cable".
--- 437,441 ----
CComPtr<ITuningSpaceContainer> TuningSpaceContainer;
! TuningSpaceContainer.CoCreateInstance(CLSID_SystemTuningSpaces, NULL, CLSCTX_INPROC_SERVER);
// Try to match any tuning spaces named "Local (something) Cable".
***************
*** 470,474 ****
HRESULT CMainDlg::CreateTuneReqStore()
{
! HRESULT Result = m_TuneRequestStore.CreateInstance(__uuidof(TUNEREQSTORELib::TuneRequestStore));
if (SUCCEEDED(Result))
{
--- 475,479 ----
HRESULT CMainDlg::CreateTuneReqStore()
{
! HRESULT Result = m_TuneRequestStore.CoCreateInstance(__uuidof(TUNEREQSTORELib::TuneRequestStore), NULL, CLSCTX_INPROC_SERVER);
if (SUCCEEDED(Result))
{
***************
*** 518,524 ****
// Sidebar
long NewWidth = MulDiv((WinRect.right - WinRect.left), ARWidth, ARHeight);
! WinRect.left += ((WinRect.right - WinRect.left) - Height) / 2;
! WinRect.right = WinRect.left + Height;
}
if(FAILED(m_VMRControl->SetVideoPosition(&SrcRect, &WinRect)))
{
--- 523,530 ----
// Sidebar
long NewWidth = MulDiv((WinRect.right - WinRect.left), ARWidth, ARHeight);
! WinRect.left += ((WinRect.right - WinRect.left) - NewWidth) / 2;
! WinRect.right = WinRect.left + NewWidth;
}
+ ATLTRACE("SetupVideoPosition : %d %d %d %d\n", WinRect.top, WinRect.left, WinRect.bottom, WinRect.right);
if(FAILED(m_VMRControl->SetVideoPosition(&SrcRect, &WinRect)))
{
***************
*** 564,568 ****
// implement the IVMRWindowlessControl interface
Result = GraphBuilder->EnumFilters(&EnumFilters);
! if(SUCCEEDED(Result))
{
CComPtr<IBaseFilter> BaseFilter;
--- 570,574 ----
// implement the IVMRWindowlessControl interface
Result = GraphBuilder->EnumFilters(&EnumFilters);
! if(Result == S_OK)
{
CComPtr<IBaseFilter> BaseFilter;
***************
*** 577,580 ****
--- 583,587 ----
return;
}
+ BaseFilter.Release();
}
}
***************
*** 654,657 ****
--- 661,667 ----
//
// $Log$
+ // Revision 1.6 2003/02/26 08:17:55 adcockj
+ // Bug Fixes
+ //
// Revision 1.5 2003/02/25 17:23:17 adcockj
// Added log and id to new files
Index: MainDlg.h
===================================================================
RCS file: /cvsroot/bdadev/CleverTelly/MainDlg.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** MainDlg.h 25 Feb 2003 17:23:18 -0000 1.4
--- MainDlg.h 26 Feb 2003 08:17:56 -0000 1.5
***************
*** 161,165 ****
private:
CComQIPtr<IMSVidCtl> m_pVidControl;
! TUNEREQSTORELib::ITuneRequestStorePtr m_TuneRequestStore;
CComPtr<IConnectionPoint> m_ConnectionPoint;
CComQIPtr<IMediaEventEx> m_MediaEvents;
--- 161,165 ----
private:
CComQIPtr<IMSVidCtl> m_pVidControl;
! CComPtr<TUNEREQSTORELib::ITuneRequestStore> m_TuneRequestStore;
CComPtr<IConnectionPoint> m_ConnectionPoint;
CComQIPtr<IMediaEventEx> m_MediaEvents;
|
