github/chiaki
1
0
Fork 0
mirror of https://git.sr.ht/~thestr4ng3r/chiaki synced 2025-07-15 01:23:37 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Toggle Discovery

Browse source
This commit is contained in:
Florian Märkl 2019-08-14 20:22:26 +02:00
parent 696cf7823f
commit fd0bf8600d
No known key found for this signature in database
GPG key ID: 125BC8A5A6A1E857
8 changed files with 134 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

15
gui/src/main.cpp
View file

@ -3,6 +3,7 @@
#include <videodecoder.h>
#include <mainwindow.h>
#include <streamsession.h>
#include <settings.h>
#include <chiaki-cli.h>
@ -28,13 +29,16 @@ static const QMap<QString, CLICommand> cli_commands = {
};
int RunStream(QApplication &app, const StreamSessionConnectInfo &connect_info);
int RunMain(QApplication &app);
int RunMain(QApplication &app, Settings *settings);
int main(int argc, char *argv[])
{
qRegisterMetaType<DiscoveryHost>();
qRegisterMetaType<ChiakiQuitReason>();
QApplication::setOrganizationName("Chiaki");
QApplication::setApplicationName("Chiaki");
ChiakiErrorCode err = chiaki_lib_init();
if(err != CHIAKI_ERR_SUCCESS)
{
@ -43,7 +47,8 @@ int main(int argc, char *argv[])
}
QApplication app(argc, argv);
QApplication::setApplicationName("Chiaki");
Settings settings;
QCommandLineParser parser;
parser.setOptionsAfterPositionalArgumentsMode(QCommandLineParser::ParseAsPositionalArguments);
@ -76,7 +81,7 @@ int main(int argc, char *argv[])
QStringList args = parser.positionalArguments();
if(args.length() == 0)
return RunMain(app);
return RunMain(app, &settings);
if(args[0] == "stream")
{
@ -129,9 +134,9 @@ int main(int argc, char *argv[])
}
}
int RunMain(QApplication &app)
int RunMain(QApplication &app, Settings *settings)
{
MainWindow main_window;
MainWindow main_window(settings);
main_window.show();
return app.exec();
}