Nikolay Sivov : mf/session: Add a helper to send events while completing commands.
Alexandre Julliard
julliard at winehq.org
Wed Jul 21 16:04:31 CDT 2021
Module: wine
Branch: master
Commit: 10ba5a90fc81a2f12d1f82131e0067248d01bd95
URL: https://source.winehq.org/git/wine.git/?a=commit;h=10ba5a90fc81a2f12d1f82131e0067248d01bd95
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Wed Jul 21 17:27:07 2021 +0300
mf/session: Add a helper to send events while completing commands.
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/mf/session.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/dlls/mf/session.c b/dlls/mf/session.c
index 91d8f0cac87..80cc8ab7135 100644
--- a/dlls/mf/session.c
+++ b/dlls/mf/session.c
@@ -826,6 +826,13 @@ static void session_command_complete(struct media_session *session)
}
}
+static void session_command_complete_with_event(struct media_session *session, MediaEventType event,
+ HRESULT status, const PROPVARIANT *param)
+{
+ IMFMediaEventQueue_QueueEventParamVar(session->event_queue, event, &GUID_NULL, status, param);
+ session_command_complete(session);
+}
+
static void session_start(struct media_session *session, const GUID *time_format, const PROPVARIANT *start_position)
{
struct media_source *source;
@@ -863,9 +870,7 @@ static void session_start(struct media_session *session, const GUID *time_format
session_command_complete(session);
break;
default:
- IMFMediaEventQueue_QueueEventParamVar(session->event_queue, MESessionStarted, &GUID_NULL,
- MF_E_INVALIDREQUEST, NULL);
- session_command_complete(session);
+ session_command_complete_with_event(session, MESessionStarted, MF_E_INVALIDREQUEST, NULL);
break;
}
}
@@ -911,8 +916,7 @@ static void session_set_paused(struct media_session *session, unsigned int state
if (state != ~0u) session->state = state;
if (SUCCEEDED(status))
session_set_caps(session, session->caps & ~MFSESSIONCAP_PAUSE);
- IMFMediaEventQueue_QueueEventParamVar(session->event_queue, MESessionPaused, &GUID_NULL, status, NULL);
- session_command_complete(session);
+ session_command_complete_with_event(session, MESessionPaused, status, NULL);
}
static void session_set_closed(struct media_session *session, HRESULT status)
@@ -920,8 +924,7 @@ static void session_set_closed(struct media_session *session, HRESULT status)
session->state = SESSION_STATE_CLOSED;
if (SUCCEEDED(status))
session_set_caps(session, session->caps & ~(MFSESSIONCAP_START | MFSESSIONCAP_SEEK));
- IMFMediaEventQueue_QueueEventParamVar(session->event_queue, MESessionClosed, &GUID_NULL, status, NULL);
- session_command_complete(session);
+ session_command_complete_with_event(session, MESessionClosed, status, NULL);
}
static void session_pause(struct media_session *session)
@@ -1007,8 +1010,7 @@ static void session_stop(struct media_session *session)
hr = S_OK;
/* fallthrough */
default:
- IMFMediaEventQueue_QueueEventParamVar(session->event_queue, MESessionStopped, &GUID_NULL, hr, NULL);
- session_command_complete(session);
+ session_command_complete_with_event(session, MESessionStopped, hr, NULL);
break;
}
}
@@ -1077,9 +1079,7 @@ static void session_clear_topologies(struct media_session *session)
hr = MF_E_INVALIDREQUEST;
else
session_clear_queued_topologies(session);
- IMFMediaEventQueue_QueueEventParamVar(session->event_queue, MESessionTopologiesCleared,
- &GUID_NULL, hr, NULL);
- session_command_complete(session);
+ session_command_complete_with_event(session, MESessionTopologiesCleared, hr, NULL);
}
static struct media_source *session_get_media_source(struct media_session *session, IMFMediaSource *source)
More information about the wine-cvs
mailing list