diff --git a/tools/player-video/appl/MediaDecoder.cpp b/tools/player-video/appl/MediaDecoder.cpp index 7255eb4..d6bfca6 100644 --- a/tools/player-video/appl/MediaDecoder.cpp +++ b/tools/player-video/appl/MediaDecoder.cpp @@ -390,20 +390,16 @@ void appl::MediaDecoder::init(ememory::SharedPtr _property, uint APPL_ERROR("get media error"); return; } - APPL_WARNING("Get File"); + APPL_DEBUG("Get File"); media.getFile().andThen( [=](const zeus::ProxyFile& _proxy) mutable { - APPL_WARNING("Receive ProxyFile"); + APPL_DEBUG("Receive ProxyFile"); m_remote->m_fileHandle = _proxy; - APPL_WARNING("We have handle"); m_remote->m_fileHandle.getSize().andThen( [=](uint64_t _value) mutable { - APPL_WARNING("Receive FileSize to index property"); - APPL_WARNING("pppllloooppp " << _value); - //m_remote->m_buffer.resize(_value, 0); - APPL_WARNING("pppllloooppp"); - //m_remote->checkIfWeNeedMoreDataFromNetwork(); - APPL_WARNING("pppppplllllloooooopppppp"); + APPL_DEBUG("Receive FileSize to index property" << _value); + m_remote->m_buffer.resize(_value, 0); + m_remote->checkIfWeNeedMoreDataFromNetwork(); return true; }); return true; diff --git a/zeus/message/Parameter.cpp b/zeus/message/Parameter.cpp index 0820184..b48b334 100644 --- a/zeus/message/Parameter.cpp +++ b/zeus/message/Parameter.cpp @@ -16,9 +16,6 @@ zeus::message::Parameter::Parameter(ememory::SharedPtr _iface): Message(_iface) { } -zeus::message::Parameter::~Parameter() { - ZEUS_ERROR("remove MESSAGE parameter ..."); -} bool zeus::message::Parameter::writeOn(enet::WebSocket& _interface) { uint8_t* data = nullptr; @@ -34,7 +31,6 @@ bool zeus::message::Parameter::writeOn(enet::WebSocket& _interface) { } void zeus::message::Parameter::composeWith(const uint8_t* _buffer, uint32_t _lenght) { - ZEUS_ERROR("MESSAGE parameter ... ==> clear() ..."); m_parameter.clear(); uint16_t nbParameters = 0; if (_lenght < sizeof(uint16_t)) { @@ -44,7 +40,6 @@ void zeus::message::Parameter::composeWith(const uint8_t* _buffer, uint32_t _len uint32_t offset = 0; memcpy(&nbParameters, &_buffer[offset], sizeof(uint16_t)); offset += sizeof(uint16_t); - ZEUS_ERROR("MESSAGE parameter ... ==> resize() ..."); m_parameter.resize(nbParameters, std::make_pair(-1, std::vector())); // Load all Parameters nbParameters = 0; @@ -68,8 +63,7 @@ void zeus::message::Parameter::composeWith(const uint8_t* _buffer, uint32_t _len } zeus::message::ParamType zeus::message::Parameter::getParameterType(int32_t _id) const { - if (m_parameter.size() <= _id - && _id < 0) { + if (m_parameter.size() <= _id) { ZEUS_ERROR("out of range Id for parameter ... " << _id << " have " << m_parameter.size()); return createType(); } @@ -141,21 +135,14 @@ const uint8_t* zeus::message::Parameter::getParameterPointer(int32_t _id) const ZEUS_ERROR("Second parameter have no size ... "); return out; } - ZEUS_ERROR("Second parameter size=" << m_parameter[_id].second.size() << " first elem=" << m_parameter[_id].first); + ZEUS_VERBOSE("Second parameter size=" << m_parameter[_id].second.size() << " first elem=" << m_parameter[_id].first); out = static_cast(&(m_parameter[_id].second[m_parameter[_id].first])); - { - std::vector tmppppp; - for (auto &it:m_parameter[_id].second) { - tmppppp.push_back(it); - } - ZEUS_ERROR(" buffer=" << tmppppp); - } return out; } uint32_t zeus::message::Parameter::getParameterSize(int32_t _id) const { int32_t out = 0; - if (m_parameter.size() <= _id + if ( m_parameter.size() <= _id && _id < 0) { ZEUS_ERROR("out of range Id for parameter ... " << _id << " have " << m_parameter.size()); return 0; diff --git a/zeus/message/Parameter.hpp b/zeus/message/Parameter.hpp index 416885d..7fdd61d 100644 --- a/zeus/message/Parameter.hpp +++ b/zeus/message/Parameter.hpp @@ -18,7 +18,6 @@ namespace zeus { mutable std::vector>> m_parameter; //!< list of the parameter (offset of start data and buffer of data (subprotocol...) public: Parameter(ememory::SharedPtr _iface); - ~Parameter(); /** * @brief Template to get a parameter with a specific type * @param[in] _id Number of the parameter