From bb78226119c8503e8fc8e3550dc446cbf86efea8 Mon Sep 17 00:00:00 2001 From: Erik Zandvliet Date: Thu, 18 Apr 2013 14:17:26 +0200 Subject: [PATCH] Updated flv2dtsc to use new code style --- src/converters/flv2dtsc.cpp | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/converters/flv2dtsc.cpp b/src/converters/flv2dtsc.cpp index 031d9f55..b4a9402f 100644 --- a/src/converters/flv2dtsc.cpp +++ b/src/converters/flv2dtsc.cpp @@ -40,23 +40,17 @@ namespace Converters { if (counter > 8){ sending = true; meta_out["moreheader"] = 0LL; - std::string packed_header = meta_out.toPacked(); - unsigned int size = htonl(packed_header.size()); - std::cout << std::string(DTSC::Magic_Header, 4) << std::string((char*) &size, 4) << packed_header; + std::cout << meta_out.toNetPacked(); std::cout << prebuffer.rdbuf(); prebuffer.str(""); std::cerr << "Buffer done, starting real-time output..." << std::endl; }else{ - std::string packed_out = pack_out.toPacked(); - unsigned int size = htonl(packed_out.size()); - prebuffer << std::string(DTSC::Magic_Packet, 4) << std::string((char*) &size, 4) << packed_out; + prebuffer << pack_out.toNetPacked(); continue; //don't also write } } //simply write - std::string packed_out = pack_out.toPacked(); - unsigned int size = htonl(packed_out.size()); - std::cout << std::string(DTSC::Magic_Packet, 4) << std::string((char*) &size, 4) << packed_out; + std::cout << pack_out.toNetPacked(); } } @@ -64,9 +58,7 @@ namespace Converters { if ( !sending){ std::cerr << "EOF - outputting buffer..." << std::endl; meta_out["moreheader"] = 0LL; - std::string packed_header = meta_out.toPacked(); - unsigned int size = htonl(packed_header.size()); - std::cout << std::string(DTSC::Magic_Header, 4) << std::string((char*) &size, 4) << packed_header; + std::cout << meta_out.toNetPacked(); std::cout << prebuffer.rdbuf(); } std::cerr << "Done!" << std::endl;