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

Merge branch 'development' into LTS_development

Browse source 
# Conflicts:
#	src/output/output.h
#	src/output/output_hls.cpp
This commit is contained in:
Thulinma 2017-10-20 14:25:27 +02:00
commit 3cb5774822
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/output/output.h
View file

@ -87,11 +87,8 @@ namespace Mist {
std::string hostLookup(std::string ip); std::string hostLookup(std::string ip);
bool onList(std::string ip, std::string list); bool onList(std::string ip, std::string list);
std::string getCountry(std::string ip); std::string getCountry(std::string ip);
/*LTS-END*/
void doSync(bool force = false); void doSync(bool force = false);
inline bool keepGoing(){ /*LTS-END*/
return config->is_active && myConn;
}
std::map<unsigned long, unsigned int> currKeyOpen; std::map<unsigned long, unsigned int> currKeyOpen;
void loadPageForKey(long unsigned int trackId, long long int keyNum); void loadPageForKey(long unsigned int trackId, long long int keyNum);
int pageNumForKey(long unsigned int trackId, long long int keyNum); int pageNumForKey(long unsigned int trackId, long long int keyNum);
@ -141,6 +138,9 @@ namespace Mist {
void bufferLivePacket(const DTSC::Packet & packet); void bufferLivePacket(const DTSC::Packet & packet);
uint64_t firstPacketTime; uint64_t firstPacketTime;
uint64_t lastPacketTime; uint64_t lastPacketTime;
inline bool keepGoing(){
return config->is_active && myConn;
}
}; };
} }

5
src/output/output_hls.cpp
View file

@ -340,6 +340,11 @@ namespace Mist {
} }
initialize(); initialize();
if (!keepGoing()){
return;
}
if (H.url.substr(5 + streamName.size(), 5) == "/push"){ if (H.url.substr(5 + streamName.size(), 5) == "/push"){
std::string relPushUrl = H.url.substr(10 + streamName.size()); std::string relPushUrl = H.url.substr(10 + streamName.size());
H.Clean(); H.Clean();