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:
#	lib/bitfields.h
#	src/input/input.cpp
#	src/output/output.cpp
This commit is contained in:
Thulinma 2018-01-24 19:04:21 +01:00
commit ad29c297c2
11 changed files with 130 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/output/output.cpp
View file

@ -1246,20 +1246,6 @@ namespace Mist{
return 0;
}
/// Returns the ID of the main selected track, or 0 if no tracks are selected.
/// The main track is the first video track, if any, and otherwise the first other track.
long unsigned int Output::getMainSelectedTrack(){
if (!selectedTracks.size()){
return 0;
}
for (std::set<long unsigned int>::iterator it = selectedTracks.begin(); it != selectedTracks.end(); it++){
if (myMeta.tracks.count(*it) && myMeta.tracks[*it].type == "video"){
return *it;
}
}
return *(selectedTracks.begin());
}
void Output::dropTrack(uint32_t trackId, std::string reason, bool probablyBad){
//depending on whether this is probably bad and the current debug level, print a message
unsigned int printLevel = DLVL_INFO;

1
src/output/output.h
View file

@ -54,7 +54,6 @@ namespace Mist {
uint64_t endTime();
uint64_t liveTime();
void setBlocking(bool blocking);
long unsigned int getMainSelectedTrack();
void updateMeta();
void selectTrack(const std::string &trackType, const std::string &trackVal); /*LTS*/
void selectDefaultTracks();