From 6861eaabaf7ad92e758b6887f3090b093c1d31de Mon Sep 17 00:00:00 2001 From: jp9000 Date: Sat, 17 Oct 2015 04:19:43 -0700 Subject: [PATCH] libobs: Use macros for obs validity checks --- libobs/obs-internal.h | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/libobs/obs-internal.h b/libobs/obs-internal.h index 8cc2969be..17746cc6b 100644 --- a/libobs/obs-internal.h +++ b/libobs/obs-internal.h @@ -62,25 +62,11 @@ static inline bool obs_object_valid(const void *obj, const char *f, return true; } -static inline bool obs_source_valid(const obs_source_t *obj, const char *f) -{ - return obs_object_valid(obj, f, "source"); -} - -static inline bool obs_output_valid(const obs_output_t *obj, const char *f) -{ - return obs_object_valid(obj, f, "output"); -} - -static inline bool obs_encoder_valid(const obs_encoder_t *obj, const char *f) -{ - return obs_object_valid(obj, f, "encoder"); -} - -static inline bool obs_service_valid(const obs_service_t *obj, const char *f) -{ - return obs_object_valid(obj, f, "service"); -} +#define obs_ptr_valid(ptr, func) obs_object_valid(ptr, func, #ptr) +#define obs_source_valid obs_ptr_valid +#define obs_output_valid obs_ptr_valid +#define obs_encoder_valid obs_ptr_valid +#define obs_service_valid obs_ptr_valid /* ------------------------------------------------------------------------- */ /* modules */