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

Prevent AAC and FLV input keepRunning overrides from hiding generic functions

Browse source
This commit is contained in:
Thulinma 2024-09-24 15:28:36 +02:00
parent ee853b1ffb
commit 3d62b9b35d
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/input/input_aac.cpp
View file

@ -111,7 +111,7 @@ namespace Mist{
// Overrides the default keepRunning function to shut down // Overrides the default keepRunning function to shut down
// if the file disappears or changes, by polling the file's mtime. // if the file disappears or changes, by polling the file's mtime.
// If neither applies, calls the original function. // If neither applies, calls the original function.
bool InputAAC::keepRunning(){ bool InputAAC::keepRunning(bool updateActCtr){
struct stat statData; struct stat statData;
if (stat(config->getString("input").c_str(), &statData) == -1){ if (stat(config->getString("input").c_str(), &statData) == -1){
INFO_MSG("Shutting down because input file disappeared"); INFO_MSG("Shutting down because input file disappeared");
@ -121,7 +121,7 @@ namespace Mist{
INFO_MSG("Shutting down because input file changed"); INFO_MSG("Shutting down because input file changed");
return false; return false;
} }
return Input::keepRunning(); return Input::keepRunning(updateActCtr);
} }

2
src/input/input_aac.h
View file

@ -16,7 +16,7 @@ namespace Mist{
bool readHeader(); bool readHeader();
void seek(uint64_t seekTime, size_t idx); void seek(uint64_t seekTime, size_t idx);
void getNext(size_t idx = INVALID_TRACK_ID); void getNext(size_t idx = INVALID_TRACK_ID);
bool keepRunning(); bool keepRunning(bool updateActCtr = true);
uint64_t lastModTime; uint64_t lastModTime;
HTTP::URIReader inFile; HTTP::URIReader inFile;
size_t audioTrack; size_t audioTrack;

4
src/input/input_flv.cpp
View file

@ -67,7 +67,7 @@ namespace Mist{
/// Overrides the default keepRunning function to shut down /// Overrides the default keepRunning function to shut down
/// if the file disappears or changes, by polling the file's mtime. /// if the file disappears or changes, by polling the file's mtime.
/// If neither applies, calls the original function. /// If neither applies, calls the original function.
bool InputFLV::keepRunning(){ bool InputFLV::keepRunning(bool updateActCtr){
struct stat statData; struct stat statData;
if (stat(config->getString("input").c_str(), &statData) == -1){ if (stat(config->getString("input").c_str(), &statData) == -1){
INFO_MSG("Shutting down because input file disappeared"); INFO_MSG("Shutting down because input file disappeared");
@ -77,7 +77,7 @@ namespace Mist{
INFO_MSG("Shutting down because input file changed"); INFO_MSG("Shutting down because input file changed");
return false; return false;
} }
return Input::keepRunning(); return Input::keepRunning(updateActCtr);
} }
bool InputFLV::readHeader(){ bool InputFLV::readHeader(){

2
src/input/input_flv.h
View file

@ -15,7 +15,7 @@ namespace Mist{
bool readHeader(); bool readHeader();
void getNext(size_t idx = INVALID_TRACK_ID); void getNext(size_t idx = INVALID_TRACK_ID);
void seek(uint64_t seekTime, size_t idx = INVALID_TRACK_ID); void seek(uint64_t seekTime, size_t idx = INVALID_TRACK_ID);
bool keepRunning(); bool keepRunning(bool updateActCtr = true);
FLV::Tag tmpTag; FLV::Tag tmpTag;
uint64_t lastModTime; uint64_t lastModTime;
FILE *inFile; FILE *inFile;