Commit 134f2791 authored by Laurent Claustre's avatar Laurent Claustre

* Added new method to get back shared_memory names in CtSpsImage class

* Updated applications/tango

Conflicts:

	applications/tango
parent ce6f680c
Subproject commit 315c7d74d8c9ed286efdb2d56ef293e9f305be33
Subproject commit 7d429321f8e047dfd5b6fe1e83ea2e754c26e5e2
......@@ -46,6 +46,7 @@ class CtSpsImage
void setNames(const std::string& spec_name,
const std::string& array_name);
void getNames(std::string &spec_name, std::string &array_name) const;
void prepare(const FrameDim &frame_dim);
void frameReady(Data&);
void reset();
......
......@@ -32,10 +32,13 @@ using namespace lima;
void setNames(const std::string& spec_name,
const std::string& array_name);
void getNames(std::string& spec_name /Out/,
std::string& array_name /Out/);
void prepare(const FrameDim &frame_dim);
void frameReady(Data&);
void reset();
void setActive(bool aFlag);
bool isActive() const;
};
%End
\ No newline at end of file
%End
......@@ -40,7 +40,9 @@ public:
void setNames(const std::string& spec_name,
const std::string& array_name);
void getNames(std::string &spec_name,
std::string &array_name) const;
void setFrameDim(const FrameDim& frame_dim);
void update(Data& data);
......@@ -170,6 +172,7 @@ void CtSpsImage::_update_finnished(Data &aData)
m_next_data = Data();
}
void CtSpsImage::setNames(const std::string& spec_name,
const std::string& array_name)
{
......@@ -178,6 +181,15 @@ void CtSpsImage::setNames(const std::string& spec_name,
m_sps_cnt->setNames(spec_name,array_name);
}
void CtSpsImage::getNames(std::string& spec_name,
std::string& array_name) const
{
DEB_MEMBER_FUNCT();
m_sps_cnt->getNames(spec_name, array_name);
}
void CtSpsImage::prepare(const FrameDim &frame_dim)
{
DEB_MEMBER_FUNCT();
......@@ -229,6 +241,17 @@ void _SpsImage::setNames(const std::string& spec_name,
m_array_name = array_name;
}
void _SpsImage::getNames(std::string &spec_name, std::string &array_name) const
{
DEB_MEMBER_FUNCT();
spec_name = m_spec_name;
array_name = m_array_name;
DEB_RETURN() << DEB_VAR2(spec_name, array_name);
}
void _SpsImage::setFrameDim(const FrameDim& frame_dim)
{
DEB_MEMBER_FUNCT();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment