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/input/input.cpp
This commit is contained in:
Thulinma 2017-07-26 17:01:52 +02:00
commit 6b1db9d0ec
11 changed files with 71 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/input/input_buffer.cpp
View file

@ -1030,16 +1030,5 @@ namespace Mist {
return true;
}
bool inputBuffer::readHeader() {
return true;
}
void inputBuffer::getNext(bool smart) {}
void inputBuffer::seek(int seekTime) {}
void inputBuffer::trackSelect(std::string trackSpec) {}
}