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

Moved STREAM_BUFFER EMPTY call from ~MistInBuffer() to finish()

Browse source
This commit is contained in:
Thulinma 2017-08-04 11:45:23 +02:00
parent c64b5c9934
commit 07a0a3df2d
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/input/input_buffer.cpp
View file

@ -103,14 +103,6 @@ namespace Mist {
inputBuffer::~inputBuffer() { inputBuffer::~inputBuffer() {
config->is_active = false; config->is_active = false;
if (myMeta.tracks.size()) { if (myMeta.tracks.size()) {
/*LTS-START*/
if (myMeta.bufferWindow) {
if (Triggers::shouldTrigger("STREAM_BUFFER")) {
std::string payload = config->getString("streamname") + "\nEMPTY";
Triggers::doTrigger("STREAM_BUFFER", payload, config->getString("streamname"));
}
}
/*LTS-END*/
DEBUG_MSG(DLVL_DEVEL, "Cleaning up, removing last keyframes"); DEBUG_MSG(DLVL_DEVEL, "Cleaning up, removing last keyframes");
for (std::map<unsigned int, DTSC::Track>::iterator it = myMeta.tracks.begin(); it != myMeta.tracks.end(); it++) { for (std::map<unsigned int, DTSC::Track>::iterator it = myMeta.tracks.begin(); it != myMeta.tracks.end(); it++) {
std::map<unsigned long, DTSCPageData> & locations = bufferLocations[it->first]; std::map<unsigned long, DTSCPageData> & locations = bufferLocations[it->first];
@ -432,6 +424,16 @@ namespace Mist {
} }
void inputBuffer::finish() { void inputBuffer::finish() {
if (myMeta.tracks.size()) {
/*LTS-START*/
if (myMeta.bufferWindow) {
if (Triggers::shouldTrigger("STREAM_BUFFER")) {
std::string payload = config->getString("streamname") + "\nEMPTY";
Triggers::doTrigger("STREAM_BUFFER", payload, config->getString("streamname"));
}
}
/*LTS-END*/
}
Input::finish(); Input::finish();
updateMeta(); updateMeta();
if (bufferLocations.size()) { if (bufferLocations.size()) {