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

(API Change) Rename obs_source_get(/release)frame

Browse Source 
Renamed functions:
- obs_source_getframe (rename to obs_source_get_frame)
- obs_source_releaseframe (rename to obs_source_release_frame)

For the sake of consistency and helping to get rid of the "squishy
function name" issue
This commit is contained in:
jp9000 2014-08-02 00:58:06 -07:00
parent 24bd82a09c
commit 7b402245dc
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libobs/obs-source.c
View File

@ -1036,7 +1036,7 @@ static void obs_source_draw_async_texture(struct obs_source *source)
static void obs_source_render_async_video(obs_source_t source)
{
struct source_frame *frame = obs_source_getframe(source);
struct source_frame *frame = obs_source_get_frame(source);
if (frame) {
if (!set_async_texture_size(source, frame))
return;
@ -1047,7 +1047,7 @@ static void obs_source_render_async_video(obs_source_t source)
if (source->async_texture)
obs_source_draw_async_texture(source);
obs_source_releaseframe(source, frame);
obs_source_release_frame(source, frame);
}
static inline void obs_source_render_filters(obs_source_t source)
@ -1561,7 +1561,7 @@ static inline struct source_frame *get_closest_frame(obs_source_t source,
* the frame with the closest timing to ensure sync. Also ensures that timing
* with audio is synchronized.
*/
struct source_frame *obs_source_getframe(obs_source_t source)
struct source_frame *obs_source_get_frame(obs_source_t source)
{
struct source_frame *frame = NULL;
uint64_t sys_time;
@ -1602,7 +1602,7 @@ unlock:
return frame;
}
void obs_source_releaseframe(obs_source_t source, struct source_frame *frame)
void obs_source_release_frame(obs_source_t source, struct source_frame *frame)
{
if (source && frame) {
source_frame_destroy(frame);

4
libobs/obs.h
View File

@ -715,10 +715,10 @@ EXPORT void obs_source_output_audio(obs_source_t source,
const struct source_audio *audio);
/** Gets the current async video frame */
EXPORT struct source_frame *obs_source_getframe(obs_source_t source);
EXPORT struct source_frame *obs_source_get_frame(obs_source_t source);
/** Releases the current async video frame */
EXPORT void obs_source_releaseframe(obs_source_t source,
EXPORT void obs_source_release_frame(obs_source_t source,
struct source_frame *frame);
/** Default RGB filter handler for generic effect filters */