Updated flv2dtsc to use new code style

This commit is contained in:
Erik Zandvliet 2013-04-18 14:17:26 +02:00
parent 3d6dd21773
commit bb78226119

View file

@ -40,23 +40,17 @@ namespace Converters {
if (counter > 8){ if (counter > 8){
sending = true; sending = true;
meta_out["moreheader"] = 0LL; meta_out["moreheader"] = 0LL;
std::string packed_header = meta_out.toPacked(); std::cout << meta_out.toNetPacked();
unsigned int size = htonl(packed_header.size());
std::cout << std::string(DTSC::Magic_Header, 4) << std::string((char*) &size, 4) << packed_header;
std::cout << prebuffer.rdbuf(); std::cout << prebuffer.rdbuf();
prebuffer.str(""); prebuffer.str("");
std::cerr << "Buffer done, starting real-time output..." << std::endl; std::cerr << "Buffer done, starting real-time output..." << std::endl;
}else{ }else{
std::string packed_out = pack_out.toPacked(); prebuffer << pack_out.toNetPacked();
unsigned int size = htonl(packed_out.size());
prebuffer << std::string(DTSC::Magic_Packet, 4) << std::string((char*) &size, 4) << packed_out;
continue; //don't also write continue; //don't also write
} }
} }
//simply write //simply write
std::string packed_out = pack_out.toPacked(); std::cout << pack_out.toNetPacked();
unsigned int size = htonl(packed_out.size());
std::cout << std::string(DTSC::Magic_Packet, 4) << std::string((char*) &size, 4) << packed_out;
} }
} }
@ -64,9 +58,7 @@ namespace Converters {
if ( !sending){ if ( !sending){
std::cerr << "EOF - outputting buffer..." << std::endl; std::cerr << "EOF - outputting buffer..." << std::endl;
meta_out["moreheader"] = 0LL; meta_out["moreheader"] = 0LL;
std::string packed_header = meta_out.toPacked(); std::cout << meta_out.toNetPacked();
unsigned int size = htonl(packed_header.size());
std::cout << std::string(DTSC::Magic_Header, 4) << std::string((char*) &size, 4) << packed_header;
std::cout << prebuffer.rdbuf(); std::cout << prebuffer.rdbuf();
} }
std::cerr << "Done!" << std::endl; std::cerr << "Done!" << std::endl;