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

Working multi-input

Browse source
This commit is contained in:
Erik Zandvliet 2015-04-02 09:56:47 +02:00
parent 9b6312ca01
commit d370ef4eac
31 changed files with 1264 additions and 690 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/dtsc.cpp
View file

@ -1029,7 +1029,7 @@ bool DTSC::File::seek_time(unsigned int ms, unsigned int trackNo, bool forceSeek
bool DTSC::File::seek_time(unsigned int ms) {
currentPositions.clear();
if (selectedTracks.size()) {
for (std::set<unsigned int>::iterator it = selectedTracks.begin(); it != selectedTracks.end(); it++) {
for (std::set<unsigned long>::iterator it = selectedTracks.begin(); it != selectedTracks.end(); it++) {
seek_time(ms, (*it), true);
}
}
@ -1077,7 +1077,7 @@ bool DTSC::File::atKeyframe() {
return false;
}
void DTSC::File::selectTracks(std::set<unsigned int> & tracks) {
void DTSC::File::selectTracks(std::set<unsigned long> & tracks) {
selectedTracks = tracks;
currentPositions.clear();
seek_time(0);

4
lib/dtsc.h
View file

@ -353,7 +353,7 @@ namespace DTSC {
void writePacket(std::string & newPacket);
void writePacket(JSON::Value & newPacket);
bool atKeyframe();
void selectTracks(std::set<unsigned int> & tracks);
void selectTracks(std::set<unsigned long> & tracks);
private:
long int endPos;
void readHeader(int pos);
@ -369,7 +369,7 @@ namespace DTSC {
void * buffer;
bool created;
std::set<seekPos> currentPositions;
std::set<unsigned int> selectedTracks;
std::set<unsigned long> selectedTracks;
};
//FileWriter