Merge branch 'master' into better_inventory

 Conflicts:
	README
	data/templates/products/entry.html
	docker/Dockerfile
	docker/init.sh
	src/database/database.vala
	src/database/db-interface.vala
	src/pdf-stock/Makefile
	src/pdf-stock/pdf-stock-interface.vala
	src/pdf-stock/pdf-stock.vala
	src/web/Makefile
	src/web/main.vala
	templates/menu.html
	templates/products/index.html

1 files changed, 12 insertions, 4 deletions

diff --git a/src/audio/audio-interface.vala b/src/audio/audio-interface.vala
index fe13af5..721a484 100644
--- a/src/audio/audio-interface.vala
+++ b/src/audio/audio-interface.vala
@@ -17,8 +17,16 @@
 public interface AudioPlayer : Object {
 	public abstract signal void end_of_stream();
 
-	public abstract void play_system(string file) throws IOError;
-	public abstract string get_random_user_theme() throws IOError;
-	public abstract string[] get_user_themes() throws IOError;
-	public abstract void play_user(string theme, string type) throws IOError;
+	public abstract void play_system(string file) throws DBusError, IOError;
+	public abstract string get_random_user_theme() throws DBusError, IOError;
+	public abstract string[] get_user_themes() throws DBusError, IOError;
+	public abstract void play_user(string theme, string type) throws DBusError, IOError;
+}
+
+public enum AudioType {
+	ERROR,
+	LOGIN,
+	LOGOUT,
+	PURCHASE,
+	INFO
 }