mirror/obs-studio
1
0 Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-10-21 13:34:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

(API Change) libobs: Add hotkey data to *_create functions

Browse Source
This commit is contained in:
Palana committed 2015-05-11 20:45:25 +02:00
1 parent d0cae31a48
commit 1d39c3e9b6
15 files changed
+68 -52
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

obs/window-basic-main.cpp
+8 -5
View File
@@ -292,7 +292,7 @@ void OBSBasic::CreateDefaultScene()
#ifdef __APPLE__
source = obs_source_create(OBS_SOURCE_TYPE_INPUT, "display_capture",
Str("Basic.DisplayCapture"), NULL);
Str("Basic.DisplayCapture"), NULL, nullptr);
if (source) {
obs_scene_add(scene, source);
@@ -407,7 +407,8 @@ bool OBSBasic::LoadService()
obs_data_t *settings = obs_data_get_obj(data, "settings");
service = obs_service_create(type, "default_service", settings);
service = obs_service_create(type, "default_service", settings,
nullptr);
obs_service_release(service);
obs_data_release(settings);
@@ -421,7 +422,8 @@ bool OBSBasic::InitService()
if (LoadService())
return true;
service = obs_service_create("rtmp_common", "default_service", nullptr);
service = obs_service_create("rtmp_common", "default_service", nullptr,
nullptr);
if (!service)
return false;
obs_service_release(service);
@@ -1449,7 +1451,8 @@ void OBSBasic::RenderMain(void *data, uint32_t cx, uint32_t cy)
obs_service_t *OBSBasic::GetService()
{
if (!service) {
service = obs_service_create("rtmp_common", NULL, NULL);
service = obs_service_create("rtmp_common", NULL, NULL,
nullptr);
obs_service_release(service);
}
return service;
@@ -1635,7 +1638,7 @@ void OBSBasic::ResetAudioDevice(const char *sourceId, const char *deviceName,
obs_data_t *settings = obs_data_create();
obs_data_set_string(settings, "device_id", deviceId);
source = obs_source_create(OBS_SOURCE_TYPE_INPUT,
sourceId, deviceDesc, settings);
sourceId, deviceDesc, settings, nullptr);
obs_data_release(settings);
obs_set_output_source(channel, source);