[pulseaudio-commits] src/Makefile.am src/modules

Tanu Kaskinen tanuk at kemper.freedesktop.org
Wed Jul 25 23:24:52 PDT 2012


 src/Makefile.am             |   15 --
 src/modules/bluetooth/ipc.h |  244 --------------------------------------------
 2 files changed, 1 insertion(+), 258 deletions(-)

New commits:
commit d16546cecadb7e408ff33c53258c7dcda160cd8c
Author: Mikel Astiz <mikel.astiz at bmw-carit.de>
Date:   Fri Jul 6 11:19:53 2012 +0200

    bluetooth: Remove library for IPC to BlueZ
    
    This library is not used anymore after the definitive transition to
    Media API.

diff --git a/src/Makefile.am b/src/Makefile.am
index 63ad837..279dd86 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1240,7 +1240,6 @@ modlibexec_LTLIBRARIES += \
 		libbluetooth-util.la \
 		module-bluetooth-proximity.la \
 		module-bluetooth-discover.la \
-		libbluetooth-ipc.la \
 		libbluetooth-sbc.la \
 		module-bluetooth-policy.la \
 		module-bluetooth-device.la
@@ -1942,14 +1941,6 @@ libbluetooth_sbc_la_LIBADD = $(MODULE_LIBADD)
 libbluetooth_sbc_la_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/src/modules/bluetooth/sbc
 BLUETOOTH_SBC_FILES = $(subst modules/bluetooth/,,$(libbluetooth_sbc_la_SOURCES))
 
-libbluetooth_ipc_la_SOURCES = \
-		modules/bluetooth/a2dp-codecs.h \
-		modules/bluetooth/ipc.c modules/bluetooth/ipc.h
-libbluetooth_ipc_la_LDFLAGS = -avoid-version
-libbluetooth_ipc_la_LIBADD = $(AM_LIBADD) libpulsecore- at PA_MAJORMINOR@.la libpulsecommon- at PA_MAJORMINOR@.la libpulse.la
-libbluetooth_ipc_la_CFLAGS = $(AM_CFLAGS)
-BLUETOOTH_IPC_FILES = $(subst modules/bluetooth/,,$(libbluetooth_ipc_la_SOURCES)) rtp.h
-
 libbluetooth_util_la_SOURCES = modules/bluetooth/bluetooth-util.c modules/bluetooth/bluetooth-util.h
 libbluetooth_util_la_LDFLAGS = -avoid-version
 libbluetooth_util_la_LIBADD = $(MODULE_LIBADD) $(DBUS_LIBS)
@@ -1957,7 +1948,7 @@ libbluetooth_util_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
 
 module_bluetooth_device_la_SOURCES = modules/bluetooth/module-bluetooth-device.c modules/bluetooth/rtp.h
 module_bluetooth_device_la_LDFLAGS = $(MODULE_LDFLAGS)
-module_bluetooth_device_la_LIBADD = $(MODULE_LIBADD) $(DBUS_LIBS) libbluetooth-util.la libbluetooth-ipc.la libbluetooth-sbc.la
+module_bluetooth_device_la_LIBADD = $(MODULE_LIBADD) $(DBUS_LIBS) libbluetooth-util.la libbluetooth-sbc.la
 module_bluetooth_device_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) -I$(top_srcdir)/src/modules/bluetooth/sbc
 
 module_bluetooth_policy_la_SOURCES = modules/bluetooth/module-bluetooth-policy.c
@@ -2026,10 +2017,6 @@ update-sbc:
 		wget -O /dev/null http://git.kernel.org/\?p=bluetooth/bluez.git\;a=blob_plain\;f=$$i ; \
 		wget -O $(top_srcdir)/src/modules/bluetooth/$$i http://git.kernel.org/\?p=bluetooth/bluez.git\;a=blob_plain\;f=$$i ; \
 	done
-	for i in $(BLUETOOTH_IPC_FILES); do \
-		wget -O /dev/null http://git.kernel.org/\?p=bluetooth/bluez.git\;a=blob_plain\;f=audio/$$i ; \
-		wget -O $(top_srcdir)/src/modules/bluetooth/$$i http://git.kernel.org/\?p=bluetooth/bluez.git\;a=blob_plain\;f=audio/$$i ; \
-	done
 
 update-reserve:
 	for i in reserve.c reserve.h reserve-monitor.c reserve-monitor.h ; do \
diff --git a/src/modules/bluetooth/ipc.h b/src/modules/bluetooth/ipc.h
index 61ae019..3d8ab77 100644
--- a/src/modules/bluetooth/ipc.h
+++ b/src/modules/bluetooth/ipc.h
@@ -4,7 +4,6 @@
  *
  *  Copyright (C) 2004-2010  Marcel Holtmann <marcel at holtmann.org>
  *
- *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
  *  License as published by the Free Software Foundation; either
@@ -21,43 +20,6 @@
  *
  */
 
-/*
-  Message sequence chart of streaming sequence for A2DP transport
-
-  Audio daemon			User
-				on snd_pcm_open
-				<--BT_GET_CAPABILITIES_REQ
-
-  BT_GET_CAPABILITIES_RSP-->
-
-				on snd_pcm_hw_params
-				<--BT_SETCONFIGURATION_REQ
-
-  BT_SET_CONFIGURATION_RSP-->
-
-				on snd_pcm_prepare
-				<--BT_START_STREAM_REQ
-
-  <Moves to streaming state>
-  BT_START_STREAM_RSP-->
-
-  BT_NEW_STREAM_IND -->
-
-				<  streams data >
-				..........
-
-				on snd_pcm_drop/snd_pcm_drain
-
-				<--BT_STOP_STREAM_REQ
-
-  <Moves to open state>
-  BT_STOP_STREAM_RSP-->
-
-				on IPC close or appl crash
-  <Moves to idle>
-
- */
-
 #ifndef BT_AUDIOCLIENT_H
 #define BT_AUDIOCLIENT_H
 
@@ -72,58 +34,6 @@ extern "C" {
 #include <sys/un.h>
 #include <errno.h>
 
-#define BT_SUGGESTED_BUFFER_SIZE   512
-#define BT_IPC_SOCKET_NAME "\0/org/bluez/audio"
-
-/* Generic message header definition, except for RESPONSE messages */
-typedef struct {
-	uint8_t type;
-	uint8_t name;
-	uint16_t length;
-} __attribute__ ((packed)) bt_audio_msg_header_t;
-
-typedef struct {
-	bt_audio_msg_header_t h;
-	uint8_t posix_errno;
-} __attribute__ ((packed)) bt_audio_error_t;
-
-/* Message types */
-#define BT_REQUEST			0
-#define BT_RESPONSE			1
-#define BT_INDICATION			2
-#define BT_ERROR			3
-
-/* Messages names */
-#define BT_GET_CAPABILITIES		0
-#define BT_OPEN				1
-#define BT_SET_CONFIGURATION		2
-#define BT_NEW_STREAM			3
-#define BT_START_STREAM			4
-#define BT_STOP_STREAM			5
-#define BT_CLOSE			6
-#define BT_CONTROL			7
-#define BT_DELAY_REPORT			8
-
-#define BT_CAPABILITIES_TRANSPORT_A2DP	0
-#define BT_CAPABILITIES_TRANSPORT_SCO	1
-#define BT_CAPABILITIES_TRANSPORT_ANY	2
-
-#define BT_CAPABILITIES_ACCESS_MODE_READ	1
-#define BT_CAPABILITIES_ACCESS_MODE_WRITE	2
-#define BT_CAPABILITIES_ACCESS_MODE_READWRITE	3
-
-#define BT_FLAG_AUTOCONNECT	1
-
-struct bt_get_capabilities_req {
-	bt_audio_msg_header_t	h;
-	char			source[18];	/* Address of the local Device */
-	char			destination[18];/* Address of the remote Device */
-	char			object[128];	/* DBus object path */
-	uint8_t			transport;	/* Requested transport */
-	uint8_t			flags;		/* Requested flags */
-	uint8_t			seid;		/* Requested capability configuration */
-} __attribute__ ((packed));
-
 /**
  * SBC Codec parameters as per A2DP profile 1.0 § 4.3
  */
@@ -163,25 +73,6 @@ struct bt_get_capabilities_req {
 #define BT_A2DP_ALLOCATION_SNR			(1 << 1)
 #define BT_A2DP_ALLOCATION_LOUDNESS		1
 
-#define BT_MPEG_SAMPLING_FREQ_16000		(1 << 5)
-#define BT_MPEG_SAMPLING_FREQ_22050		(1 << 4)
-#define BT_MPEG_SAMPLING_FREQ_24000		(1 << 3)
-#define BT_MPEG_SAMPLING_FREQ_32000		(1 << 2)
-#define BT_MPEG_SAMPLING_FREQ_44100		(1 << 1)
-#define BT_MPEG_SAMPLING_FREQ_48000		1
-
-#define BT_MPEG_LAYER_1				(1 << 2)
-#define BT_MPEG_LAYER_2				(1 << 1)
-#define BT_MPEG_LAYER_3				1
-
-#define BT_HFP_CODEC_PCM			0x00
-
-#define BT_PCM_FLAG_NREC			0x01
-#define BT_PCM_FLAG_PCM_ROUTING			0x02
-
-#define BT_WRITE_LOCK				(1 << 1)
-#define BT_READ_LOCK				1
-
 typedef struct {
 	uint8_t seid;
 	uint8_t transport;
@@ -219,141 +110,6 @@ typedef struct {
 	uint16_t sampling_rate;
 } __attribute__ ((packed)) pcm_capabilities_t;
 
-struct bt_get_capabilities_rsp {
-	bt_audio_msg_header_t	h;
-	char			source[18];	/* Address of the local Device */
-	char			destination[18];/* Address of the remote Device */
-	char			object[128];	/* DBus object path */
-	uint8_t			data[0];	/* First codec_capabilities_t */
-} __attribute__ ((packed));
-
-struct bt_open_req {
-	bt_audio_msg_header_t	h;
-	char			source[18];	/* Address of the local Device */
-	char			destination[18];/* Address of the remote Device */
-	char			object[128];	/* DBus object path */
-	uint8_t			seid;		/* Requested capability configuration to lock */
-	uint8_t			lock;		/* Requested lock */
-} __attribute__ ((packed));
-
-struct bt_open_rsp {
-	bt_audio_msg_header_t	h;
-	char			source[18];	/* Address of the local Device */
-	char			destination[18];/* Address of the remote Device */
-	char			object[128];	/* DBus object path */
-} __attribute__ ((packed));
-
-struct bt_set_configuration_req {
-	bt_audio_msg_header_t	h;
-	codec_capabilities_t	codec;		/* Requested codec */
-} __attribute__ ((packed));
-
-struct bt_set_configuration_rsp {
-	bt_audio_msg_header_t	h;
-	uint16_t		link_mtu;	/* Max length that transport supports */
-} __attribute__ ((packed));
-
-#define BT_STREAM_ACCESS_READ		0
-#define BT_STREAM_ACCESS_WRITE		1
-#define BT_STREAM_ACCESS_READWRITE	2
-struct bt_start_stream_req {
-	bt_audio_msg_header_t	h;
-} __attribute__ ((packed));
-
-struct bt_start_stream_rsp {
-	bt_audio_msg_header_t	h;
-} __attribute__ ((packed));
-
-/* This message is followed by one byte of data containing the stream data fd
-   as ancillary data */
-struct bt_new_stream_ind {
-	bt_audio_msg_header_t	h;
-} __attribute__ ((packed));
-
-struct bt_stop_stream_req {
-	bt_audio_msg_header_t	h;
-} __attribute__ ((packed));
-
-struct bt_stop_stream_rsp {
-	bt_audio_msg_header_t	h;
-} __attribute__ ((packed));
-
-struct bt_close_req {
-	bt_audio_msg_header_t	h;
-} __attribute__ ((packed));
-
-struct bt_close_rsp {
-	bt_audio_msg_header_t	h;
-} __attribute__ ((packed));
-
-struct bt_suspend_stream_ind {
-	bt_audio_msg_header_t	h;
-} __attribute__ ((packed));
-
-struct bt_resume_stream_ind {
-	bt_audio_msg_header_t	h;
-} __attribute__ ((packed));
-
-#define BT_CONTROL_KEY_POWER			0x40
-#define BT_CONTROL_KEY_VOL_UP			0x41
-#define BT_CONTROL_KEY_VOL_DOWN			0x42
-#define BT_CONTROL_KEY_MUTE			0x43
-#define BT_CONTROL_KEY_PLAY			0x44
-#define BT_CONTROL_KEY_STOP			0x45
-#define BT_CONTROL_KEY_PAUSE			0x46
-#define BT_CONTROL_KEY_RECORD			0x47
-#define BT_CONTROL_KEY_REWIND			0x48
-#define BT_CONTROL_KEY_FAST_FORWARD		0x49
-#define BT_CONTROL_KEY_EJECT			0x4A
-#define BT_CONTROL_KEY_FORWARD			0x4B
-#define BT_CONTROL_KEY_BACKWARD			0x4C
-
-struct bt_control_req {
-	bt_audio_msg_header_t	h;
-	uint8_t			mode;		/* Control Mode */
-	uint8_t			key;		/* Control Key */
-} __attribute__ ((packed));
-
-struct bt_control_rsp {
-	bt_audio_msg_header_t	h;
-	uint8_t			mode;		/* Control Mode */
-	uint8_t			key;		/* Control Key */
-} __attribute__ ((packed));
-
-struct bt_control_ind {
-	bt_audio_msg_header_t	h;
-	uint8_t			mode;		/* Control Mode */
-	uint8_t			key;		/* Control Key */
-} __attribute__ ((packed));
-
-struct bt_delay_report_req {
-	bt_audio_msg_header_t	h;
-	uint16_t		delay;
-} __attribute__ ((packed));
-
-struct bt_delay_report_ind {
-	bt_audio_msg_header_t	h;
-	uint16_t		delay;
-} __attribute__ ((packed));
-
-/* Function declaration */
-
-/* Opens a connection to the audio service: return a socket descriptor */
-int bt_audio_service_open(void);
-
-/* Closes a connection to the audio service */
-int bt_audio_service_close(int sk);
-
-/* Receives stream data file descriptor : must be called after a
-BT_STREAMFD_IND message is returned */
-int bt_audio_service_get_data_fd(int sk);
-
-/* Human readable message type string */
-const char *bt_audio_strtype(uint8_t type);
-
-/* Human readable message name string */
-const char *bt_audio_strname(uint8_t name);
-
 #ifdef __cplusplus
 }
 #endif



More information about the pulseaudio-commits mailing list