react-native-audio-browser 0.2.0-next.50 → 0.2.0-next.52
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/android/build.gradle +15 -0
- package/android/src/cast/java/com/audiobrowser/cast/CastSupport.kt +215 -0
- package/android/src/main/AndroidManifest.xml +11 -0
- package/android/src/main/java/com/audiobrowser/AudioBrowser.kt +0 -4
- package/android/src/main/java/com/audiobrowser/RemoteOutputs.kt +47 -10
- package/android/src/main/java/com/audiobrowser/model/PlayerSetupOptions.kt +12 -3
- package/android/src/main/java/com/audiobrowser/player/EqualizerController.kt +4 -1
- package/android/src/main/java/com/audiobrowser/player/LocalEngine.kt +49 -0
- package/android/src/main/java/com/audiobrowser/player/Player.kt +170 -119
- package/android/src/main/java/com/audiobrowser/player/PlayerListener.kt +18 -13
- package/android/src/main/java/com/audiobrowser/player/TransformingDataSource.kt +10 -13
- package/android/src/main/java/com/audiobrowser/remote/RemoteItem.kt +64 -0
- package/android/src/main/java/com/audiobrowser/remote/RemoteOutputsController.kt +98 -0
- package/android/src/main/java/com/audiobrowser/remote/RemotePlayback.kt +42 -0
- package/android/src/main/java/com/audiobrowser/remote/RemoteQueue.kt +110 -0
- package/android/src/main/java/com/audiobrowser/remote/RemoteSwitchingPlayer.kt +696 -0
- package/android/src/main/java/com/audiobrowser/sonos/DeviceDescriptionParser.kt +113 -0
- package/android/src/main/java/com/audiobrowser/sonos/DidlLite.kt +39 -0
- package/android/src/main/java/com/audiobrowser/sonos/SoapClient.kt +59 -0
- package/android/src/main/java/com/audiobrowser/sonos/SoapEnvelopes.kt +92 -0
- package/android/src/main/java/com/audiobrowser/sonos/SoapResponseParser.kt +105 -0
- package/android/src/main/java/com/audiobrowser/sonos/SonosDiscoverer.kt +69 -0
- package/android/src/main/java/com/audiobrowser/sonos/SonosOutputs.kt +128 -0
- package/android/src/main/java/com/audiobrowser/sonos/SonosPlayer.kt +550 -0
- package/android/src/main/java/com/audiobrowser/sonos/SonosRemote.kt +99 -0
- package/android/src/main/java/com/audiobrowser/sonos/SonosRouteProviderService.kt +201 -0
- package/android/src/main/java/com/audiobrowser/sonos/SonosStreamUri.kt +15 -0
- package/android/src/main/java/com/audiobrowser/sonos/SonosTransport.kt +66 -0
- package/android/src/main/java/com/audiobrowser/sonos/SpeakerXml.kt +26 -0
- package/android/src/main/java/com/audiobrowser/sonos/SsdpDiscovery.kt +63 -0
- package/android/src/main/java/com/audiobrowser/sonos/SsdpMessages.kt +63 -0
- package/android/src/main/java/com/audiobrowser/sonos/ZoneGroupState.kt +68 -0
- package/android/src/main/java/com/audiobrowser/util/OutputMonitor.kt +2 -1
- package/android/src/main/java/com/audiobrowser/util/TrackFactory.kt +1 -1
- package/android/src/nocast/java/com/audiobrowser/cast/CastSupport.kt +18 -0
- package/android/src/test/java/com/audiobrowser/RemoteOutputsTest.kt +20 -3
- package/android/src/test/java/com/audiobrowser/model/PlayerSetupOptionsTest.kt +35 -0
- package/android/src/test/java/com/audiobrowser/player/EqualizerControllerTest.kt +12 -0
- package/android/src/test/java/com/audiobrowser/player/PlayerCastTest.kt +136 -0
- package/android/src/test/java/com/audiobrowser/player/PlayerSonosTest.kt +213 -0
- package/android/src/test/java/com/audiobrowser/remote/FakeRemote.kt +275 -0
- package/android/src/test/java/com/audiobrowser/remote/RemoteItemTest.kt +61 -0
- package/android/src/test/java/com/audiobrowser/remote/RemoteOutputsControllerTest.kt +77 -0
- package/android/src/test/java/com/audiobrowser/remote/RemoteQueueTest.kt +101 -0
- package/android/src/test/java/com/audiobrowser/remote/RemoteSwitchingPlayerTest.kt +815 -0
- package/android/src/test/java/com/audiobrowser/sonos/DeviceDescriptionParserTest.kt +203 -0
- package/android/src/test/java/com/audiobrowser/sonos/DidlLiteTest.kt +90 -0
- package/android/src/test/java/com/audiobrowser/sonos/SoapClientTest.kt +73 -0
- package/android/src/test/java/com/audiobrowser/sonos/SoapEnvelopesTest.kt +135 -0
- package/android/src/test/java/com/audiobrowser/sonos/SoapResponseParserTest.kt +170 -0
- package/android/src/test/java/com/audiobrowser/sonos/SonosDiscovererTest.kt +174 -0
- package/android/src/test/java/com/audiobrowser/sonos/SonosPlayerTest.kt +691 -0
- package/android/src/test/java/com/audiobrowser/sonos/SonosRemoteTest.kt +129 -0
- package/android/src/test/java/com/audiobrowser/sonos/SonosRoutesTest.kt +165 -0
- package/android/src/test/java/com/audiobrowser/sonos/SonosStreamUriTest.kt +64 -0
- package/android/src/test/java/com/audiobrowser/sonos/SonosTransportTest.kt +204 -0
- package/android/src/test/java/com/audiobrowser/sonos/SsdpMessagesTest.kt +99 -0
- package/android/src/test/java/com/audiobrowser/sonos/ZoneGroupStateTest.kt +139 -0
- package/android/src/test/java/com/audiobrowser/util/OutputMonitorTest.kt +12 -10
- package/android/src/test/resources/sonos/device_description.xml +78 -0
- package/android/src/testCast/java/com/audiobrowser/cast/CastEndsTest.kt +56 -0
- package/android/src/testCast/java/com/audiobrowser/cast/SendingMediaItemConverterTest.kt +79 -0
- package/lib/commonjs/features/player/setup.js +2 -0
- package/lib/commonjs/features/player/setup.js.map +1 -1
- package/lib/module/features/player/setup.js +2 -0
- package/lib/module/features/player/setup.js.map +1 -1
- package/lib/typescript/src/features/player/setup.d.ts +37 -7
- package/lib/typescript/src/features/player/setup.d.ts.map +1 -1
- package/lib/typescript/src/specs/audio-browser.nitro.d.ts +3 -3
- package/lib/typescript/src/specs/audio-browser.nitro.d.ts.map +1 -1
- package/nitrogen/generated/android/c++/JHybridAudioBrowserSpec.cpp +4 -0
- package/nitrogen/generated/android/c++/JNativeSetupPlayerOptions.hpp +7 -5
- package/nitrogen/generated/android/c++/JOutputType.hpp +3 -0
- package/nitrogen/generated/android/c++/JRemoteOutputsOptions.hpp +66 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeSetupPlayerOptions.kt +3 -3
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/OutputType.kt +3 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RemoteOutputsOptions.kt +61 -0
- package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Bridge.hpp +18 -0
- package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Umbrella.hpp +3 -0
- package/nitrogen/generated/ios/c++/HybridAudioBrowserSpecSwift.hpp +3 -0
- package/nitrogen/generated/ios/swift/NativeSetupPlayerOptions.swift +5 -12
- package/nitrogen/generated/ios/swift/OutputType.swift +4 -0
- package/nitrogen/generated/ios/swift/RemoteOutputsOptions.swift +78 -0
- package/nitrogen/generated/shared/c++/NativeSetupPlayerOptions.hpp +8 -5
- package/nitrogen/generated/shared/c++/OutputType.hpp +6 -2
- package/nitrogen/generated/shared/c++/RemoteOutputsOptions.hpp +92 -0
- package/package.json +3 -2
- package/src/features/player/setup.ts +38 -7
- package/src/specs/audio-browser.nitro.ts +4 -3
- package/website/guide/audio-output.md +185 -4
- package/website/guide/configuration.md +6 -0
|
@@ -0,0 +1,139 @@
|
|
|
1
|
+
package com.audiobrowser.sonos
|
|
2
|
+
|
|
3
|
+
import org.junit.Assert.assertEquals
|
|
4
|
+
import org.junit.Assert.assertNull
|
|
5
|
+
import org.junit.Test
|
|
6
|
+
|
|
7
|
+
class ZoneGroupStateTest {
|
|
8
|
+
|
|
9
|
+
private fun response(zoneGroupState: String): String =
|
|
10
|
+
"<?xml version=\"1.0\"?><s:Envelope xmlns:s=\"http://schemas.xmlsoap.org/soap/envelope/\">" +
|
|
11
|
+
"<s:Body><u:GetZoneGroupStateResponse " +
|
|
12
|
+
"xmlns:u=\"urn:schemas-upnp-org:service:ZoneGroupTopology:1\">" +
|
|
13
|
+
"<ZoneGroupState>${escape(zoneGroupState)}</ZoneGroupState>" +
|
|
14
|
+
"</u:GetZoneGroupStateResponse></s:Body></s:Envelope>"
|
|
15
|
+
|
|
16
|
+
private fun escape(s: String) =
|
|
17
|
+
s.replace("&", "&").replace("<", "<").replace(">", ">").replace("\"", """)
|
|
18
|
+
|
|
19
|
+
private fun member(uuid: String, ip: String, zone: String, extra: String = "") =
|
|
20
|
+
"<ZoneGroupMember UUID=\"$uuid\" Location=\"http://$ip:1400/xml/device_description.xml\" " +
|
|
21
|
+
"ZoneName=\"$zone\" $extra/>"
|
|
22
|
+
|
|
23
|
+
@Test
|
|
24
|
+
fun `lists a stereo pair as one room, at its coordinator`() {
|
|
25
|
+
val state =
|
|
26
|
+
"<ZoneGroupState><ZoneGroups>" +
|
|
27
|
+
"<ZoneGroup Coordinator=\"RINCON_A\" ID=\"RINCON_A:1\">" +
|
|
28
|
+
member(
|
|
29
|
+
"RINCON_A",
|
|
30
|
+
"192.168.1.31",
|
|
31
|
+
"Dining Room",
|
|
32
|
+
"ChannelMapSet=\"RINCON_A:LF,LF;RINCON_B:RF,RF\"",
|
|
33
|
+
) +
|
|
34
|
+
member("RINCON_B", "192.168.1.42", "Dining Room", "Invisible=\"1\"") +
|
|
35
|
+
"</ZoneGroup>" +
|
|
36
|
+
"<ZoneGroup Coordinator=\"RINCON_C\" ID=\"RINCON_C:7\">" +
|
|
37
|
+
member("RINCON_D", "192.168.1.41", "Living Room", "Invisible=\"1\"") +
|
|
38
|
+
member("RINCON_C", "192.168.1.39", "Living Room") +
|
|
39
|
+
"</ZoneGroup>" +
|
|
40
|
+
"</ZoneGroups><VanishedDevices/></ZoneGroupState>"
|
|
41
|
+
|
|
42
|
+
assertEquals(
|
|
43
|
+
listOf(
|
|
44
|
+
SonosGroup(
|
|
45
|
+
coordinator = "RINCON_A",
|
|
46
|
+
location = "http://192.168.1.31:1400/xml/device_description.xml",
|
|
47
|
+
name = "Dining Room",
|
|
48
|
+
),
|
|
49
|
+
SonosGroup(
|
|
50
|
+
coordinator = "RINCON_C",
|
|
51
|
+
location = "http://192.168.1.39:1400/xml/device_description.xml",
|
|
52
|
+
name = "Living Room",
|
|
53
|
+
),
|
|
54
|
+
),
|
|
55
|
+
ZoneGroupState.parse(response(state)),
|
|
56
|
+
)
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
@Test
|
|
60
|
+
fun `skips the hidden half of a stereo pair reported as a group of its own`() {
|
|
61
|
+
val state =
|
|
62
|
+
"<ZoneGroupState><ZoneGroups>" +
|
|
63
|
+
"<ZoneGroup Coordinator=\"RINCON_A\" ID=\"RINCON_A:1\">" +
|
|
64
|
+
member("RINCON_A", "10.0.0.31", "Dining Room") +
|
|
65
|
+
"</ZoneGroup>" +
|
|
66
|
+
"<ZoneGroup Coordinator=\"RINCON_B\" ID=\"RINCON_B:2\">" +
|
|
67
|
+
member("RINCON_B", "10.0.0.42", "Dining Room", "Invisible=\"1\"") +
|
|
68
|
+
"</ZoneGroup>" +
|
|
69
|
+
"</ZoneGroups></ZoneGroupState>"
|
|
70
|
+
|
|
71
|
+
assertEquals(listOf("RINCON_A"), ZoneGroupState.parse(response(state))!!.map { it.coordinator })
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
@Test
|
|
75
|
+
fun `names a group of rooms after its coordinator and counts the rest`() {
|
|
76
|
+
val state =
|
|
77
|
+
"<ZoneGroupState><ZoneGroups>" +
|
|
78
|
+
"<ZoneGroup Coordinator=\"RINCON_K\" ID=\"RINCON_K:3\">" +
|
|
79
|
+
member("RINCON_O", "10.0.0.3", "Office") +
|
|
80
|
+
member("RINCON_K", "10.0.0.2", "Kitchen") +
|
|
81
|
+
member("RINCON_P", "10.0.0.4", "Patio") +
|
|
82
|
+
"</ZoneGroup>" +
|
|
83
|
+
"</ZoneGroups></ZoneGroupState>"
|
|
84
|
+
|
|
85
|
+
assertEquals(listOf("Kitchen + 2"), ZoneGroupState.parse(response(state))!!.map { it.name })
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
@Test
|
|
89
|
+
fun `does not count a home theatre's satellites as rooms`() {
|
|
90
|
+
val state =
|
|
91
|
+
"<ZoneGroupState><ZoneGroups>" +
|
|
92
|
+
"<ZoneGroup Coordinator=\"RINCON_T\" ID=\"RINCON_T:9\">" +
|
|
93
|
+
"<ZoneGroupMember UUID=\"RINCON_T\" " +
|
|
94
|
+
"Location=\"http://10.0.0.9:1400/xml/device_description.xml\" ZoneName=\"TV Room\">" +
|
|
95
|
+
"<Satellite UUID=\"RINCON_S\" Location=\"http://10.0.0.10:1400/xml/device_description.xml\" " +
|
|
96
|
+
"ZoneName=\"TV Room\" Invisible=\"1\"/>" +
|
|
97
|
+
"</ZoneGroupMember>" +
|
|
98
|
+
"</ZoneGroup>" +
|
|
99
|
+
"</ZoneGroups></ZoneGroupState>"
|
|
100
|
+
|
|
101
|
+
assertEquals(
|
|
102
|
+
listOf(
|
|
103
|
+
SonosGroup(
|
|
104
|
+
coordinator = "RINCON_T",
|
|
105
|
+
location = "http://10.0.0.9:1400/xml/device_description.xml",
|
|
106
|
+
name = "TV Room",
|
|
107
|
+
)
|
|
108
|
+
),
|
|
109
|
+
ZoneGroupState.parse(response(state)),
|
|
110
|
+
)
|
|
111
|
+
}
|
|
112
|
+
|
|
113
|
+
@Test
|
|
114
|
+
fun `reads the older form without the ZoneGroupState wrapper`() {
|
|
115
|
+
val state =
|
|
116
|
+
"<ZoneGroups><ZoneGroup Coordinator=\"RINCON_A\" ID=\"RINCON_A:1\">" +
|
|
117
|
+
member("RINCON_A", "10.0.0.1", "Bedroom") +
|
|
118
|
+
"</ZoneGroup></ZoneGroups>"
|
|
119
|
+
|
|
120
|
+
assertEquals(listOf("Bedroom"), ZoneGroupState.parse(response(state))!!.map { it.name })
|
|
121
|
+
}
|
|
122
|
+
|
|
123
|
+
@Test
|
|
124
|
+
fun `skips a group whose coordinator is not among its members`() {
|
|
125
|
+
val state =
|
|
126
|
+
"<ZoneGroupState><ZoneGroups>" +
|
|
127
|
+
"<ZoneGroup Coordinator=\"RINCON_GONE\" ID=\"RINCON_GONE:1\">" +
|
|
128
|
+
member("RINCON_A", "10.0.0.1", "Bedroom") +
|
|
129
|
+
"</ZoneGroup></ZoneGroups></ZoneGroupState>"
|
|
130
|
+
|
|
131
|
+
assertEquals(emptyList<SonosGroup>(), ZoneGroupState.parse(response(state)))
|
|
132
|
+
}
|
|
133
|
+
|
|
134
|
+
@Test
|
|
135
|
+
fun `is null for a fault or garbage`() {
|
|
136
|
+
assertNull(ZoneGroupState.parse("not xml"))
|
|
137
|
+
assertNull(ZoneGroupState.parse(response("not xml")))
|
|
138
|
+
}
|
|
139
|
+
}
|
|
@@ -72,16 +72,18 @@ class OutputMonitorTest {
|
|
|
72
72
|
}
|
|
73
73
|
|
|
74
74
|
@Test
|
|
75
|
-
fun `leaving
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
75
|
+
fun `leaving a remote output with no local reading reports the phone speaker`() {
|
|
76
|
+
for (type in listOf(OutputType.REMOTE, OutputType.CAST, OutputType.SONOS)) {
|
|
77
|
+
RemoteOutputs.setCurrent(Output(type = type, name = "Kitchen", external = true))
|
|
78
|
+
idle()
|
|
79
|
+
|
|
80
|
+
RemoteOutputs.setCurrent(null)
|
|
81
|
+
idle()
|
|
82
|
+
|
|
83
|
+
val phoneSpeaker = Output(type = OutputType.SPEAKER, name = "Phone speaker", external = false)
|
|
84
|
+
assertEquals("$type", phoneSpeaker, emitted.last())
|
|
85
|
+
assertEquals("$type", phoneSpeaker, monitor.current)
|
|
86
|
+
}
|
|
85
87
|
}
|
|
86
88
|
|
|
87
89
|
private fun routeMediaTo(deviceType: Int) {
|
|
@@ -0,0 +1,78 @@
|
|
|
1
|
+
<?xml version="1.0" encoding="utf-8" ?>
|
|
2
|
+
<root xmlns="urn:schemas-upnp-org:device-1-0">
|
|
3
|
+
<specVersion>
|
|
4
|
+
<major>1</major>
|
|
5
|
+
<minor>0</minor>
|
|
6
|
+
</specVersion>
|
|
7
|
+
<device>
|
|
8
|
+
<deviceType>urn:schemas-upnp-org:device:ZonePlayer:1</deviceType>
|
|
9
|
+
<friendlyName>192.168.1.50 - Sonos One</friendlyName>
|
|
10
|
+
<manufacturer>Sonos, Inc.</manufacturer>
|
|
11
|
+
<modelNumber>S13</modelNumber>
|
|
12
|
+
<modelName>Sonos One</modelName>
|
|
13
|
+
<roomName>Kitchen</roomName>
|
|
14
|
+
<UDN>uuid:RINCON_949F3EC213E001400</UDN>
|
|
15
|
+
<serviceList>
|
|
16
|
+
<service>
|
|
17
|
+
<serviceType>urn:schemas-upnp-org:service:AlarmClock:1</serviceType>
|
|
18
|
+
<serviceId>urn:upnp-org:serviceId:AlarmClock</serviceId>
|
|
19
|
+
<controlURL>/AlarmClock/Control</controlURL>
|
|
20
|
+
<eventSubURL>/AlarmClock/Event</eventSubURL>
|
|
21
|
+
<SCPDURL>/xml/AlarmClock1.xml</SCPDURL>
|
|
22
|
+
</service>
|
|
23
|
+
<service>
|
|
24
|
+
<serviceType>urn:schemas-upnp-org:service:ZoneGroupTopology:1</serviceType>
|
|
25
|
+
<serviceId>urn:upnp-org:serviceId:ZoneGroupTopology</serviceId>
|
|
26
|
+
<controlURL>/ZoneGroupTopology/Control</controlURL>
|
|
27
|
+
<eventSubURL>/ZoneGroupTopology/Event</eventSubURL>
|
|
28
|
+
<SCPDURL>/xml/ZoneGroupTopology1.xml</SCPDURL>
|
|
29
|
+
</service>
|
|
30
|
+
</serviceList>
|
|
31
|
+
<deviceList>
|
|
32
|
+
<device>
|
|
33
|
+
<deviceType>urn:schemas-upnp-org:device:MediaServer:1</deviceType>
|
|
34
|
+
<friendlyName>192.168.1.50 - Sonos One Media Server</friendlyName>
|
|
35
|
+
<manufacturer>Sonos, Inc.</manufacturer>
|
|
36
|
+
<UDN>uuid:RINCON_949F3EC213E001400_MS</UDN>
|
|
37
|
+
<serviceList>
|
|
38
|
+
<service>
|
|
39
|
+
<serviceType>urn:schemas-upnp-org:service:ContentDirectory:1</serviceType>
|
|
40
|
+
<serviceId>urn:upnp-org:serviceId:ContentDirectory</serviceId>
|
|
41
|
+
<controlURL>/MediaServer/ContentDirectory/Control</controlURL>
|
|
42
|
+
<eventSubURL>/MediaServer/ContentDirectory/Event</eventSubURL>
|
|
43
|
+
<SCPDURL>/xml/ContentDirectory1.xml</SCPDURL>
|
|
44
|
+
</service>
|
|
45
|
+
</serviceList>
|
|
46
|
+
</device>
|
|
47
|
+
<device>
|
|
48
|
+
<deviceType>urn:schemas-upnp-org:device:MediaRenderer:1</deviceType>
|
|
49
|
+
<friendlyName>192.168.1.50 - Sonos One Media Renderer</friendlyName>
|
|
50
|
+
<manufacturer>Sonos, Inc.</manufacturer>
|
|
51
|
+
<UDN>uuid:RINCON_949F3EC213E001400_MR</UDN>
|
|
52
|
+
<serviceList>
|
|
53
|
+
<service>
|
|
54
|
+
<serviceType>urn:schemas-upnp-org:service:RenderingControl:1</serviceType>
|
|
55
|
+
<serviceId>urn:upnp-org:serviceId:RenderingControl</serviceId>
|
|
56
|
+
<controlURL>/MediaRenderer/RenderingControl/Control</controlURL>
|
|
57
|
+
<eventSubURL>/MediaRenderer/RenderingControl/Event</eventSubURL>
|
|
58
|
+
<SCPDURL>/xml/RenderingControl1.xml</SCPDURL>
|
|
59
|
+
</service>
|
|
60
|
+
<service>
|
|
61
|
+
<serviceType>urn:schemas-upnp-org:service:GroupRenderingControl:1</serviceType>
|
|
62
|
+
<serviceId>urn:upnp-org:serviceId:GroupRenderingControl</serviceId>
|
|
63
|
+
<controlURL>/MediaRenderer/GroupRenderingControl/Control</controlURL>
|
|
64
|
+
<eventSubURL>/MediaRenderer/GroupRenderingControl/Event</eventSubURL>
|
|
65
|
+
<SCPDURL>/xml/GroupRenderingControl1.xml</SCPDURL>
|
|
66
|
+
</service>
|
|
67
|
+
<service>
|
|
68
|
+
<serviceType>urn:schemas-upnp-org:service:AVTransport:1</serviceType>
|
|
69
|
+
<serviceId>urn:upnp-org:serviceId:AVTransport</serviceId>
|
|
70
|
+
<controlURL>/MediaRenderer/AVTransport/Control</controlURL>
|
|
71
|
+
<eventSubURL>/MediaRenderer/AVTransport/Event</eventSubURL>
|
|
72
|
+
<SCPDURL>/xml/AVTransport1.xml</SCPDURL>
|
|
73
|
+
</service>
|
|
74
|
+
</serviceList>
|
|
75
|
+
</device>
|
|
76
|
+
</deviceList>
|
|
77
|
+
</device>
|
|
78
|
+
</root>
|
|
@@ -0,0 +1,56 @@
|
|
|
1
|
+
package com.audiobrowser.cast
|
|
2
|
+
|
|
3
|
+
import com.google.android.gms.cast.MediaStatus
|
|
4
|
+
import org.junit.Assert.assertEquals
|
|
5
|
+
import org.junit.Assert.assertNull
|
|
6
|
+
import org.junit.Test
|
|
7
|
+
|
|
8
|
+
class CastEndsTest {
|
|
9
|
+
private val ends = CastEnds()
|
|
10
|
+
|
|
11
|
+
private fun load(n: Int) = "a#cast-send-$n"
|
|
12
|
+
|
|
13
|
+
private fun idle(contentId: String?, reason: Int = MediaStatus.IDLE_REASON_NONE) =
|
|
14
|
+
ends.report(contentId, MediaStatus.PLAYER_STATE_IDLE, reason)
|
|
15
|
+
|
|
16
|
+
@Test
|
|
17
|
+
fun `each load's end is reported once`() {
|
|
18
|
+
idle(load(1))
|
|
19
|
+
assertEquals(CastEnds.Report.ENDED, idle(load(1), MediaStatus.IDLE_REASON_FINISHED))
|
|
20
|
+
assertNull(idle(load(1), MediaStatus.IDLE_REASON_FINISHED))
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
// The Default Media Receiver, after a load it can't fetch: IDLE with the load's media, then
|
|
24
|
+
// IDLE/ERROR without media.
|
|
25
|
+
@Test
|
|
26
|
+
fun `two loads that fail in a row are each reported`() {
|
|
27
|
+
idle(load(1))
|
|
28
|
+
assertEquals(CastEnds.Report.FAILED, idle(null, MediaStatus.IDLE_REASON_ERROR))
|
|
29
|
+
assertNull(idle(null, MediaStatus.IDLE_REASON_ERROR))
|
|
30
|
+
idle(load(2))
|
|
31
|
+
assertEquals(CastEnds.Report.FAILED, idle(null, MediaStatus.IDLE_REASON_ERROR))
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
@Test
|
|
35
|
+
fun `a load that ends straight after the last one is reported`() {
|
|
36
|
+
assertEquals(CastEnds.Report.ENDED, idle(load(1), MediaStatus.IDLE_REASON_FINISHED))
|
|
37
|
+
assertEquals(CastEnds.Report.ENDED, idle(load(2), MediaStatus.IDLE_REASON_FINISHED))
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
@Test
|
|
41
|
+
fun `playing, an idle load not yet started, and an interrupted one report nothing`() {
|
|
42
|
+
assertNull(ends.report(load(1), MediaStatus.PLAYER_STATE_PLAYING, MediaStatus.IDLE_REASON_NONE))
|
|
43
|
+
assertNull(idle(load(1)))
|
|
44
|
+
assertNull(idle(load(1), MediaStatus.IDLE_REASON_INTERRUPTED))
|
|
45
|
+
assertNull(idle(load(1), MediaStatus.IDLE_REASON_CANCELED))
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
@Test
|
|
49
|
+
fun `a new session reports a load it reported before`() {
|
|
50
|
+
idle(load(1), MediaStatus.IDLE_REASON_FINISHED)
|
|
51
|
+
|
|
52
|
+
ends.reset()
|
|
53
|
+
|
|
54
|
+
assertEquals(CastEnds.Report.ENDED, idle(load(1), MediaStatus.IDLE_REASON_FINISHED))
|
|
55
|
+
}
|
|
56
|
+
}
|
|
@@ -0,0 +1,79 @@
|
|
|
1
|
+
package com.audiobrowser.cast
|
|
2
|
+
|
|
3
|
+
import androidx.media3.common.MediaItem
|
|
4
|
+
import androidx.media3.common.MediaMetadata
|
|
5
|
+
import com.audiobrowser.remote.isRemoteLive
|
|
6
|
+
import com.audiobrowser.remote.remoteItemOf
|
|
7
|
+
import com.google.android.gms.cast.MediaInfo
|
|
8
|
+
import com.google.android.gms.cast.MediaQueueItem
|
|
9
|
+
import org.junit.Assert.assertEquals
|
|
10
|
+
import org.junit.Assert.assertNotEquals
|
|
11
|
+
import org.junit.Assert.assertSame
|
|
12
|
+
import org.junit.Assert.assertTrue
|
|
13
|
+
import org.junit.Test
|
|
14
|
+
import org.junit.runner.RunWith
|
|
15
|
+
import org.mockito.Mockito.mock
|
|
16
|
+
import org.robolectric.RobolectricTestRunner
|
|
17
|
+
|
|
18
|
+
@RunWith(RobolectricTestRunner::class)
|
|
19
|
+
class SendingMediaItemConverterTest {
|
|
20
|
+
private val converter = SendingMediaItemConverter()
|
|
21
|
+
|
|
22
|
+
private fun item(id: String, live: Boolean) =
|
|
23
|
+
remoteItemOf(
|
|
24
|
+
MediaItem.Builder()
|
|
25
|
+
.setMediaId(id)
|
|
26
|
+
.setMediaMetadata(MediaMetadata.Builder().setTitle("Item $id").build())
|
|
27
|
+
.build(),
|
|
28
|
+
"https://cdn.example/$id",
|
|
29
|
+
null,
|
|
30
|
+
live,
|
|
31
|
+
)
|
|
32
|
+
|
|
33
|
+
@Test
|
|
34
|
+
fun `each send of an item has a content id of its own`() {
|
|
35
|
+
val station = item("a", live = true)
|
|
36
|
+
|
|
37
|
+
val first = converter.toMediaQueueItem(station).media!!.contentId
|
|
38
|
+
val second = converter.toMediaQueueItem(station).media!!.contentId
|
|
39
|
+
|
|
40
|
+
assertNotEquals(first, second)
|
|
41
|
+
assertTrue(first.startsWith("a"))
|
|
42
|
+
assertTrue(second.startsWith("a"))
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
@Test
|
|
46
|
+
fun `an item comes back with its own media id and URL`() {
|
|
47
|
+
val track = item("t1", live = false)
|
|
48
|
+
|
|
49
|
+
val back = converter.toMediaItem(converter.toMediaQueueItem(track))
|
|
50
|
+
|
|
51
|
+
assertEquals("t1", back.mediaId)
|
|
52
|
+
assertEquals("https://cdn.example/t1", back.localConfiguration?.uri.toString())
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
@Test
|
|
56
|
+
fun `a live item goes as a live stream and comes back live`() {
|
|
57
|
+
val station = item("a", live = true)
|
|
58
|
+
|
|
59
|
+
val sent = converter.toMediaQueueItem(station)
|
|
60
|
+
|
|
61
|
+
assertEquals(MediaInfo.STREAM_TYPE_LIVE, sent.media!!.streamType)
|
|
62
|
+
assertEquals("audio/mpeg", sent.media!!.contentType)
|
|
63
|
+
assertTrue(converter.toMediaItem(sent).isRemoteLive)
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
@Test
|
|
67
|
+
fun `a track doesn't go as a live stream`() {
|
|
68
|
+
val sent = converter.toMediaQueueItem(item("t1", live = false))
|
|
69
|
+
|
|
70
|
+
assertNotEquals(MediaInfo.STREAM_TYPE_LIVE, sent.media!!.streamType)
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
@Test
|
|
74
|
+
fun `an item the receiver reports without its media is empty`() {
|
|
75
|
+
val unloaded = mock(MediaQueueItem::class.java)
|
|
76
|
+
|
|
77
|
+
assertSame(MediaItem.EMPTY, converter.toMediaItem(unloaded))
|
|
78
|
+
}
|
|
79
|
+
}
|
|
@@ -230,6 +230,8 @@ var _validateOptions = require("./validateOptions");
|
|
|
230
230
|
|
|
231
231
|
/** iOS setup options: the audio-session fields plus the iOS runtime options. */
|
|
232
232
|
|
|
233
|
+
/** Which remote outputs `setupPlayer({ remoteOutputs })` turns on. */
|
|
234
|
+
|
|
233
235
|
/**
|
|
234
236
|
* @internal The wire shape `setupPlayer` sends across the bridge: the platform bags hold only
|
|
235
237
|
* construction fields, the runtime options nest under `options`, and the public `nowPlaying`
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_native","require","_validateOptions","resolveNowPlaying","value","autoUpdateNowPlayingMetadata","nowPlayingMetadataFormatter","wrapNowPlayingFormatter","undefined","formatter","params","definedFields","obj","out","key","nonEmpty","Object","keys","length","setupPlayer","options","nowPlaying","capabilities","forwardJumpInterval","backwardJumpInterval","progressUpdateEventInterval","android","ios","nativeSetup","appKilledPlaybackBehavior","skipSilence","remoteButtonLayout","androidSetup","playbackRates","carPlayUpNextButton","carPlayNowPlayingButtons","carPlayPlayingIndicatorLocation","iosSetup","iosUpdate","validateIOSUpdateOptions","updates","nativeBrowser"],"sourceRoot":"../../../../src","sources":["features/player/setup.ts"],"mappings":";;;;;;AAYA,IAAAA,OAAA,GAAAC,OAAA;AACA,IAAAC,gBAAA,GAAAD,OAAA;AAbA;;AAeA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAyBA;AACA;AACA;AACA;AACA;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAKA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAQA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AASA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAYA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAUA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAmBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AA2BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAGA;AACA;AACA;AACA;AACA;AACA;;AA2GA;;AA4CA;AACA;AACA;AACA;AACA;;AAoCA;;AAEA;AACA;AACA;AACA;;AAMA;AACA;AACA;AACA;;AAMA;AACA;AACA;AACA;AACA;AACA;AACA;;
|
|
1
|
+
{"version":3,"names":["_native","require","_validateOptions","resolveNowPlaying","value","autoUpdateNowPlayingMetadata","nowPlayingMetadataFormatter","wrapNowPlayingFormatter","undefined","formatter","params","definedFields","obj","out","key","nonEmpty","Object","keys","length","setupPlayer","options","nowPlaying","capabilities","forwardJumpInterval","backwardJumpInterval","progressUpdateEventInterval","android","ios","nativeSetup","appKilledPlaybackBehavior","skipSilence","remoteButtonLayout","androidSetup","playbackRates","carPlayUpNextButton","carPlayNowPlayingButtons","carPlayPlayingIndicatorLocation","iosSetup","iosUpdate","validateIOSUpdateOptions","updates","nativeBrowser"],"sourceRoot":"../../../../src","sources":["features/player/setup.ts"],"mappings":";;;;;;AAYA,IAAAA,OAAA,GAAAC,OAAA;AACA,IAAAC,gBAAA,GAAAD,OAAA;AAbA;;AAeA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAyBA;AACA;AACA;AACA;AACA;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAKA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAQA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AASA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAYA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAUA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAmBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AA2BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAGA;AACA;AACA;AACA;AACA;AACA;;AA2GA;;AA4CA;;AA2BA;AACA;AACA;AACA;AACA;;AAoCA;;AAEA;AACA;AACA;AACA;;AAMA;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","ignoreList":[]}
|
|
@@ -227,6 +227,8 @@ import { validateIOSUpdateOptions } from './validateOptions';
|
|
|
227
227
|
|
|
228
228
|
/** iOS setup options: the audio-session fields plus the iOS runtime options. */
|
|
229
229
|
|
|
230
|
+
/** Which remote outputs `setupPlayer({ remoteOutputs })` turns on. */
|
|
231
|
+
|
|
230
232
|
/**
|
|
231
233
|
* @internal The wire shape `setupPlayer` sends across the bridge: the platform bags hold only
|
|
232
234
|
* construction fields, the runtime options nest under `options`, and the public `nowPlaying`
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["nativeBrowser","validateIOSUpdateOptions","resolveNowPlaying","value","autoUpdateNowPlayingMetadata","nowPlayingMetadataFormatter","wrapNowPlayingFormatter","undefined","formatter","params","definedFields","obj","out","key","nonEmpty","Object","keys","length","setupPlayer","options","nowPlaying","capabilities","forwardJumpInterval","backwardJumpInterval","progressUpdateEventInterval","android","ios","nativeSetup","appKilledPlaybackBehavior","skipSilence","remoteButtonLayout","androidSetup","playbackRates","carPlayUpNextButton","carPlayNowPlayingButtons","carPlayPlayingIndicatorLocation","iosSetup","iosUpdate","updates"],"sourceRoot":"../../../../src","sources":["features/player/setup.ts"],"mappings":";;AAAA;;AAYA,SAASA,aAAa,QAAQ,cAAc;AAC5C,SAASC,wBAAwB,QAAQ,mBAAmB;;AAE5D;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAyBA;AACA;AACA;AACA;AACA;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAKA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAQA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AASA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAYA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAUA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAmBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AA2BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAGA;AACA;AACA;AACA;AACA;AACA;;AA2GA;;AA4CA;AACA;AACA;AACA;AACA;;AAoCA;;AAEA;AACA;AACA;AACA;;AAMA;AACA;AACA;AACA;;AAMA;AACA;AACA;AACA;AACA;AACA;AACA;;
|
|
1
|
+
{"version":3,"names":["nativeBrowser","validateIOSUpdateOptions","resolveNowPlaying","value","autoUpdateNowPlayingMetadata","nowPlayingMetadataFormatter","wrapNowPlayingFormatter","undefined","formatter","params","definedFields","obj","out","key","nonEmpty","Object","keys","length","setupPlayer","options","nowPlaying","capabilities","forwardJumpInterval","backwardJumpInterval","progressUpdateEventInterval","android","ios","nativeSetup","appKilledPlaybackBehavior","skipSilence","remoteButtonLayout","androidSetup","playbackRates","carPlayUpNextButton","carPlayNowPlayingButtons","carPlayPlayingIndicatorLocation","iosSetup","iosUpdate","updates"],"sourceRoot":"../../../../src","sources":["features/player/setup.ts"],"mappings":";;AAAA;;AAYA,SAASA,aAAa,QAAQ,cAAc;AAC5C,SAASC,wBAAwB,QAAQ,mBAAmB;;AAE5D;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAyBA;AACA;AACA;AACA;AACA;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAKA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAQA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AASA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAYA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAUA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAmBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AA2BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAGA;AACA;AACA;AACA;AACA;AACA;;AA2GA;;AA4CA;;AA2BA;AACA;AACA;AACA;AACA;;AAoCA;;AAEA;AACA;AACA;AACA;;AAMA;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","ignoreList":[]}
|
|
@@ -415,6 +415,32 @@ export interface IOSSetupOptions extends IOSUpdateOptions {
|
|
|
415
415
|
*/
|
|
416
416
|
categoryPolicy?: IOSCategoryPolicy;
|
|
417
417
|
}
|
|
418
|
+
/** Which remote outputs `setupPlayer({ remoteOutputs })` turns on. */
|
|
419
|
+
export interface RemoteOutputsOptions {
|
|
420
|
+
/**
|
|
421
|
+
* Plays on Cast devices selected in the Output Switcher, through the Default Media Receiver:
|
|
422
|
+
* the receiver fetches the track's media URL itself, so it gets the URL the media transform
|
|
423
|
+
* resolves, without its headers. Needs the app built with `AudioBrowser_castEnabled=true` in
|
|
424
|
+
* its `gradle.properties` and Google Play services on the device; without either, playback
|
|
425
|
+
* stays on the phone and a warning is logged.
|
|
426
|
+
* @default false
|
|
427
|
+
*/
|
|
428
|
+
cast?: boolean;
|
|
429
|
+
/**
|
|
430
|
+
* The Cast receiver application `cast` loads, as registered in the Google Cast SDK Developer
|
|
431
|
+
* Console: a Styled Media Receiver shows the app's own name on the device and in its
|
|
432
|
+
* notifications. Cast takes it once per app process: a change takes effect after a restart.
|
|
433
|
+
* @default the Default Media Receiver, `'CC1AD845'`
|
|
434
|
+
*/
|
|
435
|
+
castReceiverApplicationId?: string;
|
|
436
|
+
/**
|
|
437
|
+
* Plays on Sonos rooms selected in the Output Switcher, over the speakers' UPnP control: the
|
|
438
|
+
* speaker fetches the media URL the media transform resolves, without its headers. Sonos calls
|
|
439
|
+
* UPnP unsupported and lets the listener switch it off; then no rooms are listed.
|
|
440
|
+
* @default false
|
|
441
|
+
*/
|
|
442
|
+
sonos?: boolean;
|
|
443
|
+
}
|
|
418
444
|
/**
|
|
419
445
|
* Public setup options: the full launch description of a player in one bag — engine
|
|
420
446
|
* construction, runtime options (`capabilities`, jump intervals, …), and initial player state
|
|
@@ -468,16 +494,20 @@ export type SetupPlayerOptions = Pick<UpdateOptions, 'capabilities' | 'forwardJu
|
|
|
468
494
|
keepSessionAliveOnError?: boolean;
|
|
469
495
|
/**
|
|
470
496
|
* Offers remote speakers and TVs in the system Output Switcher (`openOutputPicker`), and
|
|
471
|
-
* reports the selected one as the `Output`, with `type: 'remote'
|
|
472
|
-
*
|
|
473
|
-
*
|
|
474
|
-
*
|
|
475
|
-
*
|
|
497
|
+
* reports the selected one as the `Output`, with `type: 'remote'`, or `'cast'` for a Cast
|
|
498
|
+
* device and `'sonos'` for a Sonos room. `{}` reports the selection only: the library keeps
|
|
499
|
+
* playing locally, and rendering the audio on the speaker is the provider's job. The speakers
|
|
500
|
+
* come from media route providers that declare the library's remote-output control category
|
|
501
|
+
* (`RemoteOutputs.CATEGORY` on Android). The app declares AndroidX's `MediaTransferReceiver` in
|
|
502
|
+
* its manifest for the switcher to move the session.
|
|
503
|
+
*
|
|
504
|
+
* Each `setupPlayer` sets it: left out, remote outputs are off, and playback on one comes back
|
|
505
|
+
* to the phone.
|
|
476
506
|
*
|
|
477
507
|
* Android 11+ only for now; ignored on iOS, whose route picker already lists AirPlay devices.
|
|
478
|
-
* @default
|
|
508
|
+
* @default off
|
|
479
509
|
*/
|
|
480
|
-
remoteOutputs?:
|
|
510
|
+
remoteOutputs?: RemoteOutputsOptions;
|
|
481
511
|
/** Android-specific options: engine construction and runtime, merged. */
|
|
482
512
|
android?: AndroidSetupOptions;
|
|
483
513
|
/** iOS-specific options: audio session and runtime, merged. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../../../../../src/features/player/setup.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../../../../../src/features/player/setup.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AACxC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,WAAW,CAAA;AAC9C,OAAO,KAAK,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAClE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AACrD,OAAO,KAAK,EACV,oBAAoB,EACpB,gBAAgB,EAEhB,aAAa,EACd,MAAM,WAAW,CAAA;AAIlB;;;;;;;;GAQG;AACH,MAAM,MAAM,sBAAsB,GAAG;IACnC,mCAAmC;IACnC,KAAK,EAAE,KAAK,CAAA;IACZ;;;OAGG;IACH,aAAa,CAAC,EAAE,aAAa,CAAA;IAC7B,kHAAkH;IAClH,aAAa,EAAE,OAAO,CAAA;IACtB;;;;;;;;OAQG;IACH,OAAO,CAAC,EAAE,WAAW,CAAA;IACrB,0DAA0D;IAC1D,KAAK,CAAC,EAAE,aAAa,CAAA;CACtB,CAAA;AAED;;;;GAIG;AACH,MAAM,MAAM,WAAW,GAAG,WAAW,GAAG,SAAS,CAAA;AAEjD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuDG;AACH,MAAM,MAAM,wBAAwB,GAAG,CACrC,MAAM,EAAE,sBAAsB,KAC3B,gBAAgB,GAAG,SAAS,CAAA;AAEjC;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,MAAM,uBAAuB,GAC/B,OAAO,GACP,QAAQ,GACR,cAAc,GACd,OAAO,GACP,SAAS,CAAA;AAEb;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,MAAM,WAAW,GACnB,UAAU,GACV,eAAe,GACf,YAAY,GACZ,SAAS,GACT,aAAa,GACb,QAAQ,CAAA;AAEZ;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,MAAM,MAAM,eAAe,GACvB,SAAS,GACT,UAAU,GACV,aAAa,GACb,eAAe,GACf,aAAa,GACb,WAAW,GACX,gBAAgB,GAChB,WAAW,GACX,aAAa,CAAA;AAEjB;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,MAAM,MAAM,kBAAkB,GAC1B,eAAe,GACf,YAAY,GACZ,sCAAsC,GACtC,gBAAgB,GAChB,oBAAoB,GACpB,cAAc,GACd,kBAAkB,CAAA;AAEtB;;;;;;;;GAQG;AACH,MAAM,MAAM,iBAAiB,GAAG,SAAS,GAAG,eAAe,GAAG,eAAe,CAAA;AAE7E,MAAM,WAAW,2BAA2B;IAC1C;;;;OAIG;IACH,sBAAsB,CAAC,EAAE,OAAO,CAAA;IAEhC;;;;OAIG;IACH,yBAAyB,CAAC,EAAE,OAAO,CAAA;CACpC;AAED;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,MAAM,MAAM,WAAW,GAAG;IACxB;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAA;IAEnB;;;;;;OAMG;IACH,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAE3B;;;;;;OAMG;IACH,8BAA8B,CAAC,EAAE,MAAM,CAAA;CACxC,CAAA;AAED;;;;;;;GAOG;AACH,MAAM,MAAM,qBAAqB,GAAG,MAAM,GAAG,OAAO,GAAG,SAAS,CAAA;AAEhE;;;;;GAKG;AACH,MAAM,WAAW,mBAAoB,SAAQ,oBAAoB;IAC/D;;;;;OAKG;IACH,SAAS,CAAC,EAAE,MAAM,CAAA;IAElB;;;;;;;;;;;;OAYG;IACH,YAAY,CAAC,EAAE,OAAO,GAAG,2BAA2B,CAAA;IAEpD;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,MAAM,CAAA;IAElB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,MAAM,CAAA;IAEnB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,MAAM,CAAA;IAEnB;;;;;;;;;;;;;;;;OAgBG;IACH,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IAE9B;;;;OAIG;IACH,YAAY,CAAC,EAAE,MAAM,CAAA;IAErB;;;;;;;;;OASG;IACH,gBAAgB,CAAC,EAAE,uBAAuB,CAAA;IAE1C;;;;;OAKG;IACH,wBAAwB,CAAC,EAAE,OAAO,CAAA;IAElC;;;;;;;OAOG;IACH,QAAQ,CAAC,EAAE,qBAAqB,CAAA;CACjC;AAED,gFAAgF;AAChF,MAAM,WAAW,eAAgB,SAAQ,gBAAgB;IACvD;;;;;;;;;OASG;IACH,MAAM,CAAC,EAAE,MAAM,CAAA;IAEf;;;OAGG;IACH,QAAQ,CAAC,EAAE,WAAW,CAAA;IAEtB;;;;;;;;OAQG;IACH,YAAY,CAAC,EAAE,eAAe,CAAA;IAE9B;;;OAGG;IACH,eAAe,CAAC,EAAE,kBAAkB,EAAE,CAAA;IAEtC;;;OAGG;IACH,cAAc,CAAC,EAAE,iBAAiB,CAAA;CACnC;AAED,sEAAsE;AACtE,MAAM,WAAW,oBAAoB;IACnC;;;;;;;OAOG;IACH,IAAI,CAAC,EAAE,OAAO,CAAA;IACd;;;;;OAKG;IACH,yBAAyB,CAAC,EAAE,MAAM,CAAA;IAClC;;;;;OAKG;IACH,KAAK,CAAC,EAAE,OAAO,CAAA;CAChB;AA8DD;;;;;;GAMG;AACH,MAAM,MAAM,kBAAkB,GAAG,IAAI,CACnC,aAAa,EACX,cAAc,GACd,qBAAqB,GACrB,sBAAsB,GACtB,6BAA6B,CAChC,GAAG;IACF;;;;;;;;OAQG;IACH,aAAa,CAAC,EAAE,OAAO,CAAA;IAEvB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,UAAU,CAAA;IAEvB;;;;;;;;;;;;OAYG;IACH,KAAK,CAAC,EAAE,OAAO,GAAG,WAAW,CAAA;IAE7B;;;;;;;;;;OAUG;IACH,uBAAuB,CAAC,EAAE,OAAO,CAAA;IAEjC;;;;;;;;;;;;;;OAcG;IACH,aAAa,CAAC,EAAE,oBAAoB,CAAA;IAEpC,yEAAyE;IACzE,OAAO,CAAC,EAAE,mBAAmB,CAAA;IAC7B,+DAA+D;IAC/D,GAAG,CAAC,EAAE,eAAe,CAAA;IACrB;;;;;;;;;;;OAWG;IACH,UAAU,CAAC,EAAE,OAAO,GAAG,wBAAwB,CAAA;CAChD,CAAA;AAiED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,wBAAsB,WAAW,CAC/B,OAAO,GAAE,kBAAuB,GAC/B,OAAO,CAAC,IAAI,CAAC,CA2Df"}
|
|
@@ -11,10 +11,10 @@ export type EqualizerSettings = {
|
|
|
11
11
|
/**
|
|
12
12
|
* Cross-platform audio output kind. Each platform maps its native ports into
|
|
13
13
|
* this shared set: iOS's granular Bluetooth ports (`bluetoothA2DP`/`HFP`/`LE`)
|
|
14
|
-
* all collapse to `'bluetooth'`. `'airplay'` comes from iOS only, `'remote'
|
|
15
|
-
* from Android only (with `remoteOutputs` on)
|
|
14
|
+
* all collapse to `'bluetooth'`. `'airplay'` comes from iOS only, `'remote'`,
|
|
15
|
+
* `'cast'` and `'sonos'` from Android only (with `remoteOutputs` on).
|
|
16
16
|
*/
|
|
17
|
-
export type OutputType = 'speaker' | 'receiver' | 'headphones' | 'bluetooth' | 'airplay' | 'car' | 'hdmi' | 'usb' | 'cast' | 'remote' | 'other';
|
|
17
|
+
export type OutputType = 'speaker' | 'receiver' | 'headphones' | 'bluetooth' | 'airplay' | 'car' | 'hdmi' | 'usb' | 'cast' | 'sonos' | 'remote' | 'other';
|
|
18
18
|
/**
|
|
19
19
|
* The current audio output. Read via `getOutput()` / `useOutput()` on every
|
|
20
20
|
* platform: iOS always reports one while a session is active; Android reports the
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"audio-browser.nitro.d.ts","sourceRoot":"","sources":["../../../../src/specs/audio-browser.nitro.ts"],"names":[],"mappings":"AAyDA,MAAM,MAAM,iBAAiB,GAAG;IAC9B,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,SAAS,EAAE,MAAM,CAAA;IACjB,UAAU,EAAE,MAAM,EAAE,CAAA;IACpB,qBAAqB,EAAE,MAAM,EAAE,CAAA;IAC/B,OAAO,EAAE,OAAO,CAAA;IAChB,mBAAmB,EAAE,MAAM,CAAA;IAC3B,OAAO,EAAE,MAAM,EAAE,CAAA;IACjB,mBAAmB,EAAE,MAAM,CAAA;CAC5B,CAAA;AAED;;;;;GAKG;AACH,MAAM,MAAM,UAAU,GAClB,SAAS,GACT,UAAU,GACV,YAAY,GACZ,WAAW,GACX,SAAS,GACT,KAAK,GACL,MAAM,GACN,KAAK,GACL,MAAM,GACN,QAAQ,GACR,OAAO,CAAA;AAEX;;;;;;GAMG;AACH,MAAM,MAAM,MAAM,GAAG;IACnB,sBAAsB;IACtB,IAAI,EAAE,UAAU,CAAA;IAChB,0EAA0E;IAC1E,IAAI,EAAE,MAAM,CAAA;IACZ,+EAA+E;IAC/E,QAAQ,EAAE,OAAO,CAAA;CAClB,CAAA"}
|
|
1
|
+
{"version":3,"file":"audio-browser.nitro.d.ts","sourceRoot":"","sources":["../../../../src/specs/audio-browser.nitro.ts"],"names":[],"mappings":"AAyDA,MAAM,MAAM,iBAAiB,GAAG;IAC9B,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,SAAS,EAAE,MAAM,CAAA;IACjB,UAAU,EAAE,MAAM,EAAE,CAAA;IACpB,qBAAqB,EAAE,MAAM,EAAE,CAAA;IAC/B,OAAO,EAAE,OAAO,CAAA;IAChB,mBAAmB,EAAE,MAAM,CAAA;IAC3B,OAAO,EAAE,MAAM,EAAE,CAAA;IACjB,mBAAmB,EAAE,MAAM,CAAA;CAC5B,CAAA;AAED;;;;;GAKG;AACH,MAAM,MAAM,UAAU,GAClB,SAAS,GACT,UAAU,GACV,YAAY,GACZ,WAAW,GACX,SAAS,GACT,KAAK,GACL,MAAM,GACN,KAAK,GACL,MAAM,GACN,OAAO,GACP,QAAQ,GACR,OAAO,CAAA;AAEX;;;;;;GAMG;AACH,MAAM,MAAM,MAAM,GAAG;IACnB,sBAAsB;IACtB,IAAI,EAAE,UAAU,CAAA;IAChB,0EAA0E;IAC1E,IAAI,EAAE,MAAM,CAAA;IACZ,+EAA+E;IAC/E,QAAQ,EAAE,OAAO,CAAA;CAClB,CAAA"}
|
|
@@ -205,6 +205,8 @@ namespace margelo::nitro::audiobrowser { struct FormatNowPlayingParams; }
|
|
|
205
205
|
namespace margelo::nitro::audiobrowser { enum class StallReason; }
|
|
206
206
|
// Forward declaration of `RetryConfig` to properly resolve imports.
|
|
207
207
|
namespace margelo::nitro::audiobrowser { struct RetryConfig; }
|
|
208
|
+
// Forward declaration of `RemoteOutputsOptions` to properly resolve imports.
|
|
209
|
+
namespace margelo::nitro::audiobrowser { struct RemoteOutputsOptions; }
|
|
208
210
|
|
|
209
211
|
#include <string>
|
|
210
212
|
#include <optional>
|
|
@@ -473,6 +475,8 @@ namespace margelo::nitro::audiobrowser { struct RetryConfig; }
|
|
|
473
475
|
#include "RetryConfig.hpp"
|
|
474
476
|
#include "JVariant_Boolean_RetryConfig.hpp"
|
|
475
477
|
#include "JRetryConfig.hpp"
|
|
478
|
+
#include "RemoteOutputsOptions.hpp"
|
|
479
|
+
#include "JRemoteOutputsOptions.hpp"
|
|
476
480
|
|
|
477
481
|
namespace margelo::nitro::audiobrowser {
|
|
478
482
|
|
|
@@ -56,6 +56,7 @@
|
|
|
56
56
|
#include "JPlayerCapabilities.hpp"
|
|
57
57
|
#include "JRemoteButton.hpp"
|
|
58
58
|
#include "JRemoteButtonLayout.hpp"
|
|
59
|
+
#include "JRemoteOutputsOptions.hpp"
|
|
59
60
|
#include "JRepeatMode.hpp"
|
|
60
61
|
#include "JRetryConfig.hpp"
|
|
61
62
|
#include "JStallReason.hpp"
|
|
@@ -80,6 +81,7 @@
|
|
|
80
81
|
#include "PlayerCapabilities.hpp"
|
|
81
82
|
#include "RemoteButton.hpp"
|
|
82
83
|
#include "RemoteButtonLayout.hpp"
|
|
84
|
+
#include "RemoteOutputsOptions.hpp"
|
|
83
85
|
#include "RepeatMode.hpp"
|
|
84
86
|
#include "RetryConfig.hpp"
|
|
85
87
|
#include "StallReason.hpp"
|
|
@@ -137,8 +139,8 @@ namespace margelo::nitro::audiobrowser {
|
|
|
137
139
|
jni::local_ref<JVariant_Boolean_RetryConfig> retry = this->getFieldValue(fieldRetry);
|
|
138
140
|
static const auto fieldKeepSessionAliveOnError = clazz->getField<jni::JBoolean>("keepSessionAliveOnError");
|
|
139
141
|
jni::local_ref<jni::JBoolean> keepSessionAliveOnError = this->getFieldValue(fieldKeepSessionAliveOnError);
|
|
140
|
-
static const auto fieldRemoteOutputs = clazz->getField<
|
|
141
|
-
jni::local_ref<
|
|
142
|
+
static const auto fieldRemoteOutputs = clazz->getField<JRemoteOutputsOptions>("remoteOutputs");
|
|
143
|
+
jni::local_ref<JRemoteOutputsOptions> remoteOutputs = this->getFieldValue(fieldRemoteOutputs);
|
|
142
144
|
return NativeSetupPlayerOptions(
|
|
143
145
|
android != nullptr ? std::make_optional(android->toCpp()) : std::nullopt,
|
|
144
146
|
ios != nullptr ? std::make_optional(ios->toCpp()) : std::nullopt,
|
|
@@ -157,7 +159,7 @@ namespace margelo::nitro::audiobrowser {
|
|
|
157
159
|
repeatMode != nullptr ? std::make_optional(repeatMode->toCpp()) : std::nullopt,
|
|
158
160
|
retry != nullptr ? std::make_optional(retry->toCpp()) : std::nullopt,
|
|
159
161
|
keepSessionAliveOnError != nullptr ? std::make_optional(static_cast<bool>(keepSessionAliveOnError->value())) : std::nullopt,
|
|
160
|
-
remoteOutputs != nullptr ? std::make_optional(
|
|
162
|
+
remoteOutputs != nullptr ? std::make_optional(remoteOutputs->toCpp()) : std::nullopt
|
|
161
163
|
);
|
|
162
164
|
}
|
|
163
165
|
|
|
@@ -167,7 +169,7 @@ namespace margelo::nitro::audiobrowser {
|
|
|
167
169
|
*/
|
|
168
170
|
[[maybe_unused]]
|
|
169
171
|
static jni::local_ref<JNativeSetupPlayerOptions::javaobject> fromCpp(const NativeSetupPlayerOptions& value) {
|
|
170
|
-
using JSignature = JNativeSetupPlayerOptions(jni::alias_ref<JNativeAndroidSetupOptions>, jni::alias_ref<JNativeIOSSetupOptions>, jni::alias_ref<JNativeUpdateOptions>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<JFunc_std__shared_ptr_Promise_std__optional_NowPlayingUpdate____FormatNowPlayingParams::javaobject>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<JRepeatMode>, jni::alias_ref<JVariant_Boolean_RetryConfig>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<
|
|
172
|
+
using JSignature = JNativeSetupPlayerOptions(jni::alias_ref<JNativeAndroidSetupOptions>, jni::alias_ref<JNativeIOSSetupOptions>, jni::alias_ref<JNativeUpdateOptions>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<JFunc_std__shared_ptr_Promise_std__optional_NowPlayingUpdate____FormatNowPlayingParams::javaobject>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<JRepeatMode>, jni::alias_ref<JVariant_Boolean_RetryConfig>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<JRemoteOutputsOptions>);
|
|
171
173
|
static const auto clazz = javaClassStatic();
|
|
172
174
|
static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
|
|
173
175
|
return create(
|
|
@@ -181,7 +183,7 @@ namespace margelo::nitro::audiobrowser {
|
|
|
181
183
|
value.repeatMode.has_value() ? JRepeatMode::fromCpp(value.repeatMode.value()) : nullptr,
|
|
182
184
|
value.retry.has_value() ? JVariant_Boolean_RetryConfig::fromCpp(value.retry.value()) : nullptr,
|
|
183
185
|
value.keepSessionAliveOnError.has_value() ? jni::JBoolean::valueOf(value.keepSessionAliveOnError.value()) : nullptr,
|
|
184
|
-
value.remoteOutputs.has_value() ?
|
|
186
|
+
value.remoteOutputs.has_value() ? JRemoteOutputsOptions::fromCpp(value.remoteOutputs.value()) : nullptr
|
|
185
187
|
);
|
|
186
188
|
}
|
|
187
189
|
};
|
|
@@ -69,6 +69,9 @@ namespace margelo::nitro::audiobrowser {
|
|
|
69
69
|
case OutputType::CAST:
|
|
70
70
|
static const auto fieldCAST = clazz->getStaticField<JOutputType>("CAST");
|
|
71
71
|
return clazz->getStaticFieldValue(fieldCAST);
|
|
72
|
+
case OutputType::SONOS:
|
|
73
|
+
static const auto fieldSONOS = clazz->getStaticField<JOutputType>("SONOS");
|
|
74
|
+
return clazz->getStaticFieldValue(fieldSONOS);
|
|
72
75
|
case OutputType::REMOTE:
|
|
73
76
|
static const auto fieldREMOTE = clazz->getStaticField<JOutputType>("REMOTE");
|
|
74
77
|
return clazz->getStaticFieldValue(fieldREMOTE);
|