summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--homescreen/src/main.cpp3
-rw-r--r--homescreen/src/mastervolume.cpp2
-rw-r--r--homescreen/src/mastervolume.h4
3 files changed, 2 insertions, 7 deletions
diff --git a/homescreen/src/main.cpp b/homescreen/src/main.cpp
index 63edd54..19bb0d3 100644
--- 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
--- 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
--- 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);