mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-15 00:47:17 +00:00
winegstreamer: Use NTSTATUS value in wg_muxer_create.
This commit is contained in:
parent
729ed419ae
commit
29b35f6bb7
|
@ -466,13 +466,17 @@ HRESULT wg_muxer_create(const char *format, wg_muxer_t *muxer)
|
||||||
|
|
||||||
TRACE("format %p, muxer %p.\n", format, muxer);
|
TRACE("format %p, muxer %p.\n", format, muxer);
|
||||||
|
|
||||||
if (SUCCEEDED(status = WINE_UNIX_CALL(unix_wg_muxer_create, ¶ms)))
|
if (!(status = WINE_UNIX_CALL(unix_wg_muxer_create, ¶ms)))
|
||||||
{
|
{
|
||||||
*muxer = params.muxer;
|
*muxer = params.muxer;
|
||||||
TRACE("Created wg_muxer %#I64x.\n", params.muxer);
|
TRACE("Created wg_muxer %#I64x.\n", params.muxer);
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
WARN("Failed to create muxer, status %#lx.\n", status);
|
||||||
|
}
|
||||||
|
|
||||||
return status;
|
return HRESULT_FROM_NT(status);
|
||||||
}
|
}
|
||||||
|
|
||||||
void wg_muxer_destroy(wg_muxer_t muxer)
|
void wg_muxer_destroy(wg_muxer_t muxer)
|
||||||
|
|
|
@ -61,14 +61,14 @@ NTSTATUS wg_muxer_create(void *args)
|
||||||
{
|
{
|
||||||
struct wg_muxer_create_params *params = args;
|
struct wg_muxer_create_params *params = args;
|
||||||
GstElement *first = NULL, *last = NULL;
|
GstElement *first = NULL, *last = NULL;
|
||||||
|
NTSTATUS status = STATUS_UNSUCCESSFUL;
|
||||||
GstPadTemplate *template = NULL;
|
GstPadTemplate *template = NULL;
|
||||||
GstCaps *sink_caps = NULL;
|
GstCaps *sink_caps = NULL;
|
||||||
NTSTATUS status = E_FAIL;
|
|
||||||
struct wg_muxer *muxer;
|
struct wg_muxer *muxer;
|
||||||
|
|
||||||
/* Create wg_muxer object. */
|
/* Create wg_muxer object. */
|
||||||
if (!(muxer = calloc(1, sizeof(*muxer))))
|
if (!(muxer = calloc(1, sizeof(*muxer))))
|
||||||
return E_OUTOFMEMORY;
|
return STATUS_NO_MEMORY;
|
||||||
if (!(muxer->container = gst_bin_new("wg_muxer")))
|
if (!(muxer->container = gst_bin_new("wg_muxer")))
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
|
@ -110,7 +110,7 @@ NTSTATUS wg_muxer_create(void *args)
|
||||||
GST_INFO("Created winegstreamer muxer %p.", muxer);
|
GST_INFO("Created winegstreamer muxer %p.", muxer);
|
||||||
params->muxer = (wg_transform_t)(ULONG_PTR)muxer;
|
params->muxer = (wg_transform_t)(ULONG_PTR)muxer;
|
||||||
|
|
||||||
return S_OK;
|
return STATUS_SUCCESS;
|
||||||
|
|
||||||
out:
|
out:
|
||||||
if (muxer->my_sink)
|
if (muxer->my_sink)
|
||||||
|
|
Loading…
Reference in a new issue