IntenseWebs/tuxclocker
3
0
Fork 0
mirror of https://github.com/Lurkki14/tuxclocker.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

daemon: use new module structure

Browse Source
This commit is contained in:
jussi 2020-01-24 17:15:44 +02:00
parent 3ccdaade85
commit 2c570133f9
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/tuxclockerd/main.cpp
View File

@ -27,7 +27,8 @@ void registerReadables(QObject *parent, QDBusConnection conn) {
QList <tc_readable_module_data_t> dataList;
for (uint16_t i = 0; i < count; i++) {
if (modules[i]->init_callback && modules[i]->init_callback() == TC_SUCCESS) {
auto mod = modules[i];
/*if (modules[i]->init_callback && modules[i]->init_callback() == TC_SUCCESS) {
auto &module = modules[i];
// Module was initialized successfully
// TODO : make a function in the lib to get a list of category specific data
@ -37,6 +38,14 @@ void registerReadables(QObject *parent, QDBusConnection conn) {
break;
}
}
}*/
for (uint16_t i = 0; i < mod->category_info.num_categories; i++) {
if (mod->category_info.category_data_list[i].category == TC_READABLE
&& mod->category_info.category_data_list[i].init
&& mod->category_info.category_data_list[i].init() == TC_SUCCESS) {
dataList.append(mod->category_info.category_data_list[i].readable_data());
break;
}
}
}
@ -65,8 +74,6 @@ void registerReadables(QObject *parent, QDBusConnection conn) {
traverse(data.root_node->children_nodes[i], data, p, 0);
}
}
qDebug() << dataList.length();
}
void registerAssignables(QObject *parent, QDBusConnection conn) {
@ -76,7 +83,7 @@ void registerAssignables(QObject *parent, QDBusConnection conn) {
QList <tc_assignable_module_data_t> dataList;
for (uint16_t i = 0; i < count; i++) {
if (modules[i]->init_callback && modules[i]->init_callback() == TC_SUCCESS) {
/*if (modules[i]->init_callback && modules[i]->init_callback() == TC_SUCCESS) {
auto &module = modules[i];
for (uint16_t i = 0; i < module->category_info.num_categories; i++) {
if (module->category_info.category_data_list[i].category == TC_ASSIGNABLE) {
@ -84,6 +91,15 @@ void registerAssignables(QObject *parent, QDBusConnection conn) {
break;
}
}
}*/
auto mod = modules[i];
for (uint16_t i = 0; i < mod->category_info.num_categories; i++) {
if (mod->category_info.category_data_list[i].category == TC_ASSIGNABLE
&& mod->category_info.category_data_list[i].init
&& mod->category_info.category_data_list[i].init() == TC_SUCCESS) {
dataList.append(mod->category_info.category_data_list[i].assignable_data());
break;
}
}
}