Commit Graph

791 Commits

Author SHA1 Message Date
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