[Scummvm-git-logs] scummvm master -> 83227fef8e218c8e01a60252d24513170fc50c89

[criezy]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
b09b79f2b1 DOCS: added notes about the extracted audio cd files
83227fef8e DOCS: mention the m4a support for audio cd files


Commit: b09b79f2b1c2c5c4d06a0e7e7f47664265f6d26b
    https://github.com/scummvm/scummvm/commit/b09b79f2b1c2c5c4d06a0e7e7f47664265f6d26b
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2021-08-19T21:58:24+01:00

Commit Message:
DOCS: added notes about the extracted audio cd files

Changed paths:
    doc/docportal/use_scummvm/game_files.rst


diff --git a/doc/docportal/use_scummvm/game_files.rst b/doc/docportal/use_scummvm/game_files.rst
index f2e8e44070..41e8594230 100644
--- a/doc/docportal/use_scummvm/game_files.rst
+++ b/doc/docportal/use_scummvm/game_files.rst
@@ -49,6 +49,12 @@ In most cases, ScummVM can use CD audio directly from the game CD. If you don't
 1. Extract the CD audio tracks in WAV or AIFF format.
 2. Convert the tracks to either MP3, FLAC or OGG file formats.
 3. Place the converted audio files in the same folder that contains the other game datafiles.
+4. You can name them in several ways:
+
+   1. track01.ogg - track12.ogg
+   2. track1.ogg - track12.ogg
+   3. track_01.ogg - track_12.ogg
+   4. track_1.ogg - track_12.ogg
 
 .. tip::
 


Commit: 83227fef8e218c8e01a60252d24513170fc50c89
    https://github.com/scummvm/scummvm/commit/83227fef8e218c8e01a60252d24513170fc50c89
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2021-08-19T21:58:24+01:00

Commit Message:
DOCS: mention the m4a support for audio cd files

see STREAM_FILEFORMATS array in audiostream.cpp

Changed paths:
    doc/docportal/use_scummvm/game_files.rst


diff --git a/doc/docportal/use_scummvm/game_files.rst b/doc/docportal/use_scummvm/game_files.rst
index 41e8594230..10e203f904 100644
--- a/doc/docportal/use_scummvm/game_files.rst
+++ b/doc/docportal/use_scummvm/game_files.rst
@@ -47,7 +47,7 @@ CD audio
 In most cases, ScummVM can use CD audio directly from the game CD. If you don't always want to insert the game CD to use the CD audio, you can extract the audio tracks from the CD and save them locally:
 
 1. Extract the CD audio tracks in WAV or AIFF format.
-2. Convert the tracks to either MP3, FLAC or OGG file formats.
+2. Convert the tracks to either MP3, FLAC, M4A or OGG file formats.
 3. Place the converted audio files in the same folder that contains the other game datafiles.
 4. You can name them in several ways: