#include "cl_video.h"
// cvars
-cvar_t cl_video_subtitles = {CVAR_SAVE, "cl_video_subtitles", "0", "show subtitles for videos (if they are present)"};
-cvar_t cl_video_subtitles_lines = {CVAR_SAVE, "cl_video_subtitles_lines", "4", "how many lines to occupy for subtitles"};
-cvar_t cl_video_subtitles_textsize = {CVAR_SAVE, "cl_video_subtitles_textsize", "16", "textsize for subtitles"};
-cvar_t cl_video_scale = {CVAR_SAVE, "cl_video_scale", "1", "scale of video, 1 = fullscreen, 0.75 - 3/4 of screen etc."};
-cvar_t cl_video_scale_vpos = {CVAR_SAVE, "cl_video_scale_vpos", "0", "vertical align of scaled video, -1 is top, 1 is bottom"};
-cvar_t cl_video_stipple = {CVAR_SAVE, "cl_video_stipple", "0", "draw interlacing-like effect on videos, similar to scr_stipple but static and used only with video playing."};
-cvar_t cl_video_brightness = {CVAR_SAVE, "cl_video_brightness", "1", "brightness of video, 1 = fullbright, 0.75 - 3/4 etc."};
-cvar_t cl_video_keepaspectratio = {CVAR_SAVE, "cl_video_keepaspectratio", "0", "keeps aspect ratio of fullscreen videos, leaving black color on unfilled areas, a value of 2 let video to be stretched horizontally with top & bottom being sliced out"};
-cvar_t cl_video_fadein = {CVAR_SAVE, "cl_video_fadein", "0", "fading-from-black effect once video is started, in seconds"};
-cvar_t cl_video_fadeout = {CVAR_SAVE, "cl_video_fadeout", "0", "fading-to-black effect once video is ended, in seconds"};
-
-cvar_t v_glslgamma_video = {CVAR_SAVE, "v_glslgamma_video", "1", "applies GLSL gamma to played video, could be a fraction, requires r_glslgamma_2d 1."};
+cvar_t cl_video_subtitles = {CVAR_CLIENT | CVAR_SAVE, "cl_video_subtitles", "0", "show subtitles for videos (if they are present)"};
+cvar_t cl_video_subtitles_lines = {CVAR_CLIENT | CVAR_SAVE, "cl_video_subtitles_lines", "4", "how many lines to occupy for subtitles"};
+cvar_t cl_video_subtitles_textsize = {CVAR_CLIENT | CVAR_SAVE, "cl_video_subtitles_textsize", "16", "textsize for subtitles"};
+cvar_t cl_video_scale = {CVAR_CLIENT | CVAR_SAVE, "cl_video_scale", "1", "scale of video, 1 = fullscreen, 0.75 - 3/4 of screen etc."};
+cvar_t cl_video_scale_vpos = {CVAR_CLIENT | CVAR_SAVE, "cl_video_scale_vpos", "0", "vertical align of scaled video, -1 is top, 1 is bottom"};
+cvar_t cl_video_stipple = {CVAR_CLIENT | CVAR_SAVE, "cl_video_stipple", "0", "draw interlacing-like effect on videos, similar to scr_stipple but static and used only with video playing."};
+cvar_t cl_video_brightness = {CVAR_CLIENT | CVAR_SAVE, "cl_video_brightness", "1", "brightness of video, 1 = fullbright, 0.75 - 3/4 etc."};
+cvar_t cl_video_keepaspectratio = {CVAR_CLIENT | CVAR_SAVE, "cl_video_keepaspectratio", "0", "keeps aspect ratio of fullscreen videos, leaving black color on unfilled areas, a value of 2 let video to be stretched horizontally with top & bottom being sliced out"};
+cvar_t cl_video_fadein = {CVAR_CLIENT | CVAR_SAVE, "cl_video_fadein", "0", "fading-from-black effect once video is started, in seconds"};
+cvar_t cl_video_fadeout = {CVAR_CLIENT | CVAR_SAVE, "cl_video_fadeout", "0", "fading-to-black effect once video is ended, in seconds"};
+
+cvar_t v_glslgamma_video = {CVAR_CLIENT | CVAR_SAVE, "v_glslgamma_video", "1", "applies GLSL gamma to played video, could be a fraction, requires r_glslgamma_2d 1."};
// DPV stream decoder
#include "dpvsimpledecode.h"
if (video->stream)
return true;
- Con_Printf("unable to open \"%s\", error: %s\n", video->filename, errorstring);
+ Con_Errorf("unable to open \"%s\", error: %s\n", video->filename, errorstring);
return false;
}
LinkVideoTexture( video );
// update starttime
- video->starttime += realtime - video->lasttime;
+ video->starttime += host.realtime - video->lasttime;
return true;
}
char overridename[MAX_QPATH];
cvar_t *langcvar;
- langcvar = Cvar_FindVar("language");
+ langcvar = Cvar_FindVar(&cvars_all, "language", CVAR_CLIENT | CVAR_SERVER);
subtitle_text = NULL;
if (langcvar)
{
// check limits
if (video->subtitles == CLVIDEO_MAX_SUBTITLES)
{
- Con_Printf("WARNING: CLVIDEO_MAX_SUBTITLES = %i reached when reading subtitles from '%s'\n", CLVIDEO_MAX_SUBTITLES, subtitlesfile);
+ Con_Warnf("WARNING: CLVIDEO_MAX_SUBTITLES = %i reached when reading subtitles from '%s'\n", CLVIDEO_MAX_SUBTITLES, subtitlesfile);
break;
}
// add a sub
video->state = CLVIDEO_FIRSTFRAME;
video->framenum = -1;
video->framerate = video->getframerate( video->stream );
- video->lasttime = realtime;
+ video->lasttime = host.realtime;
video->subtitles = 0;
video->width = video->getwidth( video->stream );
video = FindUnusedVid();
if( !video ) {
- Con_Printf( "CL_OpenVideo: unable to open video \"%s\" - video limit reached\n", filename );
+ Con_Errorf( "CL_OpenVideo: unable to open video \"%s\" - video limit reached\n", filename );
return NULL;
}
video = OpenVideo( video, filename, name, owner, subtitlesfile );
video->framenum = -1;
}
- video->lasttime = realtime;
+ video->lasttime = host.realtime;
return video;
}
if (!video)
return;
- video->lasttime = realtime;
+ video->lasttime = host.realtime;
video->state = state;
if (state == CLVIDEO_FIRSTFRAME)
CL_RestartVideo(video);
return;
// reset time
- video->starttime = video->lasttime = realtime;
+ video->starttime = video->lasttime = host.realtime;
video->framenum = -1;
// reopen stream
{
if (video->state != CLVIDEO_UNUSED && !video->suspended)
{
- if (realtime - video->lasttime > CLTHRESHOLD)
+ if (host.realtime - video->lasttime > CLTHRESHOLD)
{
SuspendVideo(video);
continue;
}
if (video->state == CLVIDEO_PAUSE)
{
- video->starttime = realtime - video->framenum * video->framerate;
+ video->starttime = host.realtime - video->framenum * video->framerate;
continue;
}
// read video frame from stream if time has come
if (video->state == CLVIDEO_FIRSTFRAME )
destframe = 0;
else
- destframe = (int)((realtime - video->starttime) * video->framerate);
+ destframe = (int)((host.realtime - video->starttime) * video->framerate);
if (destframe < 0)
destframe = 0;
if (video->framenum < destframe)
// calc brightness for fadein and fadeout effects
b = cl_video_brightness.value;
- if (cl_video_fadein.value && (realtime - video->starttime) < cl_video_fadein.value)
- b = pow((realtime - video->starttime)/cl_video_fadein.value, 2);
- else if (cl_video_fadeout.value && ((video->starttime + video->framenum * video->framerate) - realtime) < cl_video_fadeout.value)
- b = pow(((video->starttime + video->framenum * video->framerate) - realtime)/cl_video_fadeout.value, 2);
+ if (cl_video_fadein.value && (host.realtime - video->starttime) < cl_video_fadein.value)
+ b = pow((host.realtime - video->starttime)/cl_video_fadein.value, 2);
+ else if (cl_video_fadeout.value && ((video->starttime + video->framenum * video->framerate) - host.realtime) < cl_video_fadeout.value)
+ b = pow(((video->starttime + video->framenum * video->framerate) - host.realtime)/cl_video_fadeout.value, 2);
// draw black bg in case stipple is active or video is scaled
if (cl_video_stipple.integer || px != 0 || py != 0 || sx != vid_conwidth.integer || sy != vid_conheight.integer)
DrawQ_Fill(0, 0, vid_conwidth.integer, vid_conheight.integer, 0, 0, 0, 1, 0);
-#ifndef USE_GLES2
// enable video-only polygon stipple (of global stipple is not active)
- if (qglPolygonStipple && !scr_stipple.integer && cl_video_stipple.integer)
+ if (!scr_stipple.integer && cl_video_stipple.integer)
{
- GLubyte stipple[128];
- int s, width, parts;
-
- s = cl_video_stipple.integer;
- parts = (s & 007);
- width = (s & 070) >> 3;
- qglEnable(GL_POLYGON_STIPPLE);CHECKGLERROR // 0x0B42
- for(i = 0; i < 128; ++i)
- {
- int line = i/4;
- stipple[i] = ((line >> width) & ((1 << parts) - 1)) ? 0x00 : 0xFF;
- }
- qglPolygonStipple(stipple);CHECKGLERROR
+ Con_Print("FIXME: cl_video_stipple not implemented\n");
+ Cvar_SetValueQuick(&cl_video_stipple, 0);
}
-#endif
// draw video
if (v_glslgamma_video.value >= 1)
DrawQ_SuperPic(px, py, video->cachepic, sx, sy, st[0], st[1], b, b, b, v_glslgamma_video.value, st[2], st[3], b, b, b, v_glslgamma_video.value, st[4], st[5], b, b, b, v_glslgamma_video.value, st[6], st[7], b, b, b, v_glslgamma_video.value, 0);
}
-#ifndef USE_GLES2
- // disable video-only stipple
- if (qglPolygonStipple && !scr_stipple.integer && cl_video_stipple.integer)
- {
- qglDisable(GL_POLYGON_STIPPLE);CHECKGLERROR
- }
-#endif
-
// VorteX: draw subtitle_text
if (!video->subtitles || !cl_video_subtitles.integer)
return;
// find current subtitle
- videotime = realtime - video->starttime;
+ videotime = host.realtime - video->starttime;
for (i = 0; i < video->subtitles; i++)
{
if (videotime >= video->subtitle_start[i] && videotime <= video->subtitle_end[i])
CL_CloseVideo( cl_videos );
}
-static void CL_PlayVideo_f(void)
+static void CL_PlayVideo_f(cmd_state_t *cmd)
{
char name[MAX_QPATH], subtitlesfile[MAX_QPATH];
const char *extension;
if (COM_CheckParm("-benchmark"))
return;
- if (Cmd_Argc() < 2)
+ if (Cmd_Argc(cmd) < 2)
{
Con_Print("usage: playvideo <videoname> [custom_subtitles_file]\nplays video named video/<videoname>.dpv\nif custom subtitles file is not presented\nit tries video/<videoname>.sub");
return;
}
- extension = FS_FileExtension(Cmd_Argv(1));
+ extension = FS_FileExtension(Cmd_Argv(cmd, 1));
if (extension[0])
- dpsnprintf(name, sizeof(name), "video/%s", Cmd_Argv(1));
+ dpsnprintf(name, sizeof(name), "video/%s", Cmd_Argv(cmd, 1));
else
- dpsnprintf(name, sizeof(name), "video/%s.dpv", Cmd_Argv(1));
- if ( Cmd_Argc() > 2)
- CL_VideoStart(name, Cmd_Argv(2));
+ dpsnprintf(name, sizeof(name), "video/%s.dpv", Cmd_Argv(cmd, 1));
+ if ( Cmd_Argc(cmd) > 2)
+ CL_VideoStart(name, Cmd_Argv(cmd, 2));
else
{
- dpsnprintf(subtitlesfile, sizeof(subtitlesfile), "video/%s.dpsubs", Cmd_Argv(1));
+ dpsnprintf(subtitlesfile, sizeof(subtitlesfile), "video/%s.dpsubs", Cmd_Argv(cmd, 1));
CL_VideoStart(name, subtitlesfile);
}
}
-static void CL_StopVideo_f(void)
+static void CL_StopVideo_f(cmd_state_t *cmd)
{
CL_VideoStop();
}
bgra.i = 0;bgra.b[1] = 0xFF;cl_videogmask = bgra.i;
bgra.i = 0;bgra.b[2] = 0xFF;cl_videormask = bgra.i;
- Cmd_AddCommand( "playvideo", CL_PlayVideo_f, "play a .dpv video file" );
- Cmd_AddCommand( "stopvideo", CL_StopVideo_f, "stop playing a .dpv video file" );
+ Cmd_AddCommand(CMD_CLIENT, "playvideo", CL_PlayVideo_f, "play a .dpv video file" );
+ Cmd_AddCommand(CMD_CLIENT, "stopvideo", CL_StopVideo_f, "stop playing a .dpv video file" );
Cvar_RegisterVariable(&cl_video_subtitles);
Cvar_RegisterVariable(&cl_video_subtitles_lines);
projects / xonotic / darkplaces.git / blobdiff