2009-08-18 22:32:49

by Nick Pelly

Subject: [PATCH] Fix audio.conf parsing bug - sink and source were transposed.

---
audio/a2dp.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/audio/a2dp.c b/audio/a2dp.c
index 45be5d4..41b8f88 100644
--- a/audio/a2dp.c
+++ b/audio/a2dp.c
@@ -1098,9 +1098,9 @@ int a2dp_register(DBusConnection *conn, const bdaddr_t *src, GKeyFile *config)
g_clear_error(&err);
} else {
if (strstr(str, "Sink"))
- source = TRUE;
- if (strstr(str, "Source"))
sink = TRUE;
+ if (strstr(str, "Source"))
+ source = TRUE;
g_free(str);
}

@@ -1111,9 +1111,9 @@ int a2dp_register(DBusConnection *conn, const bdaddr_t *src, GKeyFile *config)
g_clear_error(&err);
} else {
if (strstr(str, "Sink"))
- source = FALSE;
- if (strstr(str, "Source"))
sink = FALSE;
+ if (strstr(str, "Source"))
+ source = FALSE;
g_free(str);
}

--
1.6.3.1

2009-08-22 20:06:45

by Marcel Holtmann

Subject: Re: [PATCH] Fix audio.conf parsing bug - sink and source were transposed.

Hi Bastien,

> > Jaikumar just gave me the heads up that this is by design.
> >
> > Enable=Sink means that bluetoothd offers the Sink interface for remote
> > devices - and that we are a source.
> > Enable=Source means that bluetoothd offers the Source interface for
> > remote devices - and that we are a sink.
> >
> > I'd say its counter-intuitive, but we can live with it.
>
> Comments in the code could fix that?

I prefer that we add comments in the code and the configuration file.

Nick, please send a patch that adds these comments.

Regards

Marcel

2009-08-18 23:08:32

by Bastien Nocera

Subject: Re: [PATCH] Fix audio.conf parsing bug - sink and source were transposed.

On Tue, 2009-08-18 at 16:01 -0700, Nick Pelly wrote:
> On Tue, Aug 18, 2009 at 3:32 PM, Nick Pelly<[email protected]> wrote:
<snip>
> Jaikumar just gave me the heads up that this is by design.
>
> Enable=Sink means that bluetoothd offers the Sink interface for remote
> devices - and that we are a source.
> Enable=Source means that bluetoothd offers the Source interface for
> remote devices - and that we are a sink.
>
> I'd say its counter-intuitive, but we can live with it.

Comments in the code could fix that?

2009-08-18 23:01:42

by Nick Pelly

Subject: Re: [PATCH] Fix audio.conf parsing bug - sink and source were transposed.

On Tue, Aug 18, 2009 at 3:32 PM, Nick Pelly<[email protected]> wrote:
> ---
> ?audio/a2dp.c | ? ?8 ++++----
> ?1 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/audio/a2dp.c b/audio/a2dp.c
> index 45be5d4..41b8f88 100644
> --- a/audio/a2dp.c
> +++ b/audio/a2dp.c
> @@ -1098,9 +1098,9 @@ int a2dp_register(DBusConnection *conn, const bdaddr_t *src, GKeyFile *config)
> ? ? ? ? ? ? ? ?g_clear_error(&err);
> ? ? ? ?} else {
> ? ? ? ? ? ? ? ?if (strstr(str, "Sink"))
> - ? ? ? ? ? ? ? ? ? ? ? source = TRUE;
> - ? ? ? ? ? ? ? if (strstr(str, "Source"))
> ? ? ? ? ? ? ? ? ? ? ? ?sink = TRUE;
> + ? ? ? ? ? ? ? if (strstr(str, "Source"))
> + ? ? ? ? ? ? ? ? ? ? ? source = TRUE;
> ? ? ? ? ? ? ? ?g_free(str);
> ? ? ? ?}
>
> @@ -1111,9 +1111,9 @@ int a2dp_register(DBusConnection *conn, const bdaddr_t *src, GKeyFile *config)
> ? ? ? ? ? ? ? ?g_clear_error(&err);
> ? ? ? ?} else {
> ? ? ? ? ? ? ? ?if (strstr(str, "Sink"))
> - ? ? ? ? ? ? ? ? ? ? ? source = FALSE;
> - ? ? ? ? ? ? ? if (strstr(str, "Source"))
> ? ? ? ? ? ? ? ? ? ? ? ?sink = FALSE;
> + ? ? ? ? ? ? ? if (strstr(str, "Source"))
> + ? ? ? ? ? ? ? ? ? ? ? source = FALSE;
> ? ? ? ? ? ? ? ?g_free(str);
> ? ? ? ?}
>
> --
> 1.6.3.1


Jaikumar just gave me the heads up that this is by design.

Enable=Sink means that bluetoothd offers the Sink interface for remote
devices - and that we are a source.
Enable=Source means that bluetoothd offers the Source interface for
remote devices - and that we are a sink.

I'd say its counter-intuitive, but we can live with it.

Nick