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

[DEV] continue removing stl

Browse Source
This commit is contained in:
Edouard DUPIN
2017-08-28 00:08:50 +02:00
parent c3b5ba2bdd
commit 0e175ad23c
37 changed files with 422 additions and 422 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,7 +20,7 @@ appl::Windows::Windows() :
void appl::Windows::init() {
ewol::widget::Windows::init();
std::string composition = std::string("");
etk::String composition = etk::String("");
composition += "<sizer mode='vert'>\n";
composition += " <sizer mode='hori' lock='true' min-size='10,10%'>\n";
composition += " <button name='bt-record' expend='true' fill='true'>\n";

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

@@ -16,7 +16,7 @@
#include <ewol/context/Context.hpp>
#include <audio/river/widget/TemporalViewer.hpp>
static const std::string configurationRiver =
static const etk::String configurationRiver =
"{\n"
" microphone:{\n"
" io:'input',\n"

20
sample/read/read.cpp
View File

@@ -17,7 +17,7 @@
//! [audio_river_sample_read_config_file]
static const std::string configurationRiver =
static const etk::String configurationRiver =
"{\n"
" microphone:{\n"
" io:'input',\n"
@@ -41,7 +41,7 @@ void onDataReceived(const void* _data,
size_t _nbChunk,
enum audio::format _format,
uint32_t _frequency,
const std::vector<audio::channel>& _map,
const etk::Vector<audio::channel>& _map,
etk::FSNode* _outputNode) {
if ( _format != audio::format_int16
&& _format != audio::format_float) {
@@ -82,11 +82,11 @@ int main(int _argc, const char **_argv) {
etk::init(_argc, _argv);
//! [audio_river_sample_init]
// local parameter:
std::string configFile;
std::string ioName="microphone";
std::string outputFileName = "";
etk::String configFile;
etk::String ioName="microphone";
etk::String outputFileName = "";
for (int32_t iii=0; iii<_argc ; ++iii) {
std::string data = _argv[iii];
etk::String data = _argv[iii];
if ( data == "-h"
|| data == "--help") {
std::cout << "Help : " << std::endl;
@@ -95,13 +95,13 @@ int main(int _argc, const char **_argv) {
std::cout << " --file=yyy.raw File name to store data" << std::endl;
exit(0);
} else if (etk::start_with(data, "--conf=") == true) {
configFile = std::string(data.begin()+7, data.end());
configFile = etk::String(data.begin()+7, data.end());
std::cout << "Select config: " << configFile << std::endl;
} else if (etk::start_with(data, "--io=") == true) {
ioName = std::string(data.begin()+5, data.end());
ioName = etk::String(data.begin()+5, data.end());
std::cout << "Select io: " << ioName << std::endl;
} else if (etk::start_with(data, "--file=") == true) {
outputFileName = std::string(data.begin()+7, data.end());
outputFileName = etk::String(data.begin()+7, data.end());
std::cout << "Select output file name: " << outputFileName << std::endl;
}
}
@@ -120,7 +120,7 @@ int main(int _argc, const char **_argv) {
ememory::SharedPtr<audio::river::Interface> interface;
//Get the generic input:
interface = manager->createInput(48000,
std::vector<audio::channel>(),
etk::Vector<audio::channel>(),
audio::format_int16,
ioName);
if(interface == nullptr) {

8
sample/write/write.cpp
View File

@@ -14,7 +14,7 @@
//! [audio_river_sample_write_config_file]
static const std::string configurationRiver =
static const etk::String configurationRiver =
"{\n"
" speaker:{\n"
" io:'output',\n"
@@ -40,7 +40,7 @@ void onDataNeeded(void* _data,
size_t _nbChunk,
enum audio::format _format,
uint32_t _sampleRate,
const std::vector<audio::channel>& _map) {
const etk::Vector<audio::channel>& _map) {
static double phase[8] = {0,0,0,0,0,0,0,0};
if (_format != audio::format_int16) {
@@ -65,7 +65,7 @@ int main(int _argc, const char **_argv) {
// the only one init for etk:
etk::init(_argc, _argv);
for (int32_t iii=0; iii<_argc ; ++iii) {
std::string data = _argv[iii];
etk::String data = _argv[iii];
if ( data == "-h"
|| data == "--help") {
std::cout << "Help : " << std::endl;
@@ -82,7 +82,7 @@ int main(int _argc, const char **_argv) {
ememory::SharedPtr<audio::river::Interface> interface;
//Get the generic input:
interface = manager->createOutput(48000,
std::vector<audio::channel>(),
etk::Vector<audio::channel>(),
audio::format_int16,
"speaker");
if(interface == nullptr) {