diff --git a/apps/srt-file-transmit.cpp b/apps/srt-file-transmit.cpp index abb4b2ba0..61190bf4d 100644 --- a/apps/srt-file-transmit.cpp +++ b/apps/srt-file-transmit.cpp @@ -108,7 +108,7 @@ int main( int argc, char** argv ) string sfull = Option(params, "no", o_fullstats); if (sfull == "" || !false_names.count(sfull)) - ::total_stats = true; + ::transmit_total_stats = true; string source = args[0]; string target = args[1]; diff --git a/apps/srt-live-transmit.cpp b/apps/srt-live-transmit.cpp index 34a7cdb93..93fdb4c92 100644 --- a/apps/srt-live-transmit.cpp +++ b/apps/srt-live-transmit.cpp @@ -275,7 +275,7 @@ int main( int argc, char** argv ) string logfile = Option("", "logfile"); bool internal_log = Option("no", "loginternal") != "no"; bool skip_flushing = Option("no", "S", "skipflush") != "no"; - total_stats = Option("no", "f", "full-stats") != "no"; + transmit_total_stats = Option("no", "f", "full-stats") != "no"; // Options that require integer conversion unsigned long bandwidth; diff --git a/common/transmitbase.hpp b/common/transmitbase.hpp index e93e67093..88eb04967 100644 --- a/common/transmitbase.hpp +++ b/common/transmitbase.hpp @@ -9,7 +9,7 @@ typedef std::vector bytevector; extern bool transmit_verbose; -extern bool total_stats; +extern bool transmit_total_stats; extern volatile bool transmit_throw_on_interrupt; extern unsigned long transmit_bw_report; extern unsigned long transmit_stats_report; diff --git a/common/transmitmedia.cpp b/common/transmitmedia.cpp index b96c95004..a705b9b0a 100644 --- a/common/transmitmedia.cpp +++ b/common/transmitmedia.cpp @@ -21,7 +21,7 @@ using namespace std; bool transmit_verbose = false; -bool total_stats = false; +bool transmit_total_stats = false; bool clear_stats = false; std::ostream* transmit_cverb = nullptr; volatile bool transmit_throw_on_interrupt = false; @@ -726,7 +726,7 @@ bytevector SrtSource::Read(size_t chunk) if ( transmit_stats_report && (counter % transmit_stats_report) == transmit_stats_report - 1) { PrintSrtStats(m_sock, perf); - clear_stats = !total_stats; + clear_stats = !transmit_total_stats; } ++counter; @@ -754,7 +754,7 @@ int SrtTarget::ConfigurePre(SRTSOCKET sock) void SrtTarget::Write(const bytevector& data) { - static unsigned long counter = 1; + static unsigned long counter = 1; ::transmit_throw_on_interrupt = true; @@ -782,7 +782,7 @@ void SrtTarget::Write(const bytevector& data) if ( transmit_stats_report && (counter % transmit_stats_report) == transmit_stats_report - 1) { PrintSrtStats(m_sock, perf); - clear_stats = !total_stats; + clear_stats = !transmit_total_stats; } ++counter;