Make StreamWindow create the Session

This commit is contained in:
Florian Märkl 2019-08-03 14:01:55 +02:00
commit 8e15f498c2
No known key found for this signature in database
GPG key ID: 125BC8A5A6A1E857
6 changed files with 71 additions and 42 deletions

View file

@ -43,6 +43,16 @@ class ChiakiException : public std::exception
const char *what() const noexcept override { return msg.toLocal8Bit().constData(); }
};
struct StreamSessionConnectInfo
{
QString host;
QString registkey;
QString ostype;
QString auth;
QString morning;
QString did;
};
class StreamSession : public QObject
{
friend class StreamSessionPrivate;
@ -67,7 +77,7 @@ class StreamSession : public QObject
void PushVideoSample(uint8_t *buf, size_t buf_size);
public:
explicit StreamSession(const QString &host, const QString &registkey, const QString &ostype, const QString &auth, const QString &morning, const QString &did, QObject *parent = nullptr);
explicit StreamSession(const StreamSessionConnectInfo &connect_info, QObject *parent = nullptr);
~StreamSession();
void Stop();

View file

@ -20,15 +20,16 @@
#include <QMainWindow>
#include "streamsession.h"
class QLabel;
class StreamSession;
class StreamWindow: public QMainWindow
{
Q_OBJECT
public:
explicit StreamWindow(StreamSession *session, QWidget *parent = nullptr);
explicit StreamWindow(const StreamSessionConnectInfo &connect_info, QWidget *parent = nullptr);
~StreamWindow();
private: