Prevent AAC and FLV input keepRunning overrides from hiding generic functions
This commit is contained in:
parent
ee853b1ffb
commit
3d62b9b35d
4 changed files with 6 additions and 6 deletions
|
@ -111,7 +111,7 @@ namespace Mist{
|
|||
// Overrides the default keepRunning function to shut down
|
||||
// if the file disappears or changes, by polling the file's mtime.
|
||||
// If neither applies, calls the original function.
|
||||
bool InputAAC::keepRunning(){
|
||||
bool InputAAC::keepRunning(bool updateActCtr){
|
||||
struct stat statData;
|
||||
if (stat(config->getString("input").c_str(), &statData) == -1){
|
||||
INFO_MSG("Shutting down because input file disappeared");
|
||||
|
@ -121,7 +121,7 @@ namespace Mist{
|
|||
INFO_MSG("Shutting down because input file changed");
|
||||
return false;
|
||||
}
|
||||
return Input::keepRunning();
|
||||
return Input::keepRunning(updateActCtr);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -16,7 +16,7 @@ namespace Mist{
|
|||
bool readHeader();
|
||||
void seek(uint64_t seekTime, size_t idx);
|
||||
void getNext(size_t idx = INVALID_TRACK_ID);
|
||||
bool keepRunning();
|
||||
bool keepRunning(bool updateActCtr = true);
|
||||
uint64_t lastModTime;
|
||||
HTTP::URIReader inFile;
|
||||
size_t audioTrack;
|
||||
|
|
|
@ -67,7 +67,7 @@ namespace Mist{
|
|||
/// Overrides the default keepRunning function to shut down
|
||||
/// if the file disappears or changes, by polling the file's mtime.
|
||||
/// If neither applies, calls the original function.
|
||||
bool InputFLV::keepRunning(){
|
||||
bool InputFLV::keepRunning(bool updateActCtr){
|
||||
struct stat statData;
|
||||
if (stat(config->getString("input").c_str(), &statData) == -1){
|
||||
INFO_MSG("Shutting down because input file disappeared");
|
||||
|
@ -77,7 +77,7 @@ namespace Mist{
|
|||
INFO_MSG("Shutting down because input file changed");
|
||||
return false;
|
||||
}
|
||||
return Input::keepRunning();
|
||||
return Input::keepRunning(updateActCtr);
|
||||
}
|
||||
|
||||
bool InputFLV::readHeader(){
|
||||
|
|
|
@ -15,7 +15,7 @@ namespace Mist{
|
|||
bool readHeader();
|
||||
void getNext(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;
|
||||
uint64_t lastModTime;
|
||||
FILE *inFile;
|
||||
|
|
Loading…
Add table
Reference in a new issue