From 2e6010b36d090a0d96c18dd3a0e564ebf3876947 Mon Sep 17 00:00:00 2001 From: jp9000 Date: Tue, 6 Jan 2015 01:41:13 -0800 Subject: [PATCH] win-capture: Use macros for intervals Having macros that state what these numbers mean is much more ideal than just having a random number thrown in there, wondering why it was used and what its purpose is (magic numbers). --- plugins/win-capture/game-capture.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/plugins/win-capture/game-capture.c b/plugins/win-capture/game-capture.c index c29c8656c..9d97d6055 100644 --- a/plugins/win-capture/game-capture.c +++ b/plugins/win-capture/game-capture.c @@ -44,6 +44,9 @@ #define TEXT_LIMIT_FRAMERATE obs_module_text("GameCapture.LimitFramerate") #define TEXT_CAPTURE_OVERLAYS obs_module_text("GameCapture.CaptureOverlays") +#define DEFAULT_RETRY_INTERVAL 2.0f +#define ERROR_RETRY_INTERVAL 4.0f + struct game_capture_config { char *title; char *class; @@ -323,7 +326,7 @@ static void game_capture_update(void *data, obs_data_t *settings) free_config(&gc->config); gc->config = cfg; gc->activate_hook = !!window && !!*window; - gc->retry_interval = 2.0f; + gc->retry_interval = DEFAULT_RETRY_INTERVAL; if (!gc->initial_config) { if (reset_capture) { @@ -339,7 +342,7 @@ static void *game_capture_create(obs_data_t *settings, obs_source_t *source) struct game_capture *gc = bzalloc(sizeof(*gc)); gc->source = source; gc->initial_config = true; - gc->retry_interval = 2.0f; + gc->retry_interval = DEFAULT_RETRY_INTERVAL; game_capture_update(gc, settings); return gc; @@ -964,7 +967,7 @@ static void game_capture_tick(void *data, float seconds) gc->error_acquiring = true; } else if (!gc->capturing) { - gc->retry_interval = 4.0f; + gc->retry_interval = ERROR_RETRY_INTERVAL; stop_capture(gc); } } @@ -972,7 +975,7 @@ static void game_capture_tick(void *data, float seconds) if (gc->hook_ready && object_signalled(gc->hook_ready)) { gc->capturing = start_capture(gc); if (!gc->capturing) { - gc->retry_interval = 4.0f; + gc->retry_interval = ERROR_RETRY_INTERVAL; stop_capture(gc); } }