Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 12:42:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

We are so close...

Browse source
This commit is contained in:
Zach Fox 2019-11-13 17:35:57 -08:00
parent 8255210c6a
commit b4135e2655
2 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/Application.cpp
View file

@ -893,7 +893,6 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) {
#ifdef HAVE_DDE #ifdef HAVE_DDE
DependencyManager::set<DdeFaceTracker>(); DependencyManager::set<DdeFaceTracker>();
#endif #endif
DependencyManager::set<ScreenshareScriptingInterface>();
DependencyManager::set<AudioClient>(); DependencyManager::set<AudioClient>();
DependencyManager::set<AudioScope>(); DependencyManager::set<AudioScope>();
DependencyManager::set<DeferredLightingEffect>(); DependencyManager::set<DeferredLightingEffect>();
@ -973,6 +972,7 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) {
DependencyManager::set<KeyboardScriptingInterface>(); DependencyManager::set<KeyboardScriptingInterface>();
DependencyManager::set<GrabManager>(); DependencyManager::set<GrabManager>();
DependencyManager::set<AvatarPackager>(); DependencyManager::set<AvatarPackager>();
DependencyManager::set<ScreenshareScriptingInterface>();
PlatformHelper::setup(); PlatformHelper::setup();
QObject::connect(PlatformHelper::instance(), &PlatformHelper::systemWillWake, [] { QObject::connect(PlatformHelper::instance(), &PlatformHelper::systemWillWake, [] {

16
interface/src/scripting/ScreenshareScriptingInterface.cpp
View file

@ -135,23 +135,21 @@ void ScreenshareScriptingInterface::stopScreenshare() {
void ScreenshareScriptingInterface::handleSuccessfulScreenshareInfoGet(QNetworkReply* reply) { void ScreenshareScriptingInterface::handleSuccessfulScreenshareInfoGet(QNetworkReply* reply) {
QString answer = reply->readAll(); QString answer = reply->readAll();
qDebug() << "\n\n MN HERE: REPLY" << answer;
QByteArray answerByteArray = answer.toUtf8(); QByteArray answerByteArray = answer.toUtf8();
QJsonDocument answerJSONObject = QJsonDocument::fromJson(answerByteArray); QJsonDocument answerJSONObject = QJsonDocument::fromJson(answerByteArray);
QString status = answerJSONObject["status"].toString(); QString status = answerJSONObject["status"].toString();
if (status != "success") { if (status != "success") {
qDebug() << "\n\n MN HERE: SCREENSHARE REPLY FAIL"; qDebug() << "Error when retrieving screenshare info via HTTP. Error:" << reply->errorString();
stopScreenshare(); stopScreenshare();
emit screenshareError(); emit screenshareError();
return; return;
} }
_token = answerJSONObject["token"].toString(); _token = answerJSONObject["token"].toString();
_projectAPIKey = answerJSONObject["projectAPIKey"].toString(); _projectAPIKey = answerJSONObject["projectApiKey"].toString();
_sessionID = answerJSONObject["sessionID"].toString(); _sessionID = answerJSONObject["sessionID"].toString();
qDebug() << "token:" << _token << " projectAPIKey:" << _projectAPIKey << " sessionID: " << _sessionID;
if (_token.isEmpty() || _projectAPIKey.isEmpty() || _sessionID.isEmpty()) { if (_token.isEmpty() || _projectAPIKey.isEmpty() || _sessionID.isEmpty()) {
qDebug() << "Not all Screen Share information was retrieved from the backend. Stopping..."; qDebug() << "Not all Screen Share information was retrieved from the backend. Stopping...";
@ -167,16 +165,10 @@ void ScreenshareScriptingInterface::handleSuccessfulScreenshareInfoGet(QNetworkR
arguments << "--projectAPIKey=" + _projectAPIKey << " "; arguments << "--projectAPIKey=" + _projectAPIKey << " ";
arguments << "--sessionID=" + _sessionID << " "; arguments << "--sessionID=" + _sessionID << " ";
connect(_screenshareProcess.get(), &QProcess::errorOccurred,
[=](QProcess::ProcessError error) { qDebug() << "ZRF QProcess::errorOccurred. `error`:" << error; });
connect(_screenshareProcess.get(), &QProcess::started, [=]() { qDebug() << "ZRF QProcess::started"; });
connect(_screenshareProcess.get(), &QProcess::stateChanged, [=](QProcess::ProcessState newState) {
qDebug() << "ZRF QProcess::stateChanged. `newState`:" << newState;
});
connect(_screenshareProcess.get(), QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), connect(_screenshareProcess.get(), QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished),
[=](int exitCode, QProcess::ExitStatus exitStatus) { [=](int exitCode, QProcess::ExitStatus exitStatus) {
qDebug() << "ZRF QProcess::finished. `exitCode`:" << exitCode << "`exitStatus`:" << exitStatus;
stopScreenshare(); stopScreenshare();
emit screenshareProcessTerminated();
}); });
_screenshareProcess->start(SCREENSHARE_EXE_PATH, arguments); _screenshareProcess->start(SCREENSHARE_EXE_PATH, arguments);
@ -214,7 +206,7 @@ void ScreenshareScriptingInterface::handleSuccessfulScreenshareInfoGet(QNetworkR
} }
void ScreenshareScriptingInterface::handleFailedScreenshareInfoGet(QNetworkReply* reply) { void ScreenshareScriptingInterface::handleFailedScreenshareInfoGet(QNetworkReply* reply) {
qDebug() << "\n\n MN HERE: handleFailedScreenshareInfoGet():" << reply->readAll(); qDebug() << "Failed to get screenshare info via HTTP. Error:" << reply->errorString();
stopScreenshare(); stopScreenshare();
emit screenshareError(); emit screenshareError();
} }