partial autodownload rewrite
* own source file for autodownload * use cleaned up zip functions * use new http get function (no more curl) * enforce strict file naming rules and file size limits * ping all package servers on every game start to determine ping times * support media file update lists (also kept on package servers) * allow users to manually prioritise package servers * automatically select server with newest media file revision new or changed commands: addpckserver hostname [priority] Adds a host name to the list of package servers. If a priority is given, it influences the sorting of servers. Servers with higher priority are queried first. If servers have the same priority, they are sorted by ping. Default priority is zero. getpackageserver Returns a table with four columns of all configured package servers. The columns are: host name, priority, ping and resolved. "resolved" is a flag, indicating, if the server answered the ping during game start. removed cubescript idents: sortpckservers gamestarts DOCREF addpckserver getpckserver
This commit is contained in:
+64
-74
@@ -266,95 +266,85 @@ bool sbuffer::load(bool trydl)
|
||||
{
|
||||
const char *exts[] = { "", ".wav", ".ogg" };
|
||||
string filepath;
|
||||
loopk(2)
|
||||
loopi(sizeof(exts)/sizeof(exts[0]))
|
||||
{
|
||||
loopi(sizeof(exts)/sizeof(exts[0]))
|
||||
formatstring(filepath)("packages/audio/%s%s", name, exts[i]);
|
||||
stream *f = openfile(path(filepath), "rb");
|
||||
if(!f) continue;
|
||||
|
||||
size_t len = strlen(filepath);
|
||||
if(len >= 4 && !strcasecmp(filepath + len - 4, ".ogg"))
|
||||
{
|
||||
formatstring(filepath)("packages/audio/%s%s", name, exts[i]);
|
||||
stream *f = openfile(path(filepath), "rb");
|
||||
if(!f && k>0 && trydl) // only try donwloading after trying all extensions
|
||||
OggVorbis_File oggfile;
|
||||
if(!ov_open_callbacks(f, &oggfile, NULL, 0, oggcallbacks))
|
||||
{
|
||||
requirepackage(PCK_AUDIO, filepath);
|
||||
bool skip = false;
|
||||
loopj(sizeof(exts)/sizeof(exts[0])) if(strstr(name, exts[j])) skip = true; // don't try extensions if name already has a known extension
|
||||
if(skip) break;
|
||||
continue;
|
||||
}
|
||||
if(!f) continue;
|
||||
vorbis_info *info = ov_info(&oggfile, -1);
|
||||
|
||||
size_t len = strlen(filepath);
|
||||
if(len >= 4 && !strcasecmp(filepath + len - 4, ".ogg"))
|
||||
{
|
||||
OggVorbis_File oggfile;
|
||||
if(!ov_open_callbacks(f, &oggfile, NULL, 0, oggcallbacks))
|
||||
const size_t BUFSIZE = 32*1024;
|
||||
vector<char> buf;
|
||||
int bitstream;
|
||||
long bytes;
|
||||
|
||||
do
|
||||
{
|
||||
vorbis_info *info = ov_info(&oggfile, -1);
|
||||
char buffer[BUFSIZE];
|
||||
bytes = ov_read(&oggfile, buffer, BUFSIZE, isbigendian(), 2, 1, &bitstream);
|
||||
loopi(bytes) buf.add(buffer[i]);
|
||||
} while(bytes > 0);
|
||||
|
||||
const size_t BUFSIZE = 32*1024;
|
||||
vector<char> buf;
|
||||
int bitstream;
|
||||
long bytes;
|
||||
|
||||
do
|
||||
{
|
||||
char buffer[BUFSIZE];
|
||||
bytes = ov_read(&oggfile, buffer, BUFSIZE, isbigendian(), 2, 1, &bitstream);
|
||||
loopi(bytes) buf.add(buffer[i]);
|
||||
} while(bytes > 0);
|
||||
|
||||
alBufferData(id, info->channels == 2 ? AL_FORMAT_STEREO16 : AL_FORMAT_MONO16, buf.getbuf(), buf.length(), info->rate);
|
||||
ov_clear(&oggfile);
|
||||
}
|
||||
else
|
||||
{
|
||||
delete f;
|
||||
continue;
|
||||
}
|
||||
alBufferData(id, info->channels == 2 ? AL_FORMAT_STEREO16 : AL_FORMAT_MONO16, buf.getbuf(), buf.length(), info->rate);
|
||||
ov_clear(&oggfile);
|
||||
}
|
||||
else
|
||||
{
|
||||
SDL_AudioSpec wavspec;
|
||||
uint32_t wavlen;
|
||||
uint8_t *wavbuf;
|
||||
|
||||
if(!SDL_LoadWAV_RW(f->rwops(), 1, &wavspec, &wavbuf, &wavlen))
|
||||
{
|
||||
SDL_ClearError();
|
||||
continue;
|
||||
}
|
||||
|
||||
ALenum format;
|
||||
switch(wavspec.format) // map wav header to openal format
|
||||
{
|
||||
case AUDIO_U8:
|
||||
case AUDIO_S8:
|
||||
format = wavspec.channels==2 ? AL_FORMAT_STEREO8 : AL_FORMAT_MONO8;
|
||||
break;
|
||||
case AUDIO_U16:
|
||||
case AUDIO_S16:
|
||||
format = wavspec.channels==2 ? AL_FORMAT_STEREO16 : AL_FORMAT_MONO16;
|
||||
break;
|
||||
default:
|
||||
SDL_FreeWAV(wavbuf);
|
||||
delete f;
|
||||
unload();
|
||||
return false;
|
||||
}
|
||||
|
||||
alBufferData(id, format, wavbuf, wavlen, wavspec.freq);
|
||||
SDL_FreeWAV(wavbuf);
|
||||
delete f;
|
||||
continue;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
SDL_AudioSpec wavspec;
|
||||
uint32_t wavlen;
|
||||
uint8_t *wavbuf;
|
||||
|
||||
if(ALERR)
|
||||
{
|
||||
unload();
|
||||
return false;
|
||||
};
|
||||
if(!SDL_LoadWAV_RW(f->rwops(), 1, &wavspec, &wavbuf, &wavlen))
|
||||
{
|
||||
SDL_ClearError();
|
||||
continue;
|
||||
}
|
||||
|
||||
return true;
|
||||
ALenum format;
|
||||
switch(wavspec.format) // map wav header to openal format
|
||||
{
|
||||
case AUDIO_U8:
|
||||
case AUDIO_S8:
|
||||
format = wavspec.channels==2 ? AL_FORMAT_STEREO8 : AL_FORMAT_MONO8;
|
||||
break;
|
||||
case AUDIO_U16:
|
||||
case AUDIO_S16:
|
||||
format = wavspec.channels==2 ? AL_FORMAT_STEREO16 : AL_FORMAT_MONO16;
|
||||
break;
|
||||
default:
|
||||
SDL_FreeWAV(wavbuf);
|
||||
delete f;
|
||||
unload();
|
||||
return false;
|
||||
}
|
||||
|
||||
alBufferData(id, format, wavbuf, wavlen, wavspec.freq);
|
||||
SDL_FreeWAV(wavbuf);
|
||||
delete f;
|
||||
|
||||
if(ALERR)
|
||||
{
|
||||
unload();
|
||||
return false;
|
||||
};
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
if(trydl) requirepackage(PCK_AUDIO, name); // only try donwloading after trying all extensions
|
||||
}
|
||||
unload(); // loading failed
|
||||
return false;
|
||||
|
||||
Reference in New Issue
Block a user