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

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

Browse Source
This commit is contained in:
Palana
2014-11-01 21:41:17 +01:00
parent d0cae31a48
commit 1d39c3e9b6
15 changed files with 68 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libobs/obs.h
View File

@@ -655,7 +655,8 @@ EXPORT const char *obs_source_get_display_name(enum obs_source_type type,
* or modifying video/audio. Use obs_source_release to release it.
*/
EXPORT obs_source_t *obs_source_create(enum obs_source_type type,
const char *id, const char *name, obs_data_t *settings);
const char *id, const char *name, obs_data_t *settings,
obs_data_t *hotkey_data);
/**
* Adds/releases a reference to a source. When the last reference is
@@ -1092,7 +1093,7 @@ EXPORT const char *obs_output_get_display_name(const char *id);
* directshow, or other custom outputs.
*/
EXPORT obs_output_t *obs_output_create(const char *id, const char *name,
obs_data_t *settings);
obs_data_t *settings, obs_data_t *hotkey_data);
/**
* Adds/releases a reference to an output. When the last reference is
@@ -1302,7 +1303,7 @@ EXPORT const char *obs_encoder_get_display_name(const char *id);
* @return The video encoder context, or NULL if failed or not found.
*/
EXPORT obs_encoder_t *obs_video_encoder_create(const char *id, const char *name,
obs_data_t *settings);
obs_data_t *settings, obs_data_t *hotkey_data);
/**
* Creates an audio encoder context
@@ -1314,7 +1315,8 @@ EXPORT obs_encoder_t *obs_video_encoder_create(const char *id, const char *name,
* @return The video encoder context, or NULL if failed or not found.
*/
EXPORT obs_encoder_t *obs_audio_encoder_create(const char *id, const char *name,
obs_data_t *settings, size_t mixer_idx);
obs_data_t *settings, size_t mixer_idx,
obs_data_t *hotkey_data);
/**
* Adds/releases a reference to an encoder. When the last reference is
@@ -1434,7 +1436,7 @@ EXPORT void obs_free_encoder_packet(struct encoder_packet *packet);
EXPORT const char *obs_service_get_display_name(const char *id);
EXPORT obs_service_t *obs_service_create(const char *id, const char *name,
obs_data_t *settings);
obs_data_t *settings, obs_data_t *hotkey_data);
/**
* Adds/releases a reference to a service. When the last reference is