mirror/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-03-05 23:26:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

(API Change) libobs: Make obs_service refcounted

Browse Source
This commit is contained in:
Palana
2015-05-04 02:07:43 +02:00
parent ba0b8eb0e1
commit 71abed387f
7 changed files with 138 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
obs/window-basic-main.cpp
View File

@@ -387,11 +387,6 @@ bool OBSBasic::LoadService()
{
const char *type;
if (service) {
obs_service_destroy(service);
service = nullptr;
}
char serviceJsonPath[512];
int ret = os_get_config_path(serviceJsonPath, sizeof(serviceJsonPath),
SERVICE_PATH);
@@ -410,6 +405,7 @@ bool OBSBasic::LoadService()
obs_data_t *settings = obs_data_get_obj(data, "settings");
service = obs_service_create(type, "default_service", settings);
obs_service_release(service);
obs_data_release(settings);
obs_data_release(data);
@@ -425,6 +421,7 @@ bool OBSBasic::InitService()
service = obs_service_create("rtmp_common", "default_service", nullptr);
if (!service)
return false;
obs_service_release(service);
return true;
}
@@ -690,6 +687,7 @@ OBSBasic::~OBSBasic()
delete cpuUsageTimer;
os_cpu_usage_info_destroy(cpuUsageInfo);
service = nullptr;
outputHandler.reset();
if (interaction)
@@ -1447,18 +1445,17 @@ void OBSBasic::RenderMain(void *data, uint32_t cx, uint32_t cy)
obs_service_t *OBSBasic::GetService()
{
if (!service)
if (!service) {
service = obs_service_create("rtmp_common", NULL, NULL);
obs_service_release(service);
}
return service;
}
void OBSBasic::SetService(obs_service_t *newService)
{
if (newService) {
if (service)
obs_service_destroy(service);
if (newService)
service = newService;
}
}
bool OBSBasic::StreamingActive()