From: <ad...@us...> - 2003-02-25 08:01:23
|
Update of /cvsroot/bdadev/TuneReqStore In directory sc8-pr-cvs1:/tmp/cvs-serv21761 Modified Files: TuneReqStore.idl TuneRequestStore.cpp TuneRequestStore.h Log Message: Added support for video Control Index: TuneReqStore.idl =================================================================== RCS file: /cvsroot/bdadev/TuneReqStore/TuneReqStore.idl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** TuneReqStore.idl 21 Feb 2003 16:36:43 -0000 1.6 --- TuneReqStore.idl 25 Feb 2003 08:01:13 -0000 1.7 *************** *** 113,116 **** --- 113,117 ---- [id(4), helpstring("method AttachToTIF")] HRESULT AttachToTIF([in] IFilterGraph* pFilterGraph); [id(5), helpstring("method DetachFromTIF")] HRESULT DetachFromTIF(); + [id(6), helpstring("method AttachToVideoControl")] HRESULT AttachToVideoControl(IDispatch* VidCtl); }; *************** *** 158,161 **** --- 159,165 ---- // // $Log$ + // Revision 1.7 2003/02/25 08:01:13 adcockj + // Added support for video Control + // // Revision 1.6 2003/02/21 16:36:43 adcockj // Added schedule functionality (untested) and some code clean up Index: TuneRequestStore.cpp =================================================================== RCS file: /cvsroot/bdadev/TuneReqStore/TuneRequestStore.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** TuneRequestStore.cpp 21 Feb 2003 20:58:10 -0000 1.11 --- TuneRequestStore.cpp 25 Feb 2003 08:01:14 -0000 1.12 *************** *** 41,44 **** --- 41,45 ---- #include "TuneInfo.h" #include "ProgramInfo.h" + #include "Msvidctl.h" ///////////////////////////////////////////////////////////////////////////// *************** *** 288,308 **** STDMETHODIMP CTuneRequestStore::DetachFromTIF() { ! // make sure we've got the latest info ! // since this is the last chance we have to talk to the TIF ! UpdateInfo(); ! // unadvise GuideDataEvent object ! m_ConnectionPoint->Unadvise(m_GuideDataCookie); ! // release any objects we hold onto ! m_ConnectionPoint.Release(); ! m_GuideData.Release(); ! m_FilterGraph.Release(); ! m_GuideDataCookie = 0; return S_OK; } /////////////////////////////////////////////////////////////////////////////// // IPropertyBag interface --- 289,335 ---- STDMETHODIMP CTuneRequestStore::DetachFromTIF() { ! if(m_GuideData) ! { ! // make sure we've got the latest info ! // since this is the last chance we have to talk to the TIF ! UpdateInfo(); ! // unadvise GuideDataEvent object ! m_ConnectionPoint->Unadvise(m_GuideDataCookie); ! // release any objects we hold onto ! m_ConnectionPoint.Release(); ! m_GuideData.Release(); ! m_FilterGraph.Release(); ! m_GuideDataCookie = 0; ! } return S_OK; } + STDMETHODIMP CTuneRequestStore::AttachToVideoControl(IDispatch* VidCtl) + { + CComQIPtr<IMSVidCtl> VidCtl2 = VidCtl; + if(VidCtl2 == NULL) + { + return E_FAIL; + } + + CComQIPtr<IMSVidGraphSegmentContainer> GraphSegCont = VidCtl2; + if(GraphSegCont != NULL) + { + CComPtr<IGraphBuilder> GraphBuilder; + HRESULT Result = GraphSegCont->get_Graph(&GraphBuilder); + CHECK(Result); + + return AttachToTIF(GraphBuilder); + } + else + { + return E_FAIL; + } + } + /////////////////////////////////////////////////////////////////////////////// // IPropertyBag interface *************** *** 885,892 **** if(pTuneInfo->m_ProgramInfos[i] != NULL) { ! pTuneInfo->m_ProgramInfos[i]->put_Description(Description); ! pTuneInfo->m_ProgramInfos[i]->put_Name(Title); ! pTuneInfo->m_ProgramInfos[i]->put_StartTime(DoubleStartTime); ! pTuneInfo->m_ProgramInfos[i]->put_EndTime(DoubleEndTime); } } --- 912,926 ---- if(pTuneInfo->m_ProgramInfos[i] != NULL) { ! CComBSTR Id; ! Result = pTuneInfo->m_ProgramInfos[i]->get_Id(&Id); ! CHECK(Result); ! if(Id == ScheduleID) ! { ! pTuneInfo->m_ProgramInfos[i]->put_Description(Description); ! pTuneInfo->m_ProgramInfos[i]->put_Name(Title); ! pTuneInfo->m_ProgramInfos[i]->put_StartTime(DoubleStartTime); ! pTuneInfo->m_ProgramInfos[i]->put_EndTime(DoubleEndTime); ! return Result; ! } } } *************** *** 1109,1112 **** --- 1143,1149 ---- // // $Log$ + // Revision 1.12 2003/02/25 08:01:14 adcockj + // Added support for video Control + // // Revision 1.11 2003/02/21 20:58:10 adcockj // Bug Fixes to schedule code Index: TuneRequestStore.h =================================================================== RCS file: /cvsroot/bdadev/TuneReqStore/TuneRequestStore.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** TuneRequestStore.h 21 Feb 2003 16:36:44 -0000 1.9 --- TuneRequestStore.h 25 Feb 2003 08:01:15 -0000 1.10 *************** *** 51,54 **** --- 51,55 ---- public: + STDMETHOD(AttachToVideoControl)(IDispatch* VidCtl); // ITuneRequestStore STDMETHOD(get__NewEnum)(/*[out, retval]*/ IEnumTuneInfo** ppUnk); |