Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-05 23:42:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

logging ids

Browse source
This commit is contained in:
milad 2019-11-01 10:51:23 -07:00
parent 240764caa9
commit 1b3367fcf9
4 changed files with 25 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -9,12 +9,14 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
#include "ScreenshareScriptingInterface.h"
#include <QThread>
#include <QDesktopServices>
#include <QUrl>
#include <QCoreApplication>
#include <QDesktopServices>
#include <QThread>
#include <QUrl>
#include <AddressManager.h>
#include "ScreenshareScriptingInterface.h"
ScreenshareScriptingInterface::ScreenshareScriptingInterface() {
};
@ -23,16 +25,11 @@ ScreenshareScriptingInterface::~ScreenshareScriptingInterface() {
stopScreenshare();
}
void ScreenshareScriptingInterface::startScreenshare(QString displayName, QString userName, QString token, QString sessionID, QString apiKey) {
void ScreenshareScriptingInterface::startScreenshare(const QString& roomName) {
if (QThread::currentThread() != thread()) {
// We must start a new QProcess from the main thread.
QMetaObject::invokeMethod(
this, "startScreenshare",
Q_ARG(QString, displayName),
Q_ARG(QString, userName),
Q_ARG(QString, token),
Q_ARG(QString, sessionID),
Q_ARG(QString, apiKey)
this, "startScreenshare"
);
return;
}
@ -50,14 +47,15 @@ void ScreenshareScriptingInterface::startScreenshare(QString displayName, QStrin
return;
}
if (displayName.isEmpty() || userName.isEmpty() || token.isEmpty() || sessionID.isEmpty() || apiKey.isEmpty()) {
qDebug() << "Screenshare executable can't launch without connection info.";
return;
}
QUuid currentDomainID = DependencyManager::get<AddressManager>()->getDomainID();
// Make HTTP GET request to:
// `https://metaverse.highfidelity.com/api/v1/domain/:domain_id/screenshare`,
// passing the Domain ID that the user is connected to, as well as the `roomName`.
// The server will respond with the relevant OpenTok Token, Session ID, and API Key.
// Upon error-free response, do the logic below, passing in that info as necessary.
QStringList arguments;
arguments << "--userName=" + userName;
arguments << "--displayName=" + displayName;
arguments << "--token=" + token;
arguments << "--apiKey=" + apiKey;
arguments << "--sessionID=" + sessionID;

2
interface/src/scripting/ScreenshareScriptingInterface.h
View file

@ -14,7 +14,7 @@ public:
ScreenshareScriptingInterface();
~ScreenshareScriptingInterface();
Q_INVOKABLE void startScreenshare(QString displayName, QString userName, QString token, QString sessionID, QString apiKey);
Q_INVOKABLE void startScreenshare(const QString& roomName);
Q_INVOKABLE void stopScreenshare();
signals:

10
screenshare/src/app.js
View file

@ -117,8 +117,12 @@ function togglePage(){
}
for (let source of sources) {
console.log(JSON.stringify(sources,null,4));
sourceMap[source.id] = source;
addSource(source, "selects");
//*if (source.id.indexOf("screen") > -1) {
// console.log("Adding:", source.id)
addSource(source, "selects");
//}
}
});
}
@ -200,7 +204,7 @@ function togglePage(){
var publisherOptions = {
videoSource: stream.getVideoTracks()[0],
audioSource: stream.getAudioTracks()[0],
audioSource: null,
insertMode: 'append',
width: 1280,
height: 720
@ -268,4 +272,4 @@ function togglePage(){
document.addEventListener("DOMContentLoaded", () => {
startup();
showSources();
})
})

5
screenshare/src/main.js
View file

@ -33,11 +33,10 @@ function createWindow(){
useContentSize: true,
zoomFactor: zoomFactor,
resizable: false,
alwaysOnTop: true, // TRY
alwaysOnTop: false, // TRY
webPreferences: {
nodeIntegration: true
},
devTools: true
}
});
window.loadURL('file://' + __dirname + '/index.html');
window.setMenu(null);