From 774e7432715bb4c3981ae458396b1336622f4189 Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Fri, 28 Jun 2013 22:27:29 +0200 Subject: [PATCH] [DEV] update to the nex exml API --- external/esvg | 2 +- external/etk | 2 +- external/exml | 2 +- sources/ewol/UserConfig.cpp | 2 +- sources/ewol/compositing/Text.cpp | 4 +-- sources/ewol/renderer/audio/audio.cpp | 44 +++++++++++++-------------- sources/ewol/renderer/audio/audio.h | 22 +++++++------- sources/ewol/widget/Button.cpp | 8 ++--- sources/ewol/widget/Container.cpp | 8 ++--- sources/ewol/widget/ContainerN.cpp | 6 ++-- 10 files changed, 50 insertions(+), 50 deletions(-) diff --git a/external/esvg b/external/esvg index 18832b23..b8bb3aeb 160000 --- a/external/esvg +++ b/external/esvg @@ -1 +1 @@ -Subproject commit 18832b2305675e930e775332a7c3ba6f1aa8eaa4 +Subproject commit b8bb3aebf2cbf3baee2b11ce94249294d657bca3 diff --git a/external/etk b/external/etk index c60fe032..090d2023 160000 --- a/external/etk +++ b/external/etk @@ -1 +1 @@ -Subproject commit c60fe0326dd06a8750494ee995f90209537049ce +Subproject commit 090d2023a01af24b331df6e7c93489a12196e074 diff --git a/external/exml b/external/exml index 5fce0e9e..2f5856ca 160000 --- a/external/exml +++ b/external/exml @@ -1 +1 @@ -Subproject commit 5fce0e9ef26a8c161d10bbef21abb0faac6a2d8c +Subproject commit 2f5856ca2f20ab830a144599550251c70f61229b diff --git a/sources/ewol/UserConfig.cpp b/sources/ewol/UserConfig.cpp index 961a4f9d..26822d0b 100644 --- a/sources/ewol/UserConfig.cpp +++ b/sources/ewol/UserConfig.cpp @@ -128,7 +128,7 @@ bool ewol::userConfig::Load(void) } } if (elementFound==false) { - EWOL_ERROR("(l "<Pos()<<") node not suported : \""<GetValue()); + EWOL_ERROR("(l "<GetPos()<<") node not suported : \""<GetValue()); } } return true; diff --git a/sources/ewol/compositing/Text.cpp b/sources/ewol/compositing/Text.cpp index 6eb6008a..a37824a6 100644 --- a/sources/ewol/compositing/Text.cpp +++ b/sources/ewol/compositing/Text.cpp @@ -454,7 +454,7 @@ void ewol::Text::ParseHtmlNode(exml::Element* _element) EWOL_VERBOSE("XML Add : " << child->GetValue()); continue; } else if (_element->GetType(iii)!=exml::typeElement) { - EWOL_ERROR("(l "<< _element->GetNode(iii)->Pos() << ") node not suported type : " << _element->GetType(iii) << " val=\""<< _element->GetNode(iii)->GetValue() << "\"" ); + EWOL_ERROR("(l "<< _element->GetNode(iii)->GetPos() << ") node not suported type : " << _element->GetType(iii) << " val=\""<< _element->GetNode(iii)->GetValue() << "\"" ); continue; } exml::Element* elem = _element->GetElement(iii); @@ -534,7 +534,7 @@ void ewol::Text::ParseHtmlNode(exml::Element* _element) m_alignement = ewol::Text::alignJustify; ParseHtmlNode(elem); } else { - EWOL_ERROR("(l "<< elem->Pos() << ") node not suported type : " << elem->GetType() << " val=\""<< elem->GetValue() << "\"" ); + EWOL_ERROR("(l "<< elem->GetPos() << ") node not suported type : " << elem->GetType() << " val=\""<< elem->GetValue() << "\"" ); } } } diff --git a/sources/ewol/renderer/audio/audio.cpp b/sources/ewol/renderer/audio/audio.cpp index 580adb4c..73495385 100644 --- a/sources/ewol/renderer/audio/audio.cpp +++ b/sources/ewol/renderer/audio/audio.cpp @@ -103,72 +103,72 @@ void ewol::audio::music::Fading(int32_t timeMs) } -erreurCode_te ewol::audio::music::ListAdd(etk::UString file) +bool ewol::audio::music::ListAdd(etk::UString file) { - return ERR_FAIL; + return false; } -erreurCode_te ewol::audio::music::ListRm(etk::UString file) +bool ewol::audio::music::ListRm(etk::UString file) { - return ERR_FAIL; + return false; } -erreurCode_te ewol::audio::music::ListClean(void) +bool ewol::audio::music::ListClean(void) { - return ERR_FAIL; + return false; } -erreurCode_te ewol::audio::music::ListPrevious(void) +bool ewol::audio::music::ListPrevious(void) { - return ERR_FAIL; + return false; } -erreurCode_te ewol::audio::music::ListNext(void) +bool ewol::audio::music::ListNext(void) { - return ERR_FAIL; + return false; } -erreurCode_te ewol::audio::music::ListFirst(void) +bool ewol::audio::music::ListFirst(void) { - return ERR_FAIL; + return false; } -erreurCode_te ewol::audio::music::ListLast(void) +bool ewol::audio::music::ListLast(void) { - return ERR_FAIL; + return false; } -erreurCode_te ewol::audio::music::ListPlay(void) +bool ewol::audio::music::ListPlay(void) { - return ERR_FAIL; + return false; } -erreurCode_te ewol::audio::music::ListStop(void) +bool ewol::audio::music::ListStop(void) { - return ERR_FAIL; + return false; } -erreurCode_te ewol::audio::music::Play(etk::UString file) +bool ewol::audio::music::Play(etk::UString file) { - return ERR_FAIL; + return false; } -erreurCode_te ewol::audio::music::Stop(void) +bool ewol::audio::music::Stop(void) { - return ERR_FAIL; + return false; } diff --git a/sources/ewol/renderer/audio/audio.h b/sources/ewol/renderer/audio/audio.h index d995a776..8cbb9852 100644 --- a/sources/ewol/renderer/audio/audio.h +++ b/sources/ewol/renderer/audio/audio.h @@ -26,18 +26,18 @@ namespace ewol { namespace music { void Fading(int32_t timeMs); // list playing system : is cyclic ... - erreurCode_te ListAdd(etk::UString file); - erreurCode_te ListRm(etk::UString file); - erreurCode_te ListClean(void); - erreurCode_te ListPrevious(void); - erreurCode_te ListNext(void); - erreurCode_te ListFirst(void); - erreurCode_te ListLast(void); - erreurCode_te ListPlay(void); // List playing - erreurCode_te ListStop(void); // List stopping + bool ListAdd(etk::UString file); + bool ListRm(etk::UString file); + bool ListClean(void); + bool ListPrevious(void); + bool ListNext(void); + bool ListFirst(void); + bool ListLast(void); + bool ListPlay(void); // List playing + bool ListStop(void); // List stopping - erreurCode_te Play(etk::UString file); // play specific file ... pause the list element; - erreurCode_te Stop(void); + bool Play(etk::UString file); // play specific file ... pause the list element; + bool Stop(void); // in db float VolumeGet(void); diff --git a/sources/ewol/widget/Button.cpp b/sources/ewol/widget/Button.cpp index 7c319f59..617133c8 100644 --- a/sources/ewol/widget/Button.cpp +++ b/sources/ewol/widget/Button.cpp @@ -450,21 +450,21 @@ bool widget::Button::LoadXML(exml::Element* _element) } etk::UString widgetName = pNode->GetValue(); if (ewol::widgetManager::Exist(widgetName) == false) { - EWOL_ERROR("(l "<Pos()<<") Unknown basic node=\"" << widgetName << "\" not in : [" << ewol::widgetManager::List() << "]" ); + EWOL_ERROR("(l "<GetPos()<<") Unknown basic node=\"" << widgetName << "\" not in : [" << ewol::widgetManager::List() << "]" ); continue; } bool toogleMode=false; if (NULL != GetSubWidget()) { toogleMode=true; if (NULL != GetSubWidgetToggle()) { - EWOL_ERROR("(l "<Pos()<<") " << __class__ << " Can only have one subWidget ??? node=\"" << widgetName << "\"" ); + EWOL_ERROR("(l "<GetPos()<<") " << __class__ << " Can only have one subWidget ??? node=\"" << widgetName << "\"" ); continue; } } EWOL_DEBUG("try to create subwidget : '" << widgetName << "'"); ewol::Widget* tmpWidget = ewol::widgetManager::Create(widgetName); if (tmpWidget == NULL) { - EWOL_ERROR ("(l "<Pos()<<") Can not create the widget : \"" << widgetName << "\""); + EWOL_ERROR ("(l "<GetPos()<<") Can not create the widget : \"" << widgetName << "\""); continue; } // add widget : @@ -475,7 +475,7 @@ bool widget::Button::LoadXML(exml::Element* _element) SetSubWidgetToggle(tmpWidget); } if (false == tmpWidget->LoadXML(pNode)) { - EWOL_ERROR ("(l "<Pos()<<") can not load widget properties : \"" << widgetName << "\""); + EWOL_ERROR ("(l "<GetPos()<<") can not load widget properties : \"" << widgetName << "\""); return false; } } diff --git a/sources/ewol/widget/Container.cpp b/sources/ewol/widget/Container.cpp index 24a5309b..d9b56365 100644 --- a/sources/ewol/widget/Container.cpp +++ b/sources/ewol/widget/Container.cpp @@ -185,23 +185,23 @@ bool widget::Container::LoadXML(exml::Element* _node) } etk::UString widgetName = pNode->GetValue(); if (ewol::widgetManager::Exist(widgetName) == false) { - EWOL_ERROR("(l "<Pos()<<") Unknown basic node=\"" << widgetName << "\" not in : [" << ewol::widgetManager::List() << "]" ); + EWOL_ERROR("(l "<GetPos()<<") Unknown basic node=\"" << widgetName << "\" not in : [" << ewol::widgetManager::List() << "]" ); continue; } if (NULL != GetSubWidget()) { - EWOL_ERROR("(l "<Pos()<<") " << __class__ << " Can only have one subWidget ??? node=\"" << widgetName << "\"" ); + EWOL_ERROR("(l "<GetPos()<<") " << __class__ << " Can only have one subWidget ??? node=\"" << widgetName << "\"" ); continue; } EWOL_DEBUG("try to create subwidget : '" << widgetName << "'"); ewol::Widget* tmpWidget = ewol::widgetManager::Create(widgetName); if (tmpWidget == NULL) { - EWOL_ERROR ("(l "<Pos()<<") Can not create the widget : \"" << widgetName << "\""); + EWOL_ERROR ("(l "<GetPos()<<") Can not create the widget : \"" << widgetName << "\""); continue; } // add widget : SetSubWidget(tmpWidget); if (false == tmpWidget->LoadXML(pNode)) { - EWOL_ERROR ("(l "<Pos()<<") can not load widget properties : \"" << widgetName << "\""); + EWOL_ERROR ("(l "<GetPos()<<") can not load widget properties : \"" << widgetName << "\""); return false; } } diff --git a/sources/ewol/widget/ContainerN.cpp b/sources/ewol/widget/ContainerN.cpp index 20dea6e8..9801adb8 100644 --- a/sources/ewol/widget/ContainerN.cpp +++ b/sources/ewol/widget/ContainerN.cpp @@ -311,13 +311,13 @@ bool widget::ContainerN::LoadXML(exml::Element* _node) } etk::UString widgetName = pNode->GetValue(); if (ewol::widgetManager::Exist(widgetName) == false) { - EWOL_ERROR("[" << GetId() << "] {" << GetObjectType() << "} (l "<Pos()<<") Unknown basic node=\"" << widgetName << "\" not in : [" << ewol::widgetManager::List() << "]" ); + EWOL_ERROR("[" << GetId() << "] {" << GetObjectType() << "} (l "<GetPos()<<") Unknown basic node=\"" << widgetName << "\" not in : [" << ewol::widgetManager::List() << "]" ); continue; } EWOL_DEBUG("[" << GetId() << "] {" << GetObjectType() << "} load new element : \"" << widgetName << "\""); ewol::Widget *subWidget = ewol::widgetManager::Create(widgetName); if (subWidget == NULL) { - EWOL_ERROR ("[" << GetId() << "] {" << GetObjectType() << "} (l "<Pos()<<") Can not create the widget : \"" << widgetName << "\""); + EWOL_ERROR ("[" << GetId() << "] {" << GetObjectType() << "} (l "<GetPos()<<") Can not create the widget : \"" << widgetName << "\""); continue; } // add sub element : @@ -327,7 +327,7 @@ bool widget::ContainerN::LoadXML(exml::Element* _node) SubWidgetAddStart(subWidget); } if (false == subWidget->LoadXML(pNode)) { - EWOL_ERROR ("[" << GetId() << "] {" << GetObjectType() << "} (l "<Pos()<<") can not load widget properties : \"" << widgetName << "\""); + EWOL_ERROR ("[" << GetId() << "] {" << GetObjectType() << "} (l "<GetPos()<<") can not load widget properties : \"" << widgetName << "\""); return false; } }