Menu
▾
▴
[aaf-commits] AAF/Utilities/AAFAnalyzer/EPAnalyzerBase EPTrack.cpp, 1.7, 1.7.4.1 EPTrack.h, 1.6, 1.6.4.1 EPTypedObjNode.cpp, 1.9, 1.9.4.1 EPTypedObjNode.h, 1.6, 1.6.4.1 EPTypedVisitor.cpp, 1.12, 1.12.4.1 EPTypedVisitor.h, 1.9, 1.9.4.1
Update of /cvsroot/aaf/AAF/Utilities/AAFAnalyzer/EPAnalyzerBase
In directory vz-cvs-4.sog:/tmp/cvs-serv26409/EPAnalyzerBase
Modified Files:
Tag: V116_branch
EPTrack.cpp EPTrack.h EPTypedObjNode.cpp EPTypedObjNode.h
EPTypedVisitor.cpp EPTypedVisitor.h
Log Message:
resolve remaining boost tr1 conflicts in vc10
Index: EPTypedObjNode.h
===================================================================
RCS file: /cvsroot/aaf/AAF/Utilities/AAFAnalyzer/EPAnalyzerBase/EPTypedObjNode.h,v
retrieving revision 1.6
retrieving revision 1.6.4.1
diff -C2 -d -r1.6 -r1.6.4.1
*** EPTypedObjNode.h 1 Jun 2009 11:46:46 -0000 1.6
--- EPTypedObjNode.h 12 Oct 2012 20:07:47 -0000 1.6.4.1
***************
*** 49,58 ****
public:
! EPTypedObjNode( const shared_ptr<AAFTypedObjNode<AAFObjType> > spNode,
! shared_ptr<EPObjType> spEPObject );
~EPTypedObjNode();
! bool PreOrderVisit(shared_ptr<Visitor> spVisitor);
! bool PostOrderVisit(shared_ptr<Visitor> spVisitor);
! shared_ptr<EPObjType> GetEPObject();
//This function will return a new node and all type information about the
--- 49,58 ----
public:
! EPTypedObjNode( const boost::shared_ptr<AAFTypedObjNode<AAFObjType> > spNode,
! boost::shared_ptr<EPObjType> spEPObject );
~EPTypedObjNode();
! bool PreOrderVisit(boost::shared_ptr<Visitor> spVisitor);
! bool PostOrderVisit(boost::shared_ptr<Visitor> spVisitor);
! boost::shared_ptr<EPObjType> GetEPObject();
//This function will return a new node and all type information about the
***************
*** 61,65 ****
//without complete type information.
template<typename AAFTo, typename EPTo>
! shared_ptr<EPTypedObjNode<AAFTo, EPTo> > DownCast()
{
--- 61,65 ----
//without complete type information.
template<typename AAFTo, typename EPTo>
! boost::shared_ptr<EPTypedObjNode<AAFTo, EPTo> > DownCast()
{
***************
*** 75,87 ****
//Find the TypedNodeFactory for the class to cast to.
! shared_ptr<TypedNodeFactory> spNodeFactory;
spNodeFactory = TypedNodeFactoryRegistry::GetInstance().LookUp(clsDef);
//Get a shared pointer to this node.
! shared_ptr<AAFObjNode> spThis =
dynamic_pointer_cast<AAFObjNode>( this->GetSharedPointerToNode() );
//If the cast is not legal, the node factory will throw an exception.
! shared_ptr<AAFTypedObjNode<AAFTo> >spNewNode =
dynamic_pointer_cast<AAFTypedObjNode<AAFTo> > (
spNodeFactory->CreateNodeFrom( spThis ) );
--- 75,87 ----
//Find the TypedNodeFactory for the class to cast to.
! boost::shared_ptr<TypedNodeFactory> spNodeFactory;
spNodeFactory = TypedNodeFactoryRegistry::GetInstance().LookUp(clsDef);
//Get a shared pointer to this node.
! boost::shared_ptr<AAFObjNode> spThis =
dynamic_pointer_cast<AAFObjNode>( this->GetSharedPointerToNode() );
//If the cast is not legal, the node factory will throw an exception.
! boost::shared_ptr<AAFTypedObjNode<AAFTo> >spNewNode =
dynamic_pointer_cast<AAFTypedObjNode<AAFTo> > (
spNodeFactory->CreateNodeFrom( spThis ) );
***************
*** 89,93 ****
//Now, make sure the object can be cast to the appropriate type:
! shared_ptr<EPTo> spEPTo( dynamic_pointer_cast<EPTo>( _spEPObject ) );
if ( !spEPTo )
{
--- 89,93 ----
//Now, make sure the object can be cast to the appropriate type:
! boost::shared_ptr<EPTo> spEPTo( dynamic_pointer_cast<EPTo>( _spEPObject ) );
if ( !spEPTo )
{
***************
*** 96,100 ****
}
! shared_ptr<EPTypedObjNode<AAFTo, EPTo> >
spDecoratedNewNode( new EPTypedObjNode<AAFTo, EPTo>( spNewNode, spEPTo ) );
--- 96,100 ----
}
! boost::shared_ptr<EPTypedObjNode<AAFTo, EPTo> >
spDecoratedNewNode( new EPTypedObjNode<AAFTo, EPTo>( spNewNode, spEPTo ) );
***************
*** 106,110 ****
private:
! shared_ptr<EPObjType> _spEPObject;
//prohibited
--- 106,110 ----
private:
! boost::shared_ptr<EPObjType> _spEPObject;
//prohibited
Index: EPTrack.cpp
===================================================================
RCS file: /cvsroot/aaf/AAF/Utilities/AAFAnalyzer/EPAnalyzerBase/EPTrack.cpp,v
retrieving revision 1.7
retrieving revision 1.7.4.1
diff -C2 -d -r1.7 -r1.7.4.1
*** EPTrack.cpp 1 Jun 2009 11:46:46 -0000 1.7
--- EPTrack.cpp 12 Oct 2012 20:07:47 -0000 1.7.4.1
***************
*** 49,53 ****
aafSourceRef_t srcRef = axSrcClip.GetSourceReference();
aafMobID_t mobid = srcRef.sourceID;
! shared_ptr<Node> spNode;
spNode = MobNodeMap::GetInstance().GetMobNode(mobid);
return spNode != NULL;
--- 49,53 ----
aafSourceRef_t srcRef = axSrcClip.GetSourceReference();
aafMobID_t mobid = srcRef.sourceID;
! boost::shared_ptr<Node> spNode;
spNode = MobNodeMap::GetInstance().GetMobNode(mobid);
return spNode != NULL;
***************
*** 63,68 ****
namespace aafanalyzer {
- using namespace boost;
-
EPTrackObject::EPTrackObject()
{}
--- 63,66 ----
***************
*** 162,166 ****
{}
! shared_ptr<EPAudioTrack> EPAudioTrack::CreateAudioTrack( AxMobSlot& axMobSlot )
{
--- 160,164 ----
{}
! boost::shared_ptr<EPAudioTrack> EPAudioTrack::CreateAudioTrack( AxMobSlot& axMobSlot )
{
***************
*** 190,194 ****
if ( AxIsA( descriptor, spFileDes ) )
{
! shared_ptr<EPAudioTrack> spTrack( new EPAudioTrack( axMobSlot, axSrcClip, axSrcMob ) );
return spTrack;
}
--- 188,192 ----
if ( AxIsA( descriptor, spFileDes ) )
{
! boost::shared_ptr<EPAudioTrack> spTrack( new EPAudioTrack( axMobSlot, axSrcClip, axSrcMob ) );
return spTrack;
}
***************
*** 200,204 ****
//Return a null shared pointer if the mob slot does not contain an essence
//track.
! return shared_ptr<EPAudioTrack>();
}
--- 198,202 ----
//Return a null shared pointer if the mob slot does not contain an essence
//track.
! return boost::shared_ptr<EPAudioTrack>();
}
***************
*** 215,219 ****
{}
! shared_ptr<EPVideoTrack> EPVideoTrack::CreateVideoTrack( AxMobSlot& axMobSlot )
{
--- 213,217 ----
{}
! boost::shared_ptr<EPVideoTrack> EPVideoTrack::CreateVideoTrack( AxMobSlot& axMobSlot )
{
***************
*** 243,247 ****
if ( AxIsA( descriptor, spFileDes ) )
{
! shared_ptr<EPVideoTrack> spTrack( new EPVideoTrack( axMobSlot, axSrcClip, axSrcMob ) );
return spTrack;
}
--- 241,245 ----
if ( AxIsA( descriptor, spFileDes ) )
{
! boost::shared_ptr<EPVideoTrack> spTrack( new EPVideoTrack( axMobSlot, axSrcClip, axSrcMob ) );
return spTrack;
}
***************
*** 253,257 ****
//Return a null shared pointer if the mob slot does not contain an essence
//track.
! return shared_ptr<EPVideoTrack>();
}
--- 251,255 ----
//Return a null shared pointer if the mob slot does not contain an essence
//track.
! return boost::shared_ptr<EPVideoTrack>();
}
Index: EPTypedVisitor.cpp
===================================================================
RCS file: /cvsroot/aaf/AAF/Utilities/AAFAnalyzer/EPAnalyzerBase/EPTypedVisitor.cpp,v
retrieving revision 1.12
retrieving revision 1.12.4.1
diff -C2 -d -r1.12 -r1.12.4.1
*** EPTypedVisitor.cpp 1 Jun 2009 11:46:46 -0000 1.12
--- EPTypedVisitor.cpp 12 Oct 2012 20:07:47 -0000 1.12.4.1
***************
*** 209,213 ****
bool PreOrderVisit( AAFTypedObjNode<IAAFTimelineMobSlot>& node )
{
! shared_ptr<AAFTypedObjNode<IAAFMobSlot> > spGeneric( node.DownCastToAAF<IAAFMobSlot>() );
return this->PreOrderVisit( *spGeneric );
}
--- 209,213 ----
bool PreOrderVisit( AAFTypedObjNode<IAAFTimelineMobSlot>& node )
{
! boost::shared_ptr<AAFTypedObjNode<IAAFMobSlot> > spGeneric( node.DownCastToAAF<IAAFMobSlot>() );
return this->PreOrderVisit( *spGeneric );
}
***************
*** 215,219 ****
bool PreOrderVisit( AAFTypedObjNode<IAAFEventMobSlot>& node )
{
! shared_ptr<AAFTypedObjNode<IAAFMobSlot> > spGeneric( node.DownCastToAAF<IAAFMobSlot>() );
return this->PreOrderVisit( *spGeneric );
}
--- 215,219 ----
bool PreOrderVisit( AAFTypedObjNode<IAAFEventMobSlot>& node )
{
! boost::shared_ptr<AAFTypedObjNode<IAAFMobSlot> > spGeneric( node.DownCastToAAF<IAAFMobSlot>() );
return this->PreOrderVisit( *spGeneric );
}
***************
*** 221,225 ****
bool PreOrderVisit( AAFTypedObjNode<IAAFStaticMobSlot>& node )
{
! shared_ptr<AAFTypedObjNode<IAAFMobSlot> > spGeneric( node.DownCastToAAF<IAAFMobSlot>() );
return this->PreOrderVisit( *spGeneric );
}
--- 221,225 ----
bool PreOrderVisit( AAFTypedObjNode<IAAFStaticMobSlot>& node )
{
! boost::shared_ptr<AAFTypedObjNode<IAAFMobSlot> > spGeneric( node.DownCastToAAF<IAAFMobSlot>() );
return this->PreOrderVisit( *spGeneric );
}
***************
*** 272,277 ****
bool PreOrderVisit( EPTypedObjNode<IAAFTimelineMobSlot, EPEssenceTrack>& node )
{
! shared_ptr<Node> spNode = node.GetSharedPointerToNode();
! shared_ptr<AAFObjNode> spAAFNode = dynamic_pointer_cast<AAFObjNode>( spNode );
_spEssenceTracks->insert( spAAFNode );
return false;
--- 272,277 ----
bool PreOrderVisit( EPTypedObjNode<IAAFTimelineMobSlot, EPEssenceTrack>& node )
{
! boost::shared_ptr<Node> spNode = node.GetSharedPointerToNode();
! boost::shared_ptr<AAFObjNode> spAAFNode = dynamic_pointer_cast<AAFObjNode>( spNode );
_spEssenceTracks->insert( spAAFNode );
return false;
***************
*** 280,285 ****
bool PreOrderVisit( EPTypedObjNode<IAAFTimelineMobSlot, EPAudioTrack>& node )
{
! shared_ptr<Node> spNode = node.GetSharedPointerToNode();
! shared_ptr<AAFObjNode> spAAFNode = dynamic_pointer_cast<AAFObjNode>( spNode );
_spEssenceTracks->insert( spAAFNode );
_spAudioTracks->insert( spAAFNode );
--- 280,285 ----
bool PreOrderVisit( EPTypedObjNode<IAAFTimelineMobSlot, EPAudioTrack>& node )
{
! boost::shared_ptr<Node> spNode = node.GetSharedPointerToNode();
! boost::shared_ptr<AAFObjNode> spAAFNode = dynamic_pointer_cast<AAFObjNode>( spNode );
_spEssenceTracks->insert( spAAFNode );
_spAudioTracks->insert( spAAFNode );
***************
*** 289,294 ****
bool PreOrderVisit( EPTypedObjNode<IAAFTimelineMobSlot, EPVideoTrack>& node )
{
! shared_ptr<Node> spNode = node.GetSharedPointerToNode();
! shared_ptr<AAFObjNode> spAAFNode = dynamic_pointer_cast<AAFObjNode>( spNode );
_spEssenceTracks->insert( spAAFNode );
_spVideoTracks->insert( spAAFNode );
--- 289,294 ----
bool PreOrderVisit( EPTypedObjNode<IAAFTimelineMobSlot, EPVideoTrack>& node )
{
! boost::shared_ptr<Node> spNode = node.GetSharedPointerToNode();
! boost::shared_ptr<AAFObjNode> spAAFNode = dynamic_pointer_cast<AAFObjNode>( spNode );
_spEssenceTracks->insert( spAAFNode );
_spVideoTracks->insert( spAAFNode );
***************
*** 298,303 ****
bool PreOrderVisit( EPTypedObjNode<IAAFTimelineMobSlot, EPTimecodeTrack>& node )
{
! shared_ptr<Node> spNode = node.GetSharedPointerToNode();
! shared_ptr<AAFObjNode> spAAFNode = dynamic_pointer_cast<AAFObjNode>( spNode );
_spTimecodeTracks->insert( spAAFNode );
return false;
--- 298,303 ----
bool PreOrderVisit( EPTypedObjNode<IAAFTimelineMobSlot, EPTimecodeTrack>& node )
{
! boost::shared_ptr<Node> spNode = node.GetSharedPointerToNode();
! boost::shared_ptr<AAFObjNode> spAAFNode = dynamic_pointer_cast<AAFObjNode>( spNode );
_spTimecodeTracks->insert( spAAFNode );
return false;
***************
*** 306,311 ****
bool PreOrderVisit( EPTypedObjNode<IAAFTimelineMobSlot, EPEdgecodeTrack>& node )
{
! shared_ptr<Node> spNode = node.GetSharedPointerToNode();
! shared_ptr<AAFObjNode> spAAFNode = dynamic_pointer_cast<AAFObjNode>( spNode );
_spEdgecodeTracks->insert( spAAFNode );
return false;
--- 306,311 ----
bool PreOrderVisit( EPTypedObjNode<IAAFTimelineMobSlot, EPEdgecodeTrack>& node )
{
! boost::shared_ptr<Node> spNode = node.GetSharedPointerToNode();
! boost::shared_ptr<AAFObjNode> spAAFNode = dynamic_pointer_cast<AAFObjNode>( spNode );
_spEdgecodeTracks->insert( spAAFNode );
return false;
***************
*** 314,319 ****
bool PreOrderVisit( EPTypedObjNode<IAAFStaticMobSlot, EPEssenceTrack>& node )
{
! shared_ptr<Node> spNode = node.GetSharedPointerToNode();
! shared_ptr<AAFObjNode> spAAFNode = dynamic_pointer_cast<AAFObjNode>( spNode );
_spEssenceTracks->insert( spAAFNode );
return false;
--- 314,319 ----
bool PreOrderVisit( EPTypedObjNode<IAAFStaticMobSlot, EPEssenceTrack>& node )
{
! boost::shared_ptr<Node> spNode = node.GetSharedPointerToNode();
! boost::shared_ptr<AAFObjNode> spAAFNode = dynamic_pointer_cast<AAFObjNode>( spNode );
_spEssenceTracks->insert( spAAFNode );
return false;
***************
*** 322,327 ****
bool PreOrderVisit( EPTypedObjNode<IAAFStaticMobSlot, EPAudioTrack>& node )
{
! shared_ptr<Node> spNode = node.GetSharedPointerToNode();
! shared_ptr<AAFObjNode> spAAFNode = dynamic_pointer_cast<AAFObjNode>( spNode );
_spEssenceTracks->insert( spAAFNode );
_spAudioTracks->insert( spAAFNode );
--- 322,327 ----
bool PreOrderVisit( EPTypedObjNode<IAAFStaticMobSlot, EPAudioTrack>& node )
{
! boost::shared_ptr<Node> spNode = node.GetSharedPointerToNode();
! boost::shared_ptr<AAFObjNode> spAAFNode = dynamic_pointer_cast<AAFObjNode>( spNode );
_spEssenceTracks->insert( spAAFNode );
_spAudioTracks->insert( spAAFNode );
***************
*** 331,336 ****
bool PreOrderVisit( EPTypedObjNode<IAAFStaticMobSlot, EPVideoTrack>& node )
{
! shared_ptr<Node> spNode = node.GetSharedPointerToNode();
! shared_ptr<AAFObjNode> spAAFNode = dynamic_pointer_cast<AAFObjNode>( spNode );
_spEssenceTracks->insert( spAAFNode );
_spVideoTracks->insert( spAAFNode );
--- 331,336 ----
bool PreOrderVisit( EPTypedObjNode<IAAFStaticMobSlot, EPVideoTrack>& node )
{
! boost::shared_ptr<Node> spNode = node.GetSharedPointerToNode();
! boost::shared_ptr<AAFObjNode> spAAFNode = dynamic_pointer_cast<AAFObjNode>( spNode );
_spEssenceTracks->insert( spAAFNode );
_spVideoTracks->insert( spAAFNode );
***************
*** 340,345 ****
bool PreOrderVisit( EPTypedObjNode<IAAFStaticMobSlot, EPTimecodeTrack>& node )
{
! shared_ptr<Node> spNode = node.GetSharedPointerToNode();
! shared_ptr<AAFObjNode> spAAFNode = dynamic_pointer_cast<AAFObjNode>( spNode );
_spTimecodeTracks->insert( spAAFNode );
return false;
--- 340,345 ----
bool PreOrderVisit( EPTypedObjNode<IAAFStaticMobSlot, EPTimecodeTrack>& node )
{
! boost::shared_ptr<Node> spNode = node.GetSharedPointerToNode();
! boost::shared_ptr<AAFObjNode> spAAFNode = dynamic_pointer_cast<AAFObjNode>( spNode );
_spTimecodeTracks->insert( spAAFNode );
return false;
***************
*** 348,353 ****
bool PreOrderVisit( EPTypedObjNode<IAAFStaticMobSlot, EPEdgecodeTrack>& node )
{
! shared_ptr<Node> spNode = node.GetSharedPointerToNode();
! shared_ptr<AAFObjNode> spAAFNode = dynamic_pointer_cast<AAFObjNode>( spNode );
_spEdgecodeTracks->insert( spAAFNode );
return false;
--- 348,353 ----
bool PreOrderVisit( EPTypedObjNode<IAAFStaticMobSlot, EPEdgecodeTrack>& node )
{
! boost::shared_ptr<Node> spNode = node.GetSharedPointerToNode();
! boost::shared_ptr<AAFObjNode> spAAFNode = dynamic_pointer_cast<AAFObjNode>( spNode );
_spEdgecodeTracks->insert( spAAFNode );
return false;
***************
*** 356,361 ****
bool PreOrderVisit( EPTypedObjNode<IAAFEventMobSlot, EPEssenceTrack>& node )
{
! shared_ptr<Node> spNode = node.GetSharedPointerToNode();
! shared_ptr<AAFObjNode> spAAFNode = dynamic_pointer_cast<AAFObjNode>( spNode );
_spEssenceTracks->insert( spAAFNode );
return false;
--- 356,361 ----
bool PreOrderVisit( EPTypedObjNode<IAAFEventMobSlot, EPEssenceTrack>& node )
{
! boost::shared_ptr<Node> spNode = node.GetSharedPointerToNode();
! boost::shared_ptr<AAFObjNode> spAAFNode = dynamic_pointer_cast<AAFObjNode>( spNode );
_spEssenceTracks->insert( spAAFNode );
return false;
***************
*** 364,369 ****
bool PreOrderVisit( EPTypedObjNode<IAAFEventMobSlot, EPAudioTrack>& node )
{
! shared_ptr<Node> spNode = node.GetSharedPointerToNode();
! shared_ptr<AAFObjNode> spAAFNode = dynamic_pointer_cast<AAFObjNode>( spNode );
_spEssenceTracks->insert( spAAFNode );
_spAudioTracks->insert( spAAFNode );
--- 364,369 ----
bool PreOrderVisit( EPTypedObjNode<IAAFEventMobSlot, EPAudioTrack>& node )
{
! boost::shared_ptr<Node> spNode = node.GetSharedPointerToNode();
! boost::shared_ptr<AAFObjNode> spAAFNode = dynamic_pointer_cast<AAFObjNode>( spNode );
_spEssenceTracks->insert( spAAFNode );
_spAudioTracks->insert( spAAFNode );
***************
*** 373,378 ****
bool PreOrderVisit( EPTypedObjNode<IAAFEventMobSlot, EPVideoTrack>& node )
{
! shared_ptr<Node> spNode = node.GetSharedPointerToNode();
! shared_ptr<AAFObjNode> spAAFNode = dynamic_pointer_cast<AAFObjNode>( spNode );
_spEssenceTracks->insert( spAAFNode );
_spVideoTracks->insert( spAAFNode );
--- 373,378 ----
bool PreOrderVisit( EPTypedObjNode<IAAFEventMobSlot, EPVideoTrack>& node )
{
! boost::shared_ptr<Node> spNode = node.GetSharedPointerToNode();
! boost::shared_ptr<AAFObjNode> spAAFNode = dynamic_pointer_cast<AAFObjNode>( spNode );
_spEssenceTracks->insert( spAAFNode );
_spVideoTracks->insert( spAAFNode );
***************
*** 382,387 ****
bool PreOrderVisit( EPTypedObjNode<IAAFEventMobSlot, EPTimecodeTrack>& node )
{
! shared_ptr<Node> spNode = node.GetSharedPointerToNode();
! shared_ptr<AAFObjNode> spAAFNode = dynamic_pointer_cast<AAFObjNode>( spNode );
_spTimecodeTracks->insert( spAAFNode );
return false;
--- 382,387 ----
bool PreOrderVisit( EPTypedObjNode<IAAFEventMobSlot, EPTimecodeTrack>& node )
{
! boost::shared_ptr<Node> spNode = node.GetSharedPointerToNode();
! boost::shared_ptr<AAFObjNode> spAAFNode = dynamic_pointer_cast<AAFObjNode>( spNode );
_spTimecodeTracks->insert( spAAFNode );
return false;
***************
*** 390,395 ****
bool PreOrderVisit( EPTypedObjNode<IAAFEventMobSlot, EPEdgecodeTrack>& node )
{
! shared_ptr<Node> spNode = node.GetSharedPointerToNode();
! shared_ptr<AAFObjNode> spAAFNode = dynamic_pointer_cast<AAFObjNode>( spNode );
_spEdgecodeTracks->insert( spAAFNode );
return false;
--- 390,395 ----
bool PreOrderVisit( EPTypedObjNode<IAAFEventMobSlot, EPEdgecodeTrack>& node )
{
! boost::shared_ptr<Node> spNode = node.GetSharedPointerToNode();
! boost::shared_ptr<AAFObjNode> spAAFNode = dynamic_pointer_cast<AAFObjNode>( spNode );
_spEdgecodeTracks->insert( spAAFNode );
return false;
***************
*** 398,403 ****
bool PreOrderVisit( EPTypedObjNode<IAAFMobSlot, EPEssenceTrack>& node )
{
! shared_ptr<Node> spNode = node.GetSharedPointerToNode();
! shared_ptr<AAFObjNode> spAAFNode = dynamic_pointer_cast<AAFObjNode>( spNode );
_spEssenceTracks->insert( spAAFNode );
return false;
--- 398,403 ----
bool PreOrderVisit( EPTypedObjNode<IAAFMobSlot, EPEssenceTrack>& node )
{
! boost::shared_ptr<Node> spNode = node.GetSharedPointerToNode();
! boost::shared_ptr<AAFObjNode> spAAFNode = dynamic_pointer_cast<AAFObjNode>( spNode );
_spEssenceTracks->insert( spAAFNode );
return false;
***************
*** 406,411 ****
bool PreOrderVisit( EPTypedObjNode<IAAFMobSlot, EPAudioTrack>& node )
{
! shared_ptr<Node> spNode = node.GetSharedPointerToNode();
! shared_ptr<AAFObjNode> spAAFNode = dynamic_pointer_cast<AAFObjNode>( spNode );
_spEssenceTracks->insert( spAAFNode );
_spAudioTracks->insert( spAAFNode );
--- 406,411 ----
bool PreOrderVisit( EPTypedObjNode<IAAFMobSlot, EPAudioTrack>& node )
{
! boost::shared_ptr<Node> spNode = node.GetSharedPointerToNode();
! boost::shared_ptr<AAFObjNode> spAAFNode = dynamic_pointer_cast<AAFObjNode>( spNode );
_spEssenceTracks->insert( spAAFNode );
_spAudioTracks->insert( spAAFNode );
***************
*** 415,420 ****
bool PreOrderVisit( EPTypedObjNode<IAAFMobSlot, EPVideoTrack>& node )
{
! shared_ptr<Node> spNode = node.GetSharedPointerToNode();
! shared_ptr<AAFObjNode> spAAFNode = dynamic_pointer_cast<AAFObjNode>( spNode );
_spEssenceTracks->insert( spAAFNode );
_spVideoTracks->insert( spAAFNode );
--- 415,420 ----
bool PreOrderVisit( EPTypedObjNode<IAAFMobSlot, EPVideoTrack>& node )
{
! boost::shared_ptr<Node> spNode = node.GetSharedPointerToNode();
! boost::shared_ptr<AAFObjNode> spAAFNode = dynamic_pointer_cast<AAFObjNode>( spNode );
_spEssenceTracks->insert( spAAFNode );
_spVideoTracks->insert( spAAFNode );
***************
*** 424,429 ****
bool PreOrderVisit( EPTypedObjNode<IAAFMobSlot, EPTimecodeTrack>& node )
{
! shared_ptr<Node> spNode = node.GetSharedPointerToNode();
! shared_ptr<AAFObjNode> spAAFNode = dynamic_pointer_cast<AAFObjNode>( spNode );
_spTimecodeTracks->insert( spAAFNode );
return false;
--- 424,429 ----
bool PreOrderVisit( EPTypedObjNode<IAAFMobSlot, EPTimecodeTrack>& node )
{
! boost::shared_ptr<Node> spNode = node.GetSharedPointerToNode();
! boost::shared_ptr<AAFObjNode> spAAFNode = dynamic_pointer_cast<AAFObjNode>( spNode );
_spTimecodeTracks->insert( spAAFNode );
return false;
***************
*** 432,462 ****
bool PreOrderVisit( EPTypedObjNode<IAAFMobSlot, EPEdgecodeTrack>& node )
{
! shared_ptr<Node> spNode = node.GetSharedPointerToNode();
! shared_ptr<AAFObjNode> spAAFNode = dynamic_pointer_cast<AAFObjNode>( spNode );
_spEdgecodeTracks->insert( spAAFNode );
return false;
}
! shared_ptr<EPTypedVisitor::MobSlotNodeSet> GetEssenceTracks()
{
return _spEssenceTracks;
}
! shared_ptr<EPTypedVisitor::MobSlotNodeSet> GetAudioTracks()
{
return _spAudioTracks;
}
! shared_ptr<EPTypedVisitor::MobSlotNodeSet> GetVideoTracks()
{
return _spVideoTracks;
}
! shared_ptr<EPTypedVisitor::MobSlotNodeSet> GetTimecodeTracks()
{
return _spTimecodeTracks;
}
! shared_ptr<EPTypedVisitor::MobSlotNodeSet> GetEdgecodeTracks()
{
return _spEdgecodeTracks;
--- 432,462 ----
bool PreOrderVisit( EPTypedObjNode<IAAFMobSlot, EPEdgecodeTrack>& node )
{
! boost::shared_ptr<Node> spNode = node.GetSharedPointerToNode();
! boost::shared_ptr<AAFObjNode> spAAFNode = dynamic_pointer_cast<AAFObjNode>( spNode );
_spEdgecodeTracks->insert( spAAFNode );
return false;
}
! boost::shared_ptr<EPTypedVisitor::MobSlotNodeSet> GetEssenceTracks()
{
return _spEssenceTracks;
}
! boost::shared_ptr<EPTypedVisitor::MobSlotNodeSet> GetAudioTracks()
{
return _spAudioTracks;
}
! boost::shared_ptr<EPTypedVisitor::MobSlotNodeSet> GetVideoTracks()
{
return _spVideoTracks;
}
! boost::shared_ptr<EPTypedVisitor::MobSlotNodeSet> GetTimecodeTracks()
{
return _spTimecodeTracks;
}
! boost::shared_ptr<EPTypedVisitor::MobSlotNodeSet> GetEdgecodeTracks()
{
return _spEdgecodeTracks;
***************
*** 465,473 ****
private:
! shared_ptr<EPTypedVisitor::MobSlotNodeSet> _spEssenceTracks;
! shared_ptr<EPTypedVisitor::MobSlotNodeSet> _spAudioTracks;
! shared_ptr<EPTypedVisitor::MobSlotNodeSet> _spVideoTracks;
! shared_ptr<EPTypedVisitor::MobSlotNodeSet> _spTimecodeTracks;
! shared_ptr<EPTypedVisitor::MobSlotNodeSet> _spEdgecodeTracks;
// prohibited
--- 465,473 ----
private:
! boost::shared_ptr<EPTypedVisitor::MobSlotNodeSet> _spEssenceTracks;
! boost::shared_ptr<EPTypedVisitor::MobSlotNodeSet> _spAudioTracks;
! boost::shared_ptr<EPTypedVisitor::MobSlotNodeSet> _spVideoTracks;
! boost::shared_ptr<EPTypedVisitor::MobSlotNodeSet> _spTimecodeTracks;
! boost::shared_ptr<EPTypedVisitor::MobSlotNodeSet> _spEdgecodeTracks;
// prohibited
***************
*** 526,534 ****
}
! AxString EPTypedVisitor::GetMobName( shared_ptr<EdgeMap> spEdgeMap, Node& node )
{
! shared_ptr<Node> spNode = dynamic_pointer_cast<Node>( node.GetSharedPointerToNode() );
DepthFirstTraversal dfs( spEdgeMap, spNode );
! shared_ptr<ParentMobVisitor> spVisitor( new ParentMobVisitor );
dfs.TraverseUp( spVisitor );
--- 526,534 ----
}
! AxString EPTypedVisitor::GetMobName( boost::shared_ptr<EdgeMap> spEdgeMap, Node& node )
{
! boost::shared_ptr<Node> spNode = dynamic_pointer_cast<Node>( node.GetSharedPointerToNode() );
DepthFirstTraversal dfs( spEdgeMap, spNode );
! boost::shared_ptr<ParentMobVisitor> spVisitor( new ParentMobVisitor );
dfs.TraverseUp( spVisitor );
***************
*** 536,544 ****
}
! AxString EPTypedVisitor::GetMobSlotName( shared_ptr<EdgeMap> spEdgeMap, Node& node )
{
! shared_ptr<Node> spNode = dynamic_pointer_cast<Node>( node.GetSharedPointerToNode() );
DepthFirstTraversal dfs( spEdgeMap, spNode );
! shared_ptr<ParentMobVisitor> spVisitor( new ParentMobVisitor );
dfs.TraverseUp( spVisitor );
--- 536,544 ----
}
! AxString EPTypedVisitor::GetMobSlotName( boost::shared_ptr<EdgeMap> spEdgeMap, Node& node )
{
! boost::shared_ptr<Node> spNode = dynamic_pointer_cast<Node>( node.GetSharedPointerToNode() );
DepthFirstTraversal dfs( spEdgeMap, spNode );
! boost::shared_ptr<ParentMobVisitor> spVisitor( new ParentMobVisitor );
dfs.TraverseUp( spVisitor );
***************
*** 546,554 ****
}
! shared_ptr<EPTypedVisitor::MobSlotNodeSet> EPTypedVisitor::GetEssenceTracks( shared_ptr<EdgeMap> spEdgeMap, Node& node )
{
! shared_ptr<Node> spNode = dynamic_pointer_cast<Node>( node.GetSharedPointerToNode() );
DepthFirstTraversal dfs( spEdgeMap, spNode );
! shared_ptr<ChildMobSlotVisitor> spVisitor( new ChildMobSlotVisitor );
dfs.TraverseDown( spVisitor );
--- 546,554 ----
}
! boost::shared_ptr<EPTypedVisitor::MobSlotNodeSet> EPTypedVisitor::GetEssenceTracks( boost::shared_ptr<EdgeMap> spEdgeMap, Node& node )
{
! boost::shared_ptr<Node> spNode = dynamic_pointer_cast<Node>( node.GetSharedPointerToNode() );
DepthFirstTraversal dfs( spEdgeMap, spNode );
! boost::shared_ptr<ChildMobSlotVisitor> spVisitor( new ChildMobSlotVisitor );
dfs.TraverseDown( spVisitor );
***************
*** 556,564 ****
}
! shared_ptr<EPTypedVisitor::MobSlotNodeSet> EPTypedVisitor::GetAudioTracks( shared_ptr<EdgeMap> spEdgeMap, Node& node )
{
! shared_ptr<Node> spNode = dynamic_pointer_cast<Node>( node.GetSharedPointerToNode() );
DepthFirstTraversal dfs( spEdgeMap, spNode );
! shared_ptr<ChildMobSlotVisitor> spVisitor( new ChildMobSlotVisitor );
dfs.TraverseDown( spVisitor );
--- 556,564 ----
}
! boost::shared_ptr<EPTypedVisitor::MobSlotNodeSet> EPTypedVisitor::GetAudioTracks( boost::shared_ptr<EdgeMap> spEdgeMap, Node& node )
{
! boost::shared_ptr<Node> spNode = dynamic_pointer_cast<Node>( node.GetSharedPointerToNode() );
DepthFirstTraversal dfs( spEdgeMap, spNode );
! boost::shared_ptr<ChildMobSlotVisitor> spVisitor( new ChildMobSlotVisitor );
dfs.TraverseDown( spVisitor );
***************
*** 566,574 ****
}
! shared_ptr<EPTypedVisitor::MobSlotNodeSet> EPTypedVisitor::GetVideoTracks( shared_ptr<EdgeMap> spEdgeMap, Node& node )
{
! shared_ptr<Node> spNode = dynamic_pointer_cast<Node>( node.GetSharedPointerToNode() );
DepthFirstTraversal dfs( spEdgeMap, spNode );
! shared_ptr<ChildMobSlotVisitor> spVisitor( new ChildMobSlotVisitor );
dfs.TraverseDown( spVisitor );
--- 566,574 ----
}
! boost::shared_ptr<EPTypedVisitor::MobSlotNodeSet> EPTypedVisitor::GetVideoTracks( boost::shared_ptr<EdgeMap> spEdgeMap, Node& node )
{
! boost::shared_ptr<Node> spNode = dynamic_pointer_cast<Node>( node.GetSharedPointerToNode() );
DepthFirstTraversal dfs( spEdgeMap, spNode );
! boost::shared_ptr<ChildMobSlotVisitor> spVisitor( new ChildMobSlotVisitor );
dfs.TraverseDown( spVisitor );
***************
*** 576,584 ****
}
! shared_ptr<EPTypedVisitor::MobSlotNodeSet> EPTypedVisitor::GetTimecodeTracks( shared_ptr<EdgeMap> spEdgeMap, Node& node )
{
! shared_ptr<Node> spNode = dynamic_pointer_cast<Node>( node.GetSharedPointerToNode() );
DepthFirstTraversal dfs( spEdgeMap, spNode );
! shared_ptr<ChildMobSlotVisitor> spVisitor( new ChildMobSlotVisitor );
dfs.TraverseDown( spVisitor );
--- 576,584 ----
}
! boost::shared_ptr<EPTypedVisitor::MobSlotNodeSet> EPTypedVisitor::GetTimecodeTracks( boost::shared_ptr<EdgeMap> spEdgeMap, Node& node )
{
! boost::shared_ptr<Node> spNode = dynamic_pointer_cast<Node>( node.GetSharedPointerToNode() );
DepthFirstTraversal dfs( spEdgeMap, spNode );
! boost::shared_ptr<ChildMobSlotVisitor> spVisitor( new ChildMobSlotVisitor );
dfs.TraverseDown( spVisitor );
***************
*** 586,594 ****
}
! shared_ptr<EPTypedVisitor::MobSlotNodeSet> EPTypedVisitor::GetEdgecodeTracks( shared_ptr<EdgeMap> spEdgeMap, Node& node )
{
! shared_ptr<Node> spNode = dynamic_pointer_cast<Node>( node.GetSharedPointerToNode() );
DepthFirstTraversal dfs( spEdgeMap, spNode );
! shared_ptr<ChildMobSlotVisitor> spVisitor( new ChildMobSlotVisitor );
dfs.TraverseDown( spVisitor );
--- 586,594 ----
}
! boost::shared_ptr<EPTypedVisitor::MobSlotNodeSet> EPTypedVisitor::GetEdgecodeTracks( boost::shared_ptr<EdgeMap> spEdgeMap, Node& node )
{
! boost::shared_ptr<Node> spNode = dynamic_pointer_cast<Node>( node.GetSharedPointerToNode() );
DepthFirstTraversal dfs( spEdgeMap, spNode );
! boost::shared_ptr<ChildMobSlotVisitor> spVisitor( new ChildMobSlotVisitor );
dfs.TraverseDown( spVisitor );
Index: EPTypedObjNode.cpp
===================================================================
RCS file: /cvsroot/aaf/AAF/Utilities/AAFAnalyzer/EPAnalyzerBase/EPTypedObjNode.cpp,v
retrieving revision 1.9
retrieving revision 1.9.4.1
diff -C2 -d -r1.9 -r1.9.4.1
*** EPTypedObjNode.cpp 1 Jun 2009 11:46:46 -0000 1.9
--- EPTypedObjNode.cpp 12 Oct 2012 20:07:47 -0000 1.9.4.1
***************
*** 44,51 ****
namespace aafanalyzer {
- using namespace boost;
-
template<typename AAFObjType, typename EPObjType>
! EPTypedObjNode<AAFObjType, EPObjType>::EPTypedObjNode( const shared_ptr<AAFTypedObjNode<AAFObjType> > spNode, shared_ptr<EPObjType> spEPObject )
: AAFTypedObjNodeDecorator<AAFObjType>( spNode ),
_spEPObject( spEPObject )
--- 44,49 ----
namespace aafanalyzer {
template<typename AAFObjType, typename EPObjType>
! EPTypedObjNode<AAFObjType, EPObjType>::EPTypedObjNode( const boost::shared_ptr<AAFTypedObjNode<AAFObjType> > spNode, boost::shared_ptr<EPObjType> spEPObject )
: AAFTypedObjNodeDecorator<AAFObjType>( spNode ),
_spEPObject( spEPObject )
***************
*** 57,63 ****
template<typename AAFObjType, typename EPObjType>
! bool EPTypedObjNode<AAFObjType, EPObjType>::PreOrderVisit(shared_ptr<Visitor> spVisitor)
{
! shared_ptr<EPTypedVisitor> spEPTypedVis = dynamic_pointer_cast<EPTypedVisitor>(spVisitor);
if (spEPTypedVis)
{
--- 55,61 ----
template<typename AAFObjType, typename EPObjType>
! bool EPTypedObjNode<AAFObjType, EPObjType>::PreOrderVisit(boost::shared_ptr<Visitor> spVisitor)
{
! boost::shared_ptr<EPTypedVisitor> spEPTypedVis = dynamic_pointer_cast<EPTypedVisitor>(spVisitor);
if (spEPTypedVis)
{
***************
*** 65,69 ****
}
! shared_ptr<TypedVisitor> spTypedVis = dynamic_pointer_cast<TypedVisitor>(spVisitor);
if(spTypedVis)
{
--- 63,67 ----
}
! boost::shared_ptr<TypedVisitor> spTypedVis = dynamic_pointer_cast<TypedVisitor>(spVisitor);
if(spTypedVis)
{
***************
*** 75,86 ****
template<typename AAFObjType, typename EPObjType>
! bool EPTypedObjNode<AAFObjType, EPObjType>::PostOrderVisit(shared_ptr<Visitor> spVisitor)
{
! shared_ptr<EPTypedVisitor> spEPTypedVis = dynamic_pointer_cast<EPTypedVisitor>(spVisitor);
if (spEPTypedVis)
{
return spEPTypedVis->PostOrderVisit(*this);
}
! shared_ptr<TypedVisitor> spTypedVis = dynamic_pointer_cast<TypedVisitor>(spVisitor);
if(spTypedVis)
{
--- 73,84 ----
template<typename AAFObjType, typename EPObjType>
! bool EPTypedObjNode<AAFObjType, EPObjType>::PostOrderVisit(boost::shared_ptr<Visitor> spVisitor)
{
! boost::shared_ptr<EPTypedVisitor> spEPTypedVis = dynamic_pointer_cast<EPTypedVisitor>(spVisitor);
if (spEPTypedVis)
{
return spEPTypedVis->PostOrderVisit(*this);
}
! boost::shared_ptr<TypedVisitor> spTypedVis = dynamic_pointer_cast<TypedVisitor>(spVisitor);
if(spTypedVis)
{
***************
*** 92,96 ****
template<typename AAFObjType, typename EPObjType>
! shared_ptr<EPObjType> EPTypedObjNode<AAFObjType, EPObjType>::GetEPObject()
{
return _spEPObject;
--- 90,94 ----
template<typename AAFObjType, typename EPObjType>
! boost::shared_ptr<EPObjType> EPTypedObjNode<AAFObjType, EPObjType>::GetEPObject()
{
return _spEPObject;
Index: EPTypedVisitor.h
===================================================================
RCS file: /cvsroot/aaf/AAF/Utilities/AAFAnalyzer/EPAnalyzerBase/EPTypedVisitor.h,v
retrieving revision 1.9
retrieving revision 1.9.4.1
diff -C2 -d -r1.9 -r1.9.4.1
*** EPTypedVisitor.h 1 Jun 2009 11:46:46 -0000 1.9
--- EPTypedVisitor.h 12 Oct 2012 20:07:47 -0000 1.9.4.1
***************
*** 64,68 ****
public:
! typedef set<shared_ptr<AAFObjNode> > MobSlotNodeSet;
// Default constructor traverse uses the default TypedVisitor also
--- 64,68 ----
public:
! typedef set<boost::shared_ptr<AAFObjNode> > MobSlotNodeSet;
// Default constructor traverse uses the default TypedVisitor also
***************
*** 82,87 ****
//to avoid constantly re-implementing them.
AxString GetMobName( AxMob& axMob, const AxString& type );
! AxString GetMobName( shared_ptr<EdgeMap> spEdgeMap, Node& node );
! AxString GetMobSlotName( shared_ptr<EdgeMap> spEdgeMap, Node& node );
//TODO: These are currently only used by EPContainedTrackVisitor, they may
--- 82,87 ----
//to avoid constantly re-implementing them.
AxString GetMobName( AxMob& axMob, const AxString& type );
! AxString GetMobName( boost::shared_ptr<EdgeMap> spEdgeMap, Node& node );
! AxString GetMobSlotName( boost::shared_ptr<EdgeMap> spEdgeMap, Node& node );
//TODO: These are currently only used by EPContainedTrackVisitor, they may
***************
*** 89,97 ****
// to EPContainedTrackVisitor. They are being left here for the time
// being in case any future tests require them.
! shared_ptr<MobSlotNodeSet> GetEssenceTracks( shared_ptr<EdgeMap> spEdgeMap, Node& node );
! shared_ptr<MobSlotNodeSet> GetAudioTracks( shared_ptr<EdgeMap> spEdgeMap, Node& node );
! shared_ptr<MobSlotNodeSet> GetVideoTracks( shared_ptr<EdgeMap> spEdgeMap, Node& node );
! shared_ptr<MobSlotNodeSet> GetTimecodeTracks( shared_ptr<EdgeMap> spEdgeMap, Node& node );
! shared_ptr<MobSlotNodeSet> GetEdgecodeTracks( shared_ptr<EdgeMap> spEdgeMap, Node& node );
private:
--- 89,97 ----
// to EPContainedTrackVisitor. They are being left here for the time
// being in case any future tests require them.
! boost::shared_ptr<MobSlotNodeSet> GetEssenceTracks( boost::shared_ptr<EdgeMap> spEdgeMap, Node& node );
! boost::shared_ptr<MobSlotNodeSet> GetAudioTracks( boost::shared_ptr<EdgeMap> spEdgeMap, Node& node );
! boost::shared_ptr<MobSlotNodeSet> GetVideoTracks( boost::shared_ptr<EdgeMap> spEdgeMap, Node& node );
! boost::shared_ptr<MobSlotNodeSet> GetTimecodeTracks( boost::shared_ptr<EdgeMap> spEdgeMap, Node& node );
! boost::shared_ptr<MobSlotNodeSet> GetEdgecodeTracks( boost::shared_ptr<EdgeMap> spEdgeMap, Node& node );
private:
***************
*** 100,105 ****
bool ForwardPreOrderVisit( EPTypedObjNode<AAFObjectType, EPObjectType>& node )
{
! shared_ptr<Node> spNode = node.GetSharedPointerToNode();
! shared_ptr<AAFTypedObjNode<AAFObjectType> > spBaseNode = dynamic_pointer_cast<AAFTypedObjNode<AAFObjectType> >(spNode);
return this->PreOrderVisit( *spBaseNode );
}
--- 100,105 ----
bool ForwardPreOrderVisit( EPTypedObjNode<AAFObjectType, EPObjectType>& node )
{
! boost::shared_ptr<Node> spNode = node.GetSharedPointerToNode();
! boost::shared_ptr<AAFTypedObjNode<AAFObjectType> > spBaseNode = dynamic_pointer_cast<AAFTypedObjNode<AAFObjectType> >(spNode);
return this->PreOrderVisit( *spBaseNode );
}
***************
*** 108,113 ****
bool ForwardPostOrderVisit( EPTypedObjNode<AAFObjectType, EPObjectType>& node )
{
! shared_ptr<Node> spNode = node.GetSharedPointerToNode();
! shared_ptr<AAFTypedObjNode<AAFObjectType> > spBaseNode = dynamic_pointer_cast<AAFTypedObjNode<AAFObjectType> >(spNode);
return this->PostOrderVisit( *spBaseNode );
}
--- 108,113 ----
bool ForwardPostOrderVisit( EPTypedObjNode<AAFObjectType, EPObjectType>& node )
{
! boost::shared_ptr<Node> spNode = node.GetSharedPointerToNode();
! boost::shared_ptr<AAFTypedObjNode<AAFObjectType> > spBaseNode = dynamic_pointer_cast<AAFTypedObjNode<AAFObjectType> >(spNode);
return this->PostOrderVisit( *spBaseNode );
}
Index: EPTrack.h
===================================================================
RCS file: /cvsroot/aaf/AAF/Utilities/AAFAnalyzer/EPAnalyzerBase/EPTrack.h,v
retrieving revision 1.6
retrieving revision 1.6.4.1
diff -C2 -d -r1.6 -r1.6.4.1
*** EPTrack.h 1 Jun 2009 11:46:46 -0000 1.6
--- EPTrack.h 12 Oct 2012 20:07:47 -0000 1.6.4.1
***************
*** 199,203 ****
public:
! static shared_ptr<EPAudioTrack> CreateAudioTrack( AxMobSlot& axMobSlot );
static const AxString GetName();
--- 199,203 ----
public:
! static boost::shared_ptr<EPAudioTrack> CreateAudioTrack( AxMobSlot& axMobSlot );
static const AxString GetName();
***************
*** 226,230 ****
public:
! static shared_ptr<EPVideoTrack> CreateVideoTrack( AxMobSlot& axMobSlot );
static const AxString GetName();
--- 226,230 ----
public:
! static boost::shared_ptr<EPVideoTrack> CreateVideoTrack( AxMobSlot& axMobSlot );
static const AxString GetName();
|