From 78a3c72f60646ab9a44eab94b3afa4652ddeb8db Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jo=C3=A3o=20Paulo=20Rechi=20Vita?= Date: Fri, 29 Aug 2008 20:22:14 -0300 Subject: [PATCH] Move bluetooth discover and device modules to src/modules/bluetooth --- src/Makefile.am | 56 +++++++++++----------- src/modules/{bt-ipc.c => bluetooth/ipc.c} | 2 +- src/modules/{bt-ipc.h => bluetooth/ipc.h} | 0 .../module-bluetooth-device.c} | 8 ++-- .../module-bluetooth-discover.c} | 2 +- src/modules/{bt-rtp.h => bluetooth/rtp.h} | 0 src/modules/{bt-sbc.c => bluetooth/sbc.c} | 6 +-- src/modules/{bt-sbc.h => bluetooth/sbc.h} | 0 .../{bt-sbc_math.h => bluetooth/sbc_math.h} | 0 .../{bt-sbc_tables.h => bluetooth/sbc_tables.h} | 0 10 files changed, 37 insertions(+), 37 deletions(-) rename src/modules/{bt-ipc.c => bluetooth/ipc.c} (99%) rename src/modules/{bt-ipc.h => bluetooth/ipc.h} (100%) rename src/modules/{module-bt-device.c => bluetooth/module-bluetooth-device.c} (99%) rename src/modules/{module-bt-discover.c => bluetooth/module-bluetooth-discover.c} (99%) rename src/modules/{bt-rtp.h => bluetooth/rtp.h} (100%) rename src/modules/{bt-sbc.c => bluetooth/sbc.c} (99%) rename src/modules/{bt-sbc.h => bluetooth/sbc.h} (100%) rename src/modules/{bt-sbc_math.h => bluetooth/sbc_math.h} (100%) rename src/modules/{bt-sbc_tables.h => bluetooth/sbc_tables.h} (100%) diff --git a/src/Makefile.am b/src/Makefile.am index 6e39681..c5af829 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -45,7 +45,7 @@ endif # Compiler/linker flags # ################################### -AM_CFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src/modules -I$(top_builddir)/src/modules/rtp -I$(top_builddir)/src/modules/gconf +AM_CFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src/modules -I$(top_builddir)/src/modules/rtp -I$(top_builddir)/src/modules/gconf -I$(top_builddir)/src/modules/bluetooth AM_CFLAGS += $(PTHREAD_CFLAGS) -D_POSIX_PTHREAD_SEMANTICS AM_CFLAGS += $(LTDLINCL) AM_CFLAGS += $(LIBSAMPLERATE_CFLAGS) $(LIBSNDFILE_CFLAGS) $(LIBSPEEX_CFLAGS) @@ -1161,10 +1161,10 @@ endif if HAVE_BLUEZ modlibexec_LTLIBRARIES += \ module-bt-proximity.la \ - module-bt-discover.la \ - libbt-ipc.la \ - libbt-sbc.la \ - module-bt-device.la + module-bluetooth-discover.la \ + libbluetooth-ipc.la \ + libbluetooth-sbc.la \ + module-bluetooth-device.la pulselibexec_PROGRAMS += \ bt-proximity-helper @@ -1224,8 +1224,8 @@ SYMDEF_FILES = \ modules/module-suspend-on-idle-symdef.h \ modules/module-hal-detect-symdef.h \ modules/module-bt-proximity-symdef.h \ - modules/module-bt-discover-symdef.h \ - modules/module-bt-device-symdef.h \ + modules/bluetooth/module-bluetooth-discover-symdef.h \ + modules/bluetooth/module-bluetooth-device-symdef.h \ modules/gconf/module-gconf-symdef.h \ modules/module-position-event-sounds-symdef.h \ modules/module-console-kit-symdef.h @@ -1237,6 +1237,7 @@ $(SYMDEF_FILES): modules/module-defs.h.m4 $(MKDIR_P) modules $(MKDIR_P) modules/gconf $(MKDIR_P) modules/rtp + $(MKDIR_P) modules/bluetooth $(M4) -Dfname="$@" $< > $@ # Simple protocol @@ -1566,27 +1567,26 @@ bt_proximity_helper_LDADD = $(AM_LDADD) $(BLUEZ_LIBS) bt_proximity_helper_CFLAGS = $(AM_CFLAGS) $(BLUEZ_CFLAGS) bt_proximity_helper_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) -# Bluetooth discover -module_bt_discover_la_SOURCES = modules/module-bt-discover.c -module_bt_discover_la_LDFLAGS = -module -avoid-version -module_bt_discover_la_LIBADD = $(AM_LIBADD) $(DBUS_LIBS) libpulsecore.la libdbus-util.la -module_bt_discover_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) - -# Bluetooth device -libbt_sbc_la_SOURCES = modules/bt-sbc.c modules/bt-sbc.h modules/bt-sbc_tables.h modules/bt-sbc_math.h -libbt_sbc_la_LDFLAGS = -avoid-version -libbt_sbc_la_LIBADD = $(AM_LIBADD) -libbt_sbc_la_CFLAGS = $(AM_CFLAGS) - -libbt_ipc_la_SOURCES = modules/bt-ipc.c modules/bt-ipc.h -libbt_ipc_la_LDFLAGS = -avoid-version -libbt_ipc_la_LIBADD = $(AM_LIBADD) -libbt_ipc_la_CFLAGS = $(AM_CFLAGS) - -module_bt_device_la_SOURCES = modules/module-bt-device.c -module_bt_device_la_LDFLAGS = -module -avoid-version -module_bt_device_la_LIBADD = $(AM_LIBADD) $(DBUS_LIBS) libpulsecore.la libdbus-util.la libbt-ipc.la libbt-sbc.la libsocket-util.la -module_bt_device_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) +# Bluetooth sink / source +module_bluetooth_discover_la_SOURCES = modules/bluetooth/module-bluetooth-discover.c +module_bluetooth_discover_la_LDFLAGS = -module -avoid-version +module_bluetooth_discover_la_LIBADD = $(AM_LIBADD) $(DBUS_LIBS) libpulsecore.la libdbus-util.la +module_bluetooth_discover_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) + +libbluetooth_sbc_la_SOURCES = modules/bluetooth/sbc.c modules/bluetooth/sbc.h modules/bluetooth/sbc_tables.h modules/bluetooth/sbc_math.h +libbluetooth_sbc_la_LDFLAGS = -avoid-version +libbluetooth_sbc_la_LIBADD = $(AM_LIBADD) +libbluetooth_sbc_la_CFLAGS = $(AM_CFLAGS) + +libbluetooth_ipc_la_SOURCES = modules/bluetooth/ipc.c modules/bluetooth/ipc.h +libbluetooth_ipc_la_LDFLAGS = -avoid-version +libbluetooth_ipc_la_LIBADD = $(AM_LIBADD) +libbluetooth_ipc_la_CFLAGS = $(AM_CFLAGS) + +module_bluetooth_device_la_SOURCES = modules/bluetooth/module-bluetooth-device.c +module_bluetooth_device_la_LDFLAGS = -module -avoid-version +module_bluetooth_device_la_LIBADD = $(AM_LIBADD) $(DBUS_LIBS) libpulsecore.la libdbus-util.la libbluetooth-ipc.la libbluetooth-sbc.la libsocket-util.la +module_bluetooth_device_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) ################################### # Some minor stuff # diff --git a/src/modules/bt-ipc.c b/src/modules/bluetooth/ipc.c similarity index 99% rename from src/modules/bt-ipc.c rename to src/modules/bluetooth/ipc.c index e585328..e7b712d 100644 --- a/src/modules/bt-ipc.c +++ b/src/modules/bluetooth/ipc.c @@ -20,7 +20,7 @@ * */ -#include "bt-ipc.h" +#include "ipc.h" /* This table contains the string representation for messages */ static const char *strmsg[] = { diff --git a/src/modules/bt-ipc.h b/src/modules/bluetooth/ipc.h similarity index 100% rename from src/modules/bt-ipc.h rename to src/modules/bluetooth/ipc.h diff --git a/src/modules/module-bt-device.c b/src/modules/bluetooth/module-bluetooth-device.c similarity index 99% rename from src/modules/module-bt-device.c rename to src/modules/bluetooth/module-bluetooth-device.c index 654130b..335a8ed 100644 --- a/src/modules/module-bt-device.c +++ b/src/modules/bluetooth/module-bluetooth-device.c @@ -45,10 +45,10 @@ #include #include "dbus-util.h" -#include "module-bt-device-symdef.h" -#include "bt-ipc.h" -#include "bt-sbc.h" -#include "bt-rtp.h" +#include "module-bluetooth-device-symdef.h" +#include "ipc.h" +#include "sbc.h" +#include "rtp.h" #define DEFAULT_SINK_NAME "bluetooth_sink" #define BUFFER_SIZE 2048 diff --git a/src/modules/module-bt-discover.c b/src/modules/bluetooth/module-bluetooth-discover.c similarity index 99% rename from src/modules/module-bt-discover.c rename to src/modules/bluetooth/module-bluetooth-discover.c index 2b0d6c5..12473df 100644 --- a/src/modules/module-bt-discover.c +++ b/src/modules/bluetooth/module-bluetooth-discover.c @@ -34,7 +34,7 @@ #include #include "dbus-util.h" -#include "module-bt-discover-symdef.h" +#include "module-bluetooth-discover-symdef.h" PA_MODULE_AUTHOR("Joao Paulo Rechi Vita"); PA_MODULE_DESCRIPTION("Detect available bluetooth audio devices and load bluetooth audio drivers"); diff --git a/src/modules/bt-rtp.h b/src/modules/bluetooth/rtp.h similarity index 100% rename from src/modules/bt-rtp.h rename to src/modules/bluetooth/rtp.h diff --git a/src/modules/bt-sbc.c b/src/modules/bluetooth/sbc.c similarity index 99% rename from src/modules/bt-sbc.c rename to src/modules/bluetooth/sbc.c index 8e7b060..6303421 100644 --- a/src/modules/bt-sbc.c +++ b/src/modules/bluetooth/sbc.c @@ -41,10 +41,10 @@ #include #include -#include "bt-sbc_math.h" -#include "bt-sbc_tables.h" +#include "sbc_math.h" +#include "sbc_tables.h" -#include "bt-sbc.h" +#include "sbc.h" #define SBC_SYNCWORD 0x9C diff --git a/src/modules/bt-sbc.h b/src/modules/bluetooth/sbc.h similarity index 100% rename from src/modules/bt-sbc.h rename to src/modules/bluetooth/sbc.h diff --git a/src/modules/bt-sbc_math.h b/src/modules/bluetooth/sbc_math.h similarity index 100% rename from src/modules/bt-sbc_math.h rename to src/modules/bluetooth/sbc_math.h diff --git a/src/modules/bt-sbc_tables.h b/src/modules/bluetooth/sbc_tables.h similarity index 100% rename from src/modules/bt-sbc_tables.h rename to src/modules/bluetooth/sbc_tables.h -- 2.7.4