[Sumover-dev] [svn commit] r4808 - in vic/branches/cc: rtp

[sumover-dev at cs.ucl.ac.uk]

Author: soohyunc
Date: Sun May  9 15:21:29 2010
New Revision: 4808

Modified:
   vic/branches/cc/cc/tfwc_sndr.cpp
   vic/branches/cc/cc/tfwc_sndr.h
   vic/branches/cc/rtp/transmitter.cpp
   vic/branches/cc/rtp/transmitter.h

Log:
rename "cc_tfwc_trigger()" to "tfwc_trigger()". 



Modified: vic/branches/cc/cc/tfwc_sndr.cpp
==============================================================================
--- vic/branches/cc/cc/tfwc_sndr.cpp	(original)
+++ vic/branches/cc/cc/tfwc_sndr.cpp	Sun May  9 15:21:29 2010
@@ -962,7 +962,7 @@
  */
 void TfwcSndr::packet_clocking (pktbuf* pb, bool flag) {
 	if (flag)
-		cc_tfwc_trigger();
+		tfwc_trigger();
 	else
-		cc_tfwc_trigger(pb);
+		tfwc_trigger(pb);
 }

Modified: vic/branches/cc/cc/tfwc_sndr.h
==============================================================================
--- vic/branches/cc/cc/tfwc_sndr.h	(original)
+++ vic/branches/cc/cc/tfwc_sndr.h	Sun May  9 15:21:29 2010
@@ -65,7 +65,7 @@
 	// virtual functions
 	virtual void tfwc_output(bool recv_by_ch=0) {UNUSED(recv_by_ch);};
 	virtual void tfwc_output(pktbuf*) {};
-	virtual void cc_tfwc_trigger(pktbuf* pb=0) {UNUSED(pb);};
+	virtual void tfwc_trigger(pktbuf* pb=0) {UNUSED(pb);};
 	virtual double tx_ts_offset() {};
 	virtual int tx_buf_size() {};
 

Modified: vic/branches/cc/rtp/transmitter.cpp
==============================================================================
--- vic/branches/cc/rtp/transmitter.cpp	(original)
+++ vic/branches/cc/rtp/transmitter.cpp	Sun May  9 15:21:29 2010
@@ -428,7 +428,7 @@
 /*
  * trigger packet out forcefully
  */
-void Transmitter::cc_tfwc_trigger(pktbuf* pb) {
+void Transmitter::tfwc_trigger(pktbuf* pb) {
 	// if pb is null here, it means this routine was called 
 	// by SessionManager::recv(CtrlHandler* ch).
 	// therefore, assign pktbuf's head to pb.

Modified: vic/branches/cc/rtp/transmitter.h
==============================================================================
--- vic/branches/cc/rtp/transmitter.h	(original)
+++ vic/branches/cc/rtp/transmitter.h	Sun May  9 15:21:29 2010
@@ -103,7 +103,7 @@
 	// TFWC output
 	virtual void tfwc_output(bool recv_by_ch=0);
 	virtual void tfwc_output(pktbuf*);
-	virtual void cc_tfwc_trigger(pktbuf*);
+	virtual void tfwc_trigger(pktbuf*);
 	// TFRC output
 	virtual void tfrc_output(bool recv_by_ch=0);
 	virtual void tfrc_output(pktbuf*);