jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

(API Change) obs_reset_video: Use return codes

Browse Source 
Changed API functions:
libobs: obs_reset_video

Before, video initialization returned a boolean, but "failed" is too
little information, if it fails due to lack of device capabilities or
bad video device parameters, the front-end needs to know that.

The OBS Basic UI has also been updated to reflect this API change.
This commit is contained in:
jp9000
2014-07-20 17:40:57 -07:00
parent e62f965d3e
commit 778cc2b318
13 changed files with 150 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libobs-opengl/gl-subsystem.c
View File

@@ -197,16 +197,19 @@ const char *device_preprocessor_name(void)
return "_OPENGL";
}
device_t device_create(struct gs_init_data *info)
int device_create(device_t *p_device, struct gs_init_data *info)
{
struct gs_device *device = bzalloc(sizeof(struct gs_device));
int errorcode = GS_ERROR_FAIL;
device->plat = gl_platform_create(device, info);
if (!device->plat)
goto fail;
if (!gl_init_extensions(device))
if (!gl_init_extensions(device)) {
errorcode = GS_ERROR_NOT_SUPPORTED;
goto fail;
}
gl_enable(GL_CULL_FACE);
@@ -221,12 +224,15 @@ device_t device_create(struct gs_init_data *info)
device_leavecontext(device);
device->cur_swap = gl_platform_getswap(device->plat);
return device;
*p_device = device;
return GS_SUCCESS;
fail:
blog(LOG_ERROR, "device_create (GL) failed");
bfree(device);
return NULL;
*p_device = NULL;
return errorcode;
}
void device_destroy(device_t device)