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

Remove 'locale' parameter from all callbacks 

The locale parameter was a mistake, because it puts extra needless
burden upon the module developer to have to handle this variable for
each and every single callback function.  The parameter is being removed
in favor of a single centralized module callback function that
specifically updates locale information for a module only when needed.
master
jp9000 2014-06-25 00:13:00 -07:00
parent 74b4743bce
commit 0b4a259e56
38 changed files with 125 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libobs/obs-encoder.c
View File

@ -30,10 +30,10 @@ static inline struct obs_encoder_info *get_encoder_info(const char *id)
return NULL;
}
const char *obs_encoder_getdisplayname(const char *id, const char *locale)
const char *obs_encoder_getdisplayname(const char *id)
{
struct obs_encoder_info *ei = get_encoder_info(id);
return ei ? ei->getname(locale) : NULL;
return ei ? ei->getname() : NULL;
}
static bool init_encoder(struct obs_encoder *encoder, const char *name,
@ -227,14 +227,14 @@ obs_data_t obs_encoder_defaults(const char *id)
return (info) ? get_defaults(info) : NULL;
}
obs_properties_t obs_get_encoder_properties(const char *id, const char *locale)
obs_properties_t obs_get_encoder_properties(const char *id)
{
const struct obs_encoder_info *ei = get_encoder_info(id);
if (ei && ei->properties) {
obs_data_t defaults = get_defaults(ei);
obs_properties_t properties;
properties = ei->properties(locale);
properties = ei->properties();
obs_properties_apply_settings(properties, defaults);
obs_data_release(defaults);
return properties;
@ -242,12 +242,11 @@ obs_properties_t obs_get_encoder_properties(const char *id, const char *locale)
return NULL;
}
obs_properties_t obs_encoder_properties(obs_encoder_t encoder,
const char *locale)
obs_properties_t obs_encoder_properties(obs_encoder_t encoder)
{
if (encoder && encoder->info.properties) {
obs_properties_t props;
props = encoder->info.properties(locale);
props = encoder->info.properties();
obs_properties_apply_settings(props, encoder->context.settings);
return props;
}

6
libobs/obs-encoder.h
View File

@ -102,10 +102,9 @@ struct obs_encoder_info {
/**
* Gets the full translated name of this encoder
*
* @param locale Locale to use for translation
* @return Translated name of the encoder
*/
const char *(*getname)(const char *locale);
const char *(*getname)(void);
/**
* Creates the encoder with the specified settings
@ -155,10 +154,9 @@ struct obs_encoder_info {
/**
* Gets the property information of this encoder
*
* @param locale The locale to translate with
* @return The properties data
*/
obs_properties_t (*properties)(const char *locale);
obs_properties_t (*properties)(void);
/**
* Updates the settings for this encoder (usually used for things like

12
libobs/obs-output.c
View File

@ -30,10 +30,10 @@ static inline const struct obs_output_info *find_output(const char *id)
return NULL;
}
const char *obs_output_getdisplayname(const char *id, const char *locale)
const char *obs_output_getdisplayname(const char *id)
{
const struct obs_output_info *info = find_output(id);
return (info != NULL) ? info->getname(locale) : NULL;
return (info != NULL) ? info->getname() : NULL;
}
static const char *output_signals[] = {
@ -166,14 +166,14 @@ obs_data_t obs_output_defaults(const char *id)
return (info) ? get_defaults(info) : NULL;
}
obs_properties_t obs_get_output_properties(const char *id, const char *locale)
obs_properties_t obs_get_output_properties(const char *id)
{
const struct obs_output_info *info = find_output(id);
if (info && info->properties) {
obs_data_t defaults = get_defaults(info);
obs_properties_t properties;
properties = info->properties(locale);
properties = info->properties();
obs_properties_apply_settings(properties, defaults);
obs_data_release(defaults);
return properties;
@ -181,11 +181,11 @@ obs_properties_t obs_get_output_properties(const char *id, const char *locale)
return NULL;
}
obs_properties_t obs_output_properties(obs_output_t output, const char *locale)
obs_properties_t obs_output_properties(obs_output_t output)
{
if (output && output->info.properties) {
obs_properties_t props;
props = output->info.properties(locale);
props = output->info.properties();
obs_properties_apply_settings(props, output->context.settings);
return props;
}

4
libobs/obs-output.h
View File

@ -31,7 +31,7 @@ struct obs_output_info {
uint32_t flags;
const char *(*getname)(const char *locale);
const char *(*getname)(void);
void *(*create)(obs_data_t settings, obs_output_t output);
void (*destroy)(void *data);
@ -49,7 +49,7 @@ struct obs_output_info {
void (*defaults)(obs_data_t settings);
obs_properties_t (*properties)(const char *locale);
obs_properties_t (*properties)(void);
void (*pause)(void *data);
};

3
libobs/obs-scene.c
View File

@ -43,10 +43,9 @@ static inline void signal_item_remove(struct obs_scene_item *item)
calldata_free(&params);
}
static const char *scene_getname(const char *locale)
static const char *scene_getname(void)
{
/* TODO: locale */
UNUSED_PARAMETER(locale);
return "Scene";
}

13
libobs/obs-service.c
View File

@ -27,10 +27,10 @@ static inline const struct obs_service_info *find_service(const char *id)
return NULL;
}
const char *obs_service_getdisplayname(const char *id, const char *locale)
const char *obs_service_getdisplayname(const char *id)
{
const struct obs_service_info *info = find_service(id);
return (info != NULL) ? info->getname(locale) : NULL;
return (info != NULL) ? info->getname() : NULL;
}
obs_service_t obs_service_create(const char *id, const char *name,
@ -112,14 +112,14 @@ obs_data_t obs_service_defaults(const char *id)
return (info) ? get_defaults(info) : NULL;
}
obs_properties_t obs_get_service_properties(const char *id, const char *locale)
obs_properties_t obs_get_service_properties(const char *id)
{
const struct obs_service_info *info = find_service(id);
if (info && info->properties) {
obs_data_t defaults = get_defaults(info);
obs_properties_t properties;
properties = info->properties(locale);
properties = info->properties();
obs_properties_apply_settings(properties, defaults);
obs_data_release(defaults);
return properties;
@ -127,12 +127,11 @@ obs_properties_t obs_get_service_properties(const char *id, const char *locale)
return NULL;
}
obs_properties_t obs_service_properties(obs_service_t service,
const char *locale)
obs_properties_t obs_service_properties(obs_service_t service)
{
if (service && service->info.properties) {
obs_properties_t props;
props = service->info.properties(locale);
props = service->info.properties();
obs_properties_apply_settings(props, service->context.settings);
return props;
}

4
libobs/obs-service.h
View File

@ -21,7 +21,7 @@ struct obs_service_info {
/* required */
const char *id;
const char *(*getname)(const char *locale);
const char *(*getname)(void);
void *(*create)(obs_data_t settings, obs_service_t service);
void (*destroy)(void *data);
@ -33,7 +33,7 @@ struct obs_service_info {
void (*defaults)(obs_data_t settings);
obs_properties_t (*properties)(const char *locale);
obs_properties_t (*properties)(void);
/**
* Called when getting ready to start up an output, before the encoders

13
libobs/obs-source.c
View File

@ -95,11 +95,10 @@ bool obs_source_init_context(struct obs_source *source,
source_signals);
}
const char *obs_source_getdisplayname(enum obs_source_type type,
const char *id, const char *locale)
const char *obs_source_getdisplayname(enum obs_source_type type, const char *id)
{
const struct obs_source_info *info = get_source_info(type, id);
return (info != NULL) ? info->getname(locale) : NULL;
return (info != NULL) ? info->getname() : NULL;
}
/* internal initialization */
@ -322,14 +321,14 @@ obs_data_t obs_source_settings(enum obs_source_type type, const char *id)
}
obs_properties_t obs_get_source_properties(enum obs_source_type type,
const char *id, const char *locale)
const char *id)
{
const struct obs_source_info *info = get_source_info(type, id);
if (info && info->properties) {
obs_data_t defaults = get_defaults(info);
obs_properties_t properties;
properties = info->properties(locale);
properties = info->properties();
obs_properties_apply_settings(properties, defaults);
obs_data_release(defaults);
return properties;
@ -337,11 +336,11 @@ obs_properties_t obs_get_source_properties(enum obs_source_type type,
return NULL;
}
obs_properties_t obs_source_properties(obs_source_t source, const char *locale)
obs_properties_t obs_source_properties(obs_source_t source)
{
if (source_valid(source) && source->info.properties) {
obs_properties_t props;
props = source->info.properties(locale);
props = source->info.properties();
obs_properties_apply_settings(props, source->context.settings);
return props;
}

6
libobs/obs-source.h
View File

@ -118,10 +118,9 @@ struct obs_source_info {
/**
* Get the translated name of the source type
*
* @param locale The locale to translate with
* @return The translated name of the source type
*/
const char *(*getname)(const char *locale);
const char *(*getname)(void);
/**
* Creates the source data for the source
@ -161,10 +160,9 @@ struct obs_source_info {
/**
* Gets the property information of this source
*
* @param locale The locale to translate with
* @return The properties data
*/
obs_properties_t (*properties)(const char *locale);
obs_properties_t (*properties)(void);
/**
* Updates the settings for this source

34
libobs/obs.h
View File

@ -477,7 +477,7 @@ EXPORT void obs_display_remove_draw_callback(obs_display_t display,
/** Returns the translated display name of a source */
EXPORT const char *obs_source_getdisplayname(enum obs_source_type type,
const char *id, const char *locale);
const char *id);
/**
* Creates a source of the specified type with the specified settings.
@ -512,14 +512,13 @@ EXPORT obs_data_t obs_get_source_defaults(enum obs_source_type type,
/** Returns the property list, if any. Free with obs_properties_destroy */
EXPORT obs_properties_t obs_get_source_properties(enum obs_source_type type,
const char *id, const char *locale);
const char *id);
/**
* Returns the properties list for a specific existing source. Free with
* obs_properties_destroy
*/
EXPORT obs_properties_t obs_source_properties(obs_source_t source,
const char *locale);
EXPORT obs_properties_t obs_source_properties(obs_source_t source);
/** Updates settings for this source */
EXPORT void obs_source_update(obs_source_t source, obs_data_t settings);
@ -752,8 +751,7 @@ EXPORT void obs_sceneitem_get_box_transform(obs_sceneitem_t item,
/* ------------------------------------------------------------------------- */
/* Outputs */
EXPORT const char *obs_output_getdisplayname(const char *id,
const char *locale);
EXPORT const char *obs_output_getdisplayname(const char *id);
/**
* Creates an output.
@ -778,15 +776,13 @@ EXPORT bool obs_output_active(obs_output_t output);
EXPORT obs_data_t obs_output_defaults(const char *id);
/** Returns the property list, if any. Free with obs_properties_destroy */
EXPORT obs_properties_t obs_get_output_properties(const char *id,
const char *locale);
EXPORT obs_properties_t obs_get_output_properties(const char *id);
/**
* Returns the property list of an existing output, if any. Free with
* obs_properties_destroy
*/
EXPORT obs_properties_t obs_output_properties(obs_output_t output,
const char *locale);
EXPORT obs_properties_t obs_output_properties(obs_output_t output);
/** Updates the settings for this output context */
EXPORT void obs_output_update(obs_output_t output, obs_data_t settings);
@ -898,8 +894,7 @@ EXPORT void obs_output_signal_stop(obs_output_t output, int code);
/* ------------------------------------------------------------------------- */
/* Encoders */
EXPORT const char *obs_encoder_getdisplayname(const char *id,
const char *locale);
EXPORT const char *obs_encoder_getdisplayname(const char *id);
/**
* Creates a video encoder context
@ -933,15 +928,13 @@ EXPORT const char *obs_encoder_get_codec(obs_encoder_t encoder);
EXPORT obs_data_t obs_encoder_defaults(const char *id);
/** Returns the property list, if any. Free with obs_properties_destroy */
EXPORT obs_properties_t obs_get_encoder_properties(const char *id,
const char *locale);
EXPORT obs_properties_t obs_get_encoder_properties(const char *id);
/**
* Returns the property list of an existing encoder, if any. Free with
* obs_properties_destroy
*/
EXPORT obs_properties_t obs_encoder_properties(obs_encoder_t encoder,
const char *locale);
EXPORT obs_properties_t obs_encoder_properties(obs_encoder_t encoder);
/**
* Updates the settings of the encoder context. Usually used for changing
@ -987,8 +980,7 @@ EXPORT void obs_free_encoder_packet(struct encoder_packet *packet);
/* ------------------------------------------------------------------------- */
/* Stream Services */
EXPORT const char *obs_service_getdisplayname(const char *id,
const char *locale);
EXPORT const char *obs_service_getdisplayname(const char *id);
EXPORT obs_service_t obs_service_create(const char *id, const char *name,
obs_data_t settings);
@ -1000,15 +992,13 @@ EXPORT const char *obs_service_getname(obs_service_t service);
EXPORT obs_data_t obs_service_defaults(const char *id);
/** Returns the property list, if any. Free with obs_properties_destroy */
EXPORT obs_properties_t obs_get_service_properties(const char *id,
const char *locale);
EXPORT obs_properties_t obs_get_service_properties(const char *id);
/**
* Returns the property list of an existing service context, if any. Free with
* obs_properties_destroy
*/
EXPORT obs_properties_t obs_service_properties(obs_service_t service,
const char *locale);
EXPORT obs_properties_t obs_service_properties(obs_service_t service);
/** Gets the service type */
EXPORT const char *obs_service_gettype(obs_service_t service);

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

@ -210,7 +210,7 @@ static inline bool HasAudioDevices(const char *source_id)
{
const char *output_id = source_id;
obs_properties_t props = obs_get_source_properties(
OBS_SOURCE_TYPE_INPUT, output_id, App()->GetLocale());
OBS_SOURCE_TYPE_INPUT, output_id);
size_t count = 0;
if (!props)
@ -1299,8 +1299,7 @@ void OBSBasic::AddSourcePopupMenu(const QPoint &pos)
QMenu popup;
while (obs_enum_input_types(idx++, &type)) {
const char *name = obs_source_getdisplayname(
OBS_SOURCE_TYPE_INPUT,
type, App()->GetLocale());
OBS_SOURCE_TYPE_INPUT, type);
if (strcmp(type, "scene") == 0)
continue;

4
obs/window-basic-properties.cpp
View File

@ -44,8 +44,8 @@ OBSBasicProperties::OBSBasicProperties(QWidget *parent, OBSSource source_)
obs_data_release(settings);
view = new OBSPropertiesView(settings,
obs_source_properties(source, App()->GetLocale()),
source, (PropertiesUpdateCallback)obs_source_update);
obs_source_properties(source), source,
(PropertiesUpdateCallback)obs_source_update);
layout()->addWidget(view);
layout()->setAlignment(view, Qt::AlignBottom);

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,

3
obs/window-basic-source-select.cpp
View File

@ -169,8 +169,7 @@ OBSBasicSourceSelect::OBSBasicSourceSelect(OBSBasic *parent, const char *type_)
ui->setupUi(this);
QString placeHolderText{QT_UTF8(obs_source_getdisplayname(
OBS_SOURCE_TYPE_INPUT,
type_, App()->GetLocale()))};
OBS_SOURCE_TYPE_INPUT, type_))};
QString text{placeHolderText};
int i = 1;

18
plugins/linux-pulseaudio/pulse-input.c
View File

@ -281,7 +281,7 @@ skip:
/**
* Get plugin properties
*/
static obs_properties_t pulse_properties(const char *locale, bool input)
static obs_properties_t pulse_properties(bool input)
{
obs_properties_t props = obs_properties_create();
obs_property_t devices = obs_properties_add_list(props, "device_id",
@ -295,14 +295,14 @@ static obs_properties_t pulse_properties(const char *locale, bool input)
return props;
}
static obs_properties_t pulse_input_properties(const char *locale)
static obs_properties_t pulse_input_properties(void)
{
return pulse_properties(locale, true);
return pulse_properties(true);
}
static obs_properties_t pulse_output_properties(const char *locale)
static obs_properties_t pulse_output_properties(void)
{
return pulse_properties(locale, false);
return pulse_properties(false);
}
/**
@ -366,15 +366,15 @@ static void pulse_output_defaults(obs_data_t settings)
/**
* Returns the name of the plugin
*/
static const char *pulse_input_getname(const char *locale)
static const char *pulse_input_getname(void)
{
UNUSED_PARAMETER(locale);
/* TODO: locale */
return "Pulse Audio Input Capture";
}
static const char *pulse_output_getname(const char *locale)
static const char *pulse_output_getname(void)
{
UNUSED_PARAMETER(locale);
/* TODO: locale */
return "Pulse Audio Output Capture";
}

7
plugins/linux-v4l2/v4l2-input.c
View File

@ -266,9 +266,9 @@ exit:
return NULL;
}
static const char* v4l2_getname(const char* locale)
static const char* v4l2_getname(void)
{
UNUSED_PARAMETER(locale);
/* TODO: locale */
return "V4L2 Capture Input";
}
@ -452,8 +452,9 @@ static bool resolution_selected(obs_properties_t props, obs_property_t p,
return true;
}
static obs_properties_t v4l2_properties(const char *locale)
static obs_properties_t v4l2_properties(void)
{
/* TODO: locale */
obs_properties_t props = obs_properties_create();
obs_property_t device_list = obs_properties_add_list(props, "device_id",
"Device", OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_STRING);

9
plugins/linux-xcomposite/plugin-main.cpp
View File

@ -37,9 +37,9 @@ static uint32_t xcompcap_getheight(void* data)
return cc->height();
}
static obs_properties_t xcompcap_props(const char *locale)
static obs_properties_t xcompcap_props(void)
{
return XCompcapMain::properties(locale);
return XCompcapMain::properties();
}
void xcompcap_defaults(obs_data_t settings)
@ -55,10 +55,9 @@ void xcompcap_update(void *data, obs_data_t settings)
OBS_DECLARE_MODULE()
static const char* xcompcap_getname(const char* locale)
static const char* xcompcap_getname(void)
{
UNUSED_PARAMETER(locale);
/* TODO: locale */
return "Xcomposite capture";
}

2
plugins/linux-xcomposite/xcompcap-main.cpp
View File

@ -46,7 +46,7 @@ void XCompcapMain::deinit()
XCompcap::cleanupDisplay();
}
obs_properties_t XCompcapMain::properties(const char *locale)
obs_properties_t XCompcapMain::properties()
{
obs_properties_t props = obs_properties_create();

2
plugins/linux-xcomposite/xcompcap-main.h
View File

@ -8,7 +8,7 @@ class XCompcapMain
static bool init();
static void deinit();
static obs_properties_t properties(const char *locale);
static obs_properties_t properties();
static void defaults(obs_data_t settings);
XCompcapMain(obs_data_t settings, obs_source_t source);

7
plugins/linux-xshm/xshm-input.c
View File

@ -108,9 +108,9 @@ static int_fast32_t xshm_update_geometry(struct xshm_data *data,
/**
* Returns the name of the plugin
*/
static const char* xshm_getname(const char* locale)
static const char* xshm_getname(void)
{
UNUSED_PARAMETER(locale);
/* TODO: locale */
return "X11 Shared Memory Screen Input";
}
@ -154,8 +154,9 @@ static void xshm_defaults(obs_data_t defaults)
/**
* Get the properties for the capture
*/
static obs_properties_t xshm_properties(const char *locale)
static obs_properties_t xshm_properties(void)
{
/* TODO: locale */
obs_properties_t props = obs_properties_create();
int_fast32_t screen_max;

5
plugins/mac-avcapture/av-capture.m
View File

@ -131,10 +131,9 @@ static inline void update_frame_size(struct av_capture *capture,
}
@end
static const char *av_capture_getname(const char *locale)
static const char *av_capture_getname(void)
{
/* TODO: locale */
UNUSED_PARAMETER(locale);
return "Video Capture Device";
}
@ -569,7 +568,7 @@ static bool properties_device_changed(obs_properties_t props, obs_property_t p,
return true;
}
static obs_properties_t av_capture_properties(char const *locale)
static obs_properties_t av_capture_properties(void)
{
obs_properties_t props = obs_properties_create();

16
plugins/mac-capture/mac-audio.c
View File

@ -628,17 +628,15 @@ static void coreaudio_uninit(struct coreaudio_data *ca)
/* ------------------------------------------------------------------------- */
static const char *coreaudio_input_getname(const char *locale)
static const char *coreaudio_input_getname(void)
{
/* TODO: Locale */
UNUSED_PARAMETER(locale);
return "CoreAudio Input Capture";
}
static const char *coreaudio_output_getname(const char *locale)
static const char *coreaudio_output_getname(void)
{
/* TODO: Locale */
UNUSED_PARAMETER(locale);
return "CoreAudio Output Capture";
}
@ -704,7 +702,7 @@ static void *coreaudio_create_output_capture(obs_data_t settings,
return coreaudio_create(settings, source, false);
}
static obs_properties_t coreaudio_properties(const char *locale, bool input)
static obs_properties_t coreaudio_properties(bool input)
{
obs_properties_t props = obs_properties_create();
obs_property_t property;
@ -732,14 +730,14 @@ static obs_properties_t coreaudio_properties(const char *locale, bool input)
return props;
}
static obs_properties_t coreaudio_input_properties(const char *locale)
static obs_properties_t coreaudio_input_properties(void)
{
return coreaudio_properties(locale, true);
return coreaudio_properties(true);
}
static obs_properties_t coreaudio_output_properties(const char *locale)
static obs_properties_t coreaudio_output_properties(void)
{
return coreaudio_properties(locale, false);
return coreaudio_properties(false);
}
struct obs_source_info coreaudio_input_capture_info = {

6
plugins/obs-ffmpeg/obs-ffmpeg-aac.c
View File

@ -44,9 +44,9 @@ struct aac_encoder {
int frame_size_bytes;
};
static const char *aac_getname(const char *locale)
static const char *aac_getname(void)
{
UNUSED_PARAMETER(locale);
/* TODO: locale */
return "FFmpeg Default AAC Encoder";
}
@ -238,7 +238,7 @@ static void aac_defaults(obs_data_t settings)
obs_data_set_default_int(settings, "bitrate", 128);
}
static obs_properties_t aac_properties(const char *locale)
static obs_properties_t aac_properties(void)
{
obs_properties_t props = obs_properties_create();

4
plugins/obs-ffmpeg/obs-ffmpeg-output.c
View File

@ -396,9 +396,9 @@ fail:
/* ------------------------------------------------------------------------- */
static const char *ffmpeg_output_getname(const char *locale)
static const char *ffmpeg_output_getname(void)
{
UNUSED_PARAMETER(locale);
/* TODO: locale */
return "FFmpeg file output";
}

6
plugins/obs-libfdk/obs-libfdk.c
View File

@ -59,13 +59,13 @@ typedef struct libfdk_encoder {
int packet_buffer_size;
} libfdk_encoder_t;
static const char *libfdk_getname(const char *locale)
static const char *libfdk_getname(void)
{
UNUSED_PARAMETER(locale);
/* TODO: locale */
return "libfdk aac encoder";
}
static obs_properties_t libfdk_properties(const char *locale)
static obs_properties_t libfdk_properties(void)
{
obs_properties_t props = obs_properties_create();

6
plugins/obs-outputs/flv-output.c
View File

@ -32,9 +32,9 @@ struct flv_output {
int64_t last_packet_ts;
};
static const char *flv_output_getname(const char *locale)
static const char *flv_output_getname(void)
{
UNUSED_PARAMETER(locale);
/* TODO: locale */
return "FLV File Output";
}
@ -189,7 +189,7 @@ static void flv_output_data(void *data, struct encoder_packet *packet)
}
}
static obs_properties_t flv_output_properties(const char *locale)
static obs_properties_t flv_output_properties(void)
{
obs_properties_t props = obs_properties_create();

5
plugins/obs-outputs/rtmp-stream.c
View File

@ -61,10 +61,9 @@ struct rtmp_stream {
RTMP rtmp;
};
static const char *rtmp_stream_getname(const char *locale)
static const char *rtmp_stream_getname(void)
{
/* TODO: locale stuff */
UNUSED_PARAMETER(locale);
return "RTMP Stream";
}
@ -567,7 +566,7 @@ static void rtmp_stream_defaults(obs_data_t defaults)
obs_data_set_default_int(defaults, "drop_threshold", 600000);
}
static obs_properties_t rtmp_stream_properties(const char *locale)
static obs_properties_t rtmp_stream_properties(void)
{
obs_properties_t props = obs_properties_create();

5
plugins/obs-x264/obs-x264.c
View File

@ -38,10 +38,9 @@ struct obs_x264 {
/* ------------------------------------------------------------------------- */
static const char *obs_x264_getname(const char *locale)
static const char *obs_x264_getname(void)
{
/* TODO locale lookup */
UNUSED_PARAMETER(locale);
return "x264";
}
@ -93,7 +92,7 @@ static inline void add_strings(obs_property_t list, const char *const *strings)
}
}
static obs_properties_t obs_x264_props(const char *locale)
static obs_properties_t obs_x264_props(void)
{
/* TODO: locale */

6
plugins/rtmp-services/rtmp-common.c
View File

@ -8,10 +8,8 @@ struct rtmp_common {
char *key;
};
static const char *rtmp_common_getname(const char *locale)
static const char *rtmp_common_getname(void)
{
UNUSED_PARAMETER(locale);
/* TODO: locale */
return "Streaming Services";
}
@ -200,7 +198,7 @@ static bool service_selected(obs_properties_t props, obs_property_t p,
return true;
}
static obs_properties_t rtmp_common_properties(const char *locale)
static obs_properties_t rtmp_common_properties(void)
{
obs_properties_t ppts = obs_properties_create();
obs_property_t list;

6
plugins/rtmp-services/rtmp-custom.c
View File

@ -4,10 +4,8 @@ struct rtmp_custom {
char *server, *key;
};
static const char *rtmp_custom_name(const char *locale)
static const char *rtmp_custom_name(void)
{
UNUSED_PARAMETER(locale);
/* TODO: locale */
return "Custom Streaming Server";
}
@ -41,7 +39,7 @@ static void *rtmp_custom_create(obs_data_t settings, obs_service_t service)
return data;
}
static obs_properties_t rtmp_custom_properties(const char *locale)
static obs_properties_t rtmp_custom_properties(void)
{
obs_properties_t ppts = obs_properties_create();

4
plugins/win-capture/monitor-capture.c
View File

@ -81,9 +81,9 @@ static inline void update_settings(struct monitor_capture *capture,
/* ------------------------------------------------------------------------- */
static const char *monitor_capture_getname(const char *locale)
static const char *monitor_capture_getname(void)
{
/* TODO: translate */
/* TODO: locale */
return "Monitor Capture";
}

5
plugins/win-capture/window-capture.c
View File

@ -294,10 +294,9 @@ static HWND find_window(struct window_capture *wc)
/* ------------------------------------------------------------------------- */
static const char *wc_getname(const char *locale)
static const char *wc_getname(void)
{
/* TODO: locale */
UNUSED_PARAMETER(locale);
return "Window capture";
}
@ -362,7 +361,7 @@ static void wc_defaults(obs_data_t defaults)
obs_data_setbool(defaults, "compatibility", false);
}
static obs_properties_t wc_properties(const char *locale)
static obs_properties_t wc_properties(void)
{
obs_properties_t ppts = obs_properties_create();
obs_property_t p;

6
plugins/win-dshow/win-dshow.cpp
View File

@ -251,9 +251,9 @@ void DShowInput::Update(obs_data_t settings)
/* ------------------------------------------------------------------------- */
static const char *GetDShowInputName(const char *locale)
static const char *GetDShowInputName(void)
{
UNUSED_PARAMETER(locale);
/* TODO: locale */
return "Video Capture Device";
}
@ -778,7 +778,7 @@ static bool DeviceIntervalChanged(obs_properties_t props, obs_property_t p,
return true;
}
static obs_properties_t GetDShowProperties(const char *locale)
static obs_properties_t GetDShowProperties(void)
{
obs_properties_t ppts = obs_properties_create();
PropertiesData *data = new PropertiesData;

14
plugins/win-wasapi/win-wasapi.cpp
View File

@ -416,13 +416,13 @@ DWORD WINAPI WASAPISource::CaptureThread(LPVOID param)
/* ------------------------------------------------------------------------- */
static const char *GetWASAPIInputName(const char *locale)
static const char *GetWASAPIInputName(void)
{
/* TODO: translate */
return "Audio Input Capture (WASAPI)";
}
static const char *GetWASAPIOutputName(const char *locale)
static const char *GetWASAPIOutputName(void)
{
/* TODO: translate */
return "Audio Output Capture (WASAPI)";
@ -466,7 +466,7 @@ static void UpdateWASAPISource(void *obj, obs_data_t settings)
static_cast<WASAPISource*>(obj)->Update(settings);
}
static obs_properties_t GetWASAPIProperties(const char *locale, bool input)
static obs_properties_t GetWASAPIProperties(bool input)
{
obs_properties_t props = obs_properties_create();
vector<AudioDeviceInfo> devices;
@ -494,14 +494,14 @@ static obs_properties_t GetWASAPIProperties(const char *locale, bool input)
return props;
}
static obs_properties_t GetWASAPIPropertiesInput(const char *locale)
static obs_properties_t GetWASAPIPropertiesInput(void)
{
return GetWASAPIProperties(locale, true);
return GetWASAPIProperties(true);
}
static obs_properties_t GetWASAPIPropertiesOutput(const char *locale)
static obs_properties_t GetWASAPIPropertiesOutput(void)
{
return GetWASAPIProperties(locale, false);
return GetWASAPIProperties(false);
}
void RegisterWASAPIInput()

7
test/test-input/test-desktop.m
View File

@ -258,9 +258,8 @@ static void display_capture_video_render(void *data, effect_t effect)
technique_end(tech);
}
static const char *display_capture_getname(const char *locale)
static const char *display_capture_getname(void)
{
UNUSED_PARAMETER(locale);
return "Display Capture";
}
@ -300,9 +299,9 @@ static void display_capture_update(void *data, obs_data_t settings)
gs_leavecontext();
}
static obs_properties_t display_capture_properties(char const *locale)
static obs_properties_t display_capture_properties(void)
{
obs_properties_t props = obs_properties_create(locale);
obs_properties_t props = obs_properties_create();
obs_property_t list = obs_properties_add_list(props,
"display", "Display",

3
test/test-input/test-filter.c
View File

@ -5,9 +5,8 @@ struct test_filter {
effect_t whatever;
};
static const char *filter_getname(const char *locale)
static const char *filter_getname(void)
{
UNUSED_PARAMETER(locale);
return "Test";
}

3
test/test-input/test-random.c
View File

@ -10,9 +10,8 @@ struct random_tex {
bool initialized;
};
static const char *random_getname(const char *locale)
static const char *random_getname(void)
{
UNUSED_PARAMETER(locale);
return "20x20 Random Pixel Texture Source (Test)";
}

3
test/test-input/test-sinewave.c
View File

@ -58,9 +58,8 @@ static void *sinewave_thread(void *pdata)
/* ------------------------------------------------------------------------- */
static const char *sinewave_getname(const char *locale)
static const char *sinewave_getname(void)
{
UNUSED_PARAMETER(locale);
return "Sinewave Sound Source (Test)";
}