From 578696351b722d80d1001cdbcc9379ef983276bf Mon Sep 17 00:00:00 2001 From: Jamin Liu Date: Fri, 17 Jan 2014 18:15:37 +0800 Subject: [PATCH 1/5] Bug 953045 - Fix a bug of bluetooth AVRCP to support media metadata updating correctly. f=shuang, r=echou --- dom/bluetooth/bluez/linux/BluetoothDBusService.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dom/bluetooth/bluez/linux/BluetoothDBusService.cpp b/dom/bluetooth/bluez/linux/BluetoothDBusService.cpp index a73b8ba15c6..e8682eed47e 100644 --- a/dom/bluetooth/bluez/linux/BluetoothDBusService.cpp +++ b/dom/bluetooth/bluez/linux/BluetoothDBusService.cpp @@ -3119,6 +3119,13 @@ BluetoothDBusService::SendMetaData(const nsAString& aTitle, nsCString tempMediaNumber = EmptyCString(); nsCString tempTotalMediaCount = EmptyCString(); nsCString tempDuration = EmptyCString(); + + // We currently don't support genre field in music player. + // In order to send media metadata through AVRCP, we set genre to an empty + // string to match the BlueZ method "UpdateMetaData" with signature "sssssss", + // which takes genre field as the last parameter. + nsCString tempGenre = EmptyCString(); + if (aMediaNumber >= 0) { tempMediaNumber.AppendInt(aMediaNumber); } @@ -3135,6 +3142,7 @@ BluetoothDBusService::SendMetaData(const nsAString& aTitle, const char* mediaNumber = tempMediaNumber.get(); const char* totalMediaCount = tempTotalMediaCount.get(); const char* duration = tempDuration.get(); + const char* genre = tempGenre.get(); nsAutoString prevTitle, prevAlbum; a2dp->GetTitle(prevTitle); @@ -3161,6 +3169,7 @@ BluetoothDBusService::SendMetaData(const nsAString& aTitle, DBUS_TYPE_STRING, &mediaNumber, DBUS_TYPE_STRING, &totalMediaCount, DBUS_TYPE_STRING, &duration, + DBUS_TYPE_STRING, &genre, DBUS_TYPE_INVALID); NS_ENSURE_TRUE_VOID(ret); From 267cbb61b29cf4d47396ea83f4f7a500e93639fb Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sun, 19 Jan 2014 18:30:11 -0800 Subject: [PATCH 2/5] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/c94fb9636998 Author: Dominic Kuo Desc: Merge pull request #15002 from dominickuo/bug-949016 Bug 949016 - [music] include the missing css file in open.html, r=jimporter ======== https://hg.mozilla.org/integration/gaia-central/rev/928c52ba3121 Author: Dominic Kuo Desc: Bug 949016 - [music] include the missing css file in open.html --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index b9fe064670f..59a51151817 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "34bb6cda673afe1b610c2be5611889c38d180b53", + "revision": "c94fb9636998bbfc2814e634caf8d44906fe7408", "repo_path": "/integration/gaia-central" } From ffeec7eee614f74eaf4e0dcc736b94167499d52b Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sun, 19 Jan 2014 18:35:58 -0800 Subject: [PATCH 3/5] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 9cd24f86300..f707bd7955a 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -12,7 +12,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index bee5b37f3e4..0dd60c7bdbc 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 9cd24f86300..f707bd7955a 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -12,7 +12,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index ecaa98aca14..de89050fb35 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 8280e61d538..9a2d7e2a32d 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -10,7 +10,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 0c7f298bcca..8fc32ba98fc 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -12,7 +12,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 32a2a286cc0..61bc5fe68c3 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 8a0343b3b2f..0cd9937efae 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index eab5b80e0b9..c101b04350c 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -11,7 +11,7 @@ - + From 3cfad74242bed1ae03afd0800335c03792430bd7 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sun, 19 Jan 2014 20:06:13 -0800 Subject: [PATCH 4/5] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/997156ae4add Author: John Hu Desc: Merge pull request #15340 from huchengtw-moz/video/Bug_947103-visual-update-player Bug 947103 - [Video] Update to refreshed video player, r=ivanovpavel ======== https://hg.mozilla.org/integration/gaia-central/rev/27babd36ee0c Author: John Hu Desc: Bug 947103 - [Video] Update to refreshed video player --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 59a51151817..8e1e08eac8b 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "c94fb9636998bbfc2814e634caf8d44906fe7408", + "revision": "997156ae4adde76831ba2fccce33ae340f897f75", "repo_path": "/integration/gaia-central" } From c56eddc0ceb3d4ec371461da148d054b69ccff04 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sun, 19 Jan 2014 20:06:58 -0800 Subject: [PATCH 5/5] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index f707bd7955a..eae83d8407b 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -12,7 +12,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 0dd60c7bdbc..5c8f26d7a22 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index f707bd7955a..eae83d8407b 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -12,7 +12,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index de89050fb35..67ffa9b48d3 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 9a2d7e2a32d..08372355ab9 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -10,7 +10,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 8fc32ba98fc..bff5c5cdc04 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -12,7 +12,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 61bc5fe68c3..959cd669e6e 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 0cd9937efae..01174fef439 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index c101b04350c..5eaae35fef1 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -11,7 +11,7 @@ - +