diff --git a/documentation/multimedia.sgml b/documentation/multimedia.sgml
index ba34538a04b..cf339e7bf91 100644
--- a/documentation/multimedia.sgml
+++ b/documentation/multimedia.sgml
@@ -30,8 +30,8 @@
- There are two specific low level drivers (one for wave input/output,
- another one for MIDI output only), whose role is:
+ There are two specific low level drivers (msacm.drv for wave input/output,
+ midimap.drv for MIDI output only), whose role is:
@@ -40,7 +40,9 @@
- add the possibility to convert streams (ie ADPCM => PCM)
+ add the possibility to convert streams (ie ADPCM =>
+ PCM) (this is useful if the format required by the
+ application for playback isn't supported by the soundcard).
@@ -125,8 +127,13 @@
Other sub systems
- No other is available. Could think of Sun Audio, remote audio systems
- (using X extensions, ...), ALSA, EsounD, ArTs...
+ Support is also provided for ALSA, aRts, NAS, Jack,
+ AudioIO, but with less intensive debugging than the OSS.
+
+
+
+ EsounD isn't supported yet. ALSA support still needs a
+ couple of refinements.
@@ -202,14 +209,16 @@
Other sub systems
- Could support other MIDI implementation for other sub systems (any
- idea here ?)
+ Could support other MIDI implementation for other sub
+ systems (ALSA, any other idea here ?)
Could also implement a software synthesizer, either inside Wine or
using using MIDI loop back devices in an external program (like
timidity). The only trouble is that timidity is GPL'ed...
+ Note: this could be achieved using the ALSA sequencer and
+ Timidity being used as a server.
@@ -498,7 +507,7 @@
The currently best implementation is the MCI CDAUDIO driver that can
be found in dlls/winmm/mcicda/mcicda.c. The implementation is mostly
complete, there have been no reports of errors. It makes use of
- misc/cdrom.c Wine internal cdrom interface.
+ dlls/ntdll/cdrom.c Wine cdrom interface.
This interface has been ported on Linux, FreeBSD and NetBSD. (Sun
should be similar, but are not implemented.)
@@ -521,12 +530,6 @@
configuration scheme)
-
-
- The DLL is not cleanly separated from the NTDLL DLL. The CDROM
- interface should be exported someway (or stored in a Wine only DLL)
-
-
@@ -760,16 +763,6 @@
regarding this point.
-
-
- add clean-up mechanisms when process detaches from MM DLLs
-
-
-
-
- prepare for the 16/32 big split
-
-
check thread-safeness for MMSYSTEM and WINMM entry points
@@ -799,9 +792,9 @@
MCI drivers are seen as regular Wine modules, and can be loaded (with
- a correct load order between builtin, native, so), as any
- other DLL. Please note, that MCI drivers module names must bear the
- .drv extension to be correctly understood.
+ a correct load order between builtin, native), as any other DLL.
+ Please note, that MCI drivers module names must bear the .drv
+ extension to be correctly understood.
@@ -867,13 +860,6 @@
using binary command line.
-
-
- the Wine native MCI drivers should use the mmThreadXXX API (but since
- all built-in MCI drivers are 32 bit, this would require a special
- flag to mark 32 bit entry points)
-
-
@@ -987,6 +973,13 @@
model
+
+
+ we need also a generic tool to let the end user pick
+ up his/her driver depending on the hardware present on the machine.
+ model
+
+
@@ -1222,35 +1215,35 @@ Kernel space | Client applications
-
- MS ACM Dlls
+
+ MS ACM Dlls
-
- Contents
+
+ Contents
- tbd
-
+ tbd
+
-
- Status
+
+ Status
- tbd
-
+ tbd
+
-
- Caching
+
+ Caching
-
- The MSACM/MSACM32 keeps some data cached for all known ACM
- drivers. Under the key
-
+
+ The MSACM/MSACM32 keeps some data cached for all known ACM
+ drivers. Under the key
+
Software\Microsoft\AudioCompressionManager\DriverCache\<driver
name>
-
- are kept for values:
-
-
-
+
+ , are kept for values:
+
+
+
aFormatTagCache which contains an array of
DWORD. There are two DWORDs per cFormatTags
entry. The first DWORD contains a format tag
@@ -1258,37 +1251,36 @@ Kernel space | Client applications
size for a WAVEFORMATEX structure.
(Fields dwFormatTag and cbFormatSize from
ACMFORMATDETAILS)
-
-
-
-
+
+
+
+
cFilterTags contains the number of tags supported by the driver
for filtering.
-
-
-
-
+
+
+
+
cFormatTags contains the number of tags support
by the driver for conversions.
-
-
-
-
+
+
+
+
fdwSupport (the same as the one returned from
acmDriverDetails).
-
-
-
-
+
+
+
+
-
+
The cFilterTags, cFormatTags, fdwSupport are the same
values as the ones returned from acmDriverDetails
function.
-
-
-
-
+
+
+