eukara/fteqw
1
0
Fork 0
forked from fte/fteqw
Code Pull requests Activity

Small tweek that makes qtv slightly more usable without leaving the client.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2510 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2007-05-28 02:23:37 +00:00
parent 1c9eff8804
commit a696882cb4
1 changed files with 60 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
engine/client/cl_demo.c
View file

@ -1464,6 +1464,7 @@ void CL_QTVPlay (vfsfile_t *newf)
TP_ExecTrigger ("f_demostart"); TP_ExecTrigger ("f_demostart");
} }
char qtvhostname[1024];
char qtvrequestbuffer[4096]; char qtvrequestbuffer[4096];
int qtvrequestsize; int qtvrequestsize;
vfsfile_t *qtvrequest; vfsfile_t *qtvrequest;
@ -1474,6 +1475,14 @@ void CL_QTVPoll (void)
int len; int len;
qboolean streamavailable = false; qboolean streamavailable = false;
qboolean saidheader = false; qboolean saidheader = false;
menu_t *sourcesmenu = NULL;
int sourcenum = 0;
int streamid;
int numplayers;
int numviewers;
char srchost[256];
if (!qtvrequest) if (!qtvrequest)
return; return;
@ -1523,6 +1532,8 @@ void CL_QTVPoll (void)
{ //printable error { //printable error
Con_Printf("Demo%s is available\n", colon); Con_Printf("Demo%s is available\n", colon);
} }
//generic sourcelist responce
else if (!strcmp(s, "ASOURCE")) else if (!strcmp(s, "ASOURCE"))
{ //printable source { //printable source
if (!saidheader) if (!saidheader)
@ -1531,7 +1542,47 @@ void CL_QTVPoll (void)
Con_Printf("Available Sources:\n"); Con_Printf("Available Sources:\n");
} }
Con_Printf("%s\n", colon); Con_Printf("%s\n", colon);
//we're too lazy to even try and parse this
} }
//v1.1 sourcelist responce includes SRCSRV, SRCHOST, SRCPLYRS, SRCVIEWS, SRCID
else if (!strcmp(s, "SRCSRV"))
{
//the proxy's source string (beware of file:blah without file:blah@blah)
}
else if (!strcmp(s, "SRCHOST"))
{
//the hostname from the server the stream came from
Q_strncpyz(srchost, colon, sizeof(srchost));
}
else if (!strcmp(s, "SRCPLYRS"))
{
//number of active players actually playing on that stream
numplayers = atoi(colon);
}
else if (!strcmp(s, "SRCVIEWS"))
{
//number of people watching this stream on the proxy itself
numviewers = atoi(colon);
}
else if (!strcmp(s, "SRCID"))
{
streamid = atoi(colon);
//now put it on a menu
if (!sourcesmenu)
{
m_state = m_complex;
key_dest = key_menu;
sourcesmenu = M_CreateMenu(0);
MC_AddPicture(sourcesmenu, 16, 4, "gfx/qplaque.lmp");
MC_AddCenterPicture(sourcesmenu, 4, "gfx/p_option.lmp");
}
MC_AddConsoleCommand(sourcesmenu, 42, (sourcenum++)*8 + 32, va("%s (p%i, v%i)", srchost, numplayers, numviewers), va("qtvplay %i@%s\n", streamid, qtvhostname));
}
//end of sourcelist entry
else if (!strcmp(s, "BEGIN")) else if (!strcmp(s, "BEGIN"))
streamavailable = true; streamavailable = true;
} }
@ -1650,7 +1701,8 @@ void CL_QTVPlay_f (void)
connrequest = strchrrev(connrequest, '@'); connrequest = strchrrev(connrequest, '@');
if (connrequest) if (connrequest)
host = connrequest+1; host = connrequest+1;
newf = FS_OpenTCP(host); Q_strncpyz(qtvhostname, host, sizeof(qtvhostname));
newf = FS_OpenTCP(qtvhostname);
if (!newf) if (!newf)
{ {
@ -1665,7 +1717,7 @@ void CL_QTVPlay_f (void)
host = NULL; host = NULL;
connrequest = "QTV\n" connrequest = "QTV\n"
"VERSION: 1\n"; "VERSION: 1.1\n";
VFS_WRITE(newf, connrequest, strlen(connrequest)); VFS_WRITE(newf, connrequest, strlen(connrequest));
if (raw) if (raw)
{ {
@ -1680,6 +1732,10 @@ void CL_QTVPlay_f (void)
VFS_WRITE(newf, connrequest, strlen(connrequest)); VFS_WRITE(newf, connrequest, strlen(connrequest));
connrequest = "\n"; connrequest = "\n";
} }
else
{
connrequest = "SOURCELIST\n";
}
VFS_WRITE(newf, connrequest, strlen(connrequest)); VFS_WRITE(newf, connrequest, strlen(connrequest));
connrequest = "\n"; connrequest = "\n";
@ -1702,7 +1758,7 @@ void CL_QTVList_f (void)
{ {
char *connrequest; char *connrequest;
vfsfile_t *newf; vfsfile_t *newf;
newf = FS_OpenTCP(Cmd_Argv(1)); newf = FS_OpenTCP(qtvhostname);
if (!newf) if (!newf)
{ {
@ -1711,7 +1767,7 @@ void CL_QTVList_f (void)
} }
connrequest = "QTV\n" connrequest = "QTV\n"
"VERSION: 1\n"; "VERSION: 1.1\n";
VFS_WRITE(newf, connrequest, strlen(connrequest)); VFS_WRITE(newf, connrequest, strlen(connrequest));
connrequest = "SOURCELIST\n"; connrequest = "SOURCELIST\n";
VFS_WRITE(newf, connrequest, strlen(connrequest)); VFS_WRITE(newf, connrequest, strlen(connrequest));