musicdsp/audio-river
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEBUG] compilation OK

Browse Source
This commit is contained in:
Edouard DUPIN
2015-03-12 23:17:14 +01:00
parent f9ae8f23bd
commit 57c4795a1e
12 changed files with 76 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
river/io/Manager.cpp
View File

@@ -4,13 +4,14 @@
* @license APACHE v2.0 (see license file)
*/
#include "Manager.h"
#include <river/io/Manager.h>
#include <river/debug.h>
#include "Node.h"
#include "NodeAEC.h"
#include "NodeMuxer.h"
#include "NodeAirTAudio.h"
#include "NodePortAudio.h"
#include <river/river.h>
#include <river/io/Node.h>
#include <river/io/NodeAEC.h>
#include <river/io/NodeMuxer.h>
#include <river/io/NodeAirTAudio.h>
#include <river/io/NodePortAudio.h>
#include <etk/os/FSNode.h>
#include <etk/memory.h>
#include <etk/types.h>
@@ -65,7 +66,7 @@ river::io::Manager::Manager() {
#endif
}
void river::io::Manager::init(const std::string _filename) {
void river::io::Manager::init(const std::string& _filename) {
std11::unique_lock<std11::recursive_mutex> lock(m_mutex);
if (_filename == "") {
RIVER_INFO("Load default config");
@@ -74,9 +75,15 @@ void river::io::Manager::init(const std::string _filename) {
RIVER_ERROR("you must set a basic configuration file for harware configuration: '" << _filename << "'");
}
}
void river::io::Manager::initString(const std::string& _data) {
std11::unique_lock<std11::recursive_mutex> lock(m_mutex);
m_config.parse(_data);
}
void river::io::Manager::unInit() {
std11::unique_lock<std11::recursive_mutex> lock(m_mutex);
// TODO : ...
}
river::io::Manager::~Manager() {

3
river/io/Manager.h
View File

@@ -39,7 +39,8 @@ namespace river {
* @brief Destructor
*/
~Manager();
void init();
void init(const std::string& _filename);
void initString(const std::string& _data);
void unInit();
private:
ejson::Document m_config; // harware configuration

18
river/river.cpp
View File

@@ -4,8 +4,8 @@
* @license APACHE v2.0 (see license file)
*/
#iclude <river/river.h>
#iclude <river/debug.h>
#include <river/river.h>
#include <river/debug.h>
#include <river/io/Manager.h>
static bool river_isInit = false;
@@ -20,6 +20,20 @@ void river::init(const std::string& _filename) {
RIVER_INFO("init RIVER :" << river_configFile);
std11::shared_ptr<river::io::Manager> mng = river::io::Manager::getInstance();
mng->init(river_configFile);
} else {
RIVER_ERROR("River is already init not use : " << _filename);
}
}
void river::initString(const std::string& _config) {
if (river_isInit == false) {
river_isInit = true;
river_configFile = _config;
RIVER_INFO("init RIVER with config ...");
std11::shared_ptr<river::io::Manager> mng = river::io::Manager::getInstance();
mng->initString(river_configFile);
} else {
RIVER_ERROR("River is already init not use Data ...");
}
}

7
river/river.h
View File

@@ -7,7 +7,7 @@
#ifndef __RIVER_H__
#define __RIVER_H__
#include <etk/type.h>
#include <etk/types.h>
namespace river {
/**
@@ -15,6 +15,11 @@ namespace river {
* @param[in] _filename Name of the configuration file (if "" ==> default config file)
*/
void init(const std::string& _filename);
/**
* @brief Initialize the River Library with a json data string
* @param[in] _config json sting data
*/
void initString(const std::string& _config);
/**
* @brief Un-initialize the River Library
* @note this close all stream of all interfaces.