1d785b85c2
Consolidate secondary buffer list processing and locking.
...
Two new functions DSOUND_AddBuffer and DSOUND_RemoveBuffer
have been added and the locking has been moved into these functions.
Renamed IDirectSound lock to buffer_list_lock.
Removed redundant test for IID_IDirectSoundNotify and
IID_IDirectSoundNotify8 because they are the same.
Removed check for invalid buffers on list because that shouldn't
happen anymore because of fixed 3d buffer reference counting.
Minor code cleanups.
2004-09-07 19:32:21 +00:00
f714b39762
Get rid of the no longer used ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
...
macro.
2004-08-23 19:39:48 +00:00
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
48c4bb3c31
Get rid of the non-standard ICOM_VTABLE macro.
2004-08-12 23:00:51 +00:00
02a8ab2fee
Save enumerated GUIDs in a global array so they persist after
...
enumeration.
White space cleanup.
Add tests for opening default devices.
2004-07-21 03:23:13 +00:00
3ce9c5f4b8
Do initialization to match windows behavior (with test).
2004-07-19 20:06:22 +00:00
5d8997d881
Create DirectSound or DirectSound8 depending on riid.
2004-07-06 19:25:59 +00:00
31f817b6f9
Separated DirectSoundCreate8 into two functions and added a
...
IDirectSound implementation.
Added proper COM behavior for QueryInterface for IDirectSound and
IDirectSound8.
Fixed a bug in the dsound.h header file for IDirectSound8
CreateSoundBuffer and DuplicateSoundBuffer.
Added new tests for proper COM behavior and enables some commented out
code for tests that work on windows. Added new tests for
IDirectSound8.
2004-07-04 00:13:44 +00:00
df93f2eeee
GetModuleFileName[AW] doesn't terminate the string if the buffer is
...
too small.
2004-05-19 03:22:55 +00:00
dbb03ec6dc
Fixes support for older versions of direct sound.
...
Adds support for deleting notification array.
Minor debug and white space cleanups.
2004-04-19 02:58:45 +00:00
14a7c6ddca
Remove unused lock.
2004-03-17 01:44:15 +00:00
7ecf3d03c2
Fallback to software buffer if duplicating hardware buffer fails.
2004-02-06 05:21:37 +00:00
7dd637467a
Added some missing defines and a struct.
...
Fixed some const * arguments.
2004-01-09 22:06:54 +00:00
de12a97041
Another portion of HeapReAlloc fixes.
2003-10-14 05:24:20 +00:00
e29357c2d3
Fixed some traces.
...
Fixed spec file to match Microsoft dll.
2003-10-01 03:05:25 +00:00
99b0e8fa66
Added volume and pan support to primary buffers.
...
Added more property set support.
2003-09-19 00:10:51 +00:00
725d8c39aa
Device enumeration callbacks should return a NULL guid for default
...
devices.
Fixed some volume and pan cases.
Added missing property set.
Fixed capture notification bug.
2003-09-15 20:08:05 +00:00
e37c6e18d0
Fixed header dependencies to be fully compatible with the Windows
...
headers (with help from Dimitrie O. Paun).
2003-09-05 23:08:26 +00:00
7d43d7bb3b
Use the drivers to get device capabilities and property sets.
2003-09-03 19:28:20 +00:00
5ec32cecf2
Added SecondaryBuffer and DirectSoundCaptureNotify COM objects to get
...
reference counting right.
2003-09-01 23:58:43 +00:00
b805f0f1b7
Split property sets into two types: buffer and private.
2003-08-20 18:18:23 +00:00
f5080c86e5
Added class factories for DirectSoundCapture, DirectSoundFullDuplex
...
and DirectSoundPrivate.
Added error checking to QueryInterface and CreateInterface.
Added some more functionality to property sets.
2003-08-06 22:57:24 +00:00
8c37581dd7
Fixed a bug where a NULL primary buffer pointer is used when the
...
DirectSound object didn't create properly.
2003-07-28 19:01:20 +00:00
9dacf206fe
3D buffer and listener reference counts should be fixed.
...
3D sound now plays in 3D.
COM interfaces should be correct for buffers and 3D stuff. The COM
interface is broken on notifications but I will fix that next.
Fixed the bug when closing and opening the same or another sound
device quickly.
Fixed some locking but there is a lot of work left yet.
2003-06-27 22:22:15 +00:00
a4ed8e7740
- make parameter checking and error notification consistent
...
- propagate driver and local function errors where needed
- fix error returns where pointer is given for returned data
- add 3d listener to primary buffer when needed
- copy 3d part of buffer when duplicated
- fix bug when primary buffer is reopened with smaller buffer
- loosen requirements on caps data size check
- set caps for emulated mode based on actual driver caps
2003-05-22 03:39:13 +00:00
f5a4a9b60a
Give the right ids to the DirectSoundCreate8 function (thanks to
...
Robert Reif).
2003-05-04 02:24:36 +00:00
6ad962142f
- misc. tracing fixes
...
- handle IID_IDirectSound(8) as the default sound driver
2003-05-02 21:22:49 +00:00
abde7d0acf
Reversed relationship between buffers and notifies.
...
Fixed notify reuse bug.
Minor documentation and error message cleanup.
2003-05-02 20:16:48 +00:00
e743e091ed
Added partial property set support which is used by dxdiag.exe.
2003-04-29 22:49:52 +00:00
c2ebe1ff93
Removed uses of the non standard ICOM_VTBL macro.
2003-04-10 18:17:34 +00:00
fa13d013e8
Fixed a problem when multiple devices are present and a device other
...
than the first one is used.
2003-04-05 05:11:02 +00:00
aeddf2c409
Added wide character enumeration of sound devices.
2003-04-03 18:03:01 +00:00
89b469fefe
Added support for multiple direct sound devices.
2003-03-15 00:54:11 +00:00
8c2ec131a8
Added a configuration option for setting the hardware acceleration
...
level just like the direct sound control panel app.
More work on the full duplex interface so the compile warning is no
longer generated. Full duplex interface is still stubbed out.
Moved full duplex mixer reset fix into wineoss driver where it
belongs.
Added some more locking fixes.
Capture and full duplex are now stable.
2003-03-06 22:46:34 +00:00
15cc17fbcf
Fixed code to handle full duplex properly.
...
Added support for capture driver (disabled).
Fixed direct sound capture test to handle notifications properly.
2003-03-04 02:12:34 +00:00
5be7f69d72
Added support for direct sound capture and a real direct sound capture
...
driver. Capture now works with some skipping. Full duplex does not but
I will be working on that next.
2003-02-15 00:01:17 +00:00
6bbce6cd22
Initialize the pwave array whenever we don't have a hardware buffer.
...
Always create the wineoss thread.
Change the mmap ERR into a TRACE: there are normal circumstances where
mmap will fail and we can deal with them.
2003-01-15 00:44:50 +00:00
32140adefa
DSB.SetFormat:Trace the requested format as soon as possible in case
...
it is not supported and simplify validity check.
Initialize the buffer format, and only from the fields we checked.
DirectSoundCreate8 fully initializes the buffer format (just in case).
2003-01-11 20:54:56 +00:00
112cf22a12
Always open the device in the default 22050x8x2 format, and let it
...
report the actual device format to us.
2003-01-07 19:43:18 +00:00
26d648887a
Back out the aRts volume patch, this is not user-friendly at all.
2002-12-05 19:20:36 +00:00
ee4d9c5e29
Return an error if dwSize is not valid.
...
No need to dump dwFlags before it is initialized.
2002-12-05 19:00:56 +00:00
4774477b2b
Fix for soundcards that can't do 8-bit audio, only 16-bit (also
...
checked for soundcards that can't do stereo while I was at it).
2002-09-29 18:01:33 +00:00
062425aee4
Added waveOutSetVolume when opening sound driver. Otherwise, there is
...
no sound if we use aRts.
2002-09-17 01:29:01 +00:00
9c1de6de30
Moved all the content of the DDK files ntdef.h and ntddk.h to
...
winternl.h.
2002-09-12 22:07:02 +00:00
d016f819f1
Added include protection for unistd.h and sys/time.h.
2002-08-17 00:43:16 +00:00
bacc1b3b58
- Converted HWAVE, HWAVEIN, HWAVEOUT to void*.
...
- Fixed some HMIDI{IN,OUT}16 to HANDLE conversions.
- midiOutCacheDrumPatches16 called itself recursively in an infinite
loop.
2002-08-02 19:02:49 +00:00
7015ce3096
No need to call GetModuleFileName16 now that GetModuleFileNameA
...
handles 16-bit tasks.
2002-07-05 01:28:10 +00:00
935e3df35c
Support DirectSound 8 interfaces. Split interface implementations into
...
separate files. Split primary buffer and secondary buffer interfaces
into separate implementations. Made the primary buffer state part of
the dsound object, so primary buffer objects can be created and
refcounted independently. Made the interfaces follow COM aggregation
rules more closely. Converted the dsound critical section to a R/W
lock to improve potential remixing concurrency. Fixed various bugs and
refcounting issues.
2002-06-13 19:15:06 +00:00
9a62491660
Removed trailing whitespace.
2002-05-31 23:06:46 +00:00
7c61a61616
Only enumerate DirectSound devices if the first sound device in the
...
system supports the Wine implementation of DirectSound. Also added
some entries to the sample config file and changed the values of the
"EmulDriver" key to "Y"/"N".
2002-05-28 22:45:58 +00:00
ff60a9a27b
Make defines configurable at run-time.
2002-05-11 22:53:00 +00:00
8fc98cdef8
DirectSoundEnumerateA() now passes a GUID to the callback if the first
...
call returned TRUE.
2002-05-01 18:05:30 +00:00
5769d1de00
Better support for configure detection of missing types, added check
...
for ssize_t.
Removed a couple of no longer used portability functions.
Various portability fixes in port.h.
2002-04-26 19:05:15 +00:00
c745b52803
A bit more robust against wave???Open failures.
2002-04-22 22:36:18 +00:00
ace56c62a3
Dsound will now try as many devices as are available when trying to
...
open a waveOut device in DirectSoundCreate().
2002-03-25 20:52:17 +00:00
9b0ba7ca2b
Added aRts driver.
2002-03-21 01:38:19 +00:00
0799c1a780
Added LGPL standard comment, and copyright notices where necessary.
...
Global replacement of debugtools.h by wine/debug.h.
2002-03-09 23:29:33 +00:00
f250b6b5fa
Further unified HAL and HEL mixing, and added some more intelligence
...
to prebuffering, with some basic prebuffer canceling support, to get
rid of mixing delays in Half-Life. Used a very small waveout buffer
queue in HEL mode, using a callback to queue additional buffers, to
get rid of playback delays in Half-Life. Fixed a couple of bugs.
2002-01-02 21:46:54 +00:00
fdebace998
Fix buffering problems in HEL mode.
2001-09-10 23:08:11 +00:00
2344798c46
Fixed some warnings.
2001-07-26 21:44:44 +00:00
3ca9823941
Documentation ordinal fixes.
2001-06-20 23:03:14 +00:00
8b216b3d02
Documentation ordinal fixes.
2001-06-19 18:20:47 +00:00
9c0ae56d39
Added definitions for IKsPropertySet, small stub implementation for
...
IDirectSound3DBuffer. Fixed one pointer reference.
2001-06-13 19:36:10 +00:00
c2bc22b91c
Spelling fixes.
2001-05-24 18:44:25 +00:00
e76218dd61
Add '\n' at the end of traces.
2001-05-09 17:31:31 +00:00
ed739334f4
Fixed sound disappearing after on-the-fly sample rate changes and
...
after certain underrun conditions.
Compilation fixes for when USE_DSOUND3D is defined.
2001-03-19 19:14:39 +00:00
ddf825660e
Chris Jacobson
...
Small bug fix.
2001-03-03 00:19:29 +00:00
62510ddbf6
Fixes for various underrun-related problems. Also added a mechanism
...
for the sound driver to request that a Stop should close and reopen
the device.
2001-01-13 01:00:00 +00:00
d8dea427c1
Added a more truthful message about what really is wrong.
2001-01-06 00:36:14 +00:00
ad250aac34
Now using manifest constant instead of raw values for all the
...
DRV_QUERY??? values.
2001-01-04 19:53:51 +00:00
865cf3752c
Bugfix for sound dropping out, and workaround for Half-Life's
...
braindead secondary sound buffer management.
2001-01-02 21:02:32 +00:00
0c7c94b956
More intelligent DirectSound prebuffering. By tracking the
...
last-written position of streaming buffers, it attempts to avoid
prebuffering past this position unless necessary; this may avoid a
number of sound problems in various situations. Merged HEL and HAL
mixing code, which should reduce the HEL mode's CPU usage slightly.
2000-12-22 20:31:06 +00:00
eba8cee584
Handle errors for IDsDriver_GetPosition.
...
Report DSERR_UNINITIALIZED on non-opened WineOSS audio device.
2000-12-21 20:49:26 +00:00
44a182229b
winuser.h now requires that we include winbase.h first.
2000-12-19 04:53:20 +00:00
5be8e7d8e0
Created a small static library in ole/libuuid.a that contains all the
...
UUID definitions (with the help of Francois Gouget).
2000-12-06 01:50:47 +00:00
49b3cec137
Reimplement patch by Marcus Meissner ('98) to "fix" problems with
...
DSCAPS_EMULDRIVER flag for games like Quake 2 and Unreal Tournament.
2000-10-25 20:30:31 +00:00
a9f6a9daec
Explicitly initialize structures.
2000-10-24 02:22:16 +00:00
83f52d11c1
Moved all Win16 definitions out of the standard Windows headers.
2000-09-26 22:20:14 +00:00
26d6c1f557
Don't use copies of critical sections made by memcpy()
...
Added missing WINAPIs
2000-09-01 01:22:21 +00:00
349655636b
- made the MIDI sequencer error message much better for confused users
...
to be found on #WineHQ
- use strerror instead of errno at important places
- got rid of HAVE_STRERROR macro
- removed some #include:s (hopefully I didn't break anything)
2000-08-26 20:31:48 +00:00
bea617be47
Moved GUID definitions to their respective dll.
2000-08-03 04:22:35 +00:00
fddc3e15d8
Added a few C++ operators to Direct3D structures, and made some unions
...
'nameless'.
2000-07-23 14:19:19 +00:00
6314ad696b
Fixed some warnings.
2000-07-15 21:33:38 +00:00
9405793109
Fix a couple of problems with underruns and stopping/restarting.
2000-07-08 11:45:39 +00:00
849c930481
Implemented the DirectSound HAL mode for DMA primary buffers, with a
...
10ms latency (not noticeable), and about 300ms of prebuffering. Fixed
a few bugs. Added a Wine-only WINMM flag for waveOutOpen for
DirectSound to use (so drivers like wineoss have some way of knowing
what to prepare itself for).
2000-06-24 12:54:49 +00:00
353c776a66
Restructure DirectSound. Remove dsound thread, use MM timers
...
instead. Implemented the DirectSound HEL, with the ability to
prebuffer 300ms of sound, while maintaining play latency of 40ms, and
the exact playposition (Starcraft cinematics are lip-synched). Some
initial HAL support.
2000-06-23 15:45:05 +00:00
625653f96d
Add a few more flags to those recognized when doing trace+dsound.
2000-06-11 19:59:10 +00:00
330cd693b0
Fixed some warnings.
2000-06-03 20:43:06 +00:00
f5a1027595
- Added DirectSoundCapture and DirectSoundCaptureBuffer interfaces
...
- Added some SoundCapture stubs
- Changed REFIID to LPCGUID in a few places as per MS header file
2000-06-01 22:47:35 +00:00
4dce07ea94
- Fixed some initialization/destruction and reference counting
...
- Added a little more debugging information
2000-05-30 20:49:37 +00:00
62f32331dd
- Add another way to create a 3d listener interface.
...
- Fix up some reference counting bugs and interface creation bugs
- Add DirectSoundEnumerateW stub
- Add DirectSoundCaptureEnumerate{A,W} stubs
2000-05-30 20:07:31 +00:00
8cfea6e292
Make internal buffers size multiple of 4.
2000-05-10 21:39:24 +00:00
b2dd2c5cee
DSOUND_MixerNorm: do not compare unrelated pointers.
2000-04-16 17:05:06 +00:00
3347bee15c
Make audiodevice blocking directly after the non-blocking open, since
...
we use the write(2) also for synchronization.
2000-04-06 19:32:33 +00:00
502e15b6e7
open() the OSS sounddevice non-blocking in case another process has it
...
open already.
2000-03-30 20:22:12 +00:00
c9742b3204
- Fix some compiler warnings.
...
- Remove superfluous #include statement.
2000-03-28 20:44:59 +00:00
f15473f5f3
Fixed debug formatting.
2000-03-26 18:18:26 +00:00
fcfacb95a7
Added/fixed some documentation reported by winapi_check.
2000-03-24 20:46:04 +00:00
f8e4fb0888
Made the buffer list in the directsound object thread-safe.
2000-02-20 19:16:12 +00:00
383da68cf9
Optimized debugging API to reduce code size.
2000-02-10 22:15:21 +00:00
Robert Reif