[RELEASE] create release 0.3.1

audio/river/Interface.cpp

@@ -12,10 +12,6 @@
 #include <audio/drain/EndPointRead.h>
 #include <audio/drain/Volume.h>
 
-
-#undef __class__
-#define __class__ "Interface"
-
 audio::river::Interface::Interface(void) :
   m_node(),
   m_name("") {
@@ -25,15 +21,15 @@ audio::river::Interface::Interface(void) :
 }
 
 bool audio::river::Interface::init(float _freq,
-                            const std::vector<audio::channel>& _map,
-                            audio::format _format,
-                            const std::shared_ptr<audio::river::io::Node>& _node,
-                            const std::shared_ptr<const ejson::Object>& _config) {
+                                   const std::vector<audio::channel>& _map,
+                                   audio::format _format,
+                                   ememory::SharedPtr<audio::river::io::Node> _node,
+                                   const ejson::Object& _config) {
 	std::vector<audio::channel> map(_map);
 	m_node = _node;
 	m_config = _config;
 	m_mode = audio::river::modeInterface_unknow;
-	std::string type = m_config->getStringValue("io", "error");
+	std::string type = m_config["io"].toString().get("error");
 	static int32_t uid=0;
 	m_name = _node->getName() + "__" + (_node->isInput()==true?"input":"output") + "__" + type + "__" + etk::to_string(uid++);
 	if (type == "output") {
@@ -44,7 +40,7 @@ bool audio::river::Interface::init(float _freq,
 		m_mode = audio::river::modeInterface_feedback;
 	}
 	// register interface to be notify from the volume change.
-	m_node->registerAsRemote(shared_from_this());
+	m_node->registerAsRemote(sharedFromThis());
 	
 	if (map.size() == 0) {
 		RIVER_INFO("Select auto map system ...");
@@ -57,10 +53,10 @@ bool audio::river::Interface::init(float _freq,
 	     && m_mode == audio::river::modeInterface_input) {
 		m_process.setInputConfig(m_node->getInterfaceFormat());
 		// Add volume only if the Low level has a volume (otherwise it will be added by the application)
-		std::shared_ptr<audio::drain::VolumeElement> tmpVolume = m_node->getVolume();
+		ememory::SharedPtr<audio::drain::VolumeElement> tmpVolume = m_node->getVolume();
 		if (tmpVolume != nullptr) {
 			// add all time the volume stage :
-			std::shared_ptr<audio::drain::Volume> algo = audio::drain::Volume::create();
+			ememory::SharedPtr<audio::drain::Volume> algo = audio::drain::Volume::create();
 			//algo->setInputFormat(m_node->getInterfaceFormat());
 			algo->setName("volume");
 			m_process.pushBack(algo);
@@ -72,10 +68,10 @@ bool audio::river::Interface::init(float _freq,
 	            && m_mode == audio::river::modeInterface_output) {
 		m_process.setInputConfig(audio::drain::IOFormatInterface(map, _format, _freq));
 		// Add volume only if the Low level has a volume (otherwise it will be added by the application)
-		std::shared_ptr<audio::drain::VolumeElement> tmpVolume = m_node->getVolume();
+		ememory::SharedPtr<audio::drain::VolumeElement> tmpVolume = m_node->getVolume();
 		if (tmpVolume != nullptr) {
 			// add all time the volume stage :
-			std::shared_ptr<audio::drain::Volume> algo = audio::drain::Volume::create();
+			ememory::SharedPtr<audio::drain::Volume> algo = audio::drain::Volume::create();
 			//algo->setOutputFormat(m_node->getInterfaceFormat());
 			algo->setName("volume");
 			m_process.pushBack(algo);
@@ -95,12 +91,12 @@ bool audio::river::Interface::init(float _freq,
 	return true;
 }
 
-std::shared_ptr<audio::river::Interface> audio::river::Interface::create(float _freq,
+ememory::SharedPtr<audio::river::Interface> audio::river::Interface::create(float _freq,
                                                              const std::vector<audio::channel>& _map,
                                                              audio::format _format,
-                                                             const std::shared_ptr<audio::river::io::Node>& _node,
-                                                             const std::shared_ptr<const ejson::Object>& _config) {
-	std::shared_ptr<audio::river::Interface> out = std::shared_ptr<audio::river::Interface>(new audio::river::Interface());
+                                                             const ememory::SharedPtr<audio::river::io::Node>& _node,
+                                                             const ejson::Object& _config) {
+	ememory::SharedPtr<audio::river::Interface> out = ememory::SharedPtr<audio::river::Interface>(new audio::river::Interface());
 	out->init(_freq, _map, _format, _node, _config);
 	return out;
 }
@@ -108,7 +104,7 @@ std::shared_ptr<audio::river::Interface> audio::river::Interface::create(float _
 audio::river::Interface::~Interface() {
 	//stop(true, true);
 	std::unique_lock<std::recursive_mutex> lock(m_mutex);
-	//m_node->interfaceRemove(shared_from_this());
+	//m_node->interfaceRemove(sharedFromThis());
 }
 /*
 bool audio::river::Interface::hasEndPoint() {
@@ -124,11 +120,11 @@ void audio::river::Interface::setReadwrite() {
 	}
 	if (m_node->isInput() == true) {
 		m_process.removeIfLast<audio::drain::EndPoint>();
-		std::shared_ptr<audio::drain::EndPointRead> algo = audio::drain::EndPointRead::create();
+		ememory::SharedPtr<audio::drain::EndPointRead> algo = audio::drain::EndPointRead::create();
 		m_process.pushBack(algo);
 	} else {
 		m_process.removeIfFirst<audio::drain::EndPoint>();
-		std::shared_ptr<audio::drain::EndPointWrite> algo = audio::drain::EndPointWrite::create();
+		ememory::SharedPtr<audio::drain::EndPointWrite> algo = audio::drain::EndPointWrite::create();
 		m_process.pushFront(algo);
 	}
 }
@@ -141,7 +137,7 @@ void audio::river::Interface::setOutputCallback(audio::drain::playbackFunction _
 	}
 	m_process.removeAlgoDynamic();
 	m_process.removeIfFirst<audio::drain::EndPoint>();
-	std::shared_ptr<audio::drain::Algo> algo = audio::drain::EndPointCallback::create(_function);
+	ememory::SharedPtr<audio::drain::Algo> algo = audio::drain::EndPointCallback::create(_function);
 	m_process.pushFront(algo);
 }
 
@@ -153,7 +149,7 @@ void audio::river::Interface::setInputCallback(audio::drain::recordFunction _fun
 	}
 	m_process.removeAlgoDynamic();
 	m_process.removeIfLast<audio::drain::EndPoint>();
-	std::shared_ptr<audio::drain::Algo> algo = audio::drain::EndPointCallback::create(_function);
+	ememory::SharedPtr<audio::drain::Algo> algo = audio::drain::EndPointCallback::create(_function);
 	m_process.pushBack(algo);
 }
 
@@ -164,7 +160,7 @@ void audio::river::Interface::setWriteCallback(audio::drain::playbackFunctionWri
 		return;
 	}
 	m_process.removeAlgoDynamic();
-	std::shared_ptr<audio::drain::EndPointWrite> algo = m_process.get<audio::drain::EndPointWrite>(0);
+	ememory::SharedPtr<audio::drain::EndPointWrite> algo = m_process.get<audio::drain::EndPointWrite>(0);
 	if (algo == nullptr) {
 		return;
 	}
@@ -175,14 +171,14 @@ void audio::river::Interface::start(const audio::Time& _time) {
 	std::unique_lock<std::recursive_mutex> lock(m_mutex);
 	RIVER_DEBUG("start [BEGIN]");
 	m_process.updateInterAlgo();
-	m_node->interfaceAdd(shared_from_this());
+	m_node->interfaceAdd(sharedFromThis());
 	RIVER_DEBUG("start [ END ]");
 }
 
 void audio::river::Interface::stop(bool _fast, bool _abort) {
 	std::unique_lock<std::recursive_mutex> lock(m_mutex);
 	RIVER_DEBUG("stop [BEGIN]");
-	m_node->interfaceRemove(shared_from_this());
+	m_node->interfaceRemove(sharedFromThis());
 	RIVER_DEBUG("stop [ END]");
 }
 
@@ -201,7 +197,7 @@ bool audio::river::Interface::setParameter(const std::string& _filter, const std
 		RIVER_ERROR("Interface is not allowed to modify '" << _parameter << "' Volume just allowed to modify 'FLOW' volume");
 		return false;
 	}
-	std::shared_ptr<audio::drain::Algo> algo = m_process.get<audio::drain::Algo>(_filter);
+	ememory::SharedPtr<audio::drain::Algo> algo = m_process.get<audio::drain::Algo>(_filter);
 	if (algo == nullptr) {
 		RIVER_ERROR("setParameter(" << _filter << ") ==> no filter named like this ...");
 		return false;
@@ -213,7 +209,7 @@ bool audio::river::Interface::setParameter(const std::string& _filter, const std
 std::string audio::river::Interface::getParameter(const std::string& _filter, const std::string& _parameter) const {
 	RIVER_DEBUG("getParameter [BEGIN] : '" << _filter << "':'" << _parameter << "'");
 	std::string out;
-	std::shared_ptr<const audio::drain::Algo> algo = m_process.get<const audio::drain::Algo>(_filter);
+	ememory::SharedPtr<const audio::drain::Algo> algo = m_process.get<const audio::drain::Algo>(_filter);
 	if (algo == nullptr) {
 		RIVER_ERROR("setParameter(" << _filter << ") ==> no filter named like this ...");
 		return "[ERROR]";
@@ -225,7 +221,7 @@ std::string audio::river::Interface::getParameter(const std::string& _filter, co
 std::string audio::river::Interface::getParameterProperty(const std::string& _filter, const std::string& _parameter) const {
 	RIVER_DEBUG("getParameterProperty [BEGIN] : '" << _filter << "':'" << _parameter << "'");
 	std::string out;
-	std::shared_ptr<const audio::drain::Algo> algo = m_process.get<const audio::drain::Algo>(_filter);
+	ememory::SharedPtr<const audio::drain::Algo> algo = m_process.get<const audio::drain::Algo>(_filter);
 	if (algo == nullptr) {
 		RIVER_ERROR("setParameter(" << _filter << ") ==> no filter named like this ...");
 		return "[ERROR]";
@@ -238,7 +234,7 @@ std::string audio::river::Interface::getParameterProperty(const std::string& _fi
 void audio::river::Interface::write(const void* _value, size_t _nbChunk) {
 	std::unique_lock<std::recursive_mutex> lock(m_mutex);
 	m_process.updateInterAlgo();
-	std::shared_ptr<audio::drain::EndPointWrite> algo = m_process.get<audio::drain::EndPointWrite>(0);
+	ememory::SharedPtr<audio::drain::EndPointWrite> algo = m_process.get<audio::drain::EndPointWrite>(0);
 	if (algo == nullptr) {
 		return;
 	}
@@ -290,7 +286,7 @@ size_t audio::river::Interface::size() const {
 void audio::river::Interface::setBufferSize(size_t _nbChunk) {
 	std::unique_lock<std::recursive_mutex> lock(m_mutex);
 	if (m_node->isInput() == true) {
-		std::shared_ptr<audio::drain::EndPointRead> algo = m_process.get<audio::drain::EndPointRead>(m_process.size()-1);
+		ememory::SharedPtr<audio::drain::EndPointRead> algo = m_process.get<audio::drain::EndPointRead>(m_process.size()-1);
 		if (algo == nullptr) {
 			RIVER_ERROR("Request set buffer size for Interface that is not READ or WRITE mode ...");
 			return;
@@ -298,7 +294,7 @@ void audio::river::Interface::setBufferSize(size_t _nbChunk) {
 		algo->setBufferSize(_nbChunk);
 		return;
 	}
-	std::shared_ptr<audio::drain::EndPointWrite> algo = m_process.get<audio::drain::EndPointWrite>(0);
+	ememory::SharedPtr<audio::drain::EndPointWrite> algo = m_process.get<audio::drain::EndPointWrite>(0);
 	if (algo == nullptr) {
 		RIVER_ERROR("Request set buffer size for Interface that is not READ or WRITE mode ...");
 		return;
@@ -309,7 +305,7 @@ void audio::river::Interface::setBufferSize(size_t _nbChunk) {
 void audio::river::Interface::setBufferSize(const std::chrono::microseconds& _time) {
 	std::unique_lock<std::recursive_mutex> lock(m_mutex);
 	if (m_node->isInput() == true) {
-		std::shared_ptr<audio::drain::EndPointRead> algo = m_process.get<audio::drain::EndPointRead>(m_process.size()-1);
+		ememory::SharedPtr<audio::drain::EndPointRead> algo = m_process.get<audio::drain::EndPointRead>(m_process.size()-1);
 		if (algo == nullptr) {
 			RIVER_ERROR("Request set buffer size for Interface that is not READ or WRITE mode ...");
 			return;
@@ -317,7 +313,7 @@ void audio::river::Interface::setBufferSize(const std::chrono::microseconds& _ti
 		algo->setBufferSize(_time);
 		return;
 	}
-	std::shared_ptr<audio::drain::EndPointWrite> algo = m_process.get<audio::drain::EndPointWrite>(0);
+	ememory::SharedPtr<audio::drain::EndPointWrite> algo = m_process.get<audio::drain::EndPointWrite>(0);
 	if (algo == nullptr) {
 		RIVER_ERROR("Request set buffer size for Interface that is not READ or WRITE mode ...");
 		return;
@@ -328,14 +324,14 @@ void audio::river::Interface::setBufferSize(const std::chrono::microseconds& _ti
 size_t audio::river::Interface::getBufferSize() {
 	std::unique_lock<std::recursive_mutex> lock(m_mutex);
 	if (m_node->isInput() == true) {
-		std::shared_ptr<audio::drain::EndPointRead> algo = m_process.get<audio::drain::EndPointRead>(m_process.size()-1);
+		ememory::SharedPtr<audio::drain::EndPointRead> algo = m_process.get<audio::drain::EndPointRead>(m_process.size()-1);
 		if (algo == nullptr) {
 			RIVER_ERROR("Request get buffer size for Interface that is not READ or WRITE mode ...");
 			return 0;
 		}
 		return algo->getBufferSize();
 	}
-	std::shared_ptr<audio::drain::EndPointWrite> algo = m_process.get<audio::drain::EndPointWrite>(0);
+	ememory::SharedPtr<audio::drain::EndPointWrite> algo = m_process.get<audio::drain::EndPointWrite>(0);
 	if (algo == nullptr) {
 		RIVER_ERROR("Request get buffer size for Interface that is not READ or WRITE mode ...");
 		return 0;
@@ -346,14 +342,14 @@ size_t audio::river::Interface::getBufferSize() {
 std::chrono::microseconds audio::river::Interface::getBufferSizeMicrosecond() {
 	std::unique_lock<std::recursive_mutex> lock(m_mutex);
 	if (m_node->isInput() == true) {
-		std::shared_ptr<audio::drain::EndPointRead> algo = m_process.get<audio::drain::EndPointRead>(m_process.size()-1);
+		ememory::SharedPtr<audio::drain::EndPointRead> algo = m_process.get<audio::drain::EndPointRead>(m_process.size()-1);
 		if (algo == nullptr) {
 			RIVER_ERROR("Request get buffer size for Interface that is not READ or WRITE mode ...");
 			return std::chrono::microseconds(0);
 		}
 		return algo->getBufferSizeMicrosecond();
 	}
-	std::shared_ptr<audio::drain::EndPointWrite> algo = m_process.get<audio::drain::EndPointWrite>(0);
+	ememory::SharedPtr<audio::drain::EndPointWrite> algo = m_process.get<audio::drain::EndPointWrite>(0);
 	if (algo == nullptr) {
 		RIVER_ERROR("Request get buffer size for Interface that is not READ or WRITE mode ...");
 		return std::chrono::microseconds(0);
@@ -364,14 +360,14 @@ std::chrono::microseconds audio::river::Interface::getBufferSizeMicrosecond() {
 size_t audio::river::Interface::getBufferFillSize() {
 	std::unique_lock<std::recursive_mutex> lock(m_mutex);
 	if (m_node->isInput() == true) {
-		std::shared_ptr<audio::drain::EndPointRead> algo = m_process.get<audio::drain::EndPointRead>(m_process.size()-1);
+		ememory::SharedPtr<audio::drain::EndPointRead> algo = m_process.get<audio::drain::EndPointRead>(m_process.size()-1);
 		if (algo == nullptr) {
 			RIVER_ERROR("Request get buffer size for Interface that is not READ or WRITE mode ...");
 			return 0;
 		}
 		return algo->getBufferFillSize();
 	}
-	std::shared_ptr<audio::drain::EndPointWrite> algo = m_process.get<audio::drain::EndPointWrite>(0);
+	ememory::SharedPtr<audio::drain::EndPointWrite> algo = m_process.get<audio::drain::EndPointWrite>(0);
 	if (algo == nullptr) {
 		RIVER_ERROR("Request get buffer size for Interface that is not READ or WRITE mode ...");
 		return 0;
@@ -383,14 +379,14 @@ size_t audio::river::Interface::getBufferFillSize() {
 std::chrono::microseconds audio::river::Interface::getBufferFillSizeMicrosecond() {
 	std::unique_lock<std::recursive_mutex> lock(m_mutex);
 	if (m_node->isInput() == true) {
-		std::shared_ptr<audio::drain::EndPointRead> algo = m_process.get<audio::drain::EndPointRead>(m_process.size()-1);
+		ememory::SharedPtr<audio::drain::EndPointRead> algo = m_process.get<audio::drain::EndPointRead>(m_process.size()-1);
 		if (algo == nullptr) {
 			RIVER_ERROR("Request get buffer size for Interface that is not READ or WRITE mode ...");
 			return std::chrono::microseconds(0);
 		}
 		return algo->getBufferFillSizeMicrosecond();
 	}
-	std::shared_ptr<audio::drain::EndPointWrite> algo = m_process.get<audio::drain::EndPointWrite>(0);
+	ememory::SharedPtr<audio::drain::EndPointWrite> algo = m_process.get<audio::drain::EndPointWrite>(0);
 	if (algo == nullptr) {
 		RIVER_ERROR("Request get buffer size for Interface that is not READ or WRITE mode ...");
 		return std::chrono::microseconds(0);
@@ -417,7 +413,7 @@ audio::Time audio::river::Interface::getCurrentTime() const {
 void audio::river::Interface::addVolumeGroup(const std::string& _name) {
 	std::unique_lock<std::recursive_mutex> lock(m_mutex);
 	RIVER_DEBUG("addVolumeGroup(" << _name << ")");
-	std::shared_ptr<audio::drain::Volume> algo = m_process.get<audio::drain::Volume>("volume");
+	ememory::SharedPtr<audio::drain::Volume> algo = m_process.get<audio::drain::Volume>("volume");
 	if (algo == nullptr) {
 		m_process.removeAlgoDynamic();
 		// add all time the volume stage :
@@ -431,10 +427,10 @@ void audio::river::Interface::addVolumeGroup(const std::string& _name) {
 	}
 	if (_name == "FLOW") {
 		// Local volume name
-		algo->addVolumeStage(std::make_shared<audio::drain::VolumeElement>(_name));
+		algo->addVolumeStage(ememory::makeShared<audio::drain::VolumeElement>(_name));
 	} else {
 		// get manager unique instance:
-		std::shared_ptr<audio::river::io::Manager> mng = audio::river::io::Manager::getInstance();
+		ememory::SharedPtr<audio::river::io::Manager> mng = audio::river::io::Manager::getInstance();
 		algo->addVolumeStage(mng->getVolumeGroup(_name));
 	}
 }
@@ -453,7 +449,7 @@ void audio::river::Interface::systemNeedOutputData(audio::Time _time, void* _dat
 
 void audio::river::Interface::systemVolumeChange() {
 	std::unique_lock<std::recursive_mutex> lockProcess(m_mutex);
-	std::shared_ptr<audio::drain::Volume> algo = m_process.get<audio::drain::Volume>("volume");
+	ememory::SharedPtr<audio::drain::Volume> algo = m_process.get<audio::drain::Volume>("volume");
 	if (algo == nullptr) {
 		return;
 	}

audio/river/Interface.h

@@ -11,7 +11,7 @@
 #include <mutex>
 #include <chrono>
 #include <functional>
-#include <memory>
+#include <ememory/memory.h>
 #include <audio/format.h>
 #include <audio/channel.h>
 #include <audio/drain/Process.h>
@@ -39,7 +39,7 @@ namespace audio {
 		 * @brief Interface is the basic handle to manage the input output stream
 		 * @note To create this class see @ref audio::river::Manager class
 		 */
-		class Interface : public std::enable_shared_from_this<Interface> {
+		class Interface : public ememory::EnableSharedFromThis<Interface> {
 			friend class io::Node;
 			friend class io::NodeAirTAudio;
 			friend class io::NodeAEC;
@@ -65,8 +65,8 @@ namespace audio {
 				bool init(float _freq,
 				          const std::vector<audio::channel>& _map,
 				          audio::format _format,
-				          const std::shared_ptr<audio::river::io::Node>& _node,
-				          const std::shared_ptr<const ejson::Object>& _config);
+				          ememory::SharedPtr<audio::river::io::Node> _node,
+				          const ejson::Object& _config);
 				/**
 				 * @brief Factory of this interface (called by class audio::river::Manager)
 				 * @param[in] _freq Frequency.
@@ -77,11 +77,11 @@ namespace audio {
 				 * @return nullptr The configuration does not work.
 				 * @return pointer The interface has been corectly created.
 				 */
-				static std::shared_ptr<Interface> create(float _freq,
+				static ememory::SharedPtr<Interface> create(float _freq,
 				                                           const std::vector<audio::channel>& _map,
 				                                           audio::format _format,
-				                                           const std::shared_ptr<audio::river::io::Node>& _node,
-				                                           const std::shared_ptr<const ejson::Object>& _config);
+				                                           const ememory::SharedPtr<audio::river::io::Node>& _node,
+				                                           const ejson::Object& _config);
 			public:
 				/**
 				 * @brief Destructor
@@ -89,7 +89,7 @@ namespace audio {
 				virtual ~Interface();
 			protected:
 				mutable std::recursive_mutex m_mutex; //!< Local mutex to protect data
-				std::shared_ptr<const ejson::Object> m_config; //!< configuration set by the user.
+				ejson::Object m_config; //!< configuration set by the user.
 			protected:
 				enum modeInterface m_mode; //!< interface type (input/output/feedback)
 			public:
@@ -116,7 +116,7 @@ namespace audio {
 					}
 				}
 			protected:
-				std::shared_ptr<audio::river::io::Node> m_node; //!< Hardware interface to/from stream audio flow.
+				ememory::SharedPtr<audio::river::io::Node> m_node; //!< Hardware interface to/from stream audio flow.
 			protected:
 				std::string m_name; //!< Name of the interface.
 			public:

audio/river/Manager.cpp

@@ -13,15 +13,13 @@
 #include "debug.h"
 #include <ejson/ejson.h>
 
-#undef __class__
-#define __class__ "Manager"
 static std::mutex g_mutex;
-static std::vector<std::weak_ptr<audio::river::Manager> > g_listOfAllManager;
+static std::vector<ememory::WeakPtr<audio::river::Manager> > g_listOfAllManager;
 
-std::shared_ptr<audio::river::Manager> audio::river::Manager::create(const std::string& _applicationUniqueId) {
+ememory::SharedPtr<audio::river::Manager> audio::river::Manager::create(const std::string& _applicationUniqueId) {
 	std::unique_lock<std::mutex> lock(g_mutex);
 	for (size_t iii=0; iii<g_listOfAllManager.size() ; ++iii) {
-		std::shared_ptr<audio::river::Manager> tmp = g_listOfAllManager[iii].lock();
+		ememory::SharedPtr<audio::river::Manager> tmp = g_listOfAllManager[iii].lock();
 		if (tmp == nullptr) {
 			continue;
 		}
@@ -30,7 +28,7 @@ std::shared_ptr<audio::river::Manager> audio::river::Manager::create(const std::
 		}
 	}
 	// create a new one:
-	std::shared_ptr<audio::river::Manager> out = std::shared_ptr<audio::river::Manager>(new audio::river::Manager(_applicationUniqueId));
+	ememory::SharedPtr<audio::river::Manager> out = ememory::SharedPtr<audio::river::Manager>(new audio::river::Manager(_applicationUniqueId));
 	// add it at the list:
 	for (size_t iii=0; iii<g_listOfAllManager.size() ; ++iii) {
 		if (g_listOfAllManager[iii].expired() == true) {
@@ -55,7 +53,7 @@ audio::river::Manager::~Manager() {
 
 std::vector<std::string> audio::river::Manager::getListStreamInput() {
 	std::vector<std::string> output;
-	std::shared_ptr<audio::river::io::Manager> manager = audio::river::io::Manager::getInstance();
+	ememory::SharedPtr<audio::river::io::Manager> manager = audio::river::io::Manager::getInstance();
 	if (manager == nullptr) {
 		RIVER_ERROR("Unable to load harware IO manager ... ");
 	} else {
@@ -66,7 +64,7 @@ std::vector<std::string> audio::river::Manager::getListStreamInput() {
 
 std::vector<std::string> audio::river::Manager::getListStreamOutput() {
 	std::vector<std::string> output;
-	std::shared_ptr<audio::river::io::Manager> manager = audio::river::io::Manager::getInstance();
+	ememory::SharedPtr<audio::river::io::Manager> manager = audio::river::io::Manager::getInstance();
 	if (manager == nullptr) {
 		RIVER_ERROR("Unable to load harware IO manager ... ");
 	} else {
@@ -77,7 +75,7 @@ std::vector<std::string> audio::river::Manager::getListStreamOutput() {
 
 std::vector<std::string> audio::river::Manager::getListStreamVirtual() {
 	std::vector<std::string> output;
-	std::shared_ptr<audio::river::io::Manager> manager = audio::river::io::Manager::getInstance();
+	ememory::SharedPtr<audio::river::io::Manager> manager = audio::river::io::Manager::getInstance();
 	if (manager == nullptr) {
 		RIVER_ERROR("Unable to load harware IO manager ... ");
 	} else {
@@ -88,7 +86,7 @@ std::vector<std::string> audio::river::Manager::getListStreamVirtual() {
 
 std::vector<std::string> audio::river::Manager::getListStream() {
 	std::vector<std::string> output;
-	std::shared_ptr<audio::river::io::Manager> manager = audio::river::io::Manager::getInstance();
+	ememory::SharedPtr<audio::river::io::Manager> manager = audio::river::io::Manager::getInstance();
 	if (manager == nullptr) {
 		RIVER_ERROR("Unable to load harware IO manager ... ");
 	} else {
@@ -98,7 +96,7 @@ std::vector<std::string> audio::river::Manager::getListStream() {
 }
 
 bool audio::river::Manager::setVolume(const std::string& _volumeName, float _valuedB) {
-	std::shared_ptr<audio::river::io::Manager> manager = audio::river::io::Manager::getInstance();
+	ememory::SharedPtr<audio::river::io::Manager> manager = audio::river::io::Manager::getInstance();
 	if (manager == nullptr) {
 		RIVER_ERROR("Unable to load harware IO manager ... ");
 		return false;
@@ -107,7 +105,7 @@ bool audio::river::Manager::setVolume(const std::string& _volumeName, float _val
 }
 
 float audio::river::Manager::getVolume(const std::string& _volumeName) const {
-	std::shared_ptr<audio::river::io::Manager> manager = audio::river::io::Manager::getInstance();
+	ememory::SharedPtr<audio::river::io::Manager> manager = audio::river::io::Manager::getInstance();
 	if (manager == nullptr) {
 		RIVER_ERROR("Unable to load harware IO manager ... ");
 		return false;
@@ -116,7 +114,7 @@ float audio::river::Manager::getVolume(const std::string& _volumeName) const {
 }
 
 std::pair<float,float> audio::river::Manager::getVolumeRange(const std::string& _volumeName) const {
-	std::shared_ptr<audio::river::io::Manager> manager = audio::river::io::Manager::getInstance();
+	ememory::SharedPtr<audio::river::io::Manager> manager = audio::river::io::Manager::getInstance();
 	if (manager == nullptr) {
 		RIVER_ERROR("Unable to load harware IO manager ... ");
 		return std::make_pair<float,float>(0.0f,0.0f);
@@ -125,7 +123,7 @@ std::pair<float,float> audio::river::Manager::getVolumeRange(const std::string&
 }
 
 void audio::river::Manager::setMute(const std::string& _volumeName, bool _mute) {
-	std::shared_ptr<audio::river::io::Manager> manager = audio::river::io::Manager::getInstance();
+	ememory::SharedPtr<audio::river::io::Manager> manager = audio::river::io::Manager::getInstance();
 	if (manager == nullptr) {
 		RIVER_ERROR("Unable to load harware IO manager ... ");
 		return;
@@ -134,7 +132,7 @@ void audio::river::Manager::setMute(const std::string& _volumeName, bool _mute)
 }
 
 bool audio::river::Manager::getMute(const std::string& _volumeName) const {
-	std::shared_ptr<audio::river::io::Manager> manager = audio::river::io::Manager::getInstance();
+	ememory::SharedPtr<audio::river::io::Manager> manager = audio::river::io::Manager::getInstance();
 	if (manager == nullptr) {
 		RIVER_ERROR("Unable to load harware IO manager ... ");
 		return false;
@@ -142,62 +140,62 @@ bool audio::river::Manager::getMute(const std::string& _volumeName) const {
 	return manager->getMute(_volumeName);
 }
 
-std::shared_ptr<audio::river::Interface> audio::river::Manager::createOutput(float _freq,
-                                                                               const std::vector<audio::channel>& _map,
-                                                                               audio::format _format,
-                                                                               const std::string& _streamName,
-                                                                               const std::string& _options) {
+ememory::SharedPtr<audio::river::Interface> audio::river::Manager::createOutput(float _freq,
+                                                                             const std::vector<audio::channel>& _map,
+                                                                             audio::format _format,
+                                                                             const std::string& _streamName,
+                                                                             const std::string& _options) {
 	// get global hardware interface:
-	std::shared_ptr<audio::river::io::Manager> manager = audio::river::io::Manager::getInstance();
+	ememory::SharedPtr<audio::river::io::Manager> manager = audio::river::io::Manager::getInstance();
 	if (manager == nullptr) {
 		RIVER_ERROR("Unable to load harware IO manager ... ");
-		return std::shared_ptr<audio::river::Interface>();
+		return ememory::SharedPtr<audio::river::Interface>();
 	}
 	// get the output or input channel :
-	std::shared_ptr<audio::river::io::Node> node = manager->getNode(_streamName);
+	ememory::SharedPtr<audio::river::io::Node> node = manager->getNode(_streamName);
 	if (node == nullptr) {
 		RIVER_ERROR("Can not get the Requested stream '" << _streamName << "' ==> not listed in : " << manager->getListStream());
-		return std::shared_ptr<audio::river::Interface>();
+		return ememory::SharedPtr<audio::river::Interface>();
 	}
 	if (node->isOutput() != true) {
 		RIVER_ERROR("Can not Connect output on other thing than output ... for stream '" << _streamName << "'");;
-		return std::shared_ptr<audio::river::Interface>();
+		return ememory::SharedPtr<audio::river::Interface>();
 	}
 	// create user iterface:
-	std::shared_ptr<audio::river::Interface> interface;
-	std::shared_ptr<ejson::Object> tmpOption = ejson::Object::create(_options);
-	tmpOption->addString("io", "output");
+	ememory::SharedPtr<audio::river::Interface> interface;
+	ejson::Object tmpOption = ejson::Object(_options);
+	tmpOption.add("io", ejson::String("output"));
 	interface = audio::river::Interface::create(_freq, _map, _format, node, tmpOption);
 	// store it in a list (needed to apply some parameters).
 	m_listOpenInterface.push_back(interface);
 	return interface;
 }
 
-std::shared_ptr<audio::river::Interface> audio::river::Manager::createInput(float _freq,
+ememory::SharedPtr<audio::river::Interface> audio::river::Manager::createInput(float _freq,
                                                                               const std::vector<audio::channel>& _map,
                                                                               audio::format _format,
                                                                               const std::string& _streamName,
                                                                               const std::string& _options) {
 	// get global hardware interface:
-	std::shared_ptr<audio::river::io::Manager> manager = audio::river::io::Manager::getInstance();
+	ememory::SharedPtr<audio::river::io::Manager> manager = audio::river::io::Manager::getInstance();
 	if (manager == nullptr) {
 		RIVER_ERROR("Unable to load harware IO manager ... ");
-		return std::shared_ptr<audio::river::Interface>();
+		return ememory::SharedPtr<audio::river::Interface>();
 	}
 	// get the output or input channel :
-	std::shared_ptr<audio::river::io::Node> node = manager->getNode(_streamName);
+	ememory::SharedPtr<audio::river::io::Node> node = manager->getNode(_streamName);
 	if (node == nullptr) {
 		RIVER_ERROR("Can not get the Requested stream '" << _streamName << "' ==> not listed in : " << manager->getListStream());
-		return std::shared_ptr<audio::river::Interface>();
+		return ememory::SharedPtr<audio::river::Interface>();
 	}
 	if (node->isInput() != true) {
 		RIVER_ERROR("Can not Connect input on other thing than input ... for stream '" << _streamName << "'");;
-		return std::shared_ptr<audio::river::Interface>();
+		return ememory::SharedPtr<audio::river::Interface>();
 	}
 	// create user iterface:
-	std::shared_ptr<audio::river::Interface> interface;
-	std::shared_ptr<ejson::Object> tmpOption = ejson::Object::create(_options);
-	tmpOption->addString("io", "input");
+	ememory::SharedPtr<audio::river::Interface> interface;
+	ejson::Object tmpOption = ejson::Object(_options);
+	tmpOption.add("io", ejson::String("input"));
 	interface = audio::river::Interface::create(_freq, _map, _format, node, tmpOption);
 	// store it in a list (needed to apply some parameters).
 	m_listOpenInterface.push_back(interface);
@@ -205,31 +203,31 @@ std::shared_ptr<audio::river::Interface> audio::river::Manager::createInput(floa
 }
 
 
-std::shared_ptr<audio::river::Interface> audio::river::Manager::createFeedback(float _freq,
+ememory::SharedPtr<audio::river::Interface> audio::river::Manager::createFeedback(float _freq,
                                                                                  const std::vector<audio::channel>& _map,
                                                                                  audio::format _format,
                                                                                  const std::string& _streamName,
                                                                                  const std::string& _options) {
 	// get global hardware interface:
-	std::shared_ptr<audio::river::io::Manager> manager = audio::river::io::Manager::getInstance();
+	ememory::SharedPtr<audio::river::io::Manager> manager = audio::river::io::Manager::getInstance();
 	if (manager == nullptr) {
 		RIVER_ERROR("Unable to load harware IO manager ... ");
-		return std::shared_ptr<audio::river::Interface>();
+		return ememory::SharedPtr<audio::river::Interface>();
 	}
 	// get the output or input channel :
-	std::shared_ptr<audio::river::io::Node> node = manager->getNode(_streamName);
+	ememory::SharedPtr<audio::river::io::Node> node = manager->getNode(_streamName);
 	if (node == nullptr) {
 		RIVER_ERROR("Can not get the Requested stream '" << _streamName << "' ==> not listed in : " << manager->getListStream());
-		return std::shared_ptr<audio::river::Interface>();
+		return ememory::SharedPtr<audio::river::Interface>();
 	}
 	if (node->isOutput() != true) {
 		RIVER_ERROR("Can not Connect feedback on other thing than output ... for stream '" << _streamName << "'");;
-		return std::shared_ptr<audio::river::Interface>();
+		return ememory::SharedPtr<audio::river::Interface>();
 	}
 	// create user iterface:
-	std::shared_ptr<audio::river::Interface> interface;
-	std::shared_ptr<ejson::Object> tmpOption = ejson::Object::create(_options);
-	tmpOption->addString("io", "feedback");
+	ememory::SharedPtr<audio::river::Interface> interface;
+	ejson::Object tmpOption = ejson::Object(_options);
+	tmpOption.add("io", ejson::String("feedback"));
 	interface = audio::river::Interface::create(_freq, _map, _format, node, tmpOption);
 	// store it in a list (needed to apply some parameters).
 	m_listOpenInterface.push_back(interface);
@@ -238,7 +236,7 @@ std::shared_ptr<audio::river::Interface> audio::river::Manager::createFeedback(f
 
 void audio::river::Manager::generateDotAll(const std::string& _filename) {
 	// get global hardware interface:
-	std::shared_ptr<audio::river::io::Manager> manager = audio::river::io::Manager::getInstance();
+	ememory::SharedPtr<audio::river::io::Manager> manager = audio::river::io::Manager::getInstance();
 	if (manager == nullptr) {
 		RIVER_ERROR("Can not get the harware manager");
 		return;

audio/river/Manager.h

@@ -7,7 +7,7 @@
 
 #include <string>
 #include <stdint.h>
-#include <memory>
+#include <ememory/memory.h>
 #include <audio/river/Interface.h>
 #include <audio/format.h>
 #include <audio/channel.h>
@@ -18,10 +18,10 @@ namespace audio {
 		/**
 		 * @brief Audio interface manager : Single interface for every application that want to access on the Audio input/output
 		 */
-		class Manager  : public std::enable_shared_from_this<Manager> {
+		class Manager  : public ememory::EnableSharedFromThis<Manager> {
 			private:
 				const std::string& m_applicationUniqueId; //!< name of the application that open the Audio Interface.
-				std::vector<std::weak_ptr<audio::river::Interface> > m_listOpenInterface; //!< List of all open Stream.
+				std::vector<ememory::WeakPtr<audio::river::Interface> > m_listOpenInterface; //!< List of all open Stream.
 			protected:
 				/**
 				 * @brief Constructor
@@ -33,7 +33,7 @@ namespace audio {
 				 * @param[in] _applicationUniqueId Unique name of the application
 				 * @return Pointer on the manager or nullptr if an error occured
 				 */
-				static std::shared_ptr<audio::river::Manager> create(const std::string& _applicationUniqueId);
+				static ememory::SharedPtr<audio::river::Manager> create(const std::string& _applicationUniqueId);
 				/**
 				 * @brief Destructor
 				 */
@@ -106,7 +106,7 @@ namespace audio {
 				 * @param[in] _options Json option to configure default resampling and many other things.
 				 * @return a pointer on the interface
 				 */
-				virtual std::shared_ptr<Interface> createOutput(float _freq = 48000,
+				virtual ememory::SharedPtr<Interface> createOutput(float _freq = 48000,
 				                                                  const std::vector<audio::channel>& _map = std::vector<audio::channel>(),
 				                                                  audio::format _format = audio::format_int16,
 				                                                  const std::string& _streamName = "",
@@ -120,7 +120,7 @@ namespace audio {
 				 * @param[in] _options Json option to configure default resampling and many other things.
 				 * @return a pointer on the interface
 				 */
-				virtual std::shared_ptr<Interface> createInput(float _freq = 48000,
+				virtual ememory::SharedPtr<Interface> createInput(float _freq = 48000,
 				                                                 const std::vector<audio::channel>& _map = std::vector<audio::channel>(),
 				                                                 audio::format _format = audio::format_int16,
 				                                                 const std::string& _streamName = "",
@@ -134,7 +134,7 @@ namespace audio {
 				 * @param[in] _options Json option to configure default resampling and many other things.
 				 * @return a pointer on the interface
 				 */
-				virtual std::shared_ptr<Interface> createFeedback(float _freq = 48000,
+				virtual ememory::SharedPtr<Interface> createFeedback(float _freq = 48000,
 				                                                    const std::vector<audio::channel>& _map = std::vector<audio::channel>(),
 				                                                    audio::format _format = audio::format_int16,
 				                                                    const std::string& _streamName = "",

audio/river/debug.h

@@ -14,6 +14,7 @@ namespace audio {
 }
 #define RIVER_BASE(info,data)  ELOG_BASE(audio::river::getLogId(),info,data)
 
+#define RIVER_PRINT(data)         RIVER_BASE(-1, data)
 #define RIVER_CRITICAL(data)      RIVER_BASE(1, data)
 #define RIVER_ERROR(data)         RIVER_BASE(2, data)
 #define RIVER_WARNING(data)       RIVER_BASE(3, data)

audio/river/io/Group.cpp

@@ -12,34 +12,31 @@
 #include "NodePortAudio.h"
 #include "Node.h"
 
-#undef __class__
-#define __class__ "io::Group"
-
 void audio::river::io::Group::createFrom(const ejson::Document& _obj, const std::string& _name) {
 	RIVER_INFO("Create Group[" << _name << "] (START)    ___________________________");
 	for (size_t iii=0; iii<_obj.size(); ++iii) {
-		const std::shared_ptr<const ejson::Object> tmpObject = _obj.getObject(_obj.getKey(iii));
-		if (tmpObject == nullptr) {
+		const ejson::Object tmpObject = _obj[iii].toObject();
+		if (tmpObject.exist() == false) {
 			continue;
 		}
-		std::string groupName = tmpObject->getStringValue("group", "");
+		std::string groupName = tmpObject["group"].toString().get();
 		if (groupName == _name) {
 			RIVER_INFO("Add element in Group[" << _name << "]: " << _obj.getKey(iii));
 			// get type : io
-			std::string ioType = tmpObject->getStringValue("io", "error");
+			std::string ioType = tmpObject["io"].toString().get("error");
 			#ifdef AUDIO_RIVER_BUILD_ORCHESTRA
 				if (    ioType == "input"
 				     || ioType == "output") {
-					std::shared_ptr<audio::river::io::Node> tmp = audio::river::io::NodeOrchestra::create(_obj.getKey(iii), tmpObject);
-					tmp->setGroup(shared_from_this());
+					ememory::SharedPtr<audio::river::io::Node> tmp = audio::river::io::NodeOrchestra::create(_obj.getKey(iii), tmpObject);
+					tmp->setGroup(sharedFromThis());
 					m_list.push_back(tmp);
 				}
 			#endif
 			#ifdef AUDIO_RIVER_BUILD_PORTAUDIO
 				if (    ioType == "PAinput"
 				     || ioType == "PAoutput") {
-					std::shared_ptr<audio::river::io::Node> tmp = audio::river::io::NodePortAudio::create(_obj.getKey(iii), tmpObject);
-					tmp->setGroup(shared_from_this());
+					ememory::SharedPtr<audio::river::io::Node> tmp = audio::river::io::NodePortAudio::create(_obj.getKey(iii), tmpObject);
+					tmp->setGroup(sharedFromThis());
 					m_list.push_back(tmp);
 				}
 			#endif
@@ -49,10 +46,10 @@ void audio::river::io::Group::createFrom(const ejson::Document& _obj, const std:
 	// Note : The interlink work only for alsa (NOW) and with AirTAudio...
 	if(m_list.size() > 1) {
 		#ifdef AUDIO_RIVER_BUILD_ORCHESTRA
-			std::shared_ptr<audio::river::io::NodeOrchestra> linkRef = std::dynamic_pointer_cast<audio::river::io::NodeOrchestra>(m_list[0]);
+			ememory::SharedPtr<audio::river::io::NodeOrchestra> linkRef = ememory::dynamicPointerCast<audio::river::io::NodeOrchestra>(m_list[0]);
 			for (size_t iii=1; iii<m_list.size(); ++iii) {
 				if (m_list[iii] != nullptr) {
-					std::shared_ptr<audio::river::io::NodeOrchestra> link = std::dynamic_pointer_cast<audio::river::io::NodeOrchestra>(m_list[iii]);
+					ememory::SharedPtr<audio::river::io::NodeOrchestra> link = ememory::dynamicPointerCast<audio::river::io::NodeOrchestra>(m_list[iii]);
 					linkRef->m_interface.isMasterOf(link->m_interface);
 				}
 			}
@@ -62,7 +59,7 @@ void audio::river::io::Group::createFrom(const ejson::Document& _obj, const std:
 	// manage Link Between Nodes :
 	if (m_link != nullptr) {
 		RIVER_INFO("********   START LINK   ************");
-		std::shared_ptr<audio::river::io::NodeOrchestra> link = std::dynamic_pointer_cast<audio::river::io::NodeOrchestra>(m_link);
+		ememory::SharedPtr<audio::river::io::NodeOrchestra> link = ememory::dynamicPointerCast<audio::river::io::NodeOrchestra>(m_link);
 		if (link == nullptr) {
 			RIVER_ERROR("Can not link 2 Interface with not the same type (reserved for HW interface)");
 			return;
@@ -82,7 +79,7 @@ void audio::river::io::Group::createFrom(const ejson::Document& _obj, const std:
 }
 
 
-std::shared_ptr<audio::river::io::Node> audio::river::io::Group::getNode(const std::string& _name) {
+ememory::SharedPtr<audio::river::io::Node> audio::river::io::Group::getNode(const std::string& _name) {
 	for (size_t iii=0; iii<m_list.size(); ++iii) {
 		if (m_list[iii] != nullptr) {
 			if (m_list[iii]->getName() == _name) {
@@ -90,7 +87,7 @@ std::shared_ptr<audio::river::io::Node> audio::river::io::Group::getNode(const s
 			}
 		}
 	}
-	return std::shared_ptr<audio::river::io::Node>();
+	return ememory::SharedPtr<audio::river::io::Node>();
 }
 
 void audio::river::io::Group::start() {

audio/river/io/Group.h

@@ -23,7 +23,7 @@ namespace audio {
 			 * is stopped.
 			 * @note For the Alsa interface a low level link is availlable with AirTAudio for Alsa (One thread)
 			 */
-			class Group : public std::enable_shared_from_this<Group> {
+			class Group : public ememory::EnableSharedFromThis<Group> {
 				public:
 					/**
 					 * @brief Contructor. No special thing to do.
@@ -36,7 +36,7 @@ namespace audio {
 						// TODO : ...
 					}
 				private: 
-					std::vector< std::shared_ptr<Node> > m_list; //!< List of all node in the group
+					std::vector< ememory::SharedPtr<Node> > m_list; //!< List of all node in the group
 				public:
 					/**
 					 * @brief Create a group with all node needed to syncronize together
@@ -50,7 +50,7 @@ namespace audio {
 					 * @return nullptr The node named _name was not found.
 					 * @return pointer The node was find in this group.
 					 */
-					std::shared_ptr<audio::river::io::Node> getNode(const std::string& _name);
+					ememory::SharedPtr<audio::river::io::Node> getNode(const std::string& _name);
 					/**
 					 * @brief Start the group.
 					 * @note all sub-node will be started.

audio/river/io/Manager.cpp

@@ -13,13 +13,10 @@
 #include <audio/river/io/NodeOrchestra.h>
 #include <audio/river/io/NodePortAudio.h>
 #include <etk/os/FSNode.h>
-#include <memory>
+#include <ememory/memory.h>
 #include <etk/types.h>
 #include <utility>
 
-#undef __class__
-#define __class__ "io::Manager"
-
 #ifdef AUDIO_RIVER_BUILD_PORTAUDIO
 	#include <portaudio/portaudio.h>
 #endif
@@ -95,11 +92,11 @@ audio::river::io::Manager::~Manager() {
 	#endif
 };
 
-std::shared_ptr<audio::river::io::Manager> audio::river::io::Manager::getInstance() {
+ememory::SharedPtr<audio::river::io::Manager> audio::river::io::Manager::getInstance() {
 	if (audio::river::isInit() == false) {
-		return std::shared_ptr<audio::river::io::Manager>();
+		return ememory::SharedPtr<audio::river::io::Manager>();
 	}
-	static std::shared_ptr<audio::river::io::Manager> manager(new Manager());
+	static ememory::SharedPtr<audio::river::io::Manager> manager(new Manager());
 	return manager;
 }
 
@@ -108,13 +105,13 @@ std::vector<std::string> audio::river::io::Manager::getListStreamInput() {
 	std::unique_lock<std::recursive_mutex> lock(m_mutex);
 	std::vector<std::string> output;
 	std::vector<std::string> keys = m_config.getKeys();
-	for (size_t iii=0; iii<keys.size(); ++iii) {
-		const std::shared_ptr<const ejson::Object> tmppp = m_config.getObject(keys[iii]);
-		if (tmppp != nullptr) {
-			std::string type = tmppp->getStringValue("io", "error");
+	for (auto &it : keys) {
+		const ejson::Object tmppp = m_config[it].toObject();
+		if (tmppp.exist() == true) {
+			std::string type = tmppp["io"].toString().get("error");
 			if (    type == "input"
 			     || type == "PAinput") {
-				output.push_back(keys[iii]);
+				output.push_back(it);
 			}
 		}
 	}
@@ -125,13 +122,13 @@ std::vector<std::string> audio::river::io::Manager::getListStreamOutput() {
 	std::unique_lock<std::recursive_mutex> lock(m_mutex);
 	std::vector<std::string> output;
 	std::vector<std::string> keys = m_config.getKeys();
-	for (size_t iii=0; iii<keys.size(); ++iii) {
-		const std::shared_ptr<const ejson::Object> tmppp = m_config.getObject(keys[iii]);
-		if (tmppp != nullptr) {
-			std::string type = tmppp->getStringValue("io", "error");
+	for (auto &it : keys) {
+		const ejson::Object tmppp = m_config[it].toObject();
+		if (tmppp.exist() == true) {
+			std::string type = tmppp["io"].toString().get("error");
 			if (    type == "output"
 			     || type == "PAoutput") {
-				output.push_back(keys[iii]);
+				output.push_back(it);
 			}
 		}
 	}
@@ -142,16 +139,16 @@ std::vector<std::string> audio::river::io::Manager::getListStreamVirtual() {
 	std::unique_lock<std::recursive_mutex> lock(m_mutex);
 	std::vector<std::string> output;
 	std::vector<std::string> keys = m_config.getKeys();
-	for (size_t iii=0; iii<keys.size(); ++iii) {
-		const std::shared_ptr<const ejson::Object> tmppp = m_config.getObject(keys[iii]);
-		if (tmppp != nullptr) {
-			std::string type = tmppp->getStringValue("io", "error");
+	for (auto &it : keys) {
+		const ejson::Object tmppp = m_config[it].toObject();
+		if (tmppp.exist() == true) {
+			std::string type = tmppp["io"].toString().get("error");
 			if (    type != "input"
 			     && type != "PAinput"
 			     && type != "output"
 			     && type != "PAoutput"
 			     && type != "error") {
-				output.push_back(keys[iii]);
+				output.push_back(it);
 			}
 		}
 	}
@@ -162,24 +159,24 @@ std::vector<std::string> audio::river::io::Manager::getListStream() {
 	std::unique_lock<std::recursive_mutex> lock(m_mutex);
 	std::vector<std::string> output;
 	std::vector<std::string> keys = m_config.getKeys();
-	for (size_t iii=0; iii<keys.size(); ++iii) {
-		const std::shared_ptr<const ejson::Object> tmppp = m_config.getObject(keys[iii]);
-		if (tmppp != nullptr) {
-			std::string type = tmppp->getStringValue("io", "error");
+	for (auto &it : keys) {
+		const ejson::Object tmppp = m_config[it].toObject();
+		if (tmppp.exist() == true) {
+			std::string type = tmppp["io"].toString().get("error");
 			if (type != "error") {
-				output.push_back(keys[iii]);
+				output.push_back(it);
 			}
 		}
 	}
 	return output;
 }
 
-std::shared_ptr<audio::river::io::Node> audio::river::io::Manager::getNode(const std::string& _name) {
+ememory::SharedPtr<audio::river::io::Node> audio::river::io::Manager::getNode(const std::string& _name) {
 	std::unique_lock<std::recursive_mutex> lock(m_mutex);
 	RIVER_WARNING("Get node : " << _name);
 	// search in the standalone list :
 	for (size_t iii=0; iii<m_list.size(); ++iii) {
-		std::shared_ptr<audio::river::io::Node> tmppp = m_list[iii].lock();
+		ememory::SharedPtr<audio::river::io::Node> tmppp = m_list[iii].lock();
 		if (    tmppp != nullptr
 		     && _name == tmppp->getName()) {
 			RIVER_WARNING(" find it ... in standalone");
@@ -188,11 +185,11 @@ std::shared_ptr<audio::river::io::Node> audio::river::io::Manager::getNode(const
 	}
 	// search in the group list:
 	{
-		for (std::map<std::string, std::shared_ptr<audio::river::io::Group> >::iterator it(m_listGroup.begin());
+		for (std::map<std::string, ememory::SharedPtr<audio::river::io::Group> >::iterator it(m_listGroup.begin());
 		     it != m_listGroup.end();
 		     ++it) {
 			if (it->second != nullptr) {
-				std::shared_ptr<audio::river::io::Node> node = it->second->getNode(_name);
+				ememory::SharedPtr<audio::river::io::Node> node = it->second->getNode(_name);
 				if (node != nullptr) {
 					RIVER_WARNING(" find it ... in group: " << it->first);
 					return node;
@@ -202,21 +199,21 @@ std::shared_ptr<audio::river::io::Node> audio::river::io::Manager::getNode(const
 	}
 	RIVER_WARNING("Try create a new one : " << _name);
 	// check if the node can be open :
-	const std::shared_ptr<const ejson::Object> tmpObject = m_config.getObject(_name);
-	if (tmpObject != nullptr) {
+	const ejson::Object tmpObject = m_config[_name].toObject();
+	if (tmpObject.exist() == true) {
 		//Check if it is in a group:
-		std::string groupName = tmpObject->getStringValue("group", "");
+		std::string groupName = tmpObject["group"].toString().get();
 		// get type : io
-		std::string ioType = tmpObject->getStringValue("io", "error");
+		std::string ioType = tmpObject["io"].toString().get("error");
 		if (    groupName != ""
 		     && (    ioType == "input"
 		          || ioType == "output"
 		          || ioType == "PAinput"
 		          || ioType == "PAoutput") ) {
-			std::shared_ptr<audio::river::io::Group> tmpGroup = getGroup(groupName);
+			ememory::SharedPtr<audio::river::io::Group> tmpGroup = getGroup(groupName);
 			if (tmpGroup == nullptr) {
 				RIVER_WARNING("Can not get group ... '" << groupName << "'");
-				return std::shared_ptr<audio::river::io::Node>();
+				return ememory::SharedPtr<audio::river::io::Node>();
 			}
 			return tmpGroup->getNode(_name);
 		} else {
@@ -228,7 +225,7 @@ std::shared_ptr<audio::river::io::Node> audio::river::io::Manager::getNode(const
 			if (    ioType == "input"
 			     || ioType == "output") {
 				#ifdef AUDIO_RIVER_BUILD_ORCHESTRA
-					std::shared_ptr<audio::river::io::Node> tmp = audio::river::io::NodeOrchestra::create(_name, tmpObject);
+					ememory::SharedPtr<audio::river::io::Node> tmp = audio::river::io::NodeOrchestra::create(_name, tmpObject);
 					m_list.push_back(tmp);
 					return tmp;
 				#else
@@ -238,7 +235,7 @@ std::shared_ptr<audio::river::io::Node> audio::river::io::Manager::getNode(const
 			if (    ioType == "PAinput"
 			     || ioType == "PAoutput") {
 				#ifdef AUDIO_RIVER_BUILD_PORTAUDIO
-					std::shared_ptr<audio::river::io::Node> tmp = audio::river::io::NodePortAudio::create(_name, tmpObject);
+					ememory::SharedPtr<audio::river::io::Node> tmp = audio::river::io::NodePortAudio::create(_name, tmpObject);
 					m_list.push_back(tmp);
 					return tmp;
 				#else
@@ -246,26 +243,26 @@ std::shared_ptr<audio::river::io::Node> audio::river::io::Manager::getNode(const
 				#endif
 			}
 			if (ioType == "aec") {
-				std::shared_ptr<audio::river::io::Node> tmp = audio::river::io::NodeAEC::create(_name, tmpObject);
+				ememory::SharedPtr<audio::river::io::Node> tmp = audio::river::io::NodeAEC::create(_name, tmpObject);
 				m_list.push_back(tmp);
 				return tmp;
 			}
 			if (ioType == "muxer") {
-				std::shared_ptr<audio::river::io::Node> tmp = audio::river::io::NodeMuxer::create(_name, tmpObject);
+				ememory::SharedPtr<audio::river::io::Node> tmp = audio::river::io::NodeMuxer::create(_name, tmpObject);
 				m_list.push_back(tmp);
 				return tmp;
 			}
 		}
 	}
 	RIVER_ERROR("Can not create the interface : '" << _name << "' the node is not DEFINED in the configuration file availlable : " << m_config.getKeys());
-	return std::shared_ptr<audio::river::io::Node>();
+	return ememory::SharedPtr<audio::river::io::Node>();
 }
 
-std::shared_ptr<audio::drain::VolumeElement> audio::river::io::Manager::getVolumeGroup(const std::string& _name) {
+ememory::SharedPtr<audio::drain::VolumeElement> audio::river::io::Manager::getVolumeGroup(const std::string& _name) {
 	std::unique_lock<std::recursive_mutex> lock(m_mutex);
 	if (_name == "") {
 		RIVER_ERROR("Try to create an audio group with no name ...");
-		return std::shared_ptr<audio::drain::VolumeElement>();
+		return ememory::SharedPtr<audio::drain::VolumeElement>();
 	}
 	for (size_t iii=0; iii<m_volumeGroup.size(); ++iii) {
 		if (m_volumeGroup[iii] == nullptr) {
@@ -276,14 +273,14 @@ std::shared_ptr<audio::drain::VolumeElement> audio::river::io::Manager::getVolum
 		}
 	}
 	RIVER_DEBUG("Add a new volume group : '" << _name << "'");
-	std::shared_ptr<audio::drain::VolumeElement> tmpVolume = std::make_shared<audio::drain::VolumeElement>(_name);
+	ememory::SharedPtr<audio::drain::VolumeElement> tmpVolume = ememory::makeShared<audio::drain::VolumeElement>(_name);
 	m_volumeGroup.push_back(tmpVolume);
 	return tmpVolume;
 }
 
 bool audio::river::io::Manager::setVolume(const std::string& _volumeName, float _valuedB) {
 	std::unique_lock<std::recursive_mutex> lock(m_mutex);
-	std::shared_ptr<audio::drain::VolumeElement> volume = getVolumeGroup(_volumeName);
+	ememory::SharedPtr<audio::drain::VolumeElement> volume = getVolumeGroup(_volumeName);
 	if (volume == nullptr) {
 		RIVER_ERROR("Can not set volume ... : '" << _volumeName << "'");
 		return false;
@@ -295,7 +292,7 @@ bool audio::river::io::Manager::setVolume(const std::string& _volumeName, float
 	}
 	volume->setVolume(_valuedB);
 	for (size_t iii=0; iii<m_list.size(); ++iii) {
-		std::shared_ptr<audio::river::io::Node> val = m_list[iii].lock();
+		ememory::SharedPtr<audio::river::io::Node> val = m_list[iii].lock();
 		if (val != nullptr) {
 			val->volumeChange();
 		}
@@ -305,7 +302,7 @@ bool audio::river::io::Manager::setVolume(const std::string& _volumeName, float
 
 float audio::river::io::Manager::getVolume(const std::string& _volumeName) {
 	std::unique_lock<std::recursive_mutex> lock(m_mutex);
-	std::shared_ptr<audio::drain::VolumeElement> volume = getVolumeGroup(_volumeName);
+	ememory::SharedPtr<audio::drain::VolumeElement> volume = getVolumeGroup(_volumeName);
 	if (volume == nullptr) {
 		RIVER_ERROR("Can not get volume ... : '" << _volumeName << "'");
 		return 0.0f;
@@ -319,14 +316,14 @@ std::pair<float,float> audio::river::io::Manager::getVolumeRange(const std::stri
 
 void audio::river::io::Manager::setMute(const std::string& _volumeName, bool _mute) {
 	std::unique_lock<std::recursive_mutex> lock(m_mutex);
-	std::shared_ptr<audio::drain::VolumeElement> volume = getVolumeGroup(_volumeName);
+	ememory::SharedPtr<audio::drain::VolumeElement> volume = getVolumeGroup(_volumeName);
 	if (volume == nullptr) {
 		RIVER_ERROR("Can not set volume ... : '" << _volumeName << "'");
 		return;
 	}
 	volume->setMute(_mute);
 	for (size_t iii=0; iii<m_list.size(); ++iii) {
-		std::shared_ptr<audio::river::io::Node> val = m_list[iii].lock();
+		ememory::SharedPtr<audio::river::io::Node> val = m_list[iii].lock();
 		if (val != nullptr) {
 			val->volumeChange();
 		}
@@ -335,7 +332,7 @@ void audio::river::io::Manager::setMute(const std::string& _volumeName, bool _mu
 
 bool audio::river::io::Manager::getMute(const std::string& _volumeName) {
 	std::unique_lock<std::recursive_mutex> lock(m_mutex);
-	std::shared_ptr<audio::drain::VolumeElement> volume = getVolumeGroup(_volumeName);
+	ememory::SharedPtr<audio::drain::VolumeElement> volume = getVolumeGroup(_volumeName);
 	if (volume == nullptr) {
 		RIVER_ERROR("Can not get volume ... : '" << _volumeName << "'");
 		return false;
@@ -357,14 +354,14 @@ void audio::river::io::Manager::generateDot(const std::string& _filename) {
 	{
 		// standalone
 		for (size_t iii=0; iii<m_list.size(); ++iii) {
-			std::shared_ptr<audio::river::io::Node> val = m_list[iii].lock();
+			ememory::SharedPtr<audio::river::io::Node> val = m_list[iii].lock();
 			if (val != nullptr) {
 				if (val->isHarwareNode() == true) {
 					val->generateDot(node);
 				}
 			}
 		}
-		for (std::map<std::string, std::shared_ptr<audio::river::io::Group> >::iterator it(m_listGroup.begin());
+		for (std::map<std::string, ememory::SharedPtr<audio::river::io::Group> >::iterator it(m_listGroup.begin());
 		     it != m_listGroup.end();
 		     ++it) {
 			if (it->second != nullptr) {
@@ -376,14 +373,14 @@ void audio::river::io::Manager::generateDot(const std::string& _filename) {
 	{
 		// standalone
 		for (size_t iii=0; iii<m_list.size(); ++iii) {
-			std::shared_ptr<audio::river::io::Node> val = m_list[iii].lock();
+			ememory::SharedPtr<audio::river::io::Node> val = m_list[iii].lock();
 			if (val != nullptr) {
 				if (val->isHarwareNode() == false) {
 					val->generateDot(node);
 				}
 			}
 		}
-		for (std::map<std::string, std::shared_ptr<audio::river::io::Group> >::iterator it(m_listGroup.begin());
+		for (std::map<std::string, ememory::SharedPtr<audio::river::io::Group> >::iterator it(m_listGroup.begin());
 		     it != m_listGroup.end();
 		     ++it) {
 			if (it->second != nullptr) {
@@ -397,16 +394,16 @@ void audio::river::io::Manager::generateDot(const std::string& _filename) {
 	RIVER_INFO("Generate the DOT files: " << node << " (DONE)");
 }
 
-std::shared_ptr<audio::river::io::Group> audio::river::io::Manager::getGroup(const std::string& _name) {
+ememory::SharedPtr<audio::river::io::Group> audio::river::io::Manager::getGroup(const std::string& _name) {
 	std::unique_lock<std::recursive_mutex> lock(m_mutex);
-	std::shared_ptr<audio::river::io::Group> out;
-	std::map<std::string, std::shared_ptr<audio::river::io::Group> >::iterator it = m_listGroup.find(_name);
+	ememory::SharedPtr<audio::river::io::Group> out;
+	std::map<std::string, ememory::SharedPtr<audio::river::io::Group> >::iterator it = m_listGroup.find(_name);
 	if (it == m_listGroup.end()) {
 		RIVER_INFO("Create a new group: " << _name << " (START)");
-		out = std::make_shared<audio::river::io::Group>();
+		out = ememory::makeShared<audio::river::io::Group>();
 		if (out != nullptr) {
 			out->createFrom(m_config, _name);
-			std::pair<std::string, std::shared_ptr<audio::river::io::Group> > plop(std::string(_name), out);
+			std::pair<std::string, ememory::SharedPtr<audio::river::io::Group> > plop(std::string(_name), out);
 			m_listGroup.insert(plop);
 			RIVER_INFO("Create a new group: " << _name << " ( END )");
 		} else {
@@ -417,4 +414,4 @@ std::shared_ptr<audio::river::io::Group> audio::river::io::Manager::getGroup(con
 	}
 	
 	return out;
-}
+}

audio/river/io/Manager.h

@@ -13,7 +13,7 @@
 #include <mutex>
 #include <chrono>
 #include <functional>
-#include <memory>
+#include <ememory/memory.h>
 #include <audio/format.h>
 #include <audio/channel.h>
 #include <ejson/ejson.h>
@@ -28,7 +28,7 @@ namespace audio {
 			 * @brief Internal sigleton of all Flow hadware and virtuals.
 			 * @note this class will be initialize by the audio::river::init() function at the start of the application.
 			 */
-			class Manager : public std::enable_shared_from_this<Manager> {
+			class Manager : public ememory::EnableSharedFromThis<Manager> {
 				private:
 					mutable std::recursive_mutex m_mutex; //!< prevent multiple access
 				private:
@@ -37,7 +37,7 @@ namespace audio {
 					 */
 					Manager();
 				public:
-					static std::shared_ptr<Manager> getInstance();
+					static ememory::SharedPtr<Manager> getInstance();
 					/**
 					 * @brief Destructor
 					 */
@@ -58,24 +58,24 @@ namespace audio {
 					void unInit();
 				private:
 					ejson::Document m_config; //!< harware configuration
-					std::vector<std::shared_ptr<audio::river::io::Node> > m_listKeepAlive; //!< list of all Node that might be keep alive sone/all time
-					std::vector<std::weak_ptr<audio::river::io::Node> > m_list; //!< List of all IO node
+					std::vector<ememory::SharedPtr<audio::river::io::Node> > m_listKeepAlive; //!< list of all Node that might be keep alive sone/all time
+					std::vector<ememory::WeakPtr<audio::river::io::Node> > m_list; //!< List of all IO node
 				public:
 					/**
 					 * @brief Get a node with his name (the name is set in the description file.
 					 * @param[in] _name Name of the node
 					 * @return Pointer on the noe or a nullptr if the node does not exist in the file or an error occured.
 					 */
-					std::shared_ptr<audio::river::io::Node> getNode(const std::string& _name);
+					ememory::SharedPtr<audio::river::io::Node> getNode(const std::string& _name);
 				private:
-					std::vector<std::shared_ptr<audio::drain::VolumeElement> > m_volumeGroup; //!< List of All global volume in the Low level interface.
+					std::vector<ememory::SharedPtr<audio::drain::VolumeElement> > m_volumeGroup; //!< List of All global volume in the Low level interface.
 				public:
 					/**
 					 * @brief Get a volume in the global list of vilume
 					 * @param[in] _name Name of the volume.
 					 * @return pointer on the requested volume (create it if does not exist). nullptr if the name is empty.
 					 */
-					std::shared_ptr<audio::drain::VolumeElement> getVolumeGroup(const std::string& _name);
+					ememory::SharedPtr<audio::drain::VolumeElement> getVolumeGroup(const std::string& _name);
 					/**
 					 * @brief Get all input audio stream.
 					 * @return a list of all availlables input stream name
@@ -138,13 +138,13 @@ namespace audio {
 					 */
 					void generateDot(const std::string& _filename);
 				private:
-					std::map<std::string, std::shared_ptr<audio::river::io::Group> > m_listGroup; //!< List of all groups
+					std::map<std::string, ememory::SharedPtr<audio::river::io::Group> > m_listGroup; //!< List of all groups
 					/**
 					 * @brief get a low level interface group.
 					 * @param[in] _name Name of the group.
 					 * @return Pointer on the requested group or nullptr if the group does not existed.
 					 */
-					std::shared_ptr<audio::river::io::Group> getGroup(const std::string& _name);
+					ememory::SharedPtr<audio::river::io::Group> getGroup(const std::string& _name);
 					
 			};
 		}

audio/river/io/Node.cpp

@@ -7,11 +7,7 @@
 #include "Node.h"
 #include <audio/river/debug.h>
 
-#undef __class__
-#define __class__ "io::Node"
-
-
-audio::river::io::Node::Node(const std::string& _name, const std::shared_ptr<const ejson::Object>& _config) :
+audio::river::io::Node::Node(const std::string& _name, const ejson::Object& _config) :
   m_config(_config),
   m_name(_name),
   m_isInput(false) {
@@ -34,7 +30,7 @@ audio::river::io::Node::Node(const std::string& _name, const std::shared_ptr<con
 		# muxer/demuxer format type (int8-on-int16, int16-on-int32, int24-on-int32, int32-on-int64, float)
 		mux-demux-type:"int16_on_int32", 
 	*/
-	std::string interfaceType = m_config->getStringValue("io");
+	std::string interfaceType = m_config["io"].toString().get();
 	RIVER_INFO("interfaceType=" << interfaceType);
 	if (    interfaceType == "input"
 	     || interfaceType == "PAinput"
@@ -45,12 +41,12 @@ audio::river::io::Node::Node(const std::string& _name, const std::shared_ptr<con
 		m_isInput = false;
 	}
 	
-	int32_t frequency = m_config->getNumberValue("frequency", 1);
+	int32_t frequency = m_config["frequency"].toNumber().get(1);
 	// Get audio format type:
-	std::string type = m_config->getStringValue("type", "int16");
+	std::string type = m_config["type"].toString().get("int16");
 	enum audio::format formatType = audio::getFormatFromString(type);
 	// Get volume stage :
-	std::string volumeName = m_config->getStringValue("volume-name", "");
+	std::string volumeName = m_config["volume-name"].toString().get();
 	if (volumeName != "") {
 		RIVER_INFO("add node volume stage : '" << volumeName << "'");
 		// use global manager for volume ...
@@ -58,15 +54,15 @@ audio::river::io::Node::Node(const std::string& _name, const std::shared_ptr<con
 	}
 	// Get map type :
 	std::vector<audio::channel> map;
-	const std::shared_ptr<const ejson::Array> listChannelMap = m_config->getArray("channel-map");
-	if (    listChannelMap == nullptr
-	     || listChannelMap->size() == 0) {
+	const ejson::Array listChannelMap = m_config["channel-map"].toArray();
+	if (    listChannelMap.exist() == false
+	     || listChannelMap.size() == 0) {
 		// set default channel property:
 		map.push_back(audio::channel_frontLeft);
 		map.push_back(audio::channel_frontRight);
 	} else {
-		for (size_t iii=0; iii<listChannelMap->size(); ++iii) {
-			std::string value = listChannelMap->getStringValue(iii);
+		for (auto it : listChannelMap) {
+			std::string value = it.toString().get();
 			map.push_back(audio::getChannelFromString(value));
 		}
 	}
@@ -75,15 +71,13 @@ audio::river::io::Node::Node(const std::string& _name, const std::shared_ptr<con
 	
 	std::string muxerDemuxerConfig;
 	if (m_isInput == true) {
-		muxerDemuxerConfig = m_config->getStringValue("mux-demux-type", "int16");
+		muxerDemuxerConfig = m_config["mux-demux-type"].toString().get("int16");
 	} else {
-		muxerDemuxerConfig = m_config->getStringValue("mux-demux-type", "int16-on-int32");
+		muxerDemuxerConfig = m_config["mux-demux-type"].toString().get("int16-on-int32");
 	}
 	enum audio::format muxerFormatType = audio::getFormatFromString(muxerDemuxerConfig);
 	if (m_isInput == true) {
-		if (muxerFormatType != audio::format_int16) {
-			RIVER_CRITICAL("not supported demuxer type ... " << muxerFormatType << " for INPUT set in file:" << muxerDemuxerConfig);
-		}
+		// Support all ...
 	} else {
 		if (muxerFormatType != audio::format_int16_on_int32) {
 			RIVER_CRITICAL("not supported demuxer type ... " << muxerFormatType << " for OUTPUT set in file:" << muxerDemuxerConfig);
@@ -123,7 +117,7 @@ size_t audio::river::io::Node::getNumberOfInterface(enum audio::river::modeInter
 size_t audio::river::io::Node::getNumberOfInterfaceAvaillable(enum audio::river::modeInterface _interfaceType) {
 	size_t out = 0;
 	for (size_t iii=0; iii<m_listAvaillable.size(); ++iii) {
-		std::shared_ptr<audio::river::Interface> element = m_listAvaillable[iii].lock();
+		ememory::SharedPtr<audio::river::Interface> element = m_listAvaillable[iii].lock();
 		if (element == nullptr) {
 			continue;
 		}
@@ -134,8 +128,8 @@ size_t audio::river::io::Node::getNumberOfInterfaceAvaillable(enum audio::river:
 	return out;
 }
 
-void audio::river::io::Node::registerAsRemote(const std::shared_ptr<audio::river::Interface>& _interface) {
-	std::vector<std::weak_ptr<audio::river::Interface> >::iterator it = m_listAvaillable.begin();
+void audio::river::io::Node::registerAsRemote(const ememory::SharedPtr<audio::river::Interface>& _interface) {
+	std::vector<ememory::WeakPtr<audio::river::Interface> >::iterator it = m_listAvaillable.begin();
 	while (it != m_listAvaillable.end()) {
 		if (it->expired() == true) {
 			it = m_listAvaillable.erase(it);
@@ -146,7 +140,7 @@ void audio::river::io::Node::registerAsRemote(const std::shared_ptr<audio::river
 	m_listAvaillable.push_back(_interface);
 }
 
-void audio::river::io::Node::interfaceAdd(const std::shared_ptr<audio::river::Interface>& _interface) {
+void audio::river::io::Node::interfaceAdd(const ememory::SharedPtr<audio::river::Interface>& _interface) {
 	{
 		std::unique_lock<std::mutex> lock(m_mutex);
 		for (size_t iii=0; iii<m_list.size(); ++iii) {
@@ -162,7 +156,7 @@ void audio::river::io::Node::interfaceAdd(const std::shared_ptr<audio::river::In
 	}
 }
 
-void audio::river::io::Node::interfaceRemove(const std::shared_ptr<audio::river::Interface>& _interface) {
+void audio::river::io::Node::interfaceRemove(const ememory::SharedPtr<audio::river::Interface>& _interface) {
 	{
 		std::unique_lock<std::mutex> lock(m_mutex);
 		for (size_t iii=0; iii< m_list.size(); ++iii) {
@@ -182,7 +176,7 @@ void audio::river::io::Node::interfaceRemove(const std::shared_ptr<audio::river:
 
 void audio::river::io::Node::volumeChange() {
 	for (size_t iii=0; iii< m_listAvaillable.size(); ++iii) {
-		std::shared_ptr<audio::river::Interface> node = m_listAvaillable[iii].lock();
+		ememory::SharedPtr<audio::river::Interface> node = m_listAvaillable[iii].lock();
 		if (node != nullptr) {
 			node->systemVolumeChange();
 		}
@@ -190,12 +184,11 @@ void audio::river::io::Node::volumeChange() {
 }
 
 void audio::river::io::Node::newInput(const void* _inputBuffer,
-                               uint32_t _nbChunk,
-                               const audio::Time& _time) {
+                                      uint32_t _nbChunk,
+                                      const audio::Time& _time) {
 	if (_inputBuffer == nullptr) {
 		return;
 	}
-	const int16_t* inputBuffer = static_cast<const int16_t *>(_inputBuffer);
 	for (size_t iii=0; iii< m_list.size(); ++iii) {
 		if (m_list[iii] == nullptr) {
 			continue;
@@ -204,7 +197,7 @@ void audio::river::io::Node::newInput(const void* _inputBuffer,
 			continue;
 		}
 		RIVER_VERBOSE("    IO name="<< m_list[iii]->getName());
-		m_list[iii]->systemNewInputData(_time, inputBuffer, _nbChunk);
+		m_list[iii]->systemNewInputData(_time, _inputBuffer, _nbChunk);
 	}
 	RIVER_VERBOSE("data Input size request :" << _nbChunk << " [ END ]");
 	return;
@@ -324,7 +317,7 @@ void audio::river::io::Node::generateDot(etk::FSNode& _node) {
 		if (m_listAvaillable[iii].expired() == true) {
 			continue;
 		}
-		std::shared_ptr<audio::river::Interface> element = m_listAvaillable[iii].lock();
+		ememory::SharedPtr<audio::river::Interface> element = m_listAvaillable[iii].lock();
 		if (element == nullptr) {
 			continue;
 		}
@@ -350,7 +343,7 @@ void audio::river::io::Node::generateDot(etk::FSNode& _node) {
 
 
 void audio::river::io::Node::startInGroup() {
-	std::shared_ptr<audio::river::io::Group> group = m_group.lock();
+	ememory::SharedPtr<audio::river::io::Group> group = m_group.lock();
 	if (group != nullptr) {
 		group->start();
 	} else {
@@ -359,10 +352,10 @@ void audio::river::io::Node::startInGroup() {
 }
 
 void audio::river::io::Node::stopInGroup() {
-	std::shared_ptr<audio::river::io::Group> group = m_group.lock();
+	ememory::SharedPtr<audio::river::io::Group> group = m_group.lock();
 	if (group != nullptr) {
 		group->stop();
 	} else {
 		stop();
 	}
-}
+}

audio/river/io/Node.h

@@ -11,7 +11,7 @@
 #include <stdint.h>
 #include <chrono>
 #include <functional>
-#include <memory>
+#include <ememory/memory.h>
 #include <audio/format.h>
 #include <audio/channel.h>
 #include "Manager.h"
@@ -29,7 +29,7 @@ namespace audio {
 			 * @brief A node is the base for input/output interface. When a output id declared, we automaticly have a feedback associated.
 			 * this manage the muxing of data for output an the demuxing for input.
 			 */
-			class Node : public std::enable_shared_from_this<Node> {
+			class Node : public ememory::EnableSharedFromThis<Node> {
 				friend class audio::river::io::Group;
 				protected:
 					uint32_t m_uid; //!< uniqueNodeID use for debug an dot generation.
@@ -39,7 +39,7 @@ namespace audio {
 					 * @param[in] _name Name of the node.
 					 * @param[in] _config Configuration of the node.
 					 */
-					Node(const std::string& _name, const std::shared_ptr<const ejson::Object>& _config);
+					Node(const std::string& _name, const ejson::Object& _config);
 				public:
 					/**
 					 * @brief Destructor
@@ -55,7 +55,7 @@ namespace audio {
 					};
 				protected:
 					mutable std::mutex m_mutex; //!< prevent open/close/write/read access that is multi-threaded.
-					std::shared_ptr<const ejson::Object> m_config; //!< configuration description.
+					const ejson::Object m_config; //!< configuration description.
 				protected:
 					audio::drain::Process m_process; //!< Low level algorithms
 				public:
@@ -82,10 +82,10 @@ namespace audio {
 						}
 					}
 				protected:
-					std::shared_ptr<audio::drain::VolumeElement> m_volume; //!< if a volume is set it is set here ... for hardware interface only.
+					ememory::SharedPtr<audio::drain::VolumeElement> m_volume; //!< if a volume is set it is set here ... for hardware interface only.
 				protected:
-					std::vector<std::weak_ptr<audio::river::Interface> > m_listAvaillable; //!< List of all interface that exist on this Node
-					std::vector<std::shared_ptr<audio::river::Interface> > m_list; //!< List of all connected interface at this node.
+					std::vector<ememory::WeakPtr<audio::river::Interface> > m_listAvaillable; //!< List of all interface that exist on this Node
+					std::vector<ememory::SharedPtr<audio::river::Interface> > m_list; //!< List of all connected interface at this node.
 					/**
 					 * @brief Get the number of interface with a specific type.
 					 * @param[in] _interfaceType Type of the interface.
@@ -109,20 +109,20 @@ namespace audio {
 				public:
 					/**
 					 * @brief Register an interface that can connect on it. (might be done in the Interface Init)
-					 * @note We keep a std::weak_ptr. this is the reason why we do not have a remove.
+					 * @note We keep a ememory::WeakPtr. this is the reason why we do not have a remove.
 					 * @param[in] _interface Pointer on the interface to register.
 					 */
-					void registerAsRemote(const std::shared_ptr<audio::river::Interface>& _interface);
+					void registerAsRemote(const ememory::SharedPtr<audio::river::Interface>& _interface);
 					/**
 					 * @brief Request this interface might receve/send dat on the flow. (start/resume)
 					 * @param[in] _interface Pointer on the interface to register.
 					 */
-					void interfaceAdd(const std::shared_ptr<audio::river::Interface>& _interface);
+					void interfaceAdd(const ememory::SharedPtr<audio::river::Interface>& _interface);
 					/**
 					 * @brief Un-register the interface as an availlable read/write interface. (suspend/stop)
 					 * @param[in] _interface Pointer on the interface to register.
 					 */
-					void interfaceRemove(const std::shared_ptr<audio::river::Interface>& _interface);
+					void interfaceRemove(const ememory::SharedPtr<audio::river::Interface>& _interface);
 				protected:
 					std::string m_name; //!< Name of the interface
 				public:
@@ -151,13 +151,13 @@ namespace audio {
 						return !m_isInput;
 					}
 				protected:
-					std::weak_ptr<audio::river::io::Group> m_group; //!< reference on the group. If available.
+					ememory::WeakPtr<audio::river::io::Group> m_group; //!< reference on the group. If available.
 				public:
 					/**
 					 * @brief Set this node in a low level group.
 					 * @param[in] _group Group reference.
 					 */
-					void setGroup(std::shared_ptr<audio::river::io::Group> _group) {
+					void setGroup(ememory::SharedPtr<audio::river::io::Group> _group) {
 						m_group = _group;
 					}
 				protected:
@@ -182,7 +182,7 @@ namespace audio {
 					 * @brief If this iss an hardware interface we can have a resuest of the volume stage:
 					 * @return pointer on the requested volume.
 					 */
-					const std::shared_ptr<audio::drain::VolumeElement>& getVolume() {
+					const ememory::SharedPtr<audio::drain::VolumeElement>& getVolume() {
 						return m_volume;
 					}
 				public:

audio/river/io/NodeAEC.cpp

@@ -7,43 +7,40 @@
 #include <audio/river/io/NodeAEC.h>
 #include <audio/river/debug.h>
 #include <etk/types.h>
-#include <memory>
+#include <ememory/memory.h>
 #include <functional>
 
-#undef __class__
-#define __class__ "io::NodeAEC"
-
-std::shared_ptr<audio::river::io::NodeAEC> audio::river::io::NodeAEC::create(const std::string& _name, const std::shared_ptr<const ejson::Object>& _config) {
-	return std::shared_ptr<audio::river::io::NodeAEC>(new audio::river::io::NodeAEC(_name, _config));
+ememory::SharedPtr<audio::river::io::NodeAEC> audio::river::io::NodeAEC::create(const std::string& _name, const ejson::Object& _config) {
+	return ememory::SharedPtr<audio::river::io::NodeAEC>(new audio::river::io::NodeAEC(_name, _config));
 }
 
-std::shared_ptr<audio::river::Interface> audio::river::io::NodeAEC::createInput(float _freq,
+ememory::SharedPtr<audio::river::Interface> audio::river::io::NodeAEC::createInput(float _freq,
                                                                     const std::vector<audio::channel>& _map,
                                                                     audio::format _format,
                                                                     const std::string& _objectName,
                                                                     const std::string& _name) {
 	// check if the output exist
-	const std::shared_ptr<const ejson::Object> tmppp = m_config->getObject(_objectName);
-	if (tmppp == nullptr) {
-		RIVER_ERROR("can not open a non existance virtual interface: '" << _objectName << "' not present in : " << m_config->getKeys());
-		return std::shared_ptr<audio::river::Interface>();
+	const ejson::Object tmppp = m_config[_objectName].toObject();
+	if (tmppp.exist() == false) {
+		RIVER_ERROR("can not open a non existance virtual interface: '" << _objectName << "' not present in : " << m_config.getKeys());
+		return ememory::SharedPtr<audio::river::Interface>();
 	}
-	std::string streamName = tmppp->getStringValue("map-on", "error");
+	std::string streamName = tmppp["map-on"].toString().get("error");
 	
-	m_nbChunk = m_config->getNumberValue("nb-chunk", 1024);
+	m_nbChunk = m_config["nb-chunk"].toNumber().get(1024);
 	// check if it is an Output:
-	std::string type = tmppp->getStringValue("io", "error");
+	std::string type = tmppp["io"].toString().get("error");
 	if (    type != "input"
 	     && type != "feedback") {
 		RIVER_ERROR("can not open in output a virtual interface: '" << streamName << "' configured has : " << type);
-		return std::shared_ptr<audio::river::Interface>();
+		return ememory::SharedPtr<audio::river::Interface>();
 	}
 	// get global hardware interface:
-	std::shared_ptr<audio::river::io::Manager> manager = audio::river::io::Manager::getInstance();
+	ememory::SharedPtr<audio::river::io::Manager> manager = audio::river::io::Manager::getInstance();
 	// get the output or input channel :
-	std::shared_ptr<audio::river::io::Node> node = manager->getNode(streamName);
+	ememory::SharedPtr<audio::river::io::Node> node = manager->getNode(streamName);
 	// create user iterface:
-	std::shared_ptr<audio::river::Interface> interface;
+	ememory::SharedPtr<audio::river::Interface> interface;
 	interface = audio::river::Interface::create(_freq, _map, _format, node, tmppp);
 	if (interface != nullptr) {
 		interface->setName(_name);
@@ -52,7 +49,7 @@ std::shared_ptr<audio::river::Interface> audio::river::io::NodeAEC::createInput(
 }
 
 
-audio::river::io::NodeAEC::NodeAEC(const std::string& _name, const std::shared_ptr<const ejson::Object>& _config) :
+audio::river::io::NodeAEC::NodeAEC(const std::string& _name, const ejson::Object& _config) :
   Node(_name, _config),
   m_P_attaqueTime(1),
   m_P_releaseTime(100),
@@ -346,7 +343,7 @@ void audio::river::io::NodeAEC::generateDot(etk::FSNode& _node) {
 		if (m_listAvaillable[iii].expired() == true) {
 			continue;
 		}
-		std::shared_ptr<audio::river::Interface> element = m_listAvaillable[iii].lock();
+		ememory::SharedPtr<audio::river::Interface> element = m_listAvaillable[iii].lock();
 		if (element == nullptr) {
 			continue;
 		}
@@ -368,4 +365,4 @@ void audio::river::io::NodeAEC::generateDot(etk::FSNode& _node) {
 			}
 		}
 	}
-}
+}

audio/river/io/NodeAEC.h

@@ -18,14 +18,14 @@ namespace audio {
 					/**
 					 * @brief Constructor
 					 */
-					NodeAEC(const std::string& _name, const std::shared_ptr<const ejson::Object>& _config);
+					NodeAEC(const std::string& _name, const ejson::Object& _config);
 				public:
 					/**
 					 * @brief Factory of this Virtual Node.
 					 * @param[in] _name Name of the node.
 					 * @param[in] _config Configuration of the node.
 					 */
-					static std::shared_ptr<NodeAEC> create(const std::string& _name, const std::shared_ptr<const ejson::Object>& _config);
+					static ememory::SharedPtr<NodeAEC> create(const std::string& _name, const ejson::Object& _config);
 					/**
 					 * @brief Destructor
 					 */
@@ -33,8 +33,8 @@ namespace audio {
 				protected:
 					virtual void start();
 					virtual void stop();
-					std::shared_ptr<audio::river::Interface> m_interfaceMicrophone; //!< Interface on the Microphone.
-					std::shared_ptr<audio::river::Interface> m_interfaceFeedBack; //!< Interface on the feedback of speaker.
+					ememory::SharedPtr<audio::river::Interface> m_interfaceMicrophone; //!< Interface on the Microphone.
+					ememory::SharedPtr<audio::river::Interface> m_interfaceFeedBack; //!< Interface on the feedback of speaker.
 					/**
 					 * @brief Internal: create an input with the specific parameter:
 					 * @param[in] _freq Frequency.
@@ -44,7 +44,7 @@ namespace audio {
 					 * @param[in] _name 
 					 * @return Interfae Pointer.
 					 */
-					std::shared_ptr<audio::river::Interface> createInput(float _freq,
+					ememory::SharedPtr<audio::river::Interface> createInput(float _freq,
 					                                                const std::vector<audio::channel>& _map,
 					                                                audio::format _format,
 					                                                const std::string& _streamName,

audio/river/io/NodeFile.cpp

@@ -8,10 +8,7 @@
 
 #include <audio/river/io/NodeFile.h>
 #include <audio/river/debug.h>
-#include <memory>
-
-#undef __class__
-#define __class__ "io::NodeFile"
+#include <ememory/memory.h>
 
 int32_t audio::river::io::NodeFile::recordCallback(const void* _inputBuffer,
                                                    const audio::Time& _timeInput,
@@ -37,11 +34,11 @@ int32_t audio::river::io::NodeFile::playbackCallback(void* _outputBuffer,
 
 
 
-std::shared_ptr<audio::river::io::NodeFile> audio::river::io::NodeFile::create(const std::string& _name, const std::shared_ptr<const ejson::Object>& _config) {
-	return std::shared_ptr<audio::river::io::NodeFile>(new audio::river::io::NodeFile(_name, _config));
+ememory::SharedPtr<audio::river::io::NodeFile> audio::river::io::NodeFile::create(const std::string& _name, const ejson::Object& _config) {
+	return ememory::SharedPtr<audio::river::io::NodeFile>(new audio::river::io::NodeFile(_name, _config));
 }
 
-audio::river::io::NodeFile::NodeFile(const std::string& _name, const std::shared_ptr<const ejson::Object>& _config) :
+audio::river::io::NodeFile::NodeFile(const std::string& _name, const ejson::Object& _config) :
   Node(_name, _config) {
 	audio::drain::IOFormatInterface interfaceFormat = getInterfaceFormat();
 	audio::drain::IOFormatInterface hardwareFormat = getHarwareFormat();
@@ -52,25 +49,25 @@ audio::river::io::NodeFile::NodeFile(const std::string& _name, const std::shared
 		},
 		nb-chunk:1024 # number of chunk to open device (create the latency anf the frequency to call user)
 	*/
-	std::string typeInterface = audio::orchestra::type_undefined;
+	std::string typeInterface = audio::orchestra::type::undefined;
 	std::string streamName = "default";
-	const std::shared_ptr<const ejson::Object> tmpObject = m_config->getObject("map-on");
-	if (tmpObject == nullptr) {
+	const ejson::Object tmpObject = m_config["map-on"].toObject();
+	if (tmpObject.exist() == false) {
 		RIVER_WARNING("missing node : 'map-on' ==> auto map : 'auto:default'");
 	} else {
-		typeInterface = tmpObject->getStringValue("interface", audio::orchestra::type_undefined);
+		typeInterface = tmpObject.getStringValue("interface", audio::orchestra::type::undefined);
 		if (typeInterface == "auto") {
-			typeInterface = audio::orchestra::type_undefined;
+			typeInterface = audio::orchestra::type::undefined;
 		}
-		streamName = tmpObject->getStringValue("name", "default");
+		streamName = tmpObject.getStringValue("name", "default");
 	}
-	int32_t nbChunk = m_config->getNumberValue("nb-chunk", 1024);
+	int32_t nbChunk = m_config.getNumberValue("nb-chunk", 1024);
 	
 	// intanciate specific API ...
 	m_interface.instanciate(typeInterface);
 	m_interface.setName(_name);
 	// TODO : Check return ...
-	std::string type = m_config->getStringValue("type", "int16");
+	std::string type = m_config.getStringValue("type", "int16");
 	if (streamName == "") {
 		streamName = "default";
 	}
@@ -256,7 +253,7 @@ void audio::river::io::NodeFile::start() {
 	}
 	m_alive = true;
 	RIVER_INFO("Start stream : '" << m_name << "' mode=" << (m_isInput?"read":"write") );
-	m_thread = std::make_shared<std::thread>(&audio::river::io::NodeFile::threadCallback2, this);
+	m_thread = ememory::makeShared<std::thread>(&audio::river::io::NodeFile::threadCallback2, this);
 	m_time = audio::Time::now();
 }
 

audio/river/io/NodeFile.h

@@ -24,9 +24,9 @@ namespace audio {
 					/**
 					 * @brief Constructor
 					 */
-					NodeFile(const std::string& _name, const std::shared_ptr<const ejson::Object>& _config);
+					NodeFile(const std::string& _name, const ejson::Object& _config);
 				public:
-					static std::shared_ptr<NodeFile> create(const std::string& _name, const std::shared_ptr<const ejson::Object>& _config);
+					static ememory::SharedPtr<NodeFile> create(const std::string& _name, const ejson::Object& _config);
 					/**
 					 * @brief Destructor
 					 */
@@ -41,7 +41,7 @@ namespace audio {
 					uint32_t m_sampleRate; //!< Sample Rate of the Raw file
 					audio::format m_format; //!< Format of the file
 					std::vector<audio::channel> m_map; //!< Map of the file
-					std::shared_ptr<std::thread> m_thread; //!< playing thread of the flow
+					ememory::SharedPtr<std::thread> m_thread; //!< playing thread of the flow
 					std::atomic<bool> m_alive; //!< thread is active
 				protected:
 					virtual void start();

audio/river/io/NodeMuxer.cpp

@@ -7,43 +7,40 @@
 #include <audio/river/io/NodeMuxer.h>
 #include <audio/river/debug.h>
 #include <etk/types.h>
-#include <memory>
+#include <ememory/memory.h>
 #include <functional>
 
-#undef __class__
-#define __class__ "io::NodeMuxer"
-
-std::shared_ptr<audio::river::io::NodeMuxer> audio::river::io::NodeMuxer::create(const std::string& _name, const std::shared_ptr<const ejson::Object>& _config) {
-	return std::shared_ptr<audio::river::io::NodeMuxer>(new audio::river::io::NodeMuxer(_name, _config));
+ememory::SharedPtr<audio::river::io::NodeMuxer> audio::river::io::NodeMuxer::create(const std::string& _name, const ejson::Object& _config) {
+	return ememory::SharedPtr<audio::river::io::NodeMuxer>(new audio::river::io::NodeMuxer(_name, _config));
 }
 
-std::shared_ptr<audio::river::Interface> audio::river::io::NodeMuxer::createInput(float _freq,
-                                                                      const std::vector<audio::channel>& _map,
-                                                                      audio::format _format,
-                                                                      const std::string& _objectName,
-                                                                      const std::string& _name) {
+ememory::SharedPtr<audio::river::Interface> audio::river::io::NodeMuxer::createInput(float _freq,
+                                                                                     const std::vector<audio::channel>& _map,
+                                                                                     audio::format _format,
+                                                                                     const std::string& _objectName,
+                                                                                     const std::string& _name) {
 	// check if the output exist
-	const std::shared_ptr<const ejson::Object> tmppp = m_config->getObject(_objectName);
-	if (tmppp == nullptr) {
-		RIVER_ERROR("can not open a non existance virtual interface: '" << _objectName << "' not present in : " << m_config->getKeys());
-		return std::shared_ptr<audio::river::Interface>();
+	const ejson::Object tmppp = m_config[_objectName].toObject();
+	if (tmppp.exist() == false) {
+		RIVER_ERROR("can not open a non existance virtual interface: '" << _objectName << "' not present in : " << m_config.getKeys());
+		return ememory::SharedPtr<audio::river::Interface>();
 	}
-	std::string streamName = tmppp->getStringValue("map-on", "error");
+	std::string streamName = tmppp["map-on"].toString().get("error");
 	
 	
 	// check if it is an Output:
-	std::string type = tmppp->getStringValue("io", "error");
+	std::string type = tmppp["io"].toString().get("error");
 	if (    type != "input"
 	     && type != "feedback") {
 		RIVER_ERROR("can not open in output a virtual interface: '" << streamName << "' configured has : " << type);
-		return std::shared_ptr<audio::river::Interface>();
+		return ememory::SharedPtr<audio::river::Interface>();
 	}
 	// get global hardware interface:
-	std::shared_ptr<audio::river::io::Manager> manager = audio::river::io::Manager::getInstance();
+	ememory::SharedPtr<audio::river::io::Manager> manager = audio::river::io::Manager::getInstance();
 	// get the output or input channel :
-	std::shared_ptr<audio::river::io::Node> node = manager->getNode(streamName);
+	ememory::SharedPtr<audio::river::io::Node> node = manager->getNode(streamName);
 	// create user iterface:
-	std::shared_ptr<audio::river::Interface> interface;
+	ememory::SharedPtr<audio::river::Interface> interface;
 	interface = audio::river::Interface::create(_freq, _map, _format, node, tmppp);
 	if (interface != nullptr) {
 		interface->setName(_name);
@@ -52,7 +49,7 @@ std::shared_ptr<audio::river::Interface> audio::river::io::NodeMuxer::createInpu
 }
 
 
-audio::river::io::NodeMuxer::NodeMuxer(const std::string& _name, const std::shared_ptr<const ejson::Object>& _config) :
+audio::river::io::NodeMuxer::NodeMuxer(const std::string& _name, const ejson::Object& _config) :
   Node(_name, _config) {
 	audio::drain::IOFormatInterface interfaceFormat = getInterfaceFormat();
 	audio::drain::IOFormatInterface hardwareFormat = getHarwareFormat();
@@ -88,14 +85,14 @@ audio::river::io::NodeMuxer::NodeMuxer(const std::string& _name, const std::shar
 		RIVER_ERROR("Can not opne virtual device ... map-on-input-1 in " << _name);
 		return;
 	}
-	std::shared_ptr<const ejson::Array> listChannelMap = m_config->getArray("input-1-remap");
-	if (    listChannelMap == nullptr
-	     || listChannelMap->size() == 0) {
+	const ejson::Array listChannelMap = m_config["input-1-remap"].toArray();
+	if (    listChannelMap.exist() == false
+	     || listChannelMap.size() == 0) {
 		m_mapInput1 = m_interfaceInput1->getInterfaceFormat().getMap();
 	} else {
 		m_mapInput1.clear();
-		for (size_t iii=0; iii<listChannelMap->size(); ++iii) {
-			std::string value = listChannelMap->getStringValue(iii);
+		for (const auto it : listChannelMap) {
+			std::string value = it.toString().get();
 			m_mapInput1.push_back(audio::getChannelFromString(value));
 		}
 		if (m_mapInput1.size() != m_interfaceInput1->getInterfaceFormat().getMap().size()) {
@@ -114,14 +111,14 @@ audio::river::io::NodeMuxer::NodeMuxer(const std::string& _name, const std::shar
 		RIVER_ERROR("Can not opne virtual device ... map-on-input-2 in " << _name);
 		return;
 	}
-	listChannelMap = m_config->getArray("input-2-remap");
-	if (    listChannelMap == nullptr
-	     || listChannelMap->size() == 0) {
+	const ejson::Array listChannelMap2 = m_config["input-2-remap"].toArray();
+	if (    listChannelMap2.exist() == false
+	     || listChannelMap2.size() == 0) {
 		m_mapInput2 = m_interfaceInput2->getInterfaceFormat().getMap();
 	} else {
 		m_mapInput2.clear();
-		for (size_t iii=0; iii<listChannelMap->size(); ++iii) {
-			std::string value = listChannelMap->getStringValue(iii);
+		for (const auto it : listChannelMap2) {
+			std::string value = it.toString().get();
 			m_mapInput2.push_back(audio::getChannelFromString(value));
 		}
 		if (m_mapInput2.size() != m_interfaceInput2->getInterfaceFormat().getMap().size()) {
@@ -191,38 +188,42 @@ void audio::river::io::NodeMuxer::stop() {
 
 
 void audio::river::io::NodeMuxer::onDataReceivedInput1(const void* _data,
-                                                const audio::Time& _time,
-                                                size_t _nbChunk,
-                                                enum audio::format _format,
-                                                uint32_t _frequency,
-                                                const std::vector<audio::channel>& _map) {
-	RIVER_DEBUG("Microphone Time=" << _time << " _nbChunk=" << _nbChunk << " _map=" << _map << " _format=" << _format << " freq=" << _frequency);
-	RIVER_DEBUG("           next=" << _time + audio::Duration(0, _nbChunk*1000000000LL/int64_t(_frequency)) );
+                                                       const audio::Time& _time,
+                                                       size_t _nbChunk,
+                                                       enum audio::format _format,
+                                                       uint32_t _frequency,
+                                                       const std::vector<audio::channel>& _map) {
+	RIVER_PRINT("Input-1 Time=" << _time << " _nbChunk=" << _nbChunk << " _map=" << _map << " _format=" << _format << " freq=" << _frequency);
+	RIVER_DEBUG("        next=" << _time + audio::Duration(0, _nbChunk*1000000000LL/int64_t(_frequency)) );
+	/*
 	if (_format != audio::format_int16) {
 		RIVER_ERROR("call wrong type ... (need int16_t)");
 	}
+	*/
 	// push data synchronize
 	std::unique_lock<std::mutex> lock(m_mutex);
 	m_bufferInput1.write(_data, _nbChunk, _time);
-	//RIVER_SAVE_FILE_MACRO(int16_t, "REC_Microphone.raw", _data, _nbChunk*_map.size());
+	//RIVER_SAVE_FILE_MACRO(int16_t, "REC_muxer_input_1.raw", _data, _nbChunk*_map.size());
 	process();
 }
 
 void audio::river::io::NodeMuxer::onDataReceivedInput2(const void* _data,
-                                                const audio::Time& _time,
-                                                size_t _nbChunk,
-                                                enum audio::format _format,
-                                                uint32_t _frequency,
-                                                const std::vector<audio::channel>& _map) {
-	RIVER_DEBUG("FeedBack   Time=" << _time << " _nbChunk=" << _nbChunk << " _map=" << _map << " _format=" << _format << " freq=" << _frequency);
-	RIVER_DEBUG("           next=" << _time + audio::Duration(0, _nbChunk*1000000000LL/int64_t(_frequency)) );
+                                                       const audio::Time& _time,
+                                                       size_t _nbChunk,
+                                                       enum audio::format _format,
+                                                       uint32_t _frequency,
+                                                       const std::vector<audio::channel>& _map) {
+	RIVER_PRINT("Input-2 Time=" << _time << " _nbChunk=" << _nbChunk << " _map=" << _map << " _format=" << _format << " freq=" << _frequency);
+	RIVER_DEBUG("        next=" << _time + audio::Duration(0, _nbChunk*1000000000LL/int64_t(_frequency)) );
+	/*
 	if (_format != audio::format_int16) {
 		RIVER_ERROR("call wrong type ... (need int16_t)");
 	}
+	*/
 	// push data synchronize
 	std::unique_lock<std::mutex> lock(m_mutex);
 	m_bufferInput2.write(_data, _nbChunk, _time);
-	//RIVER_SAVE_FILE_MACRO(int16_t, "REC_FeedBack.raw", _data, _nbChunk*_map.size());
+	//RIVER_SAVE_FILE_MACRO(int16_t, "REC_muxer_input_2.raw", _data, _nbChunk*_map.size());
 	process();
 }
 
@@ -233,6 +234,7 @@ void audio::river::io::NodeMuxer::process() {
 	if (m_bufferInput2.getSize() <= 256) {
 		return;
 	}
+	RIVER_PRINT("process : s1=" << m_bufferInput1.getSize() << " s2=" << m_bufferInput2.getSize());
 	audio::Time in1Time = m_bufferInput1.getReadTimeStamp();
 	audio::Time in2Time = m_bufferInput2.getReadTimeStamp();
 	audio::Duration delta;
@@ -241,18 +243,17 @@ void audio::river::io::NodeMuxer::process() {
 	} else {
 		delta = in1Time - in2Time;
 	}
-	
-	RIVER_INFO("check delta " << delta.count() << " > " << m_sampleTime.count());
+	RIVER_VERBOSE("check delta " << delta.count() << " > " << m_sampleTime.count());
 	if (delta > m_sampleTime) {
 		// Synchronize if possible
 		if (in1Time < in2Time) {
-			RIVER_INFO("in1Time < in2Time : Change Microphone time start " << in2Time);
+			RIVER_INFO("in1Time < in2Time : Change Input-1 time start " << in2Time);
 			RIVER_INFO("                                 old time stamp=" << m_bufferInput1.getReadTimeStamp());
 			m_bufferInput1.setReadPosition(in2Time);
 			RIVER_INFO("                                 new time stamp=" << m_bufferInput1.getReadTimeStamp());
 		}
 		if (in1Time > in2Time) {
-			RIVER_INFO("in1Time > in2Time : Change FeedBack time start " << in1Time);
+			RIVER_INFO("in1Time > in2Time : Change Input-2 time start " << in1Time);
 			RIVER_INFO("                               old time stamp=" << m_bufferInput2.getReadTimeStamp());
 			m_bufferInput2.setReadPosition(in1Time);
 			RIVER_INFO("                               new time stamp=" << m_bufferInput2.getReadTimeStamp());
@@ -275,17 +276,17 @@ void audio::river::io::NodeMuxer::process() {
 	}
 	std::vector<uint8_t> dataIn1;
 	std::vector<uint8_t> dataIn2;
-	dataIn1.resize(256*sizeof(int16_t)*m_mapInput1.size(), 0);
-	dataIn2.resize(256*sizeof(int16_t)*m_mapInput2.size(), 0);
-	m_data.resize(256*sizeof(int16_t)*getInterfaceFormat().getMap().size(), 0);
+	dataIn1.resize(256*audio::getFormatBytes(getInterfaceFormat().getFormat())*m_mapInput1.size(), 0);
+	dataIn2.resize(256*audio::getFormatBytes(getInterfaceFormat().getFormat())*m_mapInput2.size(), 0);
+	m_data.resize(256*audio::getFormatBytes(getInterfaceFormat().getFormat())*getInterfaceFormat().getMap().size(), 0);
 	while (true) {
 		in1Time = m_bufferInput1.getReadTimeStamp();
 		in2Time = m_bufferInput2.getReadTimeStamp();
 		//RIVER_INFO(" process 256 samples ... in1Time=" << in1Time << " in2Time=" << in2Time << " delta = " << (in1Time-in2Time).count());
 		m_bufferInput1.read(&dataIn1[0], 256);
 		m_bufferInput2.read(&dataIn2[0], 256);
-		//RIVER_SAVE_FILE_MACRO(int16_t, "REC_INPUT1.raw", &dataIn1[0], 256 * m_mapInput1.size());
-		//RIVER_SAVE_FILE_MACRO(int16_t, "REC_INPUT2.raw", &dataIn2[0], 256 * m_mapInput2.size());
+		//RIVER_SAVE_FILE_MACRO(int16_t, "REC_muxer_output_1.raw", &dataIn1[0], 256 * m_mapInput1.size());
+		//RIVER_SAVE_FILE_MACRO(int16_t, "REC_muxer_output_2.raw", &dataIn2[0], 256 * m_mapInput2.size());
 		// if threaded : send event / otherwise, process ...
 		processMuxer(&dataIn1[0], &dataIn2[0], 256, in1Time);
 		if (    m_bufferInput1.getSize() <= 256
@@ -460,7 +461,7 @@ void audio::river::io::NodeMuxer::generateDot(etk::FSNode& _node) {
 		if (m_listAvaillable[iii].expired() == true) {
 			continue;
 		}
-		std::shared_ptr<audio::river::Interface> element = m_listAvaillable[iii].lock();
+		ememory::SharedPtr<audio::river::Interface> element = m_listAvaillable[iii].lock();
 		if (element == nullptr) {
 			continue;
 		}
@@ -483,4 +484,4 @@ void audio::river::io::NodeMuxer::generateDot(etk::FSNode& _node) {
 		}
 	}
 	_node << "\n";
-}
+}

audio/river/io/NodeMuxer.h

@@ -18,9 +18,9 @@ namespace audio {
 					/**
 					 * @brief Constructor
 					 */
-					NodeMuxer(const std::string& _name, const std::shared_ptr<const ejson::Object>& _config);
+					NodeMuxer(const std::string& _name, const ejson::Object& _config);
 				public:
-					static std::shared_ptr<NodeMuxer> create(const std::string& _name, const std::shared_ptr<const ejson::Object>& _config);
+					static ememory::SharedPtr<NodeMuxer> create(const std::string& _name, const ejson::Object& _config);
 					/**
 					 * @brief Destructor
 					 */
@@ -28,9 +28,9 @@ namespace audio {
 				protected:
 					virtual void start();
 					virtual void stop();
-					std::shared_ptr<audio::river::Interface> m_interfaceInput1;
-					std::shared_ptr<audio::river::Interface> m_interfaceInput2;
-					std::shared_ptr<audio::river::Interface> createInput(float _freq,
+					ememory::SharedPtr<audio::river::Interface> m_interfaceInput1;
+					ememory::SharedPtr<audio::river::Interface> m_interfaceInput2;
+					ememory::SharedPtr<audio::river::Interface> createInput(float _freq,
 					                                              const std::vector<audio::channel>& _map,
 					                                              audio::format _format,
 					                                              const std::string& _streamName,

audio/river/io/NodeOrchestra.cpp

@@ -8,10 +8,7 @@
 
 #include <audio/river/io/NodeOrchestra.h>
 #include <audio/river/debug.h>
-#include <memory>
-
-#undef __class__
-#define __class__ "io::NodeOrchestra"
+#include <ememory/memory.h>
 
 int32_t audio::river::io::NodeOrchestra::recordCallback(const void* _inputBuffer,
                                                         const audio::Time& _timeInput,
@@ -37,11 +34,11 @@ int32_t audio::river::io::NodeOrchestra::playbackCallback(void* _outputBuffer,
 
 
 
-std::shared_ptr<audio::river::io::NodeOrchestra> audio::river::io::NodeOrchestra::create(const std::string& _name, const std::shared_ptr<const ejson::Object>& _config) {
-	return std::shared_ptr<audio::river::io::NodeOrchestra>(new audio::river::io::NodeOrchestra(_name, _config));
+ememory::SharedPtr<audio::river::io::NodeOrchestra> audio::river::io::NodeOrchestra::create(const std::string& _name, const ejson::Object& _config) {
+	return ememory::SharedPtr<audio::river::io::NodeOrchestra>(new audio::river::io::NodeOrchestra(_name, _config));
 }
 
-audio::river::io::NodeOrchestra::NodeOrchestra(const std::string& _name, const std::shared_ptr<const ejson::Object>& _config) :
+audio::river::io::NodeOrchestra::NodeOrchestra(const std::string& _name, const ejson::Object& _config) :
   Node(_name, _config) {
 	audio::drain::IOFormatInterface interfaceFormat = getInterfaceFormat();
 	audio::drain::IOFormatInterface hardwareFormat = getHarwareFormat();
@@ -52,25 +49,25 @@ audio::river::io::NodeOrchestra::NodeOrchestra(const std::string& _name, const s
 		},
 		nb-chunk:1024 # number of chunk to open device (create the latency anf the frequency to call user)
 	*/
-	std::string typeInterface = audio::orchestra::type_undefined;
+	std::string typeInterface = audio::orchestra::typeUndefined;
 	std::string streamName = "default";
-	const std::shared_ptr<const ejson::Object> tmpObject = m_config->getObject("map-on");
-	if (tmpObject == nullptr) {
+	const ejson::Object tmpObject = m_config["map-on"].toObject();
+	if (tmpObject.exist() == false) {
 		RIVER_WARNING("missing node : 'map-on' ==> auto map : 'auto:default'");
 	} else {
-		typeInterface = tmpObject->getStringValue("interface", audio::orchestra::type_undefined);
+		typeInterface = tmpObject["interface"].toString().get(audio::orchestra::typeUndefined);
 		if (typeInterface == "auto") {
-			typeInterface = audio::orchestra::type_undefined;
+			typeInterface = audio::orchestra::typeUndefined;
 		}
-		streamName = tmpObject->getStringValue("name", "default");
+		streamName = tmpObject["name"].toString().get("default");
 	}
-	int32_t nbChunk = m_config->getNumberValue("nb-chunk", 1024);
+	int32_t nbChunk = m_config["nb-chunk"].toNumber().get(1024);
 	
 	// intanciate specific API ...
 	m_interface.instanciate(typeInterface);
 	m_interface.setName(_name);
 	// TODO : Check return ...
-	std::string type = m_config->getStringValue("type", "int16");
+	std::string type = m_config["type"].toString().get("int16");
 	if (streamName == "") {
 		streamName = "default";
 	}
@@ -148,7 +145,8 @@ audio::river::io::NodeOrchestra::NodeOrchestra(const std::string& _name, const s
 					RIVER_CRITICAL("auto set format no element in the configuration: " << m_info.nativeFormats);
 				}
 			} else {
-				RIVER_CRITICAL("Can not manage input transforamtion: " << hardwareFormat.getFormat() << " not in " << m_info.nativeFormats);
+				RIVER_ERROR("Can not manage input transforamtion: " << hardwareFormat.getFormat() << " not in " << m_info.nativeFormats);
+				hardwareFormat.setFormat(hardwareFormat.getFormat());
 			}
 		}
 		if (etk::isIn(hardwareFormat.getFrequency(), m_info.sampleRates) == false) {
@@ -174,7 +172,7 @@ audio::river::io::NodeOrchestra::NodeOrchestra(const std::string& _name, const s
 				hardwareFormat.setFrequency(m_info.sampleRates[0]);
 				RIVER_INFO("auto set frequency: " << hardwareFormat.getFrequency() << "(first element in list) in " << m_info.sampleRates);
 			} else {
-				RIVER_CRITICAL("Can not manage input transforamtion:" << hardwareFormat.getFrequency() << " not in " << m_info.sampleRates);
+				RIVER_ERROR("Can not manage input transforamtion:" << hardwareFormat.getFrequency() << " not in " << m_info.sampleRates);
 			}
 			interfaceFormat.setFrequency(hardwareFormat.getFrequency());
 		}
@@ -186,10 +184,10 @@ audio::river::io::NodeOrchestra::NodeOrchestra(const std::string& _name, const s
 	params.deviceName = streamName;
 	params.nChannels = hardwareFormat.getMap().size();
 	if (m_info.channels.size() < params.nChannels) {
-		RIVER_CRITICAL("Can not open hardware device with more channel (" << params.nChannels << ") that is autorized by hardware (" << m_info.channels.size() << ").");
+		RIVER_ERROR("Can not open hardware device with more channel (" << params.nChannels << ") that is autorized by hardware (" << m_info.channels.size() << ").");
 	}
 	audio::orchestra::StreamOptions option;
-	etk::from_string(option.mode, tmpObject->getStringValue("timestamp-mode", "soft"));
+	etk::from_string(option.mode, tmpObject["timestamp-mode"].toString().get("soft"));
 	
 	RIVER_DEBUG("interfaceFormat=" << interfaceFormat);
 	RIVER_DEBUG("hardwareFormat=" << hardwareFormat);
@@ -201,28 +199,28 @@ audio::river::io::NodeOrchestra::NodeOrchestra(const std::string& _name, const s
 		m_process.setInputConfig(hardwareFormat);
 		m_process.setOutputConfig(interfaceFormat);
 		err = m_interface.openStream(nullptr, &params,
-		                        hardwareFormat.getFormat(), hardwareFormat.getFrequency(), &m_rtaudioFrameSize,
-		                        std::bind(&audio::river::io::NodeOrchestra::recordCallback,
-		                                    this,
-		                                    std::placeholders::_1,
-		                                    std::placeholders::_2,
-		                                    std::placeholders::_5,
-		                                    std::placeholders::_6),
-		                        option
-		                        );
+		                             hardwareFormat.getFormat(), hardwareFormat.getFrequency(), &m_rtaudioFrameSize,
+		                             std::bind(&audio::river::io::NodeOrchestra::recordCallback,
+		                                       this,
+		                                       std::placeholders::_1,
+		                                       std::placeholders::_2,
+		                                       std::placeholders::_5,
+		                                       std::placeholders::_6),
+		                            option
+		                            );
 	} else {
 		m_process.setInputConfig(interfaceFormat);
 		m_process.setOutputConfig(hardwareFormat);
 		err = m_interface.openStream(&params, nullptr,
-		                        hardwareFormat.getFormat(), hardwareFormat.getFrequency(), &m_rtaudioFrameSize,
-		                        std::bind(&audio::river::io::NodeOrchestra::playbackCallback,
-		                                    this,
-		                                    std::placeholders::_3,
-		                                    std::placeholders::_4,
-		                                    std::placeholders::_5,
-		                                    std::placeholders::_6),
-		                        option
-		                        );
+		                             hardwareFormat.getFormat(), hardwareFormat.getFrequency(), &m_rtaudioFrameSize,
+		                             std::bind(&audio::river::io::NodeOrchestra::playbackCallback,
+		                                       this,
+		                                       std::placeholders::_3,
+		                                       std::placeholders::_4,
+		                                       std::placeholders::_5,
+		                                       std::placeholders::_6),
+		                            option
+		                            );
 	}
 	if (err != audio::orchestra::error_none) {
 		RIVER_ERROR("Create stream : '" << m_name << "' mode=" << (m_isInput?"input":"output") << " can not create stream " << err);

audio/river/io/NodeOrchestra.h

@@ -24,9 +24,9 @@ namespace audio {
 					/**
 					 * @brief Constructor
 					 */
-					NodeOrchestra(const std::string& _name, const std::shared_ptr<const ejson::Object>& _config);
+					NodeOrchestra(const std::string& _name, const ejson::Object& _config);
 				public:
-					static std::shared_ptr<NodeOrchestra> create(const std::string& _name, const std::shared_ptr<const ejson::Object>& _config);
+					static ememory::SharedPtr<NodeOrchestra> create(const std::string& _name, const ejson::Object& _config);
 					/**
 					 * @brief Destructor
 					 */

audio/river/io/NodePortAudio.cpp

@@ -8,13 +8,10 @@
 
 #include <audio/river/io/NodePortAudio.h>
 #include <audio/river/debug.h>
-#include <memory>
+#include <ememory/memory.h>
 #include <audio/Time.h>
 #include <audio/Duration.h>
 
-#undef __class__
-#define __class__ "io::NodePortAudio"
-
 static int portAudioStreamCallback(const void *_input,
                                    void *_output,
                                    unsigned long _frameCount,
@@ -56,11 +53,11 @@ int32_t audio::river::io::NodePortAudio::duplexCallback(const void* _inputBuffer
 }
 
 
-std::shared_ptr<audio::river::io::NodePortAudio> audio::river::io::NodePortAudio::create(const std::string& _name, const std::shared_ptr<const ejson::Object>& _config) {
-	return std::shared_ptr<audio::river::io::NodePortAudio>(new audio::river::io::NodePortAudio(_name, _config));
+ememory::SharedPtr<audio::river::io::NodePortAudio> audio::river::io::NodePortAudio::create(const std::string& _name, const ejson::Object& _config) {
+	return ememory::SharedPtr<audio::river::io::NodePortAudio>(new audio::river::io::NodePortAudio(_name, _config));
 }
 
-audio::river::io::NodePortAudio::NodePortAudio(const std::string& _name, const std::shared_ptr<const ejson::Object>& _config) :
+audio::river::io::NodePortAudio::NodePortAudio(const std::string& _name, const ejson::Object& _config) :
   Node(_name, _config) {
 	audio::drain::IOFormatInterface interfaceFormat = getInterfaceFormat();
 	audio::drain::IOFormatInterface hardwareFormat = getHarwareFormat();
@@ -72,14 +69,14 @@ audio::river::io::NodePortAudio::NodePortAudio(const std::string& _name, const s
 		nb-chunk:1024 # number of chunk to open device (create the latency anf the frequency to call user)
 	*/
 	std::string streamName = "default";
-	const std::shared_ptr<const ejson::Object> tmpObject = m_config->getObject("map-on");
-	if (tmpObject == nullptr) {
+	const ejson::Object tmpObject = m_config["map-on"].toObject();
+	if (tmpObject.exist() == false) {
 		RIVER_WARNING("missing node : 'map-on' ==> auto map : 'auto:default'");
 	} else {
-		std::string value = tmpObject->getStringValue("interface", "default");
-		streamName = tmpObject->getStringValue("name", "default");
+		std::string value = tmpObject.getStringValue("interface", "default");
+		streamName = tmpObject.getStringValue("name", "default");
 	}
-	int32_t nbChunk = m_config->getNumberValue("nb-chunk", 1024);
+	int32_t nbChunk = m_config.getNumberValue("nb-chunk", 1024);
 	
 	PaError err = 0;
 	if (m_isInput == true) {

audio/river/io/NodePortAudio.h

@@ -15,15 +15,15 @@ namespace audio {
 	namespace river {
 		namespace io {
 			class Manager;
-			//! @not-in-doc
+			//! @not_in_doc
 			class NodePortAudio : public Node {
 				protected:
 					/**
 					 * @brief Constructor
 					 */
-					NodePortAudio(const std::string& _name, const std::shared_ptr<const ejson::Object>& _config);
+					NodePortAudio(const std::string& _name, const ejson::Object& _config);
 				public:
-					static std::shared_ptr<NodePortAudio> create(const std::string& _name, const std::shared_ptr<const ejson::Object>& _config);
+					static ememory::SharedPtr<NodePortAudio> create(const std::string& _name, const ejson::Object& _config);
 					/**
 					 * @brief Destructor
 					 */

audio/river/river.cpp

@@ -18,7 +18,7 @@ void audio::river::init(const std::string& _filename) {
 		river_isInit = true;
 		river_configFile = _filename;
 		RIVER_DEBUG("init RIVER :" << river_configFile);
-		std::shared_ptr<audio::river::io::Manager> mng = audio::river::io::Manager::getInstance();
+		ememory::SharedPtr<audio::river::io::Manager> mng = audio::river::io::Manager::getInstance();
 		if (mng != nullptr) {
 			mng->init(river_configFile);
 		}
@@ -32,7 +32,7 @@ void audio::river::initString(const std::string& _config) {
 		river_isInit = true;
 		river_configFile = _config;
 		RIVER_DEBUG("init RIVER with config.");
-		std::shared_ptr<audio::river::io::Manager> mng = audio::river::io::Manager::getInstance();
+		ememory::SharedPtr<audio::river::io::Manager> mng = audio::river::io::Manager::getInstance();
 		if (mng != nullptr) {
 			mng->initString(river_configFile);
 		}
@@ -45,7 +45,7 @@ void audio::river::unInit() {
 	if (river_isInit == true) {
 		river_isInit = false;
 		RIVER_DEBUG("un-init RIVER.");
-		std::shared_ptr<audio::river::io::Manager> mng = audio::river::io::Manager::getInstance();
+		ememory::SharedPtr<audio::river::io::Manager> mng = audio::river::io::Manager::getInstance();
 		if (mng != nullptr) {
 			RIVER_ERROR("Can not get on the RIVER hardware manager !!!");
 			mng->unInit();

authors.txt

@@ -0,0 +1 @@
+MR Edouard DUPIN <yui.heero@gmail.com>

lutin_audio-river-test.py

@@ -22,14 +22,14 @@ def get_compagny_name():
 	return "atria-soft"
 
 def get_maintainer():
-	return ["Mr DUPIN Edouard <yui.heero@gmail.com>"]
+	return "authors.txt"
 
 def create(target, module_name):
 	my_module = module.Module(__file__, module_name, get_type())
 	my_module.add_src_file([
 		'test/main.cpp'
 		])
-	my_module.add_module_depend(['audio-river', 'gtest', 'etk', 'test-debug'])
+	my_module.add_depend(['audio-river', 'gtest', 'etk', 'test-debug'])
 	return my_module
 
 

lutin_audio-river.py

@@ -19,10 +19,10 @@ def get_compagny_name():
 	return "atria-soft"
 
 def get_maintainer():
-	return ["Mr DUPIN Edouard <yui.heero@gmail.com>"]
+	return "authors.txt"
 
 def get_version():
-	return [0,0,0]
+	return "version.txt"
 
 def create(target, module_name):
 	my_module = module.Module(__file__, module_name, get_type())
@@ -47,9 +47,9 @@ def create(target, module_name):
 		'audio/river/io/Node.h',
 		'audio/river/io/Manager.h'
 		])
-	my_module.add_optionnal_module_depend('audio-orchestra', ["c++", "-DAUDIO_RIVER_BUILD_ORCHESTRA"])
-	my_module.add_optionnal_module_depend('portaudio', ["c++", "-DAUDIO_RIVER_BUILD_PORTAUDIO"])
-	my_module.add_module_depend(['audio', 'audio-drain', 'ejson'])
+	my_module.add_optionnal_depend('audio-orchestra', ["c++", "-DAUDIO_RIVER_BUILD_ORCHESTRA"])
+	my_module.add_optionnal_depend('portaudio', ["c++", "-DAUDIO_RIVER_BUILD_PORTAUDIO"])
+	my_module.add_depend(['audio', 'audio-drain', 'ejson'])
 	my_module.add_path(tools.get_current_path(__file__))
 	return my_module
 

sample/ioViewer/appl/Windows.cpp

@@ -1,9 +1,7 @@
-/**
- * @author Edouard DUPIN
- * 
- * @copyright 2010, Edouard DUPIN, all right reserved
- * 
- * @license BSD 3 clauses (see license file)
+/** @file
+ * @author Edouard DUPIN 
+ * @copyright 2015, Edouard DUPIN, all right reserved
+ * @license APACHE v2.0 (see license file)
  */
 
 #include <ewol/ewol.h>
@@ -14,9 +12,6 @@
 #include <audio/river/widget/TemporalViewer.h>
 #include <etk/tool.h>
 
-#undef __class__
-#define __class__ "Windows"
-
 appl::Windows::Windows() :
   m_composer(nullptr) {
 	addObjectType("appl::Windows");
@@ -49,19 +44,19 @@ void appl::Windows::init() {
 	}
 	m_composer->loadFromString(composition);
 	setSubWidget(m_composer);
-	subBind(ewol::widget::Button, "bt-record", signalPressed, shared_from_this(), &appl::Windows::onCallbackRecord);
-	subBind(ewol::widget::Button, "bt-generate", signalPressed, shared_from_this(), &appl::Windows::onCallbackGenerate);
+	subBind(ewol::widget::Button, "bt-record", signalPressed, sharedFromThis(), &appl::Windows::onCallbackRecord);
+	subBind(ewol::widget::Button, "bt-generate", signalPressed, sharedFromThis(), &appl::Windows::onCallbackGenerate);
 }
 
 void appl::Windows::onCallbackRecord() {
-	std::shared_ptr<audio::river::widget::TemporalViewer> tmpDisp = std::dynamic_pointer_cast<audio::river::widget::TemporalViewer>(getSubObjectNamed("displayer"));
+	ememory::SharedPtr<audio::river::widget::TemporalViewer> tmpDisp = ememory::dynamicPointerCast<audio::river::widget::TemporalViewer>(getSubObjectNamed("displayer"));
 	if (tmpDisp != nullptr) {
 		tmpDisp->recordToggle();
 	}
 }
 
 void appl::Windows::onCallbackGenerate() {
-	std::shared_ptr<audio::river::widget::TemporalViewer> tmpDisp = std::dynamic_pointer_cast<audio::river::widget::TemporalViewer>(getSubObjectNamed("displayer"));
+	ememory::SharedPtr<audio::river::widget::TemporalViewer> tmpDisp = ememory::dynamicPointerCast<audio::river::widget::TemporalViewer>(getSubObjectNamed("displayer"));
 	if (tmpDisp != nullptr) {
 		tmpDisp->generateToggle();
 	}

sample/ioViewer/appl/Windows.h

@@ -1,9 +1,7 @@
-/**
- * @author Edouard DUPIN
- * 
- * @copyright 2010, Edouard DUPIN, all right reserved
- * 
- * @license BSD 3 clauses (see license file)
+/** @file
+ * @author Edouard DUPIN 
+ * @copyright 2015, Edouard DUPIN, all right reserved
+ * @license APACHE v2.0 (see license file)
  */
 #pragma once
 
@@ -13,7 +11,7 @@
 namespace appl {
 	class Windows : public ewol::widget::Windows {
 		private:
-			std::shared_ptr<ewol::widget::Composer> m_composer;
+			ememory::SharedPtr<ewol::widget::Composer> m_composer;
 		protected:
 			Windows();
 			void init();

sample/ioViewer/appl/main.cpp

@@ -1,9 +1,7 @@
-/**
- * @author Edouard DUPIN
- * 
- * @copyright 2010, Edouard DUPIN, all right reserved
- * 
- * @license BSD 3 clauses (see license file)
+/** @file
+ * @author Edouard DUPIN 
+ * @copyright 2015, Edouard DUPIN, all right reserved
+ * @license APACHE v2.0 (see license file)
  */
 
 
@@ -49,7 +47,7 @@ class MainApplication : public ewol::context::Application {
 			
 			audio::river::widget::TemporalViewer::createManagerWidget(_context.getWidgetManager());
 			
-			std::shared_ptr<ewol::widget::Windows> basicWindows = appl::Windows::create();
+			ememory::SharedPtr<ewol::widget::Windows> basicWindows = appl::Windows::create();
 			// create the specific windows
 			_context.setWindows(basicWindows);
 			APPL_INFO("==> Init APPL (END)");

sample/ioViewer/lutin_ioViewer.py

@@ -25,24 +25,24 @@ def get_maintainer():
 
 def create(target, module_name):
 	my_module = module.Module(__file__, module_name, get_type())
-	my_module.add_extra_compile_flags()
+	my_module.add_extra_flags()
 	my_module.add_src_file([
 		'appl/debug.cpp',
 		'appl/main.cpp',
 		'appl/Windows.cpp'])
-	my_module.add_module_depend(['ewol', 'audio-river', 'audio-river-widget'])
+	my_module.add_depend(['ewol', 'audio-river', 'audio-river-widget'])
 	my_module.add_path(tools.get_current_path(__file__))
 	# set the package properties :
-	my_module.pkg_set("VERSION", "1.0.0")
-	my_module.pkg_set("VERSION_CODE", "1")
-	my_module.pkg_set("COMPAGNY_TYPE", "org")
-	my_module.pkg_set("COMPAGNY_NAME", "Edouard DUPIN")
-	my_module.pkg_set("MAINTAINER", ["Mr DUPIN Edouard <yui.heero@gmail.com>"])
-	my_module.pkg_set("SECTION", ["Development"])
-	my_module.pkg_set("PRIORITY", "optional")
-	my_module.pkg_set("DESCRIPTION", "Simple wiewer")
-	my_module.pkg_set("NAME", "ioViewer")
+	my_module.set_pkg("VERSION", "1.0.0")
+	my_module.set_pkg("VERSION_CODE", "1")
+	my_module.set_pkg("COMPAGNY_TYPE", "org")
+	my_module.set_pkg("COMPAGNY_NAME", "Edouard DUPIN")
+	my_module.set_pkg("MAINTAINER", ["Mr DUPIN Edouard <yui.heero@gmail.com>"])
+	my_module.set_pkg("SECTION", ["Development"])
+	my_module.set_pkg("PRIORITY", "optional")
+	my_module.set_pkg("DESCRIPTION", "Simple wiewer")
+	my_module.set_pkg("NAME", "ioViewer")
 	
-	my_module.pkg_add("RIGHT", "RECORD_AUDIO")
+	my_module.add_pkg("RIGHT", "RECORD_AUDIO")
 	return my_module
 

sample/read/lutin_river-sample-read.py

@@ -29,7 +29,7 @@ def create(target, module_name):
 	my_module.add_src_file([
 		'main.cpp',
 		])
-	my_module.add_module_depend(['audio-river', 'etk'])
+	my_module.add_depend(['audio-river', 'etk'])
 	return my_module
 
 

sample/read/main.cpp

@@ -19,6 +19,7 @@ static const std::string configurationRiver =
 	"		map-on:{\n"
 	"			interface:'auto',\n"
 	"			name:'default',\n"
+	//"			timestamp-mode:'trigered',\n"
 	"		},\n"
 	"		frequency:0,\n"
 	"		channel-map:['front-left', 'front-right'],\n"
@@ -35,21 +36,34 @@ void onDataReceived(const void* _data,
                     uint32_t _frequency,
                     const std::vector<audio::channel>& _map,
                     etk::FSNode* _outputNode) {
-	if (_format != audio::format_int16) {
-		std::cout << "[ERROR] call wrong type ... (need int16_t)" << std::endl;
+	if (    _format != audio::format_int16
+	     && _format != audio::format_float) {
+		std::cout << "[ERROR] call wrong type ... (need int16_t.float)" << std::endl;
+		return;
 	}
 	if (_outputNode->fileIsOpen() == false) {
-		// get the curent power of the signal.
-		const int16_t* data = static_cast<const int16_t*>(_data);
-		int64_t value = 0;
-		for (size_t iii=0; iii<_nbChunk*_map.size(); ++iii) {
-			value += std::abs(data[iii]);
+		if (_format != audio::format_int16) {
+			// get the curent power of the signal.
+			const int16_t* data = static_cast<const int16_t*>(_data);
+			int64_t value = 0;
+			for (size_t iii=0; iii<_nbChunk*_map.size(); ++iii) {
+				value += std::abs(data[iii]);
+			}
+			value /= (_nbChunk*_map.size());
+			std::cout << "Get data ... average=" << int32_t(value) << std::endl;
+		} else {
+			// get the curent power of the signal.
+			const float* data = static_cast<const float*>(_data);
+			float value = 0;
+			for (size_t iii=0; iii<_nbChunk*_map.size(); ++iii) {
+				value += std::abs(data[iii]);
+			}
+			value /= (_nbChunk*_map.size());
+			std::cout << "Get data ... average=" << float(value) << std::endl;
 		}
-		value /= (_nbChunk*_map.size());
-		std::cout << "Get data ... average=" << int32_t(value) << std::endl;
 	} else {
 		// just write data
-		std::cout << "Get data ... chunks=" << _nbChunk << " time=" << _time << std::endl;
+		//std::cout << "Get data ... chunks=" << _nbChunk << " time=" << _time << std::endl;
 		_outputNode->fileWrite(_data, _map.size()*audio::getFormatBytes(_format), _nbChunk);
 	}
 }
@@ -88,9 +102,9 @@ int main(int _argc, const char **_argv) {
 		audio::river::init(configFile);
 	}
 	// Create the River manager for tha application or part of the application.
-	std::shared_ptr<audio::river::Manager> manager = audio::river::Manager::create("river_sample_read");
+	ememory::SharedPtr<audio::river::Manager> manager = audio::river::Manager::create("river_sample_read");
 	// create interface:
-	std::shared_ptr<audio::river::Interface> interface;
+	ememory::SharedPtr<audio::river::Interface> interface;
 	//Get the generic input:
 	interface = manager->createInput(48000,
 	                                 std::vector<audio::channel>(),

sample/write/lutin_river-sample-write.py

@@ -29,7 +29,7 @@ def create(target, module_name):
 	my_module.add_src_file([
 		'main.cpp',
 		])
-	my_module.add_module_depend(['audio-river', 'etk'])
+	my_module.add_depend(['audio-river', 'etk'])
 	return my_module
 
 

sample/write/main.cpp

@@ -16,36 +16,41 @@ static const std::string configurationRiver =
 		"	speaker:{\n"
 		"		io:'output',\n"
 		"		map-on:{\n"
-		"			interface:'auto',\n"
-		"			name:'default',\n"
+		"			interface:'alsa',\n"
+		"			name:'hw:0,0',\n"
 		"		},\n"
-		"		frequency:0,\n"
+		"		frequency:48000,\n"
+		//"		channel-map:['front-left', 'front-right', 'rear-left', 'rear-right'],\n"
 		"		channel-map:['front-left', 'front-right'],\n"
-		"		type:'auto',\n"
+		"		type:'int16',\n"
 		"		nb-chunk:1024,\n"
 		"		volume-name:'MASTER'\n"
 		"	}\n"
 		"}\n";
 
+static const int32_t nbChannelMax=8;
+
 void onDataNeeded(void* _data,
                   const audio::Time& _time,
                   size_t _nbChunk,
                   enum audio::format _format,
                   uint32_t _frequency,
                   const std::vector<audio::channel>& _map) {
-	static double phase = 0;
+	static double phase[8] = {0,0,0,0,0,0,0,0};
+	
 	if (_format != audio::format_int16) {
 		std::cout << "[ERROR] call wrong type ... (need int16_t)" << std::endl;
 	}
+	//std::cout << "Map " << _map << std::endl;
 	int16_t* data = static_cast<int16_t*>(_data);
-	double baseCycle = 2.0*M_PI/(double)48000 * (double)550;
+	double baseCycle = 2.0*M_PI/double(48000) * double(440);
 	for (int32_t iii=0; iii<_nbChunk; iii++) {
 		for (int32_t jjj=0; jjj<_map.size(); jjj++) {
-			data[_map.size()*iii+jjj] = cos(phase) * 30000;
-		}
-		phase += baseCycle;
-		if (phase >= 2*M_PI) {
-			phase -= 2*M_PI;
+			data[_map.size()*iii+jjj] = cos(phase[jjj]) * 30000;
+			phase[jjj] += baseCycle*jjj;
+			if (phase[jjj] >= 2*M_PI) {
+				phase[jjj] -= 2*M_PI;
+			}
 		}
 	}
 }
@@ -65,9 +70,9 @@ int main(int _argc, const char **_argv) {
 	// initialize river interface
 	audio::river::initString(configurationRiver);
 	// Create the River manager for tha application or part of the application.
-	std::shared_ptr<audio::river::Manager> manager = audio::river::Manager::create("river_sample_read");
+	ememory::SharedPtr<audio::river::Manager> manager = audio::river::Manager::create("river_sample_read");
 	// create interface:
-	std::shared_ptr<audio::river::Interface> interface;
+	ememory::SharedPtr<audio::river::Interface> interface;
 	//Get the generic input:
 	interface = manager->createOutput(48000,
 	                                  std::vector<audio::channel>(),

test/main.cpp

@@ -47,10 +47,6 @@
 #include "testRecordRead.h"
 #include "testVolume.h"
 
-
-#undef __class__
-#define __class__ "test"
-
 int main(int _argc, const char** _argv) {
 	// init Google test :
 	::testing::InitGoogleTest(&_argc, const_cast<char **>(_argv));

test/testAEC.h

@@ -5,19 +5,16 @@
  */
 #pragma once
 
-#undef __class__
-#define __class__ "test_aec"
-
 namespace river_test_aec {
 	
 	class Linker {
 		private:
-			std::shared_ptr<audio::river::Manager> m_manager;
-			std::shared_ptr<audio::river::Interface> m_interfaceOut;
-			std::shared_ptr<audio::river::Interface> m_interfaceIn;
+			ememory::SharedPtr<audio::river::Manager> m_manager;
+			ememory::SharedPtr<audio::river::Interface> m_interfaceOut;
+			ememory::SharedPtr<audio::river::Interface> m_interfaceIn;
 			audio::drain::CircularBuffer m_buffer;
 		public:
-			Linker(std::shared_ptr<audio::river::Manager> _manager, const std::string& _input, const std::string& _output) :
+			Linker(ememory::SharedPtr<audio::river::Manager> _manager, const std::string& _input, const std::string& _output) :
 			  m_manager(_manager) {
 				//Set stereo output:
 				std::vector<audio::channel> channelMap;
@@ -198,10 +195,10 @@ namespace river_test_aec {
 	
 	TEST(TestUser, testAECManually) {
 		audio::river::initString(configurationRiver);
-		std::shared_ptr<audio::river::Manager> manager;
+		ememory::SharedPtr<audio::river::Manager> manager;
 		manager = audio::river::Manager::create("testApplication");
-		std::shared_ptr<Linker> processLink1 = std::make_shared<Linker>(manager, "microphone-clean", "speaker");
-		std::shared_ptr<Linker> processLink2 = std::make_shared<Linker>(manager, "microphone", "speaker-test");
+		ememory::SharedPtr<Linker> processLink1 = ememory::makeShared<Linker>(manager, "microphone-clean", "speaker");
+		ememory::SharedPtr<Linker> processLink2 = ememory::makeShared<Linker>(manager, "microphone", "speaker-test");
 		processLink1->start();
 		processLink2->start();
 		sleep(30);
@@ -215,6 +212,4 @@ namespace river_test_aec {
 	}
 };
 
-#undef __class__
-#define __class__ nullptr
 

test/testEchoDelay.h

@@ -7,16 +7,13 @@
 
 #include <test-debug/debug.h>
 
-#undef __class__
-#define __class__ "test_echo_delay"
-
 namespace river_test_echo_delay {
 	class TestClass {
 		private:
-			std::shared_ptr<audio::river::Manager> m_manager;
-			std::shared_ptr<audio::river::Interface> m_interfaceOut;
-			std::shared_ptr<audio::river::Interface> m_interfaceIn;
-			std::shared_ptr<audio::river::Interface> m_interfaceFB;
+			ememory::SharedPtr<audio::river::Manager> m_manager;
+			ememory::SharedPtr<audio::river::Interface> m_interfaceOut;
+			ememory::SharedPtr<audio::river::Interface> m_interfaceIn;
+			ememory::SharedPtr<audio::river::Interface> m_interfaceFB;
 			double m_phase;
 			double m_freq;
 			int32_t m_nextSampleCount;
@@ -31,7 +28,7 @@ namespace river_test_echo_delay {
 			int16_t m_volumeInputMin;
 			float m_gain;
 		public:
-			TestClass(std::shared_ptr<audio::river::Manager> _manager) :
+			TestClass(ememory::SharedPtr<audio::river::Manager> _manager) :
 			  m_manager(_manager),
 			  m_phase(0),
 			  m_freq(400),
@@ -416,9 +413,9 @@ namespace river_test_echo_delay {
 	
 	TEST(TestTime, testDelay) {
 		audio::river::initString(configurationRiver);
-		std::shared_ptr<audio::river::Manager> manager;
+		ememory::SharedPtr<audio::river::Manager> manager;
 		manager = audio::river::Manager::create("testApplication");
-		std::shared_ptr<TestClass> process = std::make_shared<TestClass>(manager);
+		ememory::SharedPtr<TestClass> process = ememory::makeShared<TestClass>(manager);
 		process->run();
 		process.reset();
 		usleep(500000);
@@ -426,6 +423,4 @@ namespace river_test_echo_delay {
 	}
 };
 
-#undef __class__
-#define __class__ nullptr
 

test/testFormat.h

@@ -5,9 +5,6 @@
  */
 #pragma once
 
-#undef __class__
-#define __class__ "test_format"
-
 namespace river_test_format {
 	static const std::string configurationRiver =
 		"{\n"
@@ -26,15 +23,15 @@ namespace river_test_format {
 		"}\n";
 	class testOutCallbackType {
 		private:
-			std::shared_ptr<audio::river::Manager> m_manager;
-			std::shared_ptr<audio::river::Interface> m_interface;
+			ememory::SharedPtr<audio::river::Manager> m_manager;
+			ememory::SharedPtr<audio::river::Interface> m_interface;
 			double m_phase;
 			float m_freq;
 			int32_t m_nbChannels;
 			float m_generateFreq;
 			
 		public:
-			testOutCallbackType(const std::shared_ptr<audio::river::Manager>& _manager,
+			testOutCallbackType(const ememory::SharedPtr<audio::river::Manager>& _manager,
 			                    float _freq=48000.0f,
 			                    int32_t _nbChannels=2,
 			                    audio::format _format=audio::format_int16) :
@@ -149,9 +146,9 @@ namespace river_test_format {
 	class testResampling : public ::testing::TestWithParam<float> {};
 	TEST_P(testResampling, base) {
 		audio::river::initString(configurationRiver);
-		std::shared_ptr<audio::river::Manager> manager;
+		ememory::SharedPtr<audio::river::Manager> manager;
 		manager = audio::river::Manager::create("testApplication");
-		std::shared_ptr<testOutCallbackType> process = std::make_shared<testOutCallbackType>(manager, GetParam(), 2, audio::format_int16);
+		ememory::SharedPtr<testOutCallbackType> process = ememory::makeShared<testOutCallbackType>(manager, GetParam(), 2, audio::format_int16);
 		process->run();
 		process.reset();
 		usleep(500000);
@@ -166,9 +163,9 @@ namespace river_test_format {
 	class testFormat : public ::testing::TestWithParam<audio::format> {};
 	TEST_P(testFormat, base) {
 		audio::river::initString(configurationRiver);
-		std::shared_ptr<audio::river::Manager> manager;
+		ememory::SharedPtr<audio::river::Manager> manager;
 		manager = audio::river::Manager::create("testApplication");
-		std::shared_ptr<testOutCallbackType> process = std::make_shared<testOutCallbackType>(manager, 48000, 2, GetParam());
+		ememory::SharedPtr<testOutCallbackType> process = ememory::makeShared<testOutCallbackType>(manager, 48000, 2, GetParam());
 		process->run();
 		process.reset();
 		usleep(500000);
@@ -182,9 +179,9 @@ namespace river_test_format {
 	class testChannels : public ::testing::TestWithParam<int32_t> {};
 	TEST_P(testChannels, base) {
 		audio::river::initString(configurationRiver);
-		std::shared_ptr<audio::river::Manager> manager;
+		ememory::SharedPtr<audio::river::Manager> manager;
 		manager = audio::river::Manager::create("testApplication");
-		std::shared_ptr<testOutCallbackType> process = std::make_shared<testOutCallbackType>(manager, 48000, GetParam(), audio::format_int16);
+		ememory::SharedPtr<testOutCallbackType> process = ememory::makeShared<testOutCallbackType>(manager, 48000, GetParam(), audio::format_int16);
 		process->run();
 		process.reset();
 		usleep(500000);
@@ -197,7 +194,7 @@ namespace river_test_format {
 	
 	TEST(TestALL, testChannelsFormatResampling) {
 		audio::river::initString(configurationRiver);
-		std::shared_ptr<audio::river::Manager> manager;
+		ememory::SharedPtr<audio::river::Manager> manager;
 		manager = audio::river::Manager::create("testApplication");
 		TEST_INFO("test convert flaot to output (callback mode)");
 		std::vector<float> listFreq;
@@ -226,7 +223,7 @@ namespace river_test_format {
 			for (size_t ccc=0; ccc<listChannel.size(); ++ccc) {
 				for (size_t iii=0; iii<listFormat.size(); ++iii) {
 					TEST_INFO("freq=" << listFreq[fff] << " channel=" << listChannel[ccc] << " format=" << getFormatString(listFormat[iii]));
-					std::shared_ptr<testOutCallbackType> process = std::make_shared<testOutCallbackType>(manager, listFreq[fff], listChannel[ccc], listFormat[iii]);
+					ememory::SharedPtr<testOutCallbackType> process = ememory::makeShared<testOutCallbackType>(manager, listFreq[fff], listChannel[ccc], listFormat[iii]);
 					process->run();
 					process.reset();
 					usleep(500000);
@@ -235,10 +232,6 @@ namespace river_test_format {
 		}
 		audio::river::unInit();
 	}
-
-
 };
 
-#undef __class__
-#define __class__ nullptr
 

test/testMuxer.h

@@ -7,18 +7,15 @@
 
 #include <test-debug/debug.h>
 
-#undef __class__
-#define __class__ "test_muxer"
-
 namespace river_test_muxer {
 	class TestClass {
 		private:
-			std::shared_ptr<audio::river::Manager> m_manager;
-			std::shared_ptr<audio::river::Interface> m_interfaceIn;
-			std::shared_ptr<audio::river::Interface> m_interfaceOut;
+			ememory::SharedPtr<audio::river::Manager> m_manager;
+			ememory::SharedPtr<audio::river::Interface> m_interfaceIn;
+			ememory::SharedPtr<audio::river::Interface> m_interfaceOut;
 			double m_phase;
 		public:
-			TestClass(std::shared_ptr<audio::river::Manager> _manager) :
+			TestClass(ememory::SharedPtr<audio::river::Manager> _manager) :
 			  m_manager(_manager),
 			  m_phase(0) {
 				std::vector<audio::channel> channelMap;
@@ -166,9 +163,9 @@ namespace river_test_muxer {
 	
 	TEST(TestMuxer, testMuxing) {
 		audio::river::initString(configurationRiver);
-		std::shared_ptr<audio::river::Manager> manager;
+		ememory::SharedPtr<audio::river::Manager> manager;
 		manager = audio::river::Manager::create("testApplication");
-		std::shared_ptr<TestClass> process = std::make_shared<TestClass>(manager);
+		ememory::SharedPtr<TestClass> process = ememory::makeShared<TestClass>(manager);
 		process->run();
 		process.reset();
 		usleep(500000);
@@ -176,6 +173,4 @@ namespace river_test_muxer {
 	}
 };
 
-#undef __class__
-#define __class__ nullptr
 

test/testPlaybackCallback.h

@@ -5,18 +5,15 @@
  */
 #pragma once
 
-#undef __class__
-#define __class__ "test_playback_callback"
-
 namespace river_test_playback_callback {
 	
 	class testOutCallback {
 		public:
-			std::shared_ptr<audio::river::Manager> m_manager;
-			std::shared_ptr<audio::river::Interface> m_interface;
+			ememory::SharedPtr<audio::river::Manager> m_manager;
+			ememory::SharedPtr<audio::river::Interface> m_interface;
 			double m_phase;
 		public:
-			testOutCallback(std::shared_ptr<audio::river::Manager> _manager, const std::string& _io="speaker") :
+			testOutCallback(ememory::SharedPtr<audio::river::Manager> _manager, const std::string& _io="speaker") :
 			  m_manager(_manager),
 			  m_phase(0) {
 				//Set stereo output:
@@ -92,11 +89,11 @@ namespace river_test_playback_callback {
 	
 	TEST(TestALL, testOutputCallBack) {
 		audio::river::initString(configurationRiver);
-		std::shared_ptr<audio::river::Manager> manager;
+		ememory::SharedPtr<audio::river::Manager> manager;
 		manager = audio::river::Manager::create("testApplication");
 		
 		TEST_INFO("test output (callback mode)");
-		std::shared_ptr<testOutCallback> process = std::make_shared<testOutCallback>(manager, "speaker");
+		ememory::SharedPtr<testOutCallback> process = ememory::makeShared<testOutCallback>(manager, "speaker");
 		ASSERT_NE(process, nullptr);
 		process->run();
 		process.reset();
@@ -106,11 +103,11 @@ namespace river_test_playback_callback {
 	
 	TEST(TestALL, testOutputCallBackPulse) {
 		audio::river::initString(configurationRiver);
-		std::shared_ptr<audio::river::Manager> manager;
+		ememory::SharedPtr<audio::river::Manager> manager;
 		manager = audio::river::Manager::create("testApplication");
 		
 		TEST_INFO("test output (callback mode)");
-		std::shared_ptr<testOutCallback> process = std::make_shared<testOutCallback>(manager, "speaker-pulse");
+		ememory::SharedPtr<testOutCallback> process = ememory::makeShared<testOutCallback>(manager, "speaker-pulse");
 		process->run();
 		process.reset();
 		usleep(500000);
@@ -119,20 +116,15 @@ namespace river_test_playback_callback {
 	
 	TEST(TestALL, testOutputCallBackJack) {
 		audio::river::initString(configurationRiver);
-		std::shared_ptr<audio::river::Manager> manager;
+		ememory::SharedPtr<audio::river::Manager> manager;
 		manager = audio::river::Manager::create("testApplication");
 		
 		TEST_INFO("test output (callback mode)");
-		std::shared_ptr<testOutCallback> process = std::make_shared<testOutCallback>(manager, "speaker-jack");
+		ememory::SharedPtr<testOutCallback> process = ememory::makeShared<testOutCallback>(manager, "speaker-jack");
 		process->run();
 		process.reset();
 		usleep(500000);
 		audio::river::unInit();
 	}
-
-
 };
 
-#undef __class__
-#define __class__ nullptr
-

test/testPlaybackWrite.h

@@ -5,9 +5,6 @@
  */
 #pragma once
 
-#undef __class__
-#define __class__ "test_playback_write"
-
 namespace river_test_playback_write {
 	static const std::string configurationRiver =
 		"{\n"
@@ -28,10 +25,10 @@ namespace river_test_playback_write {
 	class testOutWrite {
 		public:
 			std::vector<audio::channel> m_channelMap;
-			std::shared_ptr<audio::river::Manager> m_manager;
-			std::shared_ptr<audio::river::Interface> m_interface;
+			ememory::SharedPtr<audio::river::Manager> m_manager;
+			ememory::SharedPtr<audio::river::Interface> m_interface;
 		public:
-			testOutWrite(std::shared_ptr<audio::river::Manager> _manager) :
+			testOutWrite(ememory::SharedPtr<audio::river::Manager> _manager) :
 			  m_manager(_manager) {
 				//Set stereo output:
 				m_channelMap.push_back(audio::channel_frontLeft);
@@ -89,11 +86,11 @@ namespace river_test_playback_write {
 	
 	TEST(TestALL, testOutputWrite) {
 		audio::river::initString(configurationRiver);
-		std::shared_ptr<audio::river::Manager> manager;
+		ememory::SharedPtr<audio::river::Manager> manager;
 		manager = audio::river::Manager::create("testApplication");
 		
 		TEST_INFO("test output (write mode)");
-		std::shared_ptr<testOutWrite> process = std::make_shared<testOutWrite>(manager);
+		ememory::SharedPtr<testOutWrite> process = ememory::makeShared<testOutWrite>(manager);
 		process->run();
 		process.reset();
 		usleep(500000);
@@ -102,11 +99,11 @@ namespace river_test_playback_write {
 	
 	class testOutWriteCallback {
 		public:
-			std::shared_ptr<audio::river::Manager> m_manager;
-			std::shared_ptr<audio::river::Interface> m_interface;
+			ememory::SharedPtr<audio::river::Manager> m_manager;
+			ememory::SharedPtr<audio::river::Interface> m_interface;
 			double m_phase;
 		public:
-			testOutWriteCallback(std::shared_ptr<audio::river::Manager> _manager) :
+			testOutWriteCallback(ememory::SharedPtr<audio::river::Manager> _manager) :
 			  m_manager(_manager),
 			  m_phase(0) {
 				std::vector<audio::channel> channelMap;
@@ -166,11 +163,11 @@ namespace river_test_playback_write {
 	
 	TEST(TestALL, testOutputWriteWithCallback) {
 		audio::river::initString(configurationRiver);
-		std::shared_ptr<audio::river::Manager> manager;
+		ememory::SharedPtr<audio::river::Manager> manager;
 		manager = audio::river::Manager::create("testApplication");
 		
 		TEST_INFO("test output (write with callback event mode)");
-		std::shared_ptr<testOutWriteCallback> process = std::make_shared<testOutWriteCallback>(manager);
+		ememory::SharedPtr<testOutWriteCallback> process = ememory::makeShared<testOutWriteCallback>(manager);
 		process->run();
 		process.reset();
 		usleep(500000);
@@ -179,6 +176,3 @@ namespace river_test_playback_write {
 
 };
 
-#undef __class__
-#define __class__ nullptr
-

test/testRecordCallback.h

@@ -7,9 +7,6 @@
 
 #include <test-debug/debug.h>
 
-#undef __class__
-#define __class__ "test_record_callback"
-
 namespace river_test_record_callback {
 	static const std::string configurationRiver =
 		"{\n"
@@ -28,10 +25,10 @@ namespace river_test_record_callback {
 	
 	class testInCallback {
 		public:
-			std::shared_ptr<audio::river::Manager> m_manager;
-			std::shared_ptr<audio::river::Interface> m_interface;
+			ememory::SharedPtr<audio::river::Manager> m_manager;
+			ememory::SharedPtr<audio::river::Interface> m_interface;
 		public:
-			testInCallback(std::shared_ptr<audio::river::Manager> _manager, const std::string& _input="microphone") :
+			testInCallback(ememory::SharedPtr<audio::river::Manager> _manager, const std::string& _input="microphone") :
 			  m_manager(_manager) {
 				//Set stereo output:
 				std::vector<audio::channel> channelMap;
@@ -85,10 +82,10 @@ namespace river_test_record_callback {
 	
 	TEST(TestALL, testInputCallBack) {
 		audio::river::initString(configurationRiver);
-		std::shared_ptr<audio::river::Manager> manager;
+		ememory::SharedPtr<audio::river::Manager> manager;
 		manager = audio::river::Manager::create("testApplication");
 		TEST_INFO("test input (callback mode)");
-		std::shared_ptr<testInCallback> process = std::make_shared<testInCallback>(manager);
+		ememory::SharedPtr<testInCallback> process = ememory::makeShared<testInCallback>(manager);
 		process->run();
 		process.reset();
 		usleep(500000);
@@ -97,6 +94,3 @@ namespace river_test_record_callback {
 
 };
 
-#undef __class__
-#define __class__ nullptr
-

test/testRecordRead.h

@@ -5,13 +5,7 @@
  */
 #pragma once
 
-#undef __class__
-#define __class__ "test_record_read"
-
 namespace river_test_record_read {
 	
 };
 
-#undef __class__
-#define __class__ nullptr
-

test/testVolume.h

@@ -5,9 +5,6 @@
  */
 #pragma once
 
-#undef __class__
-#define __class__ "test_volume"
-
 namespace river_test_volume {
 	static const std::string configurationRiver =
 		"{\n"
@@ -27,11 +24,11 @@ namespace river_test_volume {
 	
 	class testCallbackVolume {
 		private:
-			std::shared_ptr<audio::river::Manager> m_manager;
-			std::shared_ptr<audio::river::Interface> m_interface;
+			ememory::SharedPtr<audio::river::Manager> m_manager;
+			ememory::SharedPtr<audio::river::Interface> m_interface;
 			double m_phase;
 		public:
-			testCallbackVolume(std::shared_ptr<audio::river::Manager> _manager) :
+			testCallbackVolume(ememory::SharedPtr<audio::river::Manager> _manager) :
 			  m_manager(_manager),
 			  m_phase(0) {
 				//Set stereo output:
@@ -122,9 +119,9 @@ namespace river_test_volume {
 	
 	TEST(TestALL, testVolume) {
 		audio::river::initString(configurationRiver);
-		std::shared_ptr<audio::river::Manager> manager;
+		ememory::SharedPtr<audio::river::Manager> manager;
 		manager = audio::river::Manager::create("testApplication");
-		std::shared_ptr<testCallbackVolume> process = std::make_shared<testCallbackVolume>(manager);
+		ememory::SharedPtr<testCallbackVolume> process = ememory::makeShared<testCallbackVolume>(manager);
 		process->run();
 		process.reset();
 		usleep(500000);
@@ -133,6 +130,4 @@ namespace river_test_volume {
 
 };
 
-#undef __class__
-#define __class__ nullptr
 

version.txt

@@ -0,0 +1 @@
+0.3.1

widget/audio/river/widget/TemporalViewer.cpp

@@ -8,9 +8,6 @@
 #include <audio/river/widget/TemporalViewer.h>
 #include <etk/tool.h>
 
-#undef __class__
-#define __class__ "TemporalViewer"
-
 static const int32_t nbSecond = 3;
 
 

widget/audio/river/widget/TemporalViewer.h

@@ -43,8 +43,8 @@ namespace audio {
 					virtual void onRegenerateDisplay();
 					virtual void periodicCall(const ewol::event::Time& _event);
 				private:
-					std::shared_ptr<audio::river::Manager> m_manager;
-					std::shared_ptr<audio::river::Interface> m_interface;
+					ememory::SharedPtr<audio::river::Manager> m_manager;
+					ememory::SharedPtr<audio::river::Interface> m_interface;
 					void onDataReceived(const void* _data,
 					                    const audio::Time& _time,
 					                    size_t _nbChunk,

widget/lutin_audio-river-widget.py

@@ -35,7 +35,7 @@ def create(target, module_name):
 	my_module.add_header_file([
 		'audio/river/widget/TemporalViewer.h'
 		])
-	my_module.add_module_depend(['ewol', 'audio-river'])
+	my_module.add_depend(['ewol', 'audio-river'])
 	my_module.add_path(tools.get_current_path(__file__))
 	return my_module