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

Removed debug messages Oswald accidentally left in ^_^

Browse source
This commit is contained in:
Thulinma 2013-07-11 15:55:43 +02:00
parent e45caad697
commit 3053ffa140
2 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/buffer/player.cpp
View file

@ -240,7 +240,6 @@ int main(int argc, char** argv){
lastTime = now - source.getJSON()["time"].asInt(); lastTime = now - source.getJSON()["time"].asInt();
} }
if (playing == -1 && playUntil == 0 && source.getJSON()["time"].asInt() > now - lastTime + 1000){ if (playing == -1 && playUntil == 0 && source.getJSON()["time"].asInt() > now - lastTime + 1000){
//std::cerr << (source.getJSON()["time"].asInt() - (now - lastTime)) << " ms sleep" << std::endl;
Util::sleep(source.getJSON()["time"].asInt() - (now - lastTime)); Util::sleep(source.getJSON()["time"].asInt() - (now - lastTime));
} }
if ( playUntil && playUntil < source.getJSON()["time"].asInt()){ if ( playUntil && playUntil < source.getJSON()["time"].asInt()){

17
src/controller/controller.cpp
View file

@ -244,11 +244,8 @@ int main(int argc, char ** argv){
/// User friendliness input added at this line /// User friendliness input added at this line
if (isatty(fileno(stdin))){ if (isatty(fileno(stdin))){
std::cerr << "User i/o detected, checking for sane config" << std::endl;
//check for username //check for username
if (Controller::Storage.isMember("account") && Controller::Storage["account"].size() > 0){ if ( !Controller::Storage.isMember("account") || Controller::Storage["account"].size() < 1){
std::cerr << "Account set" << std::endl;
}else{
std::string in_string = ""; std::string in_string = "";
while(yna(in_string) == 'x'){ while(yna(in_string) == 'x'){
std::cerr << "Account not set, do you want to create an account? (y)es, (n)o, (a)bort: "; std::cerr << "Account not set, do you want to create an account? (y)es, (n)o, (a)bort: ";
@ -268,9 +265,7 @@ int main(int argc, char ** argv){
} }
} }
//check for protocols //check for protocols
if (Controller::Storage.isMember("config") && Controller::Storage["config"].isMember("protocols") && Controller::Storage["config"]["protocols"].size() > 0){ if ( !Controller::Storage.isMember("config") || !Controller::Storage["config"].isMember("protocols") || Controller::Storage["config"]["protocols"].size() < 1){
std::cerr << "Protocols set" << std::endl;
}else{
std::string in_string = ""; std::string in_string = "";
while(yna(in_string) == 'x'){ while(yna(in_string) == 'x'){
std::cerr << "Protocols not set, do you want to enable default protocols? (y)es, (n)o, (a)bort: "; std::cerr << "Protocols not set, do you want to enable default protocols? (y)es, (n)o, (a)bort: ";
@ -285,13 +280,9 @@ int main(int argc, char ** argv){
} }
} }
//check for streams //check for streams
if (Controller::Storage.isMember("streams") && Controller::Storage["streams"].size() > 0){ if ( !Controller::Storage.isMember("streams") || Controller::Storage["streams"].size() < 1){
std::cerr << "Streams set" << std::endl; std::cerr << "No streams configured, remember to set up streams through local settings page on port " << conf.getInteger("listen_port") << " or using the API." << std::endl;
}else{
std::cerr << "Streams not set, please set up streams through local settings page on port 4242 or per JSON request." << std::endl;
} }
}else{
std::cerr << "No user i/o detected" << std::endl;
} }
std::string uplink_addr = conf.getString("uplink"); std::string uplink_addr = conf.getString("uplink");