ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-04-08 20:05:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mixer: fix README with regard to boolean values

Browse Source 
Issue #4043.
This commit is contained in:
Josef Söntgen 2021-03-08 16:26:18 +01:00 committed by Norman Feske
parent ba6c4a664f
commit 4a12b5c653
2 changed files with 36 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
repos/os/run/mixer.run
View File

@ -38,7 +38,9 @@ set config {
<default-route>
<service name="Audio_out"> <child name="mixer"/> </service>
<any-service> <parent/> <any-child/> </any-service>
</default-route>}
</default-route>
<default caps="100"/>}
append_platform_drv_config
@ -73,42 +75,42 @@ append config {
<rom name="mixer.config">
<inline description="client1 plays">
<mixer.config>
<default out_volume="75" volume="42" muted="0"/>
<default out_volume="75" volume="42" muted="false"/>
<channel_list>
<channel type="input" label="client1" name="right" number="1" active="1" volume="70" muted="0"/>
<channel type="input" label="client1" name="left" number="0" active="1" volume="70" muted="0"/>
<channel type="input" label="client2" name="right" number="1" active="1" volume="0" muted="0"/>
<channel type="input" label="client2" name="left" number="0" active="1" volume="0" muted="0"/>
<channel type="output" label="master" name="left" number="0" active="1" volume="100" muted="0"/>
<channel type="output" label="master" name="right" number="1" active="1" volume="100" muted="0"/>
<channel type="input" label="client1" name="right" number="1" active="1" volume="70" muted="false"/>
<channel type="input" label="client1" name="left" number="0" active="1" volume="70" muted="false"/>
<channel type="input" label="client2" name="right" number="1" active="1" volume="0" muted="false"/>
<channel type="input" label="client2" name="left" number="0" active="1" volume="0" muted="false"/>
<channel type="output" label="master" name="left" number="0" active="1" volume="100" muted="false"/>
<channel type="output" label="master" name="right" number="1" active="1" volume="100" muted="false"/>
</channel_list>
</mixer.config>
</inline>
<sleep milliseconds="10000" />
<inline description="client2 plays">
<mixer.config>
<default out_volume="75" volume="42" muted="0"/>
<default out_volume="75" volume="42" muted="false"/>
<channel_list>
<channel type="input" label="client1" name="right" number="1" active="1" volume="0" muted="0"/>
<channel type="input" label="client1" name="left" number="0" active="1" volume="0" muted="0"/>
<channel type="input" label="client2" name="right" number="1" active="1" volume="70" muted="0"/>
<channel type="input" label="client2" name="left" number="0" active="1" volume="70" muted="0"/>
<channel type="output" label="master" name="left" number="0" active="1" volume="100" muted="0"/>
<channel type="output" label="master" name="right" number="1" active="1" volume="100" muted="0"/>
<channel type="input" label="client1" name="right" number="1" active="1" volume="0" muted="false"/>
<channel type="input" label="client1" name="left" number="0" active="1" volume="0" muted="false"/>
<channel type="input" label="client2" name="right" number="1" active="1" volume="70" muted="false"/>
<channel type="input" label="client2" name="left" number="0" active="1" volume="70" muted="false"/>
<channel type="output" label="master" name="left" number="0" active="1" volume="100" muted="false"/>
<channel type="output" label="master" name="right" number="1" active="1" volume="100" muted="false"/>
</channel_list>
</mixer.config>
</inline>
<sleep milliseconds="10000" />
<inline description="both play">
<mixer.config>
<default out_volume="75" volume="42" muted="0"/>
<default out_volume="75" volume="42" muted="false"/>
<channel_list>
<channel type="input" label="client1" name="right" number="1" active="1" volume="50" muted="0"/>
<channel type="input" label="client1" name="left" number="0" active="1" volume="50" muted="0"/>
<channel type="input" label="client2" name="right" number="1" active="1" volume="50" muted="0"/>
<channel type="input" label="client2" name="left" number="0" active="1" volume="50" muted="0"/>
<channel type="output" label="master" name="left" number="0" active="1" volume="100" muted="0"/>
<channel type="output" label="master" name="right" number="1" active="1" volume="100" muted="0"/>
<channel type="input" label="client1" name="right" number="1" active="1" volume="50" muted="false"/>
<channel type="input" label="client1" name="left" number="0" active="1" volume="50" muted="false"/>
<channel type="input" label="client2" name="right" number="1" active="1" volume="50" muted="false"/>
<channel type="input" label="client2" name="left" number="0" active="1" volume="50" muted="false"/>
<channel type="output" label="master" name="left" number="0" active="1" volume="100" muted="false"/>
<channel type="output" label="master" name="right" number="1" active="1" volume="100" muted="false"/>
</channel_list>
</mixer.config>
</inline>
@ -118,7 +120,7 @@ append config {
</start>
<start name="mixer">
<resource name="RAM" quantum="1M"/>
<resource name="RAM" quantum="2M"/>
<provides><service name="Audio_out"/></provides>
<route>
<service name="Audio_out"> <child name="audio_drv"/> </service>

22
repos/os/src/server/mixer/README
View File

@ -13,12 +13,12 @@ The mixer gets its configuration via a ROM module called 'mixer.config'.
The following configuration snippet illustrates its structure:
! <config>
! <default out_volume="75" volume="25" muted="0"/>
! <default out_volume="75" volume="25" muted="false"/>
! <channel_list>
! <channel type="input" label="client" number="0" volume="75" muted="1"/>
! <channel type="input" label="client" number="1" volume="15" muted="1"/>
! <channel type="output" label="master" number="0" volume="100" muted="0"/>
! <channel type="output" label="master" number="1" volume="100" muted="0"/>
! <channel type="input" label="client" number="0" volume="75" muted="true"/>
! <channel type="input" label="client" number="1" volume="15" muted="true"/>
! <channel type="output" label="master" number="0" volume="100" muted="false"/>
! <channel type="output" label="master" number="1" volume="100" muted="false"/>
! </channel_list>
! </config>
@ -43,12 +43,12 @@ The report contains a `<channel_list>' node that is similar to the one
used in the 'mixer.config':
! <channel_list>
! <channel type="input" label="client0" name="left" number="0" active="1" volume="100" muted="0"/>
! <channel type="input" label="client0" name="right" number="1" active="1" volume="100" muted="0"/>
! <channel type="input" label="client1" name="left" number="0" active="0" volume="25" muted="0"/>
! <channel type="input" label="client1" name="right" number="1" active="0" volume="25" muted="0"/>
! <channel type="output" label="master" name="left" number="0" active="1" volume="100" muted="0"/>
! <channel type="output" label="master" name="right" number="1" active="1" volume="100" muted="0"/>
! <channel type="input" label="client0" name="left" number="0" active="1" volume="100" muted="false"/>
! <channel type="input" label="client0" name="right" number="1" active="1" volume="100" muted="false"/>
! <channel type="input" label="client1" name="left" number="0" active="0" volume="25" muted="false"/>
! <channel type="input" label="client1" name="right" number="1" active="0" volume="25" muted="false"/>
! <channel type="output" label="master" name="left" number="0" active="1" volume="100" muted="false"/>
! <channel type="output" label="master" name="right" number="1" active="1" volume="100" muted="false"/>
! </channel_list>
Each channel node features all mandatory attributes as well as a few optional