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

Ogg support fixed and re-added. Squash of various commits made by Wouter Spruit.

Browse source
This commit is contained in:
Thulinma 2014-12-23 13:10:28 +01:00
parent 142ef73f6c
commit a47504b5cb
17 changed files with 944 additions and 456 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/input/input.h
View file

@ -45,7 +45,7 @@ namespace Mist {
virtual void userCallback(char * data, size_t len, unsigned int id);
void parseHeader();
bool bufferFrame(int track, int keyNum);
bool bufferFrame(unsigned int track, unsigned int keyNum);
unsigned int packTime;///Media-timestamp of the last packet.
int lastActive;///Timestamp of the last time we received or sent something.
@ -53,7 +53,7 @@ namespace Mist {
int playing;
unsigned int playUntil;
unsigned int benchMark;
std::set<int> selectedTracks;
std::set<unsigned int> selectedTracks;
bool isBuffer;