Add audio conf for bluez HFP feature

diff --git a/Makefile.am b/Makefile.am
index b6f74bf..4746512 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -331,6 +331,7 @@ man_MANS = src/bluetoothd.8
 
 if DATAFILES
 conf_DATA += src/main.conf
+conf_DATA += audio/audio.conf
 endif
 
 EXTRA_DIST += src/genbuiltin src/bluetooth.conf \

diff --git a/audio/audio.conf b/audio/audio.conf
index 302e046..9feb84a 100644 (file)
--- a/audio/audio.conf
+++ b/audio/audio.conf
@@ -10,6 +10,7 @@
 # If we want to disable support for specific services
 # Defaults to supporting all implemented services
 #Disable=Control,Source
+Enable=Gateway,Socket
 
 # SCO routing. Either PCM or HCI (in which case audio is routed to/from ALSA)
 # Defaults to HCI
@@ -23,14 +24,14 @@
 
 # Headset interface specific options (i.e. options which affect how the audio
 # service interacts with remote headset devices)
-[Headset]
+#[Headset]
 
 # Set to true to support HFP, false means only HSP is supported
 # Defaults to true
 HFP=true
 
 # Maximum number of connected HSP/HFP devices per adapter. Defaults to 1
-MaxConnected=1
+#MaxConnected=1
 
 # Set to true to enable use of fast connectable mode (faster page scanning)
 # for HFP when incomming call starts. Default settings are restored after

diff --git a/packaging/audio_conf.patch b/packaging/audio_conf.patch
deleted file mode 100644 (file)
index c8fb1bf..0000000
--- a/packaging/audio_conf.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- bluez-4.98_bak/audio/audio.conf    2012-02-21 17:04:03.000000000 +0800
-+++ bluez-4.98/audio/audio.conf        2012-03-27 12:36:02.200516529 +0800
-@@ -3,56 +3,4 @@
- # This section contains options which are not specific to any
- # particular interface
- [General]
--
--# Switch to master role for incoming connections (defaults to true)
--#Master=true
--
--# If we want to disable support for specific services
--# Defaults to supporting all implemented services
--#Disable=Control,Source
--
--#ifdef __TIZEN_PATCH__
--Enable=Socket
--#endif
--
--# SCO routing. Either PCM or HCI (in which case audio is routed to/from ALSA)
--#ifdef __TIZEN_PATCH__
--SCORouting=PCM
--#else
--# Defaults to HCI
--#SCORouting=PCM
--#endif
--
--# Automatically connect both A2DP and HFP/HSP profiles for incoming
--# connections. Some headsets that support both profiles will only connect the
--# other one automatically so the default setting of true is usually a good
--# idea.
--#AutoConnect=true
--
--# Headset interface specific options (i.e. options which affect how the audio
--# service interacts with remote headset devices)
--[Headset]
--
--# Set to true to support HFP, false means only HSP is supported
--# Defaults to true
--HFP=true
--
--# Maximum number of connected HSP/HFP devices per adapter. Defaults to 1
--MaxConnected=1
--
--# Set to true to enable use of fast connectable mode (faster page scanning)
--# for HFP when incomming call starts. Default settings are restored after
--# call is answered or rejected. Page scan interval is much shorter and page
--# scan type changed to interlaced. Such allows faster connection initiated
--# by a headset.
--FastConnectable=false
--
--# Just an example of potential config options for the other interfaces
--#ifdef __TIZEN_PATCH__
--[A2DP]
--SBCSources=1
--#else
--#[A2DP]
--#SBCSources=1
--#MPEG12Sources=0
--#endif
-+Enable=Gateway,Socket
---- bluez-4.98_bak/Makefile.am 2012-02-21 17:04:03.000000000 +0800
-+++ bluez-4.98/Makefile.am     2012-03-27 12:36:47.960512742 +0800
-@@ -331,6 +331,7 @@
- 
- if DATAFILES
- conf_DATA += src/main.conf
-+conf_DATA += audio/audio.conf
- endif
- 
- EXTRA_DIST += src/genbuiltin src/bluetooth.conf \

diff --git a/packaging/bluez.changes b/packaging/bluez.changes
index 9e916c2..ee5b4df 100644 (file)
--- a/packaging/bluez.changes
+++ b/packaging/bluez.changes
@@ -1,3 +1,6 @@
+* Fri Jun  8 13:22:46 CST 2012 Arron <arron.wang@intel.com> - 4.99
+- Add audio conf for bluez HFP feature
+
 * Fri Jun  8 13:15:54 CST 2012 Arron <arron.wang@intel.com> - 4.99
 - Install more test script to test subpackage
 

diff --git a/packaging/bluez.spec b/packaging/bluez.spec
index 8b0f395..c44079e 100644 (file)
--- a/packaging/bluez.spec
+++ b/packaging/bluez.spec
@@ -7,7 +7,6 @@ License:    GPLv2+
 URL:        http://www.bluez.org/
 Source0:    %{name}-%{version}.tar.gz
 Source1:    bluetooth.service
-Patch1:     audio_conf.patch
 Requires:   bluez-libs = %{version}
 Requires:   dbus >= 0.60
 Requires:   usbutils
@@ -107,9 +106,6 @@ Scripts for testing BlueZ and its functionality
 %prep
 %setup -q -n %{name}-%{version}
 
-#audio_conf.patch
-%patch1 -p1
-
 export CFLAGS="${CFLAGS} -D__TIZEN_PATCH__ -D__BROADCOM_PATCH__"
 %reconfigure --disable-static \
                        --localstatedir=/opt/var \

diff --git a/src/bluetooth.conf b/src/bluetooth.conf
index 664dbd9..6ca5f27 100644 (file)
--- a/src/bluetooth.conf
+++ b/src/bluetooth.conf
@@ -22,6 +22,9 @@
     <allow send_destination="org.bluez"/>
   </policy>
 
+  <policy user="pulse">
+    <allow send_destination="org.bluez"/>
+  </policy>
   <!-- allow users of lp group (printing subsystem) to 
        communicate with bluetoothd -->
   <policy group="lp">