From 39b5f30c73027a4366783be97bf856290aeea80b Mon Sep 17 00:00:00 2001 From: jussi Date: Thu, 3 Oct 2019 16:47:03 +0300 Subject: [PATCH] assignable: install nvidia module --- .gitignore | 1 + src/lib/tc_module.c | 1 - src/modules/assignable/meson.build | 4 +++- src/modules/assignable/nvidia_linux.c | 2 +- src/modules/interface/qt/widgets/AssignableWidget.cpp | 5 ++++- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index b23818b..f2864c9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ build /*kdev* +**/*swp* diff --git a/src/lib/tc_module.c b/src/lib/tc_module.c index 95f4001..5d7dd94 100644 --- a/src/lib/tc_module.c +++ b/src/lib/tc_module.c @@ -83,7 +83,6 @@ tc_module_t *tc_module_find(enum tc_module_category category, const char *name) // Call the function to get the module handle tc_module_t *(*mod_info_func)() = tc_dlsym(handle, TC_MODULE_INFO_FUNCTION_NAME); - //return mod_info_func(); tc_module_t *mod; if ((mod = mod_info_func()) == NULL) { tc_dlclose(handle); diff --git a/src/modules/assignable/meson.build b/src/modules/assignable/meson.build index 78db325..d9230fd 100644 --- a/src/modules/assignable/meson.build +++ b/src/modules/assignable/meson.build @@ -17,5 +17,7 @@ if all_nvidia_linux_libs shared_library('nvidia', 'nvidia_linux.c', include_directories : incdir, dependencies : nvidia_linux_libs, - link_with : libtuxclocker) + link_with : libtuxclocker, + install_dir : get_option('libdir') / 'tuxclocker' / 'modules' / 'assignable', + install : true) endif diff --git a/src/modules/assignable/nvidia_linux.c b/src/modules/assignable/nvidia_linux.c index 6d8c76d..49ea562 100644 --- a/src/modules/assignable/nvidia_linux.c +++ b/src/modules/assignable/nvidia_linux.c @@ -32,7 +32,7 @@ tc_module_t mod_info = { .description = "Nvidia assignables", .init_callback = &init, .close_callback = &close, - .category_data_callback = (void *(*)())&category_callback + .category_data_callback = (void *(*)()) &category_callback }; tc_module_t *TC_MODULE_INFO_FUNCTION() { diff --git a/src/modules/interface/qt/widgets/AssignableWidget.cpp b/src/modules/interface/qt/widgets/AssignableWidget.cpp index 27a29e1..461172d 100644 --- a/src/modules/interface/qt/widgets/AssignableWidget.cpp +++ b/src/modules/interface/qt/widgets/AssignableWidget.cpp @@ -11,7 +11,7 @@ AssignableWidget::AssignableWidget(QWidget *parent) : QWidget(parent) { m_mainLayout->addWidget(m_splitter); m_assignableTreeView = new QTreeView; - //genAssignableTree(m_assignableTreeView); + genAssignableTree(m_assignableTreeView); m_splitter->addWidget(m_assignableTreeView); m_assignableEditor = new AssignableEditor; @@ -32,6 +32,9 @@ void AssignableWidget::genAssignableTree(QTreeView* treeView) { } printf("opened nv mod\n"); } + else { + return; + } QTreeWidgetItem *item = new QTreeWidgetItem; tc_assignable_node_t *parent = (tc_assignable_node_t*) nv_mod->category_data_callback();