mirror of
https://github.com/hyperion-project/hyperion.ng.git
synced 2023-10-10 13:36:59 +02:00
efc2046ab5
* LedDevice - Address clang findings * Fix Windows Warnings * Ensure newInput is initialised * Clean-up unused elements for Plaform Capture * Fix initialization problem and spellings * Address clang findings and spelling corrections * LedDevice clean-ups * Cleanups * Align that getLedCount is int * Have "display" as default for Grabbers * Fix config during start-up for missing elements * Framegrabber Clean-up - Remove non supported grabbers from selection, filter valid options * Typo * Framegrabber.json - Fix property numbering * Preselect active Grabbertype * Sort Grabbernames * Align options with selected element * Fix deletion of pointer to incomplete type 'BonjourBrowserWrapper' * Address macOS compile warnings * Have default layout = 1 LED only to avoid errors as in #673 * Address lgtm findings * Address finding that params passed to LedDevice discovery were not considered * Cleanups after merging with latest master * Update Changelog * Address lgtm findings * Fix comment * Test Fix * Fix Python Warning * Handle Dummy Device assignment correctly * Address delete called on non-final 'commandline::Option' that has virtual functions but non-virtual destructor * Correct that QTimer.start accepts only int * Have Release Python GIL & reset threat state chnage downward compatible * Correct format specifier * LedDevice - add assertions * Readonly DB - Fix merge issue * Smoothing - Fix wrong defaults * LedDevice - correct assertion * Show smoothing config set# in debug and related values. * Suppress error on windows, if default file is "/dev/null" * CMAKE - Allow to define QT_BASE_DIR dynamically via environment-variable * Ignore Visual Studio specific files Co-authored-by: Paulchen Panther <16664240+Paulchen-Panther@users.noreply.github.com>
61 lines
1.5 KiB
C++
61 lines
1.5 KiB
C++
// 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
|
|
#include <stdexcept>
|
|
#endif
|
|
|
|
#define STRINGIFY2(x) #x
|
|
#define STRINGIFY(x) STRINGIFY2(x)
|
|
|
|
PythonInit::PythonInit()
|
|
{
|
|
// register modules
|
|
EffectModule::registerHyperionExtensionModule();
|
|
|
|
// set Python module path when exists
|
|
QString py_patch = QDir::cleanPath(qApp->applicationDirPath() + "/../lib/python");
|
|
QString py_file = QDir::cleanPath(qApp->applicationDirPath() + "/python" + STRINGIFY(PYTHON_VERSION_MAJOR_MINOR) + ".zip");
|
|
|
|
if (QFile(py_file).exists() || QDir(py_patch).exists())
|
|
{
|
|
Py_NoSiteFlag++;
|
|
if (QFile(py_file).exists())
|
|
Py_SetPath(Py_DecodeLocale(py_file.toLatin1().data(), nullptr));
|
|
else if (QDir(py_patch).exists())
|
|
Py_SetPath(Py_DecodeLocale(py_patch.toLatin1().data(), nullptr));
|
|
}
|
|
|
|
// init Python
|
|
Debug(Logger::getInstance("DAEMON"), "Initializing Python interpreter");
|
|
Py_InitializeEx(0);
|
|
if ( !Py_IsInitialized() )
|
|
{
|
|
throw std::runtime_error("Initializing Python failed!");
|
|
}
|
|
|
|
#if (PY_VERSION_HEX < 0x03090000)
|
|
// PyEval_InitThreads became deprecated in Python 3.9 and will be removed in Python 3.11
|
|
PyEval_InitThreads(); // Create the GIL
|
|
#endif
|
|
|
|
mainThreadState = PyEval_SaveThread();
|
|
}
|
|
|
|
PythonInit::~PythonInit()
|
|
{
|
|
Debug(Logger::getInstance("DAEMON"), "Cleaning up Python interpreter");
|
|
PyEval_RestoreThread(mainThreadState);
|
|
Py_Finalize();
|
|
}
|