4aiman/obs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #124 from jp9000/new-locale-handling

Browse source 
Update to new module locale API
This commit is contained in:
Jim 2014-06-25 12:58:05 -07:00
commit 2ea50cab36
46 changed files with 210 additions and 208 deletions
Download patch file Download diff file Expand all files Collapse all files

10
obs/window-basic-settings.cpp
View file

@ -212,8 +212,7 @@ void OBSBasicSettings::LoadServiceTypes()
size_t idx = 0;
while (obs_enum_service_types(idx++, &type)) {
const char *name = obs_service_getdisplayname(type,
App()->GetLocale());
const char *name = obs_service_getdisplayname(type);
QString qName = QT_UTF8(name);
QString qType = QT_UTF8(type);
@ -229,8 +228,7 @@ void OBSBasicSettings::LoadServiceInfo()
QLayout *layout = ui->streamContainer->layout();
obs_service_t service = main->GetService();
obs_data_t settings = obs_service_get_settings(service);
obs_properties_t properties = obs_service_properties(service,
App()->GetLocale());
obs_properties_t properties = obs_service_properties(service);
delete streamProperties;
streamProperties = new OBSPropertiesView(
@ -480,9 +478,9 @@ void OBSBasicSettings::LoadAudioDevices()
const char *output_id = App()->OutputAudioSource();
obs_properties_t input_props = obs_get_source_properties(
OBS_SOURCE_TYPE_INPUT, input_id, App()->GetLocale());
OBS_SOURCE_TYPE_INPUT, input_id);
obs_properties_t output_props = obs_get_source_properties(
OBS_SOURCE_TYPE_INPUT, output_id, App()->GetLocale());
OBS_SOURCE_TYPE_INPUT, output_id);
if (input_props) {
obs_property_t inputs = obs_properties_get(input_props,