Merge pull request #356 from jmlich/find-my-phone-ubuntu

Enable find my phone on Ubuntu Touch
piggz · Apr 12, 2024 · 477c46e · 477c46e
2 parents d3f098c + 15c28e1
commit 477c46e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/daemon/daemon.pro b/daemon/daemon.pro
@@ -43,6 +43,8 @@ flavor_silica {
                       calendar
 } else:flavor_uuitk {
     DEFINES += UUITK_EDITION
+    LIBS += -lpulse-simple
+    PKGCONFIG += libpulse
     WATCHFISH_FEATURES += music \
                       voicecall \
                       notificationmonitor \

diff --git a/daemon/src/deviceinterface.cpp b/daemon/src/deviceinterface.cpp
@@ -15,7 +15,7 @@
 #include <KDb3/KDbDriverManager>
 #include <KDb3/KDbTransactionGuard>
 
-#ifdef MER_EDITION_SAILFISH
+#if defined(MER_EDITION_SAILFISH) || defined(UUITK_EDITION)
 #include <pulse/simple.h>
 #include <pulse/error.h>
 #endif
@@ -684,7 +684,7 @@ void DeviceInterface::findDevice()
 
     m_playedSounds++;
 
-#ifdef MER_EDITION_SAILFISH
+#if defined(MER_EDITION_SAILFISH) || defined(UUITK_EDITION)
 
     /* The Sample format to use */
     static const pa_sample_spec ss = {
@@ -696,11 +696,16 @@ void DeviceInterface::findDevice()
     pa_simple *s = NULL;
     int error;
 
+
+#ifdef MER_EDITION_SAILFISH
     QFile file("/usr/share/harbour-amazfish/chirp.raw");
+#else // elif defined(UUITK_EDITION)
+    QFile file("/opt/click.ubuntu.com/uk.co.piggz.amazfish/current/share/harbour-amazfish/chirp.raw");
+#endif
 
     if(!file.open(QIODevice::ReadOnly))
     {
-        qDebug() << "Unable to open chirp sound";
+        qWarning() << Q_FUNC_INFO << "Unable to open chirp sound";
         return;
     }