github/chiaki
1
0
Fork 0
mirror of https://git.sr.ht/~thestr4ng3r/chiaki synced 2025-08-20 13:33:13 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Show MessageBox on Stream Fail

Browse source
This commit is contained in:
Florian Märkl 2019-08-18 12:42:46 +02:00
commit 44e9142886
No known key found for this signature in database
GPG key ID: 125BC8A5A6A1E857
3 changed files with 25 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

1
gui/src/main.cpp
View file

@ -161,7 +161,6 @@ int RunMain(QApplication &app, Settings *settings)
int RunStream(QApplication &app, const StreamSessionConnectInfo &connect_info) int RunStream(QApplication &app, const StreamSessionConnectInfo &connect_info)
{ {
StreamWindow window(connect_info); StreamWindow window(connect_info);
window.show();
app.setQuitOnLastWindowClosed(true); app.setQuitOnLastWindowClosed(true);
return app.exec(); return app.exec();
} }

10
gui/src/mainwindow.cpp
View file

@ -225,15 +225,7 @@ void MainWindow::ServerItemWidgetTriggered()
QString host = server->GetHostAddr(); QString host = server->GetHostAddr();
StreamSessionConnectInfo info(settings, host, server->registered_host.GetRPRegistKey(), server->registered_host.GetRPKey()); StreamSessionConnectInfo info(settings, host, server->registered_host.GetRPRegistKey(), server->registered_host.GetRPKey());
try new StreamWindow(info);
{
auto stream_window = new StreamWindow(info);
stream_window->show();
}
catch(const ChiakiException &e)
{
QMessageBox::critical(this, tr("Stream failed"), e.what());
}
} }
else else
{ {

34
gui/src/streamwindow.cpp
View file

@ -25,18 +25,29 @@
StreamWindow::StreamWindow(const StreamSessionConnectInfo &connect_info, QWidget *parent) StreamWindow::StreamWindow(const StreamSessionConnectInfo &connect_info, QWidget *parent)
: QMainWindow(parent) : QMainWindow(parent)
{ {
session = new StreamSession(connect_info, this); try
{
session = new StreamSession(connect_info, this);
connect(session, &StreamSession::SessionQuit, this, &StreamWindow::SessionQuit); connect(session, &StreamSession::SessionQuit, this, &StreamWindow::SessionQuit);
av_widget = new AVOpenGLWidget(session->GetVideoDecoder(), this); av_widget = new AVOpenGLWidget(session->GetVideoDecoder(), this);
setCentralWidget(av_widget); setCentralWidget(av_widget);
grabKeyboard(); grabKeyboard();
session->Start(); session->Start();
resize(connect_info.video_profile.width, connect_info.video_profile.height); resize(connect_info.video_profile.width, connect_info.video_profile.height);
show();
}
catch(const Exception &e)
{
session = nullptr;
av_widget = nullptr;
QMessageBox::critical(this, tr("Stream failed"), tr("Failed to initialize Stream Session: %1").arg(e.what()));
close();
}
} }
StreamWindow::~StreamWindow() StreamWindow::~StreamWindow()
@ -47,17 +58,20 @@ StreamWindow::~StreamWindow()
void StreamWindow::keyPressEvent(QKeyEvent *event) void StreamWindow::keyPressEvent(QKeyEvent *event)
{ {
session->HandleKeyboardEvent(event); if(session)
session->HandleKeyboardEvent(event);
} }
void StreamWindow::keyReleaseEvent(QKeyEvent *event) void StreamWindow::keyReleaseEvent(QKeyEvent *event)
{ {
session->HandleKeyboardEvent(event); if(session)
session->HandleKeyboardEvent(event);
} }
void StreamWindow::closeEvent(QCloseEvent *) void StreamWindow::closeEvent(QCloseEvent *)
{ {
session->Stop(); if(session)
session->Stop();
} }
void StreamWindow::SessionQuit(ChiakiQuitReason reason, const QString &reason_str) void StreamWindow::SessionQuit(ChiakiQuitReason reason, const QString &reason_str)