From 90915f3bbfd93853316f95ba3c74ed0d2d4c07ad Mon Sep 17 00:00:00 2001 From: divverent Date: Sat, 3 Aug 2013 12:48:23 +0000 Subject: [PATCH] Fix name of CONFIG_VIDEO_CAPTURE macro. git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11993 d7cf8633-e32d-0410-b094-e92efae38249 ::stable-branch::merge=18eb1f68267407be6241a6ec5c3612788b153b20 --- cl_demo.c | 4 ++-- cl_screen.c | 16 ++++++++-------- snd_mix.c | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/cl_demo.c b/cl_demo.c index 6d4fb869..5741e813 100644 --- a/cl_demo.c +++ b/cl_demo.c @@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "quakedef.h" -#ifdef CONFIG_CAPTURE_VIDEO +#ifdef CONFIG_VIDEO_CAPTURE extern cvar_t cl_capturevideo; extern cvar_t cl_capturevideo_demo_stop; #endif @@ -81,7 +81,7 @@ Called when a demo file runs out, or the user starts a game // LordHavoc: now called only by CL_Disconnect void CL_StopPlayback (void) { -#ifdef CONFIG_CAPTURE_VIDEO +#ifdef CONFIG_VIDEO_CAPTURE if (cl_capturevideo_demo_stop.integer) Cvar_Set("cl_capturevideo", "0"); #endif diff --git a/cl_screen.c b/cl_screen.c index 9b1513b4..2867607d 100644 --- a/cl_screen.c +++ b/cl_screen.c @@ -7,7 +7,7 @@ #include "cl_collision.h" #include "libcurl.h" #include "csprogs.h" -#ifdef CONFIG_CAPTURE_VIDEO +#ifdef CONFIG_VIDEO_CAPTURE #include "cap_avi.h" #include "cap_ogg.h" #endif @@ -60,7 +60,7 @@ cvar_t scr_screenshot_hwgamma = {CVAR_SAVE, "scr_screenshot_hwgamma","1", "apply cvar_t scr_screenshot_alpha = {0, "scr_screenshot_alpha","0", "try to write an alpha channel to screenshots (debugging feature)"}; cvar_t scr_screenshot_timestamp = {CVAR_SAVE, "scr_screenshot_timestamp", "1", "use a timestamp based number of the type YYYYMMDDHHMMSSsss instead of sequential numbering"}; // scr_screenshot_name is defined in fs.c -#ifdef CONFIG_CAPTURE_VIDEO +#ifdef CONFIG_VIDEO_CAPTURE cvar_t cl_capturevideo = {0, "cl_capturevideo", "0", "enables saving of video to a .avi file using uncompressed I420 colorspace and PCM audio, note that scr_screenshot_gammaboost affects the brightness of the output)"}; cvar_t cl_capturevideo_demo_stop = {CVAR_SAVE, "cl_capturevideo_demo_stop", "1", "automatically stops video recording when demo ends"}; cvar_t cl_capturevideo_printfps = {CVAR_SAVE, "cl_capturevideo_printfps", "1", "prints the frames per second captured in capturevideo (is only written to the log file, not to the console, as that would be visible on the video)"}; @@ -1304,12 +1304,12 @@ static void SCR_SizeDown_f (void) Cvar_SetValue ("viewsize",scr_viewsize.value-10); } -#ifdef CONFIG_CAPTURE_VIDEO +#ifdef CONFIG_VIDEO_CAPTURE void SCR_CaptureVideo_EndVideo(void); #endif void CL_Screen_Shutdown(void) { -#ifdef CONFIG_CAPTURE_VIDEO +#ifdef CONFIG_VIDEO_CAPTURE SCR_CaptureVideo_EndVideo(); #endif } @@ -1362,7 +1362,7 @@ void CL_Screen_Init(void) Cvar_RegisterVariable (&scr_screenshot_name_in_mapdir); Cvar_RegisterVariable (&scr_screenshot_alpha); Cvar_RegisterVariable (&scr_screenshot_timestamp); -#ifdef CONFIG_CAPTURE_VIDEO +#ifdef CONFIG_VIDEO_CAPTURE Cvar_RegisterVariable (&cl_capturevideo); Cvar_RegisterVariable (&cl_capturevideo_demo_stop); Cvar_RegisterVariable (&cl_capturevideo_printfps); @@ -1411,7 +1411,7 @@ void CL_Screen_Init(void) Cmd_AddCommand ("envmap", R_Envmap_f, "render a cubemap (skybox) of the current scene"); Cmd_AddCommand ("infobar", SCR_InfoBar_f, "display a text in the infobar (usage: infobar expiretime string)"); -#ifdef CONFIG_CAPTURE_VIDEO +#ifdef CONFIG_VIDEO_CAPTURE SCR_CaptureVideo_Ogg_Init(); #endif @@ -1541,7 +1541,7 @@ void SCR_ScreenShot_f (void) Mem_Free (buffer2); } -#ifdef CONFIG_CAPTURE_VIDEO +#ifdef CONFIG_VIDEO_CAPTURE static void SCR_CaptureVideo_BeginVideo(void) { double r, g, b; @@ -2933,7 +2933,7 @@ void CL_UpdateScreen(void) SCR_DrawScreen(); } -#ifdef CONFIG_CAPTURE_VIDEO +#ifdef CONFIG_VIDEO_CAPTURE SCR_CaptureVideo(); #endif diff --git a/snd_mix.c b/snd_mix.c index 2299e3bf..38e6253a 100644 --- a/snd_mix.c +++ b/snd_mix.c @@ -28,7 +28,7 @@ static portable_sampleframe_t paintbuffer_unswapped[PAINTBUFFER_SIZE]; extern speakerlayout_t snd_speakerlayout; // for querying the listeners -#ifdef CONFIG_CAPTURE_VIDEO +#ifdef CONFIG_VIDEO_CAPTURE static void S_CaptureAVISound(const portable_sampleframe_t *paintbuffer, size_t length) { size_t i; @@ -522,7 +522,7 @@ void S_MixToBuffer(void *stream, unsigned int bufferframes) S_SoftClipPaintBuffer(paintbuffer, totalmixframes, snd_renderbuffer->format.width, snd_renderbuffer->format.channels); -#ifdef CONFIG_CAPTURE_VIDEO +#ifdef CONFIG_VIDEO_CAPTURE if (!snd_usethreadedmixing) S_CaptureAVISound(paintbuffer, totalmixframes); #endif -- 2.39.2