client: Add cap.h and move capture struct to it.

[xonotic/darkplaces.git] / client.h

diff --git a/client.h b/client.h
index a4cd3e74776003049e3ce2bae60a65b1b15aa17e..d167350041f6eb3397666fae4ab993fa916dd789 100644 (file)
--- a/client.h
+++ b/client.h
@@ -24,6 +24,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "matrixlib.h"
 #include "snd_main.h"
+#include "view.h"
+#include "cap.h"
 
 // NOTE: r_stat_name[] must match this indexing
 typedef enum r_stat_e
@@ -738,60 +740,6 @@ typedef enum qw_downloadtype_e
 }
 qw_downloadtype_t;
 
-#ifdef CONFIG_VIDEO_CAPTURE
-typedef enum capturevideoformat_e
-{
-       CAPTUREVIDEOFORMAT_AVI_I420,
-       CAPTUREVIDEOFORMAT_OGG_VORBIS_THEORA
-}
-capturevideoformat_t;
-
-typedef struct capturevideostate_s
-{
-       double startrealtime;
-       double framerate;
-       int framestep;
-       int framestepframe;
-       qbool active;
-       qbool realtime;
-       qbool error;
-       int soundrate;
-       int soundchannels;
-       int frame;
-       double starttime;
-       double lastfpstime;
-       int lastfpsframe;
-       int soundsampleframe;
-       unsigned char *screenbuffer;
-       unsigned char *outbuffer;
-       char basename[MAX_QPATH];
-       int width, height;
-
-       // precomputed RGB to YUV tables
-       // converts the RGB values to YUV (see cap_avi.c for how to use them)
-       short rgbtoyuvscaletable[3][3][256];
-       unsigned char yuvnormalizetable[3][256];
-
-       // precomputed gamma ramp (only needed if the capturevideo module uses RGB output)
-       // note: to map from these values to RGB24, you have to multiply by 255.0/65535.0, then add 0.5, then cast to integer
-       unsigned short vidramp[256 * 3];
-
-       // stuff to be filled in by the video format module
-       capturevideoformat_t format;
-       const char *formatextension;
-       qfile_t *videofile;
-               // always use this:
-               //   cls.capturevideo.videofile = FS_OpenRealFile(va(vabuf, sizeof(vabuf), "%s.%s", cls.capturevideo.basename, cls.capturevideo.formatextension), "wb", false);
-       void (*endvideo) (void);
-       void (*videoframes) (int num);
-       void (*soundframe) (const portable_sampleframe_t *paintbuffer, size_t length);
-
-       // format specific data
-       void *formatspecific;
-}
-capturevideostate_t;
-#endif
-
 #define CL_MAX_DOWNLOADACKS 4
 
 typedef struct cl_downloadack_s
@@ -1638,16 +1586,6 @@ void QW_CL_StartUpload(unsigned char *data, int size);
 extern cvar_t qport;
 void CL_KeepaliveMessage(qbool readmessages); // call this during loading of large content
 
-//
-// view
-//
-void V_StartPitchDrift_f(cmd_state_t *cmd);
-void V_StopPitchDrift (void);
-
-void V_Init (void);
-void V_UpdateBlends (void);
-void V_ParseDamage (void);
-
 //
 // cl_part
 //
@@ -1799,18 +1737,8 @@ void CL_ParseEntityLump(char *entitystring);
 void CL_FindNonSolidLocation(const vec3_t in, vec3_t out, vec_t radius);
 void CL_RelinkLightFlashes(void);
 void CL_Beam_AddPolygons(const beam_t *b);
-void Sbar_ShowFPS(void);
-void Sbar_ShowFPS_Update(void);
 void CL_UpdateMoveVars(void);
 void SCR_CaptureVideo_SoundFrame(const portable_sampleframe_t *paintbuffer, size_t length);
-void V_DriftPitch(void);
-void V_FadeViewFlashs(void);
-void V_CalcViewBlend(void);
-void V_CalcRefdefUsing (const matrix4x4_t *entrendermatrix, const vec3_t clviewangles, qbool teleported, qbool clonground, qbool clcmdjump, float clstatsviewheight, qbool cldead, const vec3_t clvelocity);
-void V_CalcRefdef(void);
-void V_MakeViewIsometric(void);
-void V_MakeViewIsometric(void);
-void V_StartPitchDrift(void);
 void CL_Locs_Reload_f(cmd_state_t *cmd);
 
 #endif