mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-26 07:00:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "update to master"

Browse source 
This reverts commit fccb4bd29d
This commit is contained in:
zhaochengyi 2024-06-25 09:52:10 +00:00
parent fccb4bd29d
commit 7b8afb3024
107 changed files with 51641 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

20
man/meson.build
View file

@ -14,6 +14,13 @@ if get_option('daemon')
]
endif
<<<<<<< HEAD
manpages += [
['pacat', '1', ['paplay', 'parec', 'parecord', 'pamon']],
['pactl', '1'],
['pulse-client.conf', '5'],
]
=======
if get_option('client')
manpages += [
['pacat', '1', ['paplay', 'parec', 'parecord', 'pamon']],
@ -33,6 +40,19 @@ if get_option('client')
]
endif
endif
>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
if cdata.has('HAVE_OSS_WRAPPER')
manpages += [
['padsp', '1'],
]
endif
if x11_dep.found()
manpages += [
['pax11publish', '1'],
]
endif
# FIXME: Add esdcompat if HAVE_ESOUND
#manpages += ['esdcompat', '1'],

8
man/pactl.1.xml.in
View file

@ -174,9 +174,13 @@ License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
<option>
<p><opt>set-default-sink</opt> <arg>SINK</arg></p>
<<<<<<< HEAD
<optdesc><p>Make the specified sink (identified by its symbolic name or numerical index) the default sink.</p></optdesc>
=======
<optdesc><p>Make the specified sink (identified by its symbolic name or numerical index) the default sink.
Use the special name \@NONE@ to unset the user defined default sink. This will make pulseaudio return to the default
sink selection based on sink priority.</p></optdesc>
>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
</option>
<option>
@ -191,9 +195,13 @@ License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
<option>
<p><opt>set-default-source</opt> <arg>SOURCE</arg></p>
<<<<<<< HEAD
<optdesc><p>Make the specified source (identified by its symbolic name or numerical index) the default source.</p></optdesc>
=======
<optdesc><p>Make the specified source (identified by its symbolic name or numerical index) the default source.
Use the special name \@NONE@ to unset the user defined default source. This will make pulseaudio return to the default
source selection based on source priority.</p></optdesc>
>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
</option>
<option>