Code Review
/
apps
/
mediaplayer.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Remove libhomescreen dependency
[apps/mediaplayer.git]
/
app
/
main.cpp
diff --git
a/app/main.cpp
b/app/main.cpp
index
63e408a
..
d72c492
100644
(file)
--- a/
app/main.cpp
+++ b/
app/main.cpp
@@
-1,5
+1,6
@@
/*
* Copyright (C) 2016 The Qt Company Ltd.
/*
* Copyright (C) 2016 The Qt Company Ltd.
+ * Copyright (C) 2017 Konsulko Group
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-24,30
+25,20
@@
#include <QtQml/QQmlContext>
#include <QtQml/qqml.h>
#include <QtQuickControls2/QQuickStyle>
#include <QtQml/QQmlContext>
#include <QtQml/qqml.h>
#include <QtQuickControls2/QQuickStyle>
+#include <QQuickWindow>
-#ifdef HAVE_LIBHOMESCREEN
-#include <libhomescreen.hpp>
-#endif
+#include <mediaplayer.h>
-#include
"playlistwithmetadata.h"
+#include
<unistd.h>
int main(int argc, char *argv[])
{
int main(int argc, char *argv[])
{
-#ifdef HAVE_LIBHOMESCREEN
- LibHomeScreen libHomeScreen;
-
- if (!libHomeScreen.renderAppToAreaAllowed(0, 1)) {
- qWarning() << "renderAppToAreaAllowed is denied";
- return -1;
- }
-#endif
+ QString graphic_role = QString("music");
QGuiApplication app(argc, argv);
QQuickStyle::setStyle("AGL");
QGuiApplication app(argc, argv);
QQuickStyle::setStyle("AGL");
- qmlRegisterType<PlaylistWithMetadata>("MediaPlayer", 1, 0, "PlaylistWithMetadata");
-
QQmlApplicationEngine engine;
QQmlContext *context = engine.rootContext();
QQmlApplicationEngine engine;
QQmlContext *context = engine.rootContext();
@@
-71,9
+62,11
@@
int main(int argc, char *argv[])
query.addQueryItem(QStringLiteral("token"), secret);
bindingAddress.setQuery(query);
context->setContextProperty(QStringLiteral("bindingAddress"), bindingAddress);
query.addQueryItem(QStringLiteral("token"), secret);
bindingAddress.setQuery(query);
context->setContextProperty(QStringLiteral("bindingAddress"), bindingAddress);
- }
- engine.load(QUrl(QStringLiteral("qrc:/MediaPlayer.qml")));
+ context->setContextProperty("AlbumArt", "");
+ context->setContextProperty("mediaplayer", new Mediaplayer(bindingAddress, context));
+ engine.load(QUrl(QStringLiteral("qrc:/MediaPlayer.qml")));
+ }
return app.exec();
}
return app.exec();
}