Menu
▾
▴
[Ravl-commits] CVS: Ravl/OS/DataProc Buffer.hh,1.4,1.5 FixedBuffer.hh,1.4,1.5 Hold.hh,1.1,1.2 MTIOConnect.hh,1.5,1.6 PlayControl.hh,1.5,1.6 ThreadPipe.hh,1.8,1.9
|
From: Charles G. <cr...@us...> - 2002-07-31 07:45:38
|
Update of /cvsroot/ravl/Ravl/OS/DataProc
In directory usw-pr-cvs1:/tmp/cvs-serv9444
Modified Files:
Buffer.hh FixedBuffer.hh Hold.hh MTIOConnect.hh PlayControl.hh
ThreadPipe.hh
Log Message:
Fix DPStreamOpC stuff.
Index: Buffer.hh
===================================================================
RCS file: /cvsroot/ravl/Ravl/OS/DataProc/Buffer.hh,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Buffer.hh 25 Jun 2002 15:53:22 -0000 1.4
--- Buffer.hh 31 Jul 2002 07:45:34 -0000 1.5
***************
*** 36,39 ****
--- 36,43 ----
//: Default constructor.
+ virtual StringC OpName() const
+ { return StringC("buffer"); }
+ //: Op type name.
+
virtual bool IsAsync() const
{ return true; }
Index: FixedBuffer.hh
===================================================================
RCS file: /cvsroot/ravl/Ravl/OS/DataProc/FixedBuffer.hh,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FixedBuffer.hh 25 Jun 2002 15:53:22 -0000 1.4
--- FixedBuffer.hh 31 Jul 2002 07:45:34 -0000 1.5
***************
*** 33,36 ****
--- 33,40 ----
{}
//: Default constructor.
+
+ virtual StringC OpName() const
+ { return StringC("buffer"); }
+ //: Op type name.
virtual bool Put(const DataT &dat)
Index: Hold.hh
===================================================================
RCS file: /cvsroot/ravl/Ravl/OS/DataProc/Hold.hh,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Hold.hh 25 Jun 2002 15:53:22 -0000 1.1
--- Hold.hh 31 Jul 2002 07:45:34 -0000 1.2
***************
*** 32,36 ****
DPHoldBodyC(const DataT &init = DataT());
//: Default constructor.
!
virtual bool IsPutReady() const;
//: Ready to accept data ?
--- 32,40 ----
DPHoldBodyC(const DataT &init = DataT());
//: Default constructor.
!
! virtual StringC OpName() const
! { return StringC("hold"); }
! //: Op type name.
!
virtual bool IsPutReady() const;
//: Ready to accept data ?
Index: MTIOConnect.hh
===================================================================
RCS file: /cvsroot/ravl/Ravl/OS/DataProc/MTIOConnect.hh,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** MTIOConnect.hh 25 Jun 2002 15:53:22 -0000 1.5
--- MTIOConnect.hh 31 Jul 2002 07:45:34 -0000 1.6
***************
*** 23,26 ****
--- 23,27 ----
#include "Ravl/DP/Event.hh"
#include "Ravl/DP/Pipes.hh"
+ #include "Ravl/DP/StreamOp.hh"
namespace RavlN {
***************
*** 33,37 ****
class DPMTIOConnectBaseBodyC
! : public DPEntityBodyC
{
public:
--- 34,38 ----
class DPMTIOConnectBaseBodyC
! : public DPStreamOpBodyC
{
public:
***************
*** 43,46 ****
--- 44,51 ----
//: Default Constructor.
+ virtual StringC OpName() const
+ { return StringC("pump"); }
+ //: Op type name.
+
bool Disconnect();
//: Stop connection.
***************
*** 90,93 ****
--- 95,112 ----
//: Do some async stuff.
+ virtual DListC<DPIPlugBaseC> IPlugs() const {
+ DListC<DPIPlugBaseC> ret;
+ ret.InsLast(DPIPlugC<DataT>(from,DPEntityC(const_cast<DPMTIOConnectBodyC<DataT> &>(*this))));
+ return ret;
+ }
+ //: Input plugs.
+
+ virtual DListC<DPOPlugBaseC> OPlugs() const {
+ DListC<DPOPlugBaseC> ret;
+ ret.InsLast(DPOPlugC<DataT>(to,DPEntityC(const_cast<DPMTIOConnectBodyC<DataT> &>(*this))));
+ return ret;
+ }
+ //: Output plugs
+
private:
DPIPortC<DataT> from;
***************
*** 102,106 ****
class DPMTIOConnectBaseC
! : public DPEntityC
{
public:
--- 121,125 ----
class DPMTIOConnectBaseC
! : public DPStreamOpC
{
public:
***************
*** 115,118 ****
--- 134,147 ----
//: Default constructor.
+ protected:
+ inline DPMTIOConnectBaseBodyC &Body()
+ { return dynamic_cast<DPMTIOConnectBaseBodyC &>(DPEntityC::Body()); }
+ //: Access body.
+
+ inline const DPMTIOConnectBaseBodyC &Body() const
+ { return dynamic_cast<const DPMTIOConnectBaseBodyC &>(DPEntityC::Body()); }
+ //: Access body.
+
+ public:
bool Disconnect();
//: Stop connection.
***************
*** 131,143 ****
// It indicates the completion of processing.
- protected:
- inline DPMTIOConnectBaseBodyC &Body()
- { return static_cast<DPMTIOConnectBaseBodyC &>(DPEntityC::Body()); }
- //: Access body.
-
- inline const DPMTIOConnectBaseBodyC &Body() const
- { return static_cast<const DPMTIOConnectBaseBodyC &>(DPEntityC::Body()); }
-
- //: Access body.
};
--- 160,163 ----
***************
*** 153,157 ****
public:
DPMTIOConnectC(const DPIPortC<DataT> &from,const DPOPortC<DataT> &to,bool nuseIsGetReady = true,bool deleteable = true,UIntT blockSize = 1)
! : DPMTIOConnectBaseC(*new DPMTIOConnectBodyC<DataT>(from,to,nuseIsGetReady,blockSize))
{}
//: Constructor.
--- 173,177 ----
public:
DPMTIOConnectC(const DPIPortC<DataT> &from,const DPOPortC<DataT> &to,bool nuseIsGetReady = true,bool deleteable = true,UIntT blockSize = 1)
! : DPEntityC(*new DPMTIOConnectBodyC<DataT>(from,to,nuseIsGetReady,blockSize))
{}
//: Constructor.
***************
*** 159,172 ****
protected:
DPMTIOConnectC(DPMTIOConnectBodyC<DataT> &oth)
! : DPMTIOConnectBaseC(oth)
{}
//: Body Constructor.
inline DPMTIOConnectBodyC<DataT> &Body()
! { return static_cast<DPMTIOConnectBodyC<DataT> &>(DPEntityC::Body()); }
//: Access body.
inline const DPMTIOConnectBodyC<DataT> &Body() const
! { return static_cast<const DPMTIOConnectBodyC<DataT> &>(DPEntityC::Body()); }
//: Access body.
--- 179,192 ----
protected:
DPMTIOConnectC(DPMTIOConnectBodyC<DataT> &oth)
! : DPEntityC(oth)
{}
//: Body Constructor.
inline DPMTIOConnectBodyC<DataT> &Body()
! { return dynamic_cast<DPMTIOConnectBodyC<DataT> &>(DPEntityC::Body()); }
//: Access body.
inline const DPMTIOConnectBodyC<DataT> &Body() const
! { return dynamic_cast<const DPMTIOConnectBodyC<DataT> &>(DPEntityC::Body()); }
//: Access body.
Index: PlayControl.hh
===================================================================
RCS file: /cvsroot/ravl/Ravl/OS/DataProc/PlayControl.hh,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PlayControl.hh 25 Jun 2002 15:53:22 -0000 1.5
--- PlayControl.hh 31 Jul 2002 07:45:34 -0000 1.6
***************
*** 284,288 ****
class DPIPlayControlBodyC
: public DPIPortBodyC<DataT>,
! public DPPlayControlBodyC
{
public:
--- 284,289 ----
class DPIPlayControlBodyC
: public DPIPortBodyC<DataT>,
! public DPPlayControlBodyC,
! public DPStreamOpBodyC
{
public:
***************
*** 297,300 ****
--- 298,305 ----
//: Constructor.
+ virtual StringC OpName() const
+ { return StringC("playcontrol"); }
+ //: Op type name.
+
virtual DataT Get() {
if(pause)
***************
*** 364,367 ****
--- 369,378 ----
//: Open new video stream.
+ virtual DListC<DPIPortBaseC> IPorts() const;
+ //: Input ports.
+
+ virtual DListC<DPIPlugBaseC> IPlugs() const;
+ //: Input plugs.
+
protected:
DPISPortC<DataT> input; // Where to get data from.
***************
*** 380,384 ****
class DPIPlayControlC
: public DPIPortC<DataT>,
! public DPPlayControlC
{
public:
--- 391,396 ----
class DPIPlayControlC
: public DPIPortC<DataT>,
! public DPPlayControlC,
! public DPStreamOpC
{
public:
***************
*** 415,425 ****
inline const DPISPortC<DataT> &Input()
{ return Body().Input(); }
! //: Access input port.
! inline bool Open(const DPISPortC<DataT> &nPort)
{ return Body().Open(nPort); }
//: Open a new input.
};
}
--- 427,454 ----
inline const DPISPortC<DataT> &Input()
{ return Body().Input(); }
! //: Access input port.
! inline bool Open(const DPISPortC<DataT> &nPort)
{ return Body().Open(nPort); }
//: Open a new input.
+ friend class DPIPlayControlBodyC<DataT>;
};
+
+ template<class DataT>
+ DListC<DPIPortBaseC> DPIPlayControlBodyC<DataT>::IPorts() const {
+ DListC<DPIPortBaseC> ret;
+ ret.InsLast(DPIPlayControlC<DataT>(const_cast<DPIPlayControlBodyC<DataT> &>(*this)));
+ return ret;
+ }
+ //: Input ports.
+
+ template<class DataT>
+ DListC<DPIPlugBaseC> DPIPlayControlBodyC<DataT>::IPlugs() const {
+ DListC<DPIPlugBaseC> ret;
+ ret.InsLast(DPIPlugC<DataT>(input,DPEntityC(const_cast<DPIPlayControlBodyC<DataT> &>(*this))));
+ return ret;
+ }
+ //: Input plugs.
}
Index: ThreadPipe.hh
===================================================================
RCS file: /cvsroot/ravl/Ravl/OS/DataProc/ThreadPipe.hh,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ThreadPipe.hh 25 Jun 2002 15:53:22 -0000 1.8
--- ThreadPipe.hh 31 Jul 2002 07:45:34 -0000 1.9
***************
*** 15,20 ****
//! date="02/10/1998"
! #include "Ravl/DP/Port.hh"
#include "Ravl/DP/Process.hh"
#include "Ravl/Threads/MessageQueue.hh"
#include "Ravl/Threads/LaunchThread.hh"
--- 15,21 ----
//! date="02/10/1998"
! #include "Ravl/DP/IOPort.hh"
#include "Ravl/DP/Process.hh"
+ #include "Ravl/DP/StreamOp.hh"
#include "Ravl/Threads/MessageQueue.hh"
#include "Ravl/Threads/LaunchThread.hh"
***************
*** 43,46 ****
--- 44,51 ----
//: Default constructor.
+ virtual StringC OpName() const
+ { return StringC("threadpipe"); }
+ //: Op type name.
+
virtual bool IsPutReady() const
{ return !gotEOS; }
***************
*** 110,114 ****
template<class InT,class OutT>
class DPThreadPipeC
! : public DPIOPortC<InT,OutT>
{
public:
--- 115,119 ----
template<class InT,class OutT>
class DPThreadPipeC
! : public DPIOPortC<InT,OutT>
{
public:
***************
*** 270,275 ****
template<class InT,class OutT>
! RCBodyVC &
! DPThreadPipeBodyC<InT,OutT>::Copy() const {
DPThreadPipeBodyC<InT,OutT> *x;
if(proc.IsStateless())
--- 275,279 ----
template<class InT,class OutT>
! RCBodyVC &DPThreadPipeBodyC<InT,OutT>::Copy() const {
DPThreadPipeBodyC<InT,OutT> *x;
if(proc.IsStateless())
|