Skip to content

Commit 90b1b69

Browse files
committed
Update text on MP3 support
1 parent 5366915 commit 90b1b69

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

faq.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -462,8 +462,7 @@
462462
<h2 id="audio"><a class="h2-link" href="#audio">SFML Audio</a><a class="back-to-top" href="#top" title="Top of the page"></a></h2>
463463

464464
<h3 id="audio-formats"><a class="h3-link" href="#audio-formats">What audio formats does SFML support?</a><a class="back-to-top" href="#top" title="Top of the page"></a></h3>
465-
<p>The Audio module is capable of playing wav, ogg/vorbis and flac files.<br>
466-
MP3 is currently not supported, as the the patents and licenses around MP3 only ran out recently. We're happy to accept pull requests with a proper implementation.</p>
465+
<p>The Audio module is capable of playing wav, ogg/vorbis, flac, and MP3 files.</p>
467466

468467
<h3 id="audio-sound-problem"><a class="h3-link" href="#audio-sound-problem">Why can't I hear any sound?</a><a class="back-to-top" href="#top" title="Top of the page"></a></h3>
469468
<p>If everything compiles and seems to work correctly, but yet no sound is coming out of your speakers you should check the obvious. Ensure your speakers and plugged in and working correctly before assuming something is wrong with SFML. You can do this by opening one of your audio assets in another audio player such as Windows Media Player or <a href="https://www.videolan.org/">VLC</a>. If audio fails to play correctly there, then check that your PC audio is not muted and that the volume control on your speakers is turned up. Once it plays correctly in an external player then the problem may be with SFML.</p>
@@ -829,4 +828,4 @@
829828

830829
<?php
831830
require("footer.php");
832-
?>
831+
?>

tutorials/2.6/audio-sounds-fr.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
<a class="internal" href="./system-stream-fr.php" title="Tutoriel sur les flux de données">flux de données perso</a> (<code>loadFromStream</code>).
6262
</p>
6363
<p>
64-
SFML supporte les formats WAV, OGG/Vorbis et FLAC. En raison de l'octroi de licences, le format MP3 n'est <strong>pas</strong> supporté.
64+
SFML supporte les formats WAV, OGG/Vorbis et FLAC. Le format MP3 est pris en charge pour le décodage mais pas pour l'encodage.
6565
</p>
6666
<p>
6767
Vous pouvez aussi charger un buffer directement depuis un tableau d'échantillons, au cas où vous les auriez récupéré depuis autre chose

tutorials/2.6/audio-sounds.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
<a class="internal" href="./system-stream.php" title="Input streams tutorial">custom input stream</a> (<code>loadFromStream</code>).
5757
</p>
5858
<p>
59-
SFML supports the audio file formats WAV, OGG/Vorbis and FLAC. Due to licensing issues MP3 is <strong>not</strong> supported.
59+
SFML supports the audio file formats WAV, OGG/Vorbis and FLAC. MP3 is supported for decoding but not encoding.
6060
</p>
6161
<p>
6262
You can also load a sound buffer directly from an array of samples, in the case they originate from another source:

0 commit comments

Comments
 (0)