summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--audio/Makefile.am3
-rw-r--r--audio/avdtp.c26
-rw-r--r--audio/avdtp.h23
-rw-r--r--audio/device.h3
-rw-r--r--audio/sink.c28
-rw-r--r--audio/sink.h27
6 files changed, 107 insertions, 3 deletions
diff --git a/audio/Makefile.am b/audio/Makefile.am
index 84242544..37acdf70 100644
--- a/audio/Makefile.am
+++ b/audio/Makefile.am
@@ -12,7 +12,8 @@ service_PROGRAMS = bluetoothd-service-audio
bluetoothd_service_audio_SOURCES = main.c \
manager.h manager.c headset.h headset.c ipc.h unix.h unix.c \
- error.h error.c device.h device.c gateway.h gateway.c
+ error.h error.c device.h device.c gateway.h gateway.c \
+ sink.c sink.h avdtp.c avdtp.h
bluetoothd_service_audio_LDADD = $(top_builddir)/common/libhelper.a \
@GLIB_LIBS@ @DBUS_LIBS@ @BLUEZ_LIBS@
diff --git a/audio/avdtp.c b/audio/avdtp.c
new file mode 100644
index 00000000..2f4ab59e
--- /dev/null
+++ b/audio/avdtp.c
@@ -0,0 +1,26 @@
+/*
+ *
+ * BlueZ - Bluetooth protocol stack for Linux
+ *
+ * Copyright (C) 2004-2007 Marcel Holtmann <marcel@holtmann.org>
+ *
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
diff --git a/audio/avdtp.h b/audio/avdtp.h
new file mode 100644
index 00000000..153a1731
--- /dev/null
+++ b/audio/avdtp.h
@@ -0,0 +1,23 @@
+/*
+ *
+ * BlueZ - Bluetooth protocol stack for Linux
+ *
+ * Copyright (C) 2004-2007 Marcel Holtmann <marcel@holtmann.org>
+ *
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ */
+
diff --git a/audio/device.h b/audio/device.h
index 12e15806..71e1053f 100644
--- a/audio/device.h
+++ b/audio/device.h
@@ -25,6 +25,7 @@
#include "headset.h"
#include "gateway.h"
+#include "sink.h"
#define AUDIO_DEVICE_INTERFACE "org.bluez.audio.Device"
@@ -45,12 +46,10 @@
#define AVRCP_TARGET_UUID "0000110C-0000-1000-8000-00805F9B34FB"
/* Move these to respective .h files once they exist */
-#define AUDIO_SINK_INTERFACE "org.bluez.audio.Sink"
#define AUDIO_SOURCE_INTERFACE "org.bluez.audio.Source"
#define AUDIO_CONTROL_INTERFACE "org.bluez.audio.Control"
#define AUDIO_TARGET_INTERFACE "org.bluez.audio.Target"
-struct sink;
struct source;
struct control;
struct target;
diff --git a/audio/sink.c b/audio/sink.c
new file mode 100644
index 00000000..436dfbce
--- /dev/null
+++ b/audio/sink.c
@@ -0,0 +1,28 @@
+/*
+ *
+ * BlueZ - Bluetooth protocol stack for Linux
+ *
+ * Copyright (C) 2004-2007 Marcel Holtmann <marcel@holtmann.org>
+ *
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "avdtp.h"
diff --git a/audio/sink.h b/audio/sink.h
new file mode 100644
index 00000000..4cc3a0e4
--- /dev/null
+++ b/audio/sink.h
@@ -0,0 +1,27 @@
+/*
+ *
+ * BlueZ - Bluetooth protocol stack for Linux
+ *
+ * Copyright (C) 2004-2007 Marcel Holtmann <marcel@holtmann.org>
+ *
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ */
+
+#define AUDIO_SINK_INTERFACE "org.bluez.audio.Sink"
+
+struct sink;
+