Commit Graph

1049 Commits

Author SHA1 Message Date
Robert Reif 72b7071e5a Return proper error code.
Change ERR to WARN for failed requests.
2005-06-05 18:06:35 +00:00
Robert Reif 2b7438224f Add support for more than 2 audio channels. 2005-05-30 11:12:07 +00:00
Francois Gouget 62253b752f Assorted spelling fixes. 2005-05-30 09:56:56 +00:00
Marcus Meissner 33f4108b69 #undef interface before including alsa headers. 2005-05-29 20:03:05 +00:00
Robert Reif 8a67554a3a Fix a multiple sound card interface bug.
Add better error messages.
2005-05-29 20:02:58 +00:00
Robert Reif 84e1e9948b Fix volume control. 2005-05-29 20:02:05 +00:00
Alexandre Julliard 0ddd30b0b6 Removed unnecessary code in the 16-bit DllEntryPoint function of some
dlls, and also fixed its ordinal in a few places.
2005-05-23 10:00:26 +00:00
Mike McCormack 66cee15084 Set thread priorities to time critical. 2005-05-14 18:49:40 +00:00
Alexandre Julliard 34fa35dc99 Added rules for building import libraries in the individual dll
makefiles, and added support for building a .def.a static import
library too.
2005-05-09 14:42:30 +00:00
Alexandre Julliard d62356aa1e Added rules to build import libraries in the individual dll makefiles.
Generate import libraries with the right name right away instead of
using an intermediate .spec.def file.
2005-05-07 12:39:52 +00:00
Robert Lunnon dc1ceb95cb Fix segmentation fault caused by incorrect referencing of client audio
format specifications array.
2005-05-07 12:17:28 +00:00
Robert Reif 723a67d1f8 Change FIXME to WARN. 2005-05-06 19:32:36 +00:00
Mike McCormack b2ba933fcf Make multimedia threads high priority. 2005-04-27 09:39:55 +00:00
Mike McCormack 795b17e055 Make WINMM_IData statically allocated. 2005-04-27 08:12:58 +00:00
Christian Costa 0b3c79f712 Fixed flags handling in MCIAVI_mciInfo. 2005-04-26 14:29:57 +00:00
Robert Reif 684f111070 Remove priority boost stuff. 2005-04-24 17:23:51 +00:00
Robert Reif 419e92812b Set thread priority for timer thread.
Add timer thread priority test.
2005-04-23 19:03:47 +00:00
Alex Villacís Lasso 569db3c812 Perform one more commit in ALSA non-emulation if there are still
frames to be transmitted.
2005-04-22 19:05:34 +00:00
Peter Berg Larsen 6e3bcb5a54 Replace strncpy with memcpy or lstrcpyn. 2005-04-18 10:30:55 +00:00
Robert Reif da9c394f67 Stub out DRVM_MAPPER_RECONFIGURE support. 2005-04-12 10:14:57 +00:00
José Manuel Ferrer Ortiz 4f50a2c0dc Spanish translations updated. 2005-04-11 13:01:46 +00:00
Robert Reif ed8cf4e3a9 Changed regression test to make sure position is correctly checked
when a different type is returned.
Added Jeremy White's WAVE_FORMAT_DIRECT/WAVE_MAPPER fix.
Added waveInGetPosition checks.
2005-04-11 12:49:22 +00:00
Robert Reif c002dfc005 Correctly handle where waveOutGetPosition changes timepos.wType
because the requested type is not supported.
Added Jeremy White's waveOutGetPosition fix to waveInGetPosition.
2005-04-11 12:49:04 +00:00
Paul van Schayck d2c7a6863b Don't stop looking for devices if one can't be opened. 2005-03-31 10:07:02 +00:00
Jerry Jenkins 4a8ce2ae41 Improve winealsa dsound driver by accessing sound driver's buffer
directly in an undocumented way.
2005-03-29 19:48:07 +00:00
Jerry Jenkins 2239b3ae2e Don't mistake frames for bytes. 2005-03-27 17:52:32 +00:00
Jakob Eriksson 9ed61de9a2 Get rid of HeapAlloc casts. 2005-03-24 21:01:35 +00:00
Francois Gouget 93416cdaf7 Assorted spelling fixes. 2005-03-23 13:15:18 +00:00
Robert Reif b19aaf1e46 Don't fail when opening a device in direct sound mode. Rather, try
alternate formats first before failing.
2005-03-23 11:58:05 +00:00
Jeremy White cd5ee268b8 Revamp the volume logic to be more self contained, fix a few bugs so
that the volume is correctly read, and is correctly converted to
windows style volume numbers.
2005-03-23 10:22:16 +00:00
Robert Reif f1565973b6 Fix direct sound capabilities to match hardware. 2005-03-21 12:32:48 +00:00
Alexandre Julliard c3b7da47f8 Fixed a missing patch chunk. 2005-03-21 11:50:06 +00:00
Robert Reif 3279b6de6e Clean up handle usage. 2005-03-21 11:21:18 +00:00
Vincent Béron 811725ac20 Correct and complete some api documentation. 2005-03-21 10:55:13 +00:00
Filip Navara 4a5ade0eb1 Specify correct buffer size in GetPrivateProfileStringW calls. 2005-03-21 10:28:38 +00:00
Robert Reif 0c9c020d68 Print out message name to make reading traces easier. 2005-03-21 10:27:47 +00:00
Robert Reif 2b3aa7c5be Fall back to default prepare/unprepare header functions. 2005-03-19 17:11:02 +00:00
Robert Reif 03c88f5f60 Add support for more than one sound card.
Fix wave out support when no volume control is present.
Use proper structure for wave in device caps.
2005-03-18 10:26:05 +00:00
Robert Reif 83d29a0761 Check wave out volume support. 2005-03-18 10:25:48 +00:00
Robert Reif 99042cfe64 Fall back to default header prepare and unprepare functions. 2005-03-17 18:56:14 +00:00
Robert Reif f7be545ede Use real device name. 2005-03-17 18:54:20 +00:00
Jeremy White 40df53aae2 Do not fallback to defaults if a driver, mapper, or midi is specified
in the registry; consolidate MMDRV_Init() into a single function.
2005-03-17 10:25:25 +00:00
Robert Reif 1a90d1cc3c Provide default implementation of waveInPrepareHeader and
waveInUnprepareHeader if driver doesn't support them.
2005-03-16 11:30:34 +00:00
Robert Reif 8b55b76daf Fix memory leak in error path. 2005-03-15 15:39:03 +00:00
Robert Reif cf4d0d9707 Fix memory leak when there are too many drivers. 2005-03-15 15:38:48 +00:00
Jason Edmeades 17cff085fb Avoid trap in mixerGetLineControlsA when cControls is uninitialized
and MIXER_GETLINECONTROLSSF_ONEBYTYPE requested.
2005-03-15 15:38:34 +00:00
Peter Berg Larsen 001a936176 Assorted memleak fixes. Found on Michael Stefaniuc smatch list. 2005-03-11 12:50:27 +00:00
Alexandre Julliard 7b738b7f8c Make sure to always pass valid QS_* flags to
MsgWaitForMultipleObjects.
2005-03-08 17:00:38 +00:00
Vincent Béron d5749b454d Make wineoss's mixer know about DST_HEADPHONES, DST_LINE and
DST_VOICEIN. Use proper constants instead of 0 and 1.
2005-03-07 10:59:28 +00:00
Steven Edwards 5727918424 Added a check for poll.h. 2005-03-04 12:38:36 +00:00
Francois Gouget 9e53994abe Warn the user if he is running the test in interactive mode but the
sound is turned off.
2005-03-03 13:49:30 +00:00
Francois Gouget fbb3343547 Assorted spelling fixes. 2005-03-02 13:53:50 +00:00
Francois Gouget 7105248ae6 Apply Jeremy White's SMPTE calculation fix to each audio driver. 2005-03-02 13:39:23 +00:00
Alexandre Julliard d0ee9f9309 Avoid spaces before preprocessor directives, that's not portable. 2005-03-02 12:23:20 +00:00
Jeremy White 36e845ce05 Aggressively round up to the proper alignment when reporting position
on streams where we are converting up.
2005-03-02 12:17:28 +00:00
Jeremy White cf23045791 More correctly establish cases where the OSS input buffer should not
be enabled.
2005-03-02 10:12:35 +00:00
Christian Costa 18a9738943 Added some more cases to MCI_MapMsgAtoW. 2005-02-26 17:41:11 +00:00
Jeremy White 2db20ef1f0 More correct fix for dsp empty case. 2005-02-23 21:00:02 +00:00
Jeremy White 494a34bfda An interactive test should have volume, else a rational user will
decide it is broken.
2005-02-23 20:28:28 +00:00
Jeremy White aa2046f643 In calculating the SMPTE time, we would round incorrectly (0:0:4.30
instead of 0:0:5.0 [the last column only goes to 29]).
2005-02-23 15:40:54 +00:00
Jeremy White 920ef0fbc9 When we get down to the last fragment or two in our output to the DSP,
we should use the SND_DSP_POST ioctl to let the sound card know to
flush those fragments.  This allows us to precisely know when the
buffer is empty, and fixes another set of winmm tests.
2005-02-23 12:43:04 +00:00
Jeremy White 1b685779a4 When testing the WAVE_MAPPER device, it seems inappropriate (to me) to
demand WAVE_FORMAT_DIRECT; this fixes another slew of tests.
2005-02-23 12:42:43 +00:00
Jeremy White 15ec2780ef When we are converting from one sample rate to another, we do have to
adjust when calculating TIME_SAMPLES.
2005-02-23 12:42:32 +00:00
Christian Costa 87844214ab Fixed offsets calculations. 2005-02-18 12:53:26 +00:00
Robert Reif e3566d8260 Fix timer tests to pass on windows 98. 2005-02-18 12:51:54 +00:00
Alex Villacís Lasso 18bfe6a095 Change SUBLANG_DEFAULT to SUBLANG_NEUTRAL for LANG_SPANISH in all
resources, so that Spanish locales other than Spain also use Spanish
resources.
2005-02-16 21:10:59 +00:00
James Hawkins 993fbb94e0 Fix improper type-conversions. 2005-02-16 17:52:35 +00:00
Robert Reif ecdf41ef2c Add some missing \ns. 2005-02-14 20:54:12 +00:00
Robert Reif b33ef44105 Added parameter checking to timeGetDevCaps.
Added timer tests.
2005-02-14 11:00:59 +00:00
Eric Pouech 1eed552b4d - rewrite MCI interfaces as Unicode interface (as it should be)
- made some winmm APIs rely on the Unicode version for the core
  implementation (instead of Ansi flavor)
2005-02-09 22:26:25 +00:00
Robert Reif 7d92b5d8b4 Fix structure member name to match windows headers and fix up all
uses.
Nameless struct fix for dsound/propset.c to compile on both windows
and wine.
2005-01-28 17:21:07 +00:00
Alexandre Julliard d1685b00bf Authors: Klemens Friedl <klemens_friedl@gmx.net>, Henning Gerhardt <henning.gerhardt@web.de>
Spelling fixes.
2005-01-17 13:43:31 +00:00
James Hawkins ed12a3defd - Use Interlocked* instead of ++/-- in AddRef/Release.
- Use only stored result of Interlocked* in AddRef/Release.
- Expand TRACEs to display the ref count.
2005-01-12 19:55:24 +00:00
Vincent Béron 151015fa02 Only use Alsa if 1.0 is detected. 2005-01-10 13:26:33 +00:00
Mike McCormack 4a0f999859 Use CreateEventW in preference to CreateEventA for unnamed events. 2005-01-07 15:40:09 +00:00
Francois Gouget 9d589acc26 Assorted spelling fixes. 2005-01-04 20:39:54 +00:00
Alexandre Julliard 75f87dd43f Get rid of the ThunkData stubs, these are not functions. 2005-01-03 20:47:48 +00:00
Michael Stefaniuc 15a308a9d7 Do not check for non NULL pointer before HeapFree'ing it. It's
redundant.
2005-01-03 14:56:42 +00:00
Michael Stefaniuc 5ad7d858e0 Do not check for non NULL pointer before HeapFree'ing it. It's
redundant.
2004-12-23 17:06:43 +00:00
Francois Gouget ee0344a4a2 Remove unneeded NULL casts. 2004-12-22 15:13:20 +00:00
Robert Reif 2d8e75dab5 A driver does not have to support all formats. 2004-12-20 19:08:18 +00:00
Robert Reif 6ca75f8bb7 Return actual result on error. 2004-12-20 17:09:12 +00:00
Robert Reif 7b53f635f7 Return flag for DRVM_MAPPER_PREFERRED_GET. 2004-12-17 19:04:28 +00:00
Alexandre Julliard ebe3c529b1 Janitorial: C booleans must not be compared against TRUE. 2004-12-09 14:07:59 +00:00
Ge van Geldorp c24ca67f58 Match PSDK definitions for LPCWAVEFORMATEX. 2004-12-08 13:57:55 +00:00
Michael Jung 0e9f423b17 Fixed linking issues. 2004-12-08 13:44:41 +00:00
Alexandre Julliard 5f1ef6d09b Fixed compile error. 2004-12-07 14:31:53 +00:00
Alexandre Julliard b4e495574b Authors: Eric Pouech <pouech-eric@wanadoo.fr>, Filip Navara <xnavara@volny.cz>
32 bit low level drivers now use a Unicode interface (used to be ANSI):
- Send the *_GETDEVCAPS messages in unicode format from the
  *GetDevCapsW function and call the *GetDevCapsW from their respective
  Ansi versions.
- Modify all low level drivers to correctly process the *_GETDEVCAPS
  messages as unicode.
- *_GETDEVCAPS messages are now mapped from/to unicode for 16 bit code.
- Removed all SoundBlaster naming oldies.
Better use of some unicode functions (instead of Ansi) in winmm.
2004-12-06 20:55:25 +00:00
Filip Navara 155c8acfbd - Check the return value from *_GETNUMDEVS message as per KB90562.
- Fix typo in MMDRV_InstallMap.
2004-12-01 15:32:19 +00:00
Eric Pouech 0a258964c2 Const correctness fixes. 2004-11-30 21:38:57 +00:00
Eric Pouech 5c2a891c43 Made some functions and variables static. 2004-11-29 18:00:10 +00:00
Rémi Assailly 8cd13776e2 Add some missing error values in WINMM_ErrorToString. 2004-11-21 15:37:04 +00:00
Robert Reif 24da756e68 One step closer to getting hardware accelerated capture working. 2004-11-19 18:25:03 +00:00
Robert Shearman 84eaaa168f Fix broken thread start routines. 2004-11-03 22:18:44 +00:00
Robert Reif 53e5799949 Don't consider a MMSYSERR_NOTSUPPORTED failure a test failure. 2004-11-03 22:13:44 +00:00
Jeremy White e078899218 The Sleep(0) in this loop is incorrect, and should be removed. This
fixes iTunes and a game reported by che.
2004-11-02 19:26:22 +00:00
Robert Reif 0e3c524f4c Split up audio.c into three separate .c files:
audio.c: OSS functions and waveIn and waveOut driver functions.
dscapture.c: direct sound capture driver implementation.
dsrender.c: direct sound renderer driver implementation.
2004-10-26 22:04:55 +00:00
Robert Reif 01d55a404b win 9x doesn't always support waveOutGetDevCapsW so don't generate an
error for MMSYSERR_NOTSUPPORTED.
Play one second of silence for each sound card when not in interactive
mode.
2004-10-26 21:18:27 +00:00
Robert Reif c67bfb2895 Don't consider no driver a test failure. 2004-10-25 21:46:12 +00:00
Francois Gouget ceab348973 Remove HAVE_LIBAUDIOIO_MIDI and LIBAUDIOIO_MidiInit(). 2004-10-21 19:58:08 +00:00
Vincent Béron 6c644d68cf Fix various function prototypes. 2004-10-19 23:55:15 +00:00
Robert Reif 9c8dd0a294 Don't consider MMSYSERR_NOTSUPPORTED an error for wide functions. 2004-10-18 23:14:54 +00:00
Jeremy White fea27b1348 Revise winmm/time.c to fix timer resolution at 1 ms. This then allows
a much more efficient implementation of timer events and timeGetTime,
and callers that used sub 10 ms resolution will now get correct
results.
2004-10-18 21:44:32 +00:00
Hans Leidekker 804277371a getMessage() is only defined when HAVE_OSS is defined. 2004-10-14 00:28:43 +00:00
Eric Pouech 1876d185e9 - bring the multimedia doc up-to-date
- moved the TODO from the doc into the code
2004-10-11 19:57:10 +00:00
Jerry Jenkins ccdea75dca Fix an error message. 2004-10-04 20:41:10 +00:00
Jerry Jenkins 30b8cccc07 Don't use the SND_PCM_ASYNC flag for the moment. 2004-10-04 19:30:04 +00:00
Uwe Bonnes 17e22fba88 Call GetProcessHeap() instead of passing its address. 2004-09-27 20:35:13 +00:00
Alexandre Julliard 4521ea6e76 Revert broken change in previous patch. 2004-09-22 04:00:14 +00:00
Hans Leidekker 719a789792 Fix signed/unsigned comparison warnings. 2004-09-22 02:46:38 +00:00
Alexandre Julliard f5f7a1822c Removed some more uses of the non-standard ICOM_THIS macro. 2004-09-08 01:50:37 +00:00
Rein Klazes ad6b12c64c Fix a heap corruption in MIX_Init ( sizeof() != strlen() ). 2004-09-02 22:57:39 +00:00
Alexandre Julliard 1b30417811 Function parameters don't need WINE_UNUSED. 2004-09-01 04:58:21 +00:00
Francois Gouget 3c4525af93 Add support for the AUDIODEV and MIXERDEV environment variables. 2004-09-01 01:28:12 +00:00
Francois Gouget 4b0cb7d581 Don't include 'mmddk.h', it's not needed. The winmm tests can now be
compiled on Windows without the DDK.
2004-08-31 17:33:03 +00:00
Robert Reif 1e82007cae Test 32 bit float samples. 2004-08-30 18:36:06 +00:00
Robert Reif 79b1c4dbe7 Round results of conversions between OSS and windows values. 2004-08-30 18:35:53 +00:00
Robert Reif fa70d5c0d0 Adds tests to read and write control details. 2004-08-27 19:39:10 +00:00
Robert Reif d7d1c3846b Set proper target type.
Set proper max and step for mux control.
2004-08-27 19:38:47 +00:00
Francois Gouget dff5004bc0 Assorted spelling fixes. 2004-08-26 00:31:20 +00:00
Dmitry Timoshkov 03490879bd Fix an obvious typo leading to a crash. 2004-08-25 17:31:03 +00:00
Robert Reif c8fa57539d Added 32 bit float support. 2004-08-25 02:11:12 +00:00
Alexandre Julliard f714b39762 Get rid of the no longer used ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
macro.
2004-08-23 19:39:48 +00:00
Robert Reif b15504e122 Added support for multiple mixers.
Get mixer name from OSS.
More tracing.
2004-08-22 22:26:48 +00:00
Robert Reif 6f4be5494b Fixed bug in volume control step size so that it actually works.
Added additional debug tracing.
Code cleanup.
2004-08-22 02:02:27 +00:00
Robert Reif 7bf4eee7ad Remove wine specific DRV_QUERYDSOUNDGUID message and calculate it in
dsound.dll (like in 2k/xp).
2004-08-20 20:01:31 +00:00
Robert Shearman 941ed629a3 - Input path can have trailing slash.
- Improve some debugging messages.
2004-08-20 19:27:15 +00:00
Robert Reif 5ae2835e82 Change step size from 0 to 1 for volume controls to stop divide by
zero in app.
Change debug channel to mixer.
Add more tracing and errors.
2004-08-20 19:22:24 +00:00
Robert Reif 2e569d14c9 Added 24/32 bit sample size and 4/6 channel support.
Added dsound capture wine specific message support.
2004-08-19 19:55:38 +00:00
John K. Hohm cc3af24375 Consistently suggest proper Emulation rather than Emulated for
HardwareAcceleration in [dsound] section of config file.
2004-08-19 18:54:41 +00:00
Robert Reif 4e64906797 Added 32 bit sample size tests and 4 and 6 channel tests. 2004-08-19 01:13:58 +00:00
Robert Reif 370d5d244e Cleanup messages in supportedFormat. 2004-08-19 01:10:36 +00:00
Robert Reif c710121132 Don't try to find alternate formats for non PCM formats. 2004-08-19 01:07:49 +00:00
Robert Reif 7fe0568482 Some sound cards have different capabilities when doing full duplex so
add duplex caps and return them when necessary.
Clean up event message printing.
2004-08-18 00:30:01 +00:00
Eric Pouech f2ea78cdfb Implemented the mmTask* functions. 2004-08-16 23:19:17 +00:00
Robert Reif 39a008ed1a Added test for WAVEFORMATEXTENSIBLE support.
Error message cleanup.
2004-08-16 21:10:04 +00:00
Robert Reif e24f873b0f Added WAVEFORMATEXTENSIBLE support. 2004-08-16 21:09:52 +00:00
David Kredba b45744c817 Added Czech resources. 2004-08-16 20:02:09 +00:00
Robert Reif 0369da5c9e More WAVEOUTCAPSW tests. 2004-08-13 23:50:18 +00:00
Francois Gouget 08177d6d7b The Windows headers support for NONAMELESSUNION and NONAMELESSSTRUCT
is unusable. So don't force this mode. Instead check whether
NONAMELESSUNION and/or NONAMELESSSTRUCT are set (by the Wine headers)
and define custom access macros accordingly.
2004-08-13 19:49:53 +00:00
Francois Gouget d244f6eb4f The Windows headers don't define the DRV_QUERYDEVICEINTERFACE(SIZE)
macros.
2004-08-13 19:46:43 +00:00
Robert Reif c5a15bf3ec Better mmap failure error message. 2004-08-13 19:42:36 +00:00
Alexandre Julliard 48c4bb3c31 Get rid of the non-standard ICOM_VTABLE macro. 2004-08-12 23:00:51 +00:00
Alexandre Julliard 0467ce9fd7 Get rid of the non-standard ICOM_VFIELD macro. 2004-08-12 19:52:49 +00:00
Alexandre Julliard b459952144 Avoid some non-portable makefile constructs, and get rid of the
ALTNAMES variable.
2004-08-11 23:59:06 +00:00
Robert Reif a34c67f6b9 Only print out verbose information when in interactive mode. 2004-08-11 18:50:09 +00:00
Robert Reif 17a8372302 Only copy number of bytes specified up to size of DevCaps structure. 2004-08-11 18:48:46 +00:00
Huw D M Davies 26ae2dd365 Fix compilation of winmm tests. 2004-08-09 22:55:03 +00:00
Mike Hearn 81fd67d0d7 Only trace FOURCC handler when one is specified 2004-08-09 18:47:37 +00:00
Robert Reif 6d33f1c2c1 Added some mixer tests. 2004-08-09 18:46:26 +00:00
Robert Reif c427708bd5 Change MIXER_GetDev to take pointer to returned address pointer and
return one of 3 possible return values rather than an address or
NULL.
2004-08-09 18:45:05 +00:00
Robert Reif 7bf7bce0da Add CRITICAL_SECTION debug info. 2004-08-04 18:14:21 +00:00
Francois Gouget e07608064a Play back what has been recorded when in interactive mode so that the
user can verify that the recording is correct.
2004-08-02 22:29:02 +00:00
Marcelo Duarte 4a132c4f15 Localization of devenum to Portuguese and minor corrections. 2004-07-29 02:40:15 +00:00
Francois Gouget eed1b5209d Added bytes_to_mmtime() to convert the stream position from bytes to
the requested MMTIME format. This function should be identical in all
drivers.
Remove the corresponding code from wodGetPosition() and
widGetPosition() and use bytes_to_mmtime() instead.
bytes_to_mmtime() uses no floating-point arithmetic to compute
TIME_SMPTE and no longer uses round(). It should have no integer
overflows either.
2004-07-23 23:01:21 +00:00
Francois Gouget b90d590d6b Sort the winmm test formats by increasing sampling rate. 2004-07-23 19:06:03 +00:00
Robert Reif 6fb51fc072 Test waveInGetDevCapsW. 2004-07-23 19:05:49 +00:00
Robert Reif f3c85028ef Windows 95 doesn't support waveOutGetDevCapsW. 2004-07-23 19:05:37 +00:00
Francois Gouget da24dff4ff Make sure we won't get an overflow in check_position() even if we play
longer test tones.
2004-07-21 03:23:29 +00:00
Robert Reif f3b7cadf8d Adds *GetDevCapsW bad pointer check.
Adds waveOutGetDevCapsW test.
2004-07-21 03:10:24 +00:00
Filip Navara 2b95caccd3 - Implementation of mmTaskCreate. Based on patch by Eric Pouech.
- Fallback implementation in waveOut[Un]PrepareHeader.
2004-07-21 03:02:36 +00:00
Francois Gouget 8b5c40fd0c Revert my previous incorrect check_position() patch: Windows returns
exactly the number of samples/bytes played (no plus one there).
Modify check_position() to work off the actual number of bytes as
calculated by wave_generate_la(). This fixes problems due to rounding
when duration is not a neat integer.
Round up the frame field when checking TIME_SMPTE.
2004-07-20 22:09:53 +00:00
Robert Reif c47b4f7941 Notify when position format not supported.
Test that position is 0 at start.
2004-07-20 01:22:47 +00:00
Francois Gouget 2e13bf774e Check that we are still playing in wodUpdatePlayedTotal(). If not,
then the value returned by snd_pcm_delay() is not usable so assume
delay=0. This gets the winmm test to complete in interactive mode with
winealsa.
2004-07-19 21:20:59 +00:00
Francois Gouget 9d9c6431da In interactive mode, check that the tone duration is within 10% of the
expected value.
2004-07-19 21:20:03 +00:00
Francois Gouget 8d4b362631 Fix the check_position() test: on Windows waveOutGetPosition() returns
the number of samples played plus one (also one extra sample for the
byte count).
2004-07-19 20:08:24 +00:00
Francois Gouget 54751b230d Use round() instead of ceil() in wodGetPosition(TIME_SMPTE).
Fixes the corresponding winmm conformance test.
2004-07-19 20:08:06 +00:00
Francois Gouget 170dbf4243 An SNDCTL_DSP_SETDUPLEX failure should be a WARN(), not an ERR(),
since the OSS specifications say we have to call it before knowing if
the sound card is full-duplex capable.
2004-07-14 21:44:50 +00:00
Dmitry Timoshkov 4381a80efe Make it possible to open read-only AVI files for a playback. 2004-07-14 21:43:03 +00:00
Henning Gerhardt 4bbc1b3fb6 More German translations. 2004-07-13 23:36:37 +00:00
Robert Reif 33e4506cda Get certification for VerifyCertification from driver to match
GetCaps.
Change OSS driver to report certified.
Change OSS driver to show message name rather than number in traces.
2004-07-06 18:43:57 +00:00
Dimitrie O. Paun 0415030f51 Lookup driver information in registry and system.ini.
Make the code inspect the registry/system.ini at call time, rather
then initialization time.
Code cleanups.
2004-06-30 18:12:20 +00:00
Hajime Segawa 76e280b401 Added some Japanese translations. 2004-06-28 23:50:22 +00:00
Francois Gouget d8e9b8f7aa Log the format when mapping the sound device (or failing to). 2004-06-16 20:06:48 +00:00
Francois Gouget 1d834f4717 Fix the check for SNDCTL_DSP_GETCAPS so that it is compliant with the
OSS specification.
Only test the different formats if tracing is on.
2004-06-15 20:25:46 +00:00
Francois Gouget 20ab4b395f Change the ARTS_Init() error message from an ERR() to a WARN() since
it can happen in perfectly normal conditions.
2004-06-15 20:25:11 +00:00
Robert Reif a9d5f0829a Added tracing to all functions.
Added error explanations.
Changed debug channel from msacm to wavemap so not confused with
msacm.
2004-06-14 17:55:03 +00:00
Robert Reif 3aab82079e Removed 11 bit sample size capture test because at least 2
manufacturers sound cards on two different OSs seem to support this.
Added some invalid parameter checks to wave[In,Out]GetDevCaps.
One test is commented out because wine doesn't handle it properly.
Minor info printing cleanup.
2004-06-14 17:54:45 +00:00
Robert Reif 1e2dcc457e Reset played variables on open. 2004-06-14 16:59:34 +00:00
Mike McCormack 8b0b70ab50 Fix PlaySound. 2004-06-14 16:55:33 +00:00
Robert Reif 95bd820fe1 Don't try to map the mapper device. 2004-06-14 16:53:59 +00:00
Robert Reif 7bd78fe59a Treat WAVE_MAPPER as a real device and performs all tests on it.
Added 16000Hz because win9x hardware spec requires it.
2004-06-04 17:58:00 +00:00
Robert Reif a7e8f6f3a2 Handle case where partial structure update requested.
Minor white space cleanup.
2004-06-04 17:57:40 +00:00
Robert Reif bdbb54f340 Fix calculation of SMPTE time (round up to full frame).
More accurate ms calculation.
2004-06-01 20:22:11 +00:00
Robert Reif e32f49381a Added a test to check playback position after done playing. 2004-06-01 20:20:54 +00:00
Robert Reif 0f939fc9b5 Returns proper error code when trying to get caps when no devices
present.
2004-06-01 20:19:30 +00:00
Robert Reif c75c2668f2 Fixed a bug where wrong a return value was returned when mapping is
not possible.
2004-06-01 19:41:18 +00:00
Robert Reif fd758586d1 Added some trace and debug printing. 2004-06-01 19:40:48 +00:00
Robert Reif 458cf0bd6d Added another possible windows failure mode. 2004-06-01 19:40:00 +00:00
Uwe Bonnes 0a5f393483 Fixed missing inversion in bit manipulation. 2004-05-27 20:12:51 +00:00
Robert Reif 41c6b5b5b9 Fixed a problem were a trace accesses a data member that may be
outside of the actual data structure passed in.
Added some more debug traces.
2004-05-27 20:05:08 +00:00
Robert Reif a6e8430a23 Added WAVE_MAPPED flag test.
Added 8000 Hz test as a typically supported format.
Added 12000 Hz test as a typically unsupported format.
Test error reporting better by testing unsupported formats.
Test using PCMWAVEFORMAT in place of WAVEFORMATEX.
2004-05-27 20:00:26 +00:00
Ivan Leo Puoti 3e42f6953e Changed my name, so update copyright info. 2004-05-27 02:25:13 +00:00
Robert Reif b0d62bb73f Fixed a bug I introduced in waveInGetDevCapsA(WAVE_MAPPER) test.
Moved format structure array to header file and restored
NB_WIN_FORMATS macro to calculate array size.
Added more error results and used macro as suggested by Andreas Mohr.
Cleaned up error result printing to be more consistent.
2004-05-21 20:53:45 +00:00
Francois Gouget c3b8ce939b Split off the winmm capture test. 2004-05-20 01:39:47 +00:00
Francois Gouget 53a20f3a4b Add a 5 second test tone to help debug issues with the tone duration
and help detect stutter issues.
Add explanations describing the interactive test.
2004-05-20 01:16:50 +00:00
Francois Gouget ceeed96a38 Use triggers to disable the sound input/output side we don't care
about when in pseudo fullduplex mode.
2004-05-20 01:16:10 +00:00
Eric Pouech df93f2eeee GetModuleFileName[AW] doesn't terminate the string if the buffer is
too small.
2004-05-19 03:22:55 +00:00
Robert Reif 463d474cc7 Print human-readable capabilities flag. 2004-05-14 04:54:54 +00:00
Robert Reif ee0868e013 Sample rate sanity check.
Fix SMPTE time.
2004-05-14 00:44:06 +00:00
Robert Reif eee90c26a9 waveOutGetDevCapsA can fail with MMSYSERR_BADDEVICEID or
MMSYSERR_NODRIVER when no drivers present.
Add better error messages.
2004-05-13 19:41:53 +00:00
Robert Reif 4a787831f0 Add an interface name to wineoss, winealsa, winearts and winejack.
Add support for wave interface message where missing.
2004-05-11 04:28:13 +00:00
James Courtier-Dutton 0040ba959b Updated to the new alsa api. 2004-05-05 22:03:48 +00:00
Francois Gouget 9f1aea2fb8 Assorted spelling fixes. 2004-05-05 01:09:24 +00:00
Francois Gouget df4409fb95 winejack.drv only supports 16bit sound so we can simplify the sound
format checks.
2004-05-05 01:06:27 +00:00
Francois Gouget 91c2507dd4 If ARTS_WaveInit() failed then transmit the failure upstream in
ARTS_DriverProc().
2004-05-05 01:06:09 +00:00
Francois Gouget bf75c5c163 Taking into account wavemap and midimap there can be up to 8 output
drivers. So increase the size of the MMDrvs array accordingly.
Skip already loaded drivers before complaining (asserting) that they
don't fit in the MMDrvs array.
2004-05-05 01:00:54 +00:00
Robert Reif abdce33943 You have to have at least one device before you can have a default
device.
2004-04-30 04:14:58 +00:00
Robert Reif 8db4d73d89 Forgot to limit capture sample rates. 2004-04-29 00:20:35 +00:00
Robert Reif 253ffd50d2 Another error return value check added after looking at the windows
tests results.
Replaced -1 with WAVE_MAPPER.
2004-04-28 03:50:36 +00:00
Ove Kaaven c6ad91ba3c Fixed a couple of bugs. 2004-04-28 00:24:09 +00:00
Robert Reif 7c80f993d2 Restore the 2 MHz sample rate test and fix the winealsa driver for
reasonable limits.
2004-04-27 23:28:46 +00:00
Francois Gouget da29b6547f Make sure the 'alsa handle' is initialized to NULL before calling
snd_pcm_open(). Otherwise if it fails we get a crash trying to close
an invalid alsa handle.
2004-04-26 23:31:11 +00:00
Francois Gouget f627aed58b waveOutGetDevCaps(-1...) must return the capabilities of the Wave
mapper.
DRV_QUERYDEVICEINTERFACE is not supported on all Windows versions.
Check the length returned by DRV_QUERYDEVICEINTERFACESIZE and fix
memory leak.
Some Windows sound drivers allow wild frequencies such as the 2MHz
one. So modify this test to use an invalid number of bits per sample
instead (hopefully that will fail really everywhere).
2004-04-26 23:30:26 +00:00
Francois Gouget cce19caacb Fix a warning in JACK_drvLoad(). 2004-04-26 20:04:21 +00:00
Francois Gouget 8ceb200817 We only support 8 and 16 bit sound so we should reject the other
formats.
2004-04-26 20:03:59 +00:00
Francois Gouget ebf0eb3138 Make static Unicode strings const. 2004-04-20 00:34:52 +00:00
Ove Kaaven 276ccc44ed Added detection of 48kHz and 96kHz support. Fixed a thinko, and some
misleading indentation.
2004-04-19 23:06:48 +00:00
Ove Kaaven 59917f4cfa Code and concepts merged in from wineoss in order to get the
non-dsound wave output performance in winealsa to an acceptable
level. It's still possible to do better than the current code, but
this should do for now.
2004-04-19 19:24:25 +00:00
Robert Reif a1f01d353c Cleanup reference counting.
Move notify array to buffer.
Add state info and fix GetStatus.
Remove unnecessary driver description flags.
2004-04-12 23:12:17 +00:00
Robert Reif dc4535f91a Remove trailing white space.
Cleanup white space and format in direct sound capture routines.
2004-04-12 22:01:47 +00:00
Francois Gouget 20547de012 Patch the fragment size if it does not match the current sound
format. This saves us from triggering a kernel freeze on some OSS 2.4
+ SoundBlaster 16 systems.
2004-04-09 19:05:09 +00:00
Dmitry Timoshkov f560c71c29 Fallback to a compression scheme specified in the stream format in the
case FOURCC handler does not exist or format is not supported.
2004-04-05 20:19:09 +00:00
Eric Pouech 30dbb04998 - implemented MCI_SOUND command
- fixed MCI command table in resource
- added a TODO list on MCI handling
2004-04-05 20:16:11 +00:00
Felix Nawothnig 301851da5a Don't free ALSA device string when the device is closed since it might
be reopened.
2004-03-31 20:05:45 +00:00
Robert Reif 86976d53e2 More duplex mode soundcard info. 2004-03-31 19:57:53 +00:00
Sylvain Petreolle 2504ac59b4 Fixed error reporting. 2004-03-29 22:55:26 +00:00
Robert Reif 605064a4bf Print out sound card info for playback, capture and duplex modes.
Hardware capabilities can vary depending on usage mode.
Print out format requested and actual format returned.
2004-03-29 20:27:50 +00:00
Robert Reif 7c112c918d Clean up white spaces.
Fix spelling error.
Improve capture error messages.
Fix error reporting when capturing from nonexistent device.
2004-03-27 20:42:57 +00:00
Mike Hearn ce32fc5684 Allow configuration of output devices to use and change standard
output plugin requested to "default".
2004-03-27 01:38:54 +00:00
Alexandre Julliard 9e4ed6460c .spec.c files are no longer used for 32-bit dlls. 2004-03-24 03:36:44 +00:00
Dmitry Timoshkov 5983223b70 Just update from/to pointers and exit on a subsequent MCI_PLAY
command.
2004-03-19 19:15:03 +00:00
Christian Costa abec033938 Release lock before wave calls that generate notification. 2004-03-18 01:34:36 +00:00
Christian Costa 6eac29532b Added support for MCI_DGV_WHERE_MAX flag in MCIAVI_mciWhere.
Fixed WHERE_WINDOW.
2004-03-16 03:09:14 +00:00
Christian Costa e55a4b634b Handle avi files with non standard video stream names. 2004-03-16 01:14:39 +00:00
Christian Costa c2adec0c70 MCI strings are case insensitive.
Fixed a returned error value.
2004-03-16 01:14:27 +00:00
Christian Costa b3b3f4c0c3 Default to FOURCC_DOS if no IOProc found. 2004-03-16 01:14:07 +00:00
Christian Costa 4bbeb429c8 Fixed deadlock when stopping playback. 2004-03-16 01:13:52 +00:00
Robert Reif af3fa1c48d Enable exact position calculation when hardware supports it. 2004-03-12 19:43:44 +00:00
Jason Edmeades ed593fdf2f Handle playing of files containing a '+' as part of the filename. 2004-03-05 20:43:40 +00:00
Alexandre Julliard 589e115233 We no longer use the .exe.spec.c files. 2004-03-02 21:16:37 +00:00
Dmitry Timoshkov 199247672c - Add a lot of traces to make debugging a bit easier.
- Add support for MCIWNDF_NOAUTOSIZEMOVIE, MCIWNDF_NOAUTOSIZEWINDOW
  and MCIWNDF_NOERRORDLG flags in the MCIWndClass implementation.
- Implement support for MCI_UPDATE in the MCIAVI driver and use it in
  the MCIWndClass WM_PAINT handler.
- Reimplement MCI_STOP command in the MCIAVI driver via an event.
- Add a test preventing the MCIAVI driver to crash after MCI_SEEK
  behind an end of stream.
2004-03-01 23:38:25 +00:00
Alexandre Julliard e8a339c1d2 Portability fixes for LSB compatibility. 2004-03-01 21:32:02 +00:00
Robert Reif 7ca0381e7a Cleanup prepare/unprepare header parameter checking.
Fix midiInGetDevCapsW.
2004-02-27 21:29:32 +00:00
Dmitry Timoshkov 6e728e4077 Convert MCIAVI window support to unicode.
Allow multiple simultaneous MCIAVI driver instances.
2004-02-27 00:42:44 +00:00
Sean Young 65130e8a5d Check uSize parameter in waveOutUnprepareHeader and
waveOutPrepareHeader.
2004-02-26 05:28:01 +00:00
Christian Costa 009c04a040 Replaced the timer and its callback by a thread for receiving midi in
events.
Handled DRVM_EXIT in OSS_midMessage.
2004-02-24 01:22:18 +00:00
Christian Costa 26d73867e0 Fixed waveInGetDevCapsW. 2004-02-24 01:02:01 +00:00
Patrik Stridvall ede82e3055 Fixed some issues found by winapi_check. 2004-02-20 20:19:23 +00:00
Christian Costa 87bef514db Replaced the timer and its callback by a thread for receiving midi in
events.
Fixed time of MIM_LONGDATA notification.
Handled DRVM_EXIT in ALSA_midMessage.
2004-02-19 04:12:18 +00:00
Robert Reif d6993619ef Add secondary buffer array. 2004-02-16 20:23:42 +00:00
Robert Reif 20fff3d111 Enable hardware secondary buffer support on cards that support it (SB
live and audigy).
2004-02-13 21:10:21 +00:00
Robert Reif 61cb01781e Save oss device fd and creation flags in dsound buffer object. 2004-02-13 21:04:28 +00:00
Robert Reif e9b7222e34 Split buffer creation function into primary and secondary buffer
creation functions. Secondary buffer creation function is stubbed
out.
2004-02-13 20:56:21 +00:00
Robert Reif b6adacb81c Moved dsound mmap mapping info into dsound objects. 2004-02-13 20:44:42 +00:00
Robert Reif 391aede4ba Use pipe sync code from wineoss. 2004-02-13 20:44:12 +00:00
Robert Reif 9a3056b243 Don't need primary lock. Fixes error in dsound tests in interactive
mode.
2004-02-13 20:21:47 +00:00
Dmitry Timoshkov ab2266de9a AFMT_AC3 might be not defined in the system headers. 2004-02-11 23:57:17 +00:00
Robert Reif a9d2fb8ee7 Fixed a problem on BSD.
Fixed a trace.
2004-02-09 20:55:30 +00:00
Robert Reif bcb1387929 Show sound card info in trace. 2004-02-06 05:20:14 +00:00
Christian Costa 485390de6f Added missing notifications to MIDI_NotifyClient.
Made checks less strict in midPrepare, only return an error for buffer
in queue.
Fixed time of input events in Alsa driver.
2004-02-05 01:24:28 +00:00
Eric Pouech da49807ea3 Fixed synchronization issue. 2004-01-28 20:05:20 +00:00
Alexandre Julliard e43e394465 All sound drivers need -ldxguid. 2004-01-27 20:16:38 +00:00
Alexandre Julliard 20b4585e3c Only link against libdxguid where necessary. 2004-01-27 00:11:16 +00:00
Francois Gouget 6b6ed724ae Add missing '\n's to debug traces. 2004-01-27 00:01:43 +00:00
Robert Reif e14a1b262a Added notify and property set to dsound output driver.
Cleaned up existing notify and property set for capture.
2004-01-20 01:47:27 +00:00
Robert Reif 76659e9e9f Fixed thread handle leaks. 2004-01-20 01:45:05 +00:00
Robert Lunnon 8732357912 Fixed type mismatch in widDsCreate. 2004-01-14 05:39:05 +00:00
Christian Costa 8349acab6c Added Midi IN support. 2004-01-13 01:05:34 +00:00
Eric Pouech 9db6037de8 - implemented TIME_KILL_SYCHRONOUS timer flags
- timeKillTimer is now thread safe
- replaced some iData attributes by global variables
2004-01-12 21:03:10 +00:00
Marcus Meissner 17ffed02eb Fixed HeapRealloc typo. 2004-01-09 20:08:48 +00:00
Jeremy Shaw ed69f0bff6 Added wave-in support and fixed a few bugs in the wave-out code. 2004-01-09 05:02:58 +00:00
Eric Pouech 6cf101c1b3 - Applied to all MCI drivers Dmitry's fix for MCI_STATUS_TIME_FORMAT
(wasn't returning string resource ID).
- Fixed mciseq when opened without a filename.
2004-01-08 00:42:02 +00:00
Francois Gouget 640cc3f3e1 Assorted spelling fixes. 2004-01-06 22:08:33 +00:00
Dmitry Timoshkov 87af75269d Register window class on mciavi driver loading, and unregister it on
driver unloading.
2004-01-06 20:39:48 +00:00
Dmitry Timoshkov d81e04a8c0 Return correct resource id for time format strings. 2004-01-06 20:39:32 +00:00
Dmitry Timoshkov a938cbeb73 Accept all standard DIB compressions in the mciavi driver. 2004-01-05 23:07:27 +00:00
Dmitry Timoshkov 41b7218466 Decode stream number from AVI frame data and assign the data to
appropriate streams.
2004-01-05 21:13:58 +00:00
Christian Costa 092f7dd352 Fix compilation issue with ALSA 0.5. 2004-01-02 20:13:57 +00:00
Dmitry Timoshkov fbaab7d847 Remove a stray LeaveCriticalSection(). 2004-01-02 01:48:30 +00:00
Dmitry Timoshkov f41e047020 Much improved mciavi driver. Fixed synchronization, RIFF file with
many streams parsing, added support for some MCI_PUT and MCI_WHERE
cases.
2004-01-01 00:48:01 +00:00
Dmitry Timoshkov 91687f6aaf Use correct pointer to an internal driver description. 2004-01-01 00:07:14 +00:00
Dmitry Timoshkov 123ce73d6b Add MCI_SYSINFO command W to A mapping. 2004-01-01 00:07:01 +00:00
Dmitry Timoshkov 9741589bdf Fix many function prototypes and data types according to Platform SDK
definitions.
2003-12-31 23:49:45 +00:00
Dmitry Timoshkov be6d014f35 Add Unicode->ANSI MCI message mapping, implement mciSendCommandW, fix
a bug with a window creation belonging to another hInstance, add
support for MCI_WINDOW command in mciavi.drv, add support for MCI_PLAY
and MCI_STOP in the MCIWndClass implementation.
2003-12-31 19:00:03 +00:00
Gerald Pfeifer db1113fed1 Improve error messages in OSS_WaveOutInit() and OSS_WaveInInit() and
warn instead of aborting in case of problems reading mixer info.
2003-12-31 18:58:07 +00:00
Steven Edwards 6bbba607c9 Porting fix for winmm resources (patch by Filip Navara). 2003-12-15 19:52:14 +00:00
Christian Costa 00bfb75485 Exported widMessage function. 2003-12-15 19:48:15 +00:00
Jeremy Shaw f7cae99969 Move the data around when the ring buffer is resized so that the empty
messages are between the tosave and toget indexes.
2003-12-12 05:55:26 +00:00
Christian Costa 076000ce51 Added WaveIn support. 2003-12-11 04:27:18 +00:00
Eric Pouech ed37b7a8bb Move (again) usage of 16 bit specific functions (thunk lock) to 16 bit
code only.
2003-12-08 21:54:29 +00:00
Christian Costa 1469cf58f3 First enumerate all internal devices and then external midi ports. 2003-12-08 21:46:50 +00:00
Alexandre Julliard 628e27ad56 Define ALSA_PCM_OLD_* symbols for compatibility with Alsa 1.0. 2003-12-04 21:14:04 +00:00
Eric Pouech ce2d3ef77d Move usage of 16 bit specific functions (MapSL) in 16 bit code only. 2003-12-02 03:36:20 +00:00
Eric Pouech cd7328672e Move usage of 16 bit specific functions (MapSL) in 16 bit code only. 2003-12-01 22:38:19 +00:00
Christian Costa 3640c36f8b Fix handling of the lpuDeviceID input param in MIDI_StreamOpen. 2003-11-26 03:39:13 +00:00
Eric Pouech 1bcbd54697 HeapReAlloc doesn't allocate memory. 2003-11-21 23:54:04 +00:00
Ivan Leo Murray-Smith e51000f44f Added Italian translation. 2003-11-17 19:59:13 +00:00
Robert Reif 3f1498fc6c Fixes more use before set races.
Work around for queue reordering feature.
Stop recording on reset.
Better debug info.
Dsound callback capture state fix.
2003-11-14 21:03:24 +00:00
Christian Costa 2aba972aff Alsa midi fixes. 2003-11-12 22:40:59 +00:00