hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed a bug with setting the live flag in the metadata (embed)

Browse source
This commit is contained in:
ThatGuy 2013-07-29 14:58:27 +02:00
parent fa727cdffe
commit 31b981dc1c
2 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/buffer/buffer_stream.cpp
View file

@ -63,14 +63,17 @@ namespace Buffer {
Storage["totals"]["count"] = tot_count;
Storage["totals"]["now"] = now;
Storage["buffer"] = name;
///\todo Fixme
// Storage["meta"] = Strm->metadata;
if (Storage["meta"].isMember("audio")){
Storage["meta"]["audio"].removeMember("init");
Storage["meta"] = Strm->metadata;
if(Storage["meta"].isMember("tracks") && Storage["meta"]["tracks"].size() > 0){
for(JSON::ObjIter it = Storage["meta"]["tracks"].ObjBegin(); it != Storage["meta"]["tracks"].ObjEnd(); it++){
it->second.removeMember("init");
it->second.removeMember("keys");
it->second.removeMember("frags");
}
if (Storage["meta"].isMember("video")){
Storage["meta"]["video"].removeMember("init");
}
ret = Storage.toString();
Storage["log"].null();
return ret;

4
src/connectors/embed.js
View file

@ -139,8 +139,8 @@ function mistembed(streamname)
}else{
// no error, and sources found. Check the video types and output the best
// available video player.
var i, video,
vtype = video.type ? video.type : 'unknown';
var i,
vtype = (video.type ? video.type : 'unknown'),
foundPlayer = false,
len = video.source.length;