diff options
author | Kevin Mitchell <kevmitch@gmail.com> | 2014-12-16 01:56:12 -0800 |
---|---|---|
committer | Diogo Franco (Kovensky) <diogomfranco@gmail.com> | 2015-01-25 17:00:17 +0900 |
commit | cfc5a65494ac62deb17ba5e67575a7faec5c1e13 (patch) | |
tree | 5e6138b7ad31d7a6f5cfc8d5dc277e9f074c6f5c /audio/out/ao_wasapi_utils.c | |
parent | 307b8925ee84c02936d78cee84f13d03f01418e1 (diff) | |
download | mpv-cfc5a65494ac62deb17ba5e67575a7faec5c1e13.tar.bz2 mpv-cfc5a65494ac62deb17ba5e67575a7faec5c1e13.tar.xz |
ao/wasapi: use IsEqualGUID and IsEqualPropertyKey
before we were reinventing this wheel
Diffstat (limited to 'audio/out/ao_wasapi_utils.c')
-rwxr-xr-x | audio/out/ao_wasapi_utils.c | 31 |
1 files changed, 6 insertions, 25 deletions
diff --git a/audio/out/ao_wasapi_utils.c b/audio/out/ao_wasapi_utils.c index d0eecc24bc..378d82669d 100755 --- a/audio/out/ao_wasapi_utils.c +++ b/audio/out/ao_wasapi_utils.c @@ -50,25 +50,6 @@ DEFINE_GUID(mp_KSDATAFORMAT_SUBTYPE_IEEE_FLOAT, 0x00000003, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); -int mp_GUID_compare(const GUID *l, const GUID *r) -{ - unsigned int i; - if (l->Data1 != r->Data1) return 1; - if (l->Data2 != r->Data2) return 1; - if (l->Data3 != r->Data3) return 1; - for (i = 0; i < 8; i++) { - if (l->Data4[i] != r->Data4[i]) return 1; - } - return 0; -} - -int mp_PKEY_compare(const PROPERTYKEY *l, const PROPERTYKEY *r) -{ - if (mp_GUID_compare(&l->fmtid, &r->fmtid)) return 1; - if (l->pid != r->pid) return 1; - return 0; -} - char *mp_GUID_to_str_buf(char *buf, size_t buf_size, const GUID *guid) { snprintf(buf, buf_size, @@ -205,11 +186,11 @@ static char *waveformat_to_str_buf(char *buf, size_t buf_size, WAVEFORMATEX *wf) case WAVE_FORMAT_EXTENSIBLE: { WAVEFORMATEXTENSIBLE *wformat = (WAVEFORMATEXTENSIBLE *)wf; - if ( !mp_GUID_compare(&mp_KSDATAFORMAT_SUBTYPE_IEEE_FLOAT, - &wformat->SubFormat) ) + if ( IsEqualGUID(&mp_KSDATAFORMAT_SUBTYPE_IEEE_FLOAT, + &wformat->SubFormat) ) type = "float"; - else if ( !mp_GUID_compare(&mp_KSDATAFORMAT_SUBTYPE_PCM, - &wformat->SubFormat) ) + else if ( IsEqualGUID(&mp_KSDATAFORMAT_SUBTYPE_PCM, + &wformat->SubFormat) ) type = "s"; break; } @@ -239,7 +220,7 @@ static bool waveformat_is_float(WAVEFORMATEX *wf) case WAVE_FORMAT_EXTENSIBLE: { WAVEFORMATEXTENSIBLE *wformat = (WAVEFORMATEXTENSIBLE *)wf; - return !mp_GUID_compare(&mp_KSDATAFORMAT_SUBTYPE_IEEE_FLOAT, &wformat->SubFormat); + return IsEqualGUID(&mp_KSDATAFORMAT_SUBTYPE_IEEE_FLOAT, &wformat->SubFormat); } case WAVE_FORMAT_IEEE_FLOAT: return true; @@ -254,7 +235,7 @@ static bool waveformat_is_pcm(WAVEFORMATEX *wf) case WAVE_FORMAT_EXTENSIBLE: { WAVEFORMATEXTENSIBLE *wformat = (WAVEFORMATEXTENSIBLE *)wf; - return !mp_GUID_compare(&mp_KSDATAFORMAT_SUBTYPE_PCM, &wformat->SubFormat); + return IsEqualGUID(&mp_KSDATAFORMAT_SUBTYPE_PCM, &wformat->SubFormat); } case WAVE_FORMAT_PCM: return true; |