X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=app%2Fmain.cpp;h=2058ff98c57baaf821401a901d8b00be4880dfd1;hb=refs%2Fchanges%2F46%2F27646%2F1;hp=8fa8117e7cd005a0c2db07d27ca3804264b9acba;hpb=13bb3fad73f1933e75ea17e101c5f8a3d2c2f561;p=apps%2Fmediaplayer.git

diff --git a/app/main.cpp b/app/main.cpp
index 8fa8117..2058ff9 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -15,94 +15,34 @@
  * limitations under the License.
  */
 
-#include <QtCore/QCommandLineParser>
 #include <QtCore/QDebug>
-#include <QtCore/QDir>
-#include <QtCore/QStandardPaths>
-#include <QtCore/QUrlQuery>
 #include <QtGui/QGuiApplication>
 #include <QtQml/QQmlApplicationEngine>
 #include <QtQml/QQmlContext>
 #include <QtQml/qqml.h>
 #include <QtQuickControls2/QQuickStyle>
 #include <QQuickWindow>
-#include <libhomescreen.hpp>
-#include <qlibwindowmanager.h>
-#include <bluetooth.h>
+
 #include <mediaplayer.h>
+#include <vehiclesignals.h>
+
+#include <unistd.h>
 
 int main(int argc, char *argv[])
 {
-    QString myname = QString("MediaPlayer");
-
+    QString graphic_role = QString("music");
     QGuiApplication app(argc, argv);
 
     QQuickStyle::setStyle("AGL");
 
     QQmlApplicationEngine engine;
     QQmlContext *context = engine.rootContext();
+    context->setContextProperty("AlbumArt", "");
+    context->setContextProperty("mediaplayer", new Mediaplayer(context));
+    VehicleSignalsConfig vsConfig("mediaplayer");
+    context->setContextProperty("VehicleSignals", new VehicleSignals(vsConfig));
 
-    QCommandLineParser parser;
-    parser.addPositionalArgument("port", app.translate("main", "port for binding"));
-    parser.addPositionalArgument("secret", app.translate("main", "secret for binding"));
-    parser.addHelpOption();
-    parser.addVersionOption();
-    parser.process(app);
-    QStringList positionalArguments = parser.positionalArguments();
-
-    if (positionalArguments.length() == 2) {
-        int port = positionalArguments.takeFirst().toInt();
-        QString secret = positionalArguments.takeFirst();
-        QUrl bindingAddress;
-        bindingAddress.setScheme(QStringLiteral("ws"));
-        bindingAddress.setHost(QStringLiteral("localhost"));
-        bindingAddress.setPort(port);
-        bindingAddress.setPath(QStringLiteral("/api"));
-        QUrlQuery query;
-        query.addQueryItem(QStringLiteral("token"), secret);
-        bindingAddress.setQuery(query);
-        context->setContextProperty(QStringLiteral("bindingAddress"), bindingAddress);
-        std::string token = secret.toStdString();
-        LibHomeScreen* hs = new LibHomeScreen();
-        QLibWindowmanager* qwm = new QLibWindowmanager();
-
-        // WindowManager
-        if(qwm->init(port,secret) != 0){
-            exit(EXIT_FAILURE);
-        }
-        // Request a surface as described in layers.json windowmanager’s file
-        if (qwm->requestSurface(myname) != 0) {
-            exit(EXIT_FAILURE);
-        }
-        // Create an event callback against an event type. Here a lambda is called when SyncDraw event occurs
-        qwm->set_event_handler(QLibWindowmanager::Event_SyncDraw, [qwm, myname](json_object *object) {
-            fprintf(stderr, "Surface got syncDraw!\n");
-            qwm->endDraw(myname);
-        });
-
-        // HomeScreen
-        hs->init(port, token.c_str());
-        // Set the event handler for Event_TapShortcut which will activate the surface for windowmanager
-        hs->set_event_handler(LibHomeScreen::Event_TapShortcut, [qwm, myname](json_object *object){
-            json_object *appnameJ = nullptr;
-            if(json_object_object_get_ex(object, "application_name", &appnameJ))
-            {
-                const char *appname = json_object_get_string(appnameJ);
-                if(myname == appname)
-                {
-                    qDebug("Surface %s got tapShortcut\n", appname);
-                    qwm->activateSurface(myname);
-                }
-            }
-        });
+    engine.load(QUrl(QStringLiteral("qrc:/MediaPlayer.qml")));
 
-        context->setContextProperty("mediaplayer", new Mediaplayer(bindingAddress));
-        context->setContextProperty("bluetooth_connection", new Bluetooth(bindingAddress));
-        engine.load(QUrl(QStringLiteral("qrc:/MediaPlayer.qml")));
-        QObject *root = engine.rootObjects().first();
-        QQuickWindow *window = qobject_cast<QQuickWindow *>(root);
-        QObject::connect(window, SIGNAL(frameSwapped()), qwm, SLOT(slotActivateSurface()
-        ));
-    }
     return app.exec();
 }