Fixes to work with running as non-root and 4A removal

Added the missing new audio permission to the widget manifest, and
reworked ringtone audio output to remove 4A support.

Bug-AGL: SPEC-2558

Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: I7ca5a438333bd046a1634a9056291bd7c215d4e6

1 files changed, 1 insertions, 13 deletions

diff --git a/app/fileplayer.h b/app/fileplayer.h
index 5f52370..a580409 100644
--- a/app/fileplayer.h
+++ b/app/fileplayer.h
@@ -21,17 +21,10 @@
 #include <thread>
 #include <gst/gst.h>
 
-extern "C"
-{
-#include <afb/afb-wsj1.h>
-#include <afb/afb-ws-client.h>
-#include <systemd/sd-event.h>
-}
-
 class FilePlayer
 {
 public:
-	FilePlayer(int port, const std::string &token, const std::string &path, const std::string &role);
+	FilePlayer(const std::string &path, const std::string &role);
 	~FilePlayer();
 
 	void play(bool loop = false);
@@ -42,10 +35,6 @@ public:
 private:
 	std::string m_path;
 	std::string m_role;
-	struct afb_wsj1 *m_ws = nullptr;
-	struct afb_wsj1_itf m_itf;
-	std::thread m_afb_thread;
-	sd_event *m_afb_loop = nullptr;
 	std::thread m_gst_thread;
 	GMainLoop *m_gst_loop = nullptr;
 	GstElement *m_playbin = nullptr;
@@ -55,7 +44,6 @@ private:
 	bool m_playing = false;
 	bool m_looping = false;
 
-	int set_role_state(bool state, std::string *output = nullptr);
 	gboolean bus_callback(GstBus *bus, GstMessage *msg);
 };