diff options
| author | Kevin Mitchell <kevmitch@gmail.com> | 2014-12-16 02:19:33 -0800 |
|---|---|---|
| committer | Kevin Mitchell <kevmitch@gmail.com> | 2014-12-16 02:19:33 -0800 |
| commit | 011b7c9c3cb00de6c5e79b0f6620103af5a38779 (patch) | |
| tree | 630bfc15adf989b51f22baa36db2d5c62b8d33ec | |
| parent | 17067343eb10293beb61d3811680b9c59f4db311 (diff) | |
| download | mpv-011b7c9c3cb00de6c5e79b0f6620103af5a38779.tar.bz2 mpv-011b7c9c3cb00de6c5e79b0f6620103af5a38779.tar.xz | |
Revert "vo/w32_common: use local definition of IID_ITaskbarList2"
This reverts commit 17067343eb10293beb61d3811680b9c59f4db311.
Embarassingly, this turned out not to be necessary.
| -rw-r--r-- | video/out/w32_common.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/video/out/w32_common.c b/video/out/w32_common.c index 9340101fa2..35ea5a030a 100644 --- a/video/out/w32_common.c +++ b/video/out/w32_common.c @@ -1003,12 +1003,6 @@ int vo_w32_config(struct vo *vo, uint32_t flags) return r; } -// cygwin doesn't have this, so just define a mp_ name-spaced copy to -// guarantee it's defined -DEFINE_GUID(mp_IID_ITaskbarList2, - 0x602D4995, 0xB13A, 0x429b, 0xA6, 0x6E, - 0x19, 0x35, 0xE4, 0x4F, 0x43, 0x17); - static void *gui_thread(void *ptr) { struct vo_w32_state *w32 = ptr; @@ -1071,7 +1065,7 @@ static void *gui_thread(void *ptr) // ITaskbarList2 has the MarkFullscreenWindow method, which is used to // make sure the taskbar is hidden when mpv goes fullscreen if (SUCCEEDED(CoCreateInstance(&CLSID_TaskbarList, NULL, - CLSCTX_INPROC_SERVER, &mp_IID_ITaskbarList2, + CLSCTX_INPROC_SERVER, &IID_ITaskbarList2, (void**)&w32->taskbar_list))) { if (FAILED(ITaskbarList2_HrInit(w32->taskbar_list))) { |