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

22
widget/audio/river/widget/TemporalViewer.cpp
View File

@@ -41,7 +41,7 @@ void audio::river::widget::TemporalViewer::onDataReceived(const void* _data,
enum audio::format _format,
uint32_t _frequency,
const std::vector<audio::channel>& _map) {
std11::unique_lock<std11::mutex> lock(m_mutex);
std::unique_lock<std::mutex> lock(m_mutex);
if (_format != audio::format_float) {
std::cout << "[ERROR] call wrong type ... (need int16_t)" << std::endl;
}
@@ -59,7 +59,7 @@ void audio::river::widget::TemporalViewer::onDataReceived(const void* _data,
}
void audio::river::widget::TemporalViewer::recordToggle() {
std11::unique_lock<std11::mutex> lock(m_mutex);
std::unique_lock<std::mutex> lock(m_mutex);
if (m_interface == nullptr) {
//Get the generic input:
std::vector<audio::channel> channel;
@@ -73,14 +73,14 @@ void audio::river::widget::TemporalViewer::recordToggle() {
return;
}
// set callback mode ...
m_interface->setInputCallback(std11::bind(&audio::river::widget::TemporalViewer::onDataReceived,
m_interface->setInputCallback(std::bind(&audio::river::widget::TemporalViewer::onDataReceived,
this,
std11::placeholders::_1,
std11::placeholders::_2,
std11::placeholders::_3,
std11::placeholders::_4,
std11::placeholders::_5,
std11::placeholders::_6));
std::placeholders::_1,
std::placeholders::_2,
std::placeholders::_3,
std::placeholders::_4,
std::placeholders::_5,
std::placeholders::_6));
// start the stream
m_interface->start();
periodicCallEnable();
@@ -107,7 +107,7 @@ void audio::river::widget::TemporalViewer::onRegenerateDisplay() {
m_draw.setColor(etk::color::black);
m_draw.setPos(vec2(0,0));
m_draw.rectangleWidth(m_size);
std11::unique_lock<std11::mutex> lock(m_mutex);
std::unique_lock<std::mutex> lock(m_mutex);
if (m_data.size() == 0) {
return;
}
@@ -146,7 +146,7 @@ void audio::river::widget::TemporalViewer::onRegenerateDisplay() {
void audio::river::widget::TemporalViewer::periodicCall(const ewol::event::Time& _event) {
std11::unique_lock<std11::mutex> lock(m_mutex);
std::unique_lock<std::mutex> lock(m_mutex);
int32_t nbSampleDelta = _event.getDeltaCall() * float(m_sampleRate);
if (m_data.size()>m_sampleRate*nbSecond) {
if (nbSampleDelta < m_data.size()) {

6
widget/audio/river/widget/TemporalViewer.h
View File

@@ -17,7 +17,7 @@ namespace audio {
namespace widget {
class TemporalViewer : public ewol::Widget {
private:
mutable std11::mutex m_mutex;
mutable std::mutex m_mutex;
private:
ewol::compositing::Drawing m_draw; //!< drawing instance
protected:
@@ -43,8 +43,8 @@ namespace audio {
virtual void onRegenerateDisplay();
virtual void periodicCall(const ewol::event::Time& _event);
private:
std11::shared_ptr<audio::river::Manager> m_manager;
std11::shared_ptr<audio::river::Interface> m_interface;
std::shared_ptr<audio::river::Manager> m_manager;
std::shared_ptr<audio::river::Interface> m_interface;
void onDataReceived(const void* _data,
const audio::Time& _time,
size_t _nbChunk,

2
widget/audio/river/widget/debug.cpp
View File

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

4
widget/audio/river/widget/debug.h
View File

@@ -5,7 +5,7 @@
*/
#pragma once
#include <etk/log.h>
#include <elog/log.h>
namespace audio {
namespace river {
@@ -15,7 +15,7 @@ namespace audio {
}
}
#define ARW_BASE(info,data) TK_LOG_BASE(audio::river::widget::getLogId(),info,data)
#define ARW_BASE(info,data) ELOG_BASE(audio::river::widget::getLogId(),info,data)
#define ARW_PRINT(data) ARW_BASE(-1, data)
#define ARW_CRITICAL(data) ARW_BASE(1, data)