mirror of
https://github.com/hyperion-project/hyperion.ng.git
synced 2023-10-10 13:36:59 +02:00
510bb903ae
* Disable AVAHI * Replace SysInfo backport with Qt SysInfo * Update vscode config * Update LedDevices * Update Logger * Update hyperiond * Update hyperion-remote * Exclude avahi * Empty definition for Process * PythonInit path broken * Exclude PiBlaster and link ws2_32 * more avahi * resolve ui bug * Update Compile howto * JsonAPI QtGrabber missing * fix error * ssize_t replacement * Nope, doesn't work * Adjust compile description and verify winSDK * Update ci script * Update ci script * Update ci * Update ci script * update Logger * Update PythonInit * added Azure & GitHub Actions, Logger, PythonInit * resolve merge conflicts * revert ssize_t in FadeCandy * look at registry for QT5 & use find_package(Python) if cmake >= 3.12 * second try * another try * and yet another test * qt5 registry search undone * Package creation test * finished package creation. only fine tuning is required :-) Signed-off-by: Paulchen-Panther <Paulchen-Panter@protonmail.com> * Dependencies for Windows finished Signed-off-by: Paulchen-Panther <Paulchen-Panter@protonmail.com> * use 'add_definitions()' until CMake 3.12 Signed-off-by: Paulchen-Panther <Paulchen-Panter@protonmail.com> * Update .github/workflows/pull-request.yml Co-Authored-By: Paulchen Panther <16664240+Paulchen-Panther@users.noreply.github.com> * Update cmake/Dependencies.cmake Co-Authored-By: brindosch <edeltraud70@gmx.de> * fix typo/ add VCINSTALLDIR var * fix again * Undo change again (Not working) * fix QT grabber Signed-off-by: Paulchen-Panther <Paulchen-Panter@protonmail.com> * first NSIS test Signed-off-by: Paulchen-Panther <Paulchen-Panter@protonmail.com> * Update NSIS package * surprise :-) Signed-off-by: Paulchen-Panther <Paulchen-Panter@protonmail.com> * Update NSIS package * fix: NSIS .bmps * Add nsis templates * Force windows gui app * fix: QSysInfo required Qt5.6, now it's 5.4 again * Update: Remove platform component and adjust package name * Add macOS as system name * Update docs * fix: Allow gh actions ci also for forks with branches * Add ReadMe docs, mention windows, add vscode linux debug config * fix: readme visual * reduce/hide banner/copyright/log message Infos here: https://docs.microsoft.com/de-de/visualstudio/msbuild/msbuild-command-line-reference?view=vs-2019#switches * Fix PythonInit * vscode: Add runner task * fix(vscode): compiler path gcc ver independent * fix azure * vscode: add windows run tasks * move process detection * main: add windows process detection * Azure file shredder * Update docs Co-authored-by: Paulchen Panther <16664240+Paulchen-Panther@users.noreply.github.com> Co-authored-by: Paulchen-Panther <Paulchen-Panter@protonmail.com>
62 lines
1.5 KiB
C++
62 lines
1.5 KiB
C++
#undef slots
|
|
#include <Python.h>
|
|
#define slots
|
|
|
|
// utils
|
|
#include <utils/Logger.h>
|
|
|
|
#include <python/PythonInit.h>
|
|
#include <python/PythonUtils.h>
|
|
|
|
// qt include
|
|
#include <QCoreApplication>
|
|
#include <QDir>
|
|
|
|
// modules to init
|
|
#include <effectengine/EffectModule.h>
|
|
|
|
#ifdef _WIN32
|
|
#define STRINGIFY2(x) #x
|
|
#define STRINGIFY(x) STRINGIFY2(x)
|
|
#endif
|
|
|
|
PythonInit::PythonInit()
|
|
{
|
|
// register modules
|
|
EffectModule::registerHyperionExtensionModule();
|
|
|
|
// set Python module path when exists
|
|
wchar_t *pythonPath = Py_DecodeLocale((QDir::cleanPath(qApp->applicationDirPath() + "/../lib/python")).toLatin1().data(), nullptr);
|
|
#ifdef _WIN32
|
|
pythonPath = Py_DecodeLocale((QDir::cleanPath(qApp->applicationDirPath())).toLatin1().data(), nullptr);
|
|
pythonPath = wcscat(pythonPath, L"/python" STRINGIFY(PYTHON_VERSION_MAJOR_MINOR) ".zip");
|
|
if(QFile(QString::fromWCharArray(pythonPath)).exists())
|
|
#else
|
|
if(QDir(QString::fromWCharArray(pythonPath)).exists())
|
|
#endif
|
|
|
|
{
|
|
Py_NoSiteFlag++;
|
|
Py_SetPath(pythonPath);
|
|
PyMem_RawFree(pythonPath);
|
|
}
|
|
|
|
// init Python
|
|
Debug(Logger::getInstance("DAEMON"), "Initializing Python interpreter");
|
|
Py_InitializeEx(0);
|
|
if ( !Py_IsInitialized() )
|
|
{
|
|
throw std::runtime_error("Initializing Python failed!");
|
|
}
|
|
|
|
PyEval_InitThreads(); // Create the GIL
|
|
mainThreadState = PyEval_SaveThread();
|
|
}
|
|
|
|
PythonInit::~PythonInit()
|
|
{
|
|
Debug(Logger::getInstance("DAEMON"), "Cleaning up Python interpreter");
|
|
PyEval_RestoreThread(mainThreadState);
|
|
Py_Finalize();
|
|
}
|