From d2fa240c1cc68a52ddc9200aff09248f3ad0dd30 Mon Sep 17 00:00:00 2001 From: saxon Date: Tue, 7 Aug 2018 12:33:40 +0930 Subject: [PATCH] Changed name of rtmpSendPacket to C_RTMP_SendPacket --- rtmp/rtmp.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/rtmp/rtmp.go b/rtmp/rtmp.go index 8fde240a..1ad96734 100644 --- a/rtmp/rtmp.go +++ b/rtmp/rtmp.go @@ -934,7 +934,7 @@ func C_SendBytesReceived(r *C.RTMP) int { r.m_nBytesInSent = r.m_nBytesIn //return int(C.RTMP_SendPacket(r, &packet, 0)) - return rtmpSendPacket(r, &packet, 0) + return C_RTMP_SendPacket(r, &packet, 0) } func C_SendConnectPacket(r *C.RTMP, cp *C.RTMPPacket) int { @@ -945,7 +945,7 @@ func C_SendConnectPacket(r *C.RTMP, cp *C.RTMPPacket) int { var enc *byte if cp != nil { - return rtmpSendPacket(r, cp, 1) + return C_RTMP_SendPacket(r, cp, 1) //return int(C.RTMP_SendPacket(r, cp, 1)) } @@ -1112,7 +1112,7 @@ func C_SendConnectPacket(r *C.RTMP, cp *C.RTMPPacket) int { int(uintptr(unsafe.Pointer(packet.m_body))))))) //return int(C.RTMP_SendPacket(r, &packet, 1)) - return rtmpSendPacket(r, &packet, 1) + return C_RTMP_SendPacket(r, &packet, 1) } func C_AMFPropEncode(p *C.AMFObjectProperty, pBuffer *byte, pBufEnd *byte) *byte { @@ -1591,7 +1591,7 @@ func C_RTMP_Write(r *C.RTMP, data []byte) int { buf = incBytePtr(buf, num) if pkt.m_nBytesRead == pkt.m_nBodySize { // TODO: Port this - ret = rtmpSendPacket(r, pkt, 0) + ret = C_RTMP_SendPacket(r, pkt, 0) // TODO: Port this C.RTMPPacket_Free(pkt) pkt.m_nBytesRead = 0 @@ -1609,7 +1609,7 @@ func C_RTMP_Write(r *C.RTMP, data []byte) int { } // send packet version 1 - less C stuff -func rtmpSendPacket(r *C.RTMP, packet *C.RTMPPacket, queue int) int { +func C_RTMP_SendPacket(r *C.RTMP, packet *C.RTMPPacket, queue int) int { var prevPacket *C.RTMPPacket last := 0 var nSize, hSize, cSize, nChunkSize int @@ -1756,7 +1756,7 @@ func rtmpSendPacket(r *C.RTMP, packet *C.RTMPPacket, queue int) int { nChunkSize = int(r.m_outChunkSize) if debugMode { - log.Printf("rtmpSendPacket: fd=%v, size=%v", r.m_sb.sb_socket, nSize) + log.Printf("C_RTMP_SendPacket: fd=%v, size=%v", r.m_sb.sb_socket, nSize) } for (nSize + hSize) != 0 {