Merage homescreen-2017 modification to homescreen.

    1. Add "Remove useless ref to pulseaudio" commit to homescreen.
    2. Remove launch app code for my mistake merging.
    Right now this source is same as a8b94699ae7ec155729fcccda2be4f22328ca790.

Relative Commit:
https://gerrit.automotivelinux.org/gerrit/#/c/15563/

Change-Id: I966e86c73d9f66ac7a7ff6763be3544ecaba28cd
Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
Signed-off-by: Stephane Desneux <stephane.desneux@iot.bzh>
Signed-off-by: zheng_wenlong <wenlong_zheng@nexty-ele.com>

diff --git a/homescreen/src/main.cpp b/homescreen/src/main.cpp
index 63edd54..19bb0d3 100644 (file)
--- a/homescreen/src/main.cpp
+++ b/homescreen/src/main.cpp
@@ -140,8 +140,5 @@ int main(int argc, char *argv[])
     QQuickWindow *window = qobject_cast<QQuickWindow *>(root);
     QObject::connect(window, SIGNAL(frameSwapped()), layoutHandler, SLOT(slotActivateSurface()));
 
-    // start homescreen appplications
-    launcher->launch("launcher@0.1");   //Launcher
-
     return a.exec();
 }

diff --git a/homescreen/src/mastervolume.cpp b/homescreen/src/mastervolume.cpp
index 5e1e450..9fb92a9 100644 (file)
--- a/homescreen/src/mastervolume.cpp
+++ b/homescreen/src/mastervolume.cpp
@@ -16,7 +16,7 @@
 
 #include "mastervolume.h"
 
-void MasterVolume::setVolume(pa_volume_t volume)
+void MasterVolume::setVolume(int volume)
 {
        int volume_delta = volume - m_volume;
        m_volume = volume;

diff --git a/homescreen/src/mastervolume.h b/homescreen/src/mastervolume.h
index 645968a..bca6356 100644 (file)
--- a/homescreen/src/mastervolume.h
+++ b/homescreen/src/mastervolume.h
@@ -17,8 +17,6 @@
 #include <QtCore/QObject>
 #include <QQmlEngine>
 
-#include <pulse/pulseaudio.h>
-
 class MasterVolume : public QObject
 {
        Q_OBJECT
@@ -33,7 +31,7 @@ class MasterVolume : public QObject
                ~MasterVolume() {}
 
                uint32_t getVolume() const { return m_volume; }
-               void setVolume(pa_volume_t volume);
+               void setVolume(int volume);
 
        public slots:
                void changeExternalVolume(int volume);