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

[DEV] update of external of elog and ethread

Browse Source
This commit is contained in:
Edouard DUPIN
2016-03-08 21:29:34 +01:00
parent dd2e5240e3
commit e7d5b421c3
39 changed files with 536 additions and 536 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sample/ioViewer/appl/debug.cpp
View File

@@ -8,6 +8,6 @@
int32_t appl::getLogId() {
static int32_t g_val = etk::log::registerInstance("ioViewer");
static int32_t g_val = elog::registerInstance("ioViewer");
return g_val;
}

4
sample/ioViewer/appl/debug.h
View File

@@ -5,13 +5,13 @@
*/
#pragma once
#include <etk/log.h>
#include <elog/log.h>
namespace appl {
int32_t getLogId();
}
#define APPL_BASE(info,data) TK_LOG_BASE(appl::getLogId(),info,data)
#define APPL_BASE(info,data) ELOG_BASE(appl::getLogId(),info,data)
#define APPL_PRINT(data) APPL_BASE(-1, data)
#define APPL_CRITICAL(data) APPL_BASE(1, data)

18
sample/read/main.cpp
View File

@@ -88,9 +88,9 @@ int main(int _argc, const char **_argv) {
audio::river::init(configFile);
}
// Create the River manager for tha application or part of the application.
std11::shared_ptr<audio::river::Manager> manager = audio::river::Manager::create("river_sample_read");
std::shared_ptr<audio::river::Manager> manager = audio::river::Manager::create("river_sample_read");
// create interface:
std11::shared_ptr<audio::river::Interface> interface;
std::shared_ptr<audio::river::Interface> interface;
//Get the generic input:
interface = manager->createInput(48000,
std::vector<audio::channel>(),
@@ -107,13 +107,13 @@ int main(int _argc, const char **_argv) {
outputNode.fileOpenWrite();
}
// set callback mode ...
interface->setInputCallback(std11::bind(&onDataReceived,
std11::placeholders::_1,
std11::placeholders::_2,
std11::placeholders::_3,
std11::placeholders::_4,
std11::placeholders::_5,
std11::placeholders::_6,
interface->setInputCallback(std::bind(&onDataReceived,
std::placeholders::_1,
std::placeholders::_2,
std::placeholders::_3,
std::placeholders::_4,
std::placeholders::_5,
std::placeholders::_6,
&outputNode));
// start the stream
interface->start();

18
sample/write/main.cpp
View File

@@ -65,9 +65,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.
std11::shared_ptr<audio::river::Manager> manager = audio::river::Manager::create("river_sample_read");
std::shared_ptr<audio::river::Manager> manager = audio::river::Manager::create("river_sample_read");
// create interface:
std11::shared_ptr<audio::river::Interface> interface;
std::shared_ptr<audio::river::Interface> interface;
//Get the generic input:
interface = manager->createOutput(48000,
std::vector<audio::channel>(),
@@ -78,13 +78,13 @@ int main(int _argc, const char **_argv) {
return -1;
}
// set callback mode ...
interface->setOutputCallback(std11::bind(&onDataNeeded,
std11::placeholders::_1,
std11::placeholders::_2,
std11::placeholders::_3,
std11::placeholders::_4,
std11::placeholders::_5,
std11::placeholders::_6));
interface->setOutputCallback(std::bind(&onDataNeeded,
std::placeholders::_1,
std::placeholders::_2,
std::placeholders::_3,
std::placeholders::_4,
std::placeholders::_5,
std::placeholders::_6));
// start the stream
interface->start();
// wait 10 second ...