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

1
src/io.h
View file

@ -77,6 +77,7 @@ namespace Mist {
void bufferFinalize(unsigned long tid);
void bufferRemove(unsigned long tid, unsigned long pageNumber);
virtual void bufferLivePacket(const DTSC::Packet & packet);
long unsigned int getMainSelectedTrack();
protected:
void continueNegotiate(unsigned long tid, bool quickNegotiate = false);
void continueNegotiate();