Merge pull request #10 from zyfdegh/issue-07

fix go build error (due to renamed variables)

.gitignore

@@ -0,0 +1 @@
+dorsvr

livemedia/rtcp_linux_amd64.go

@@ -94,7 +94,7 @@ func newRTCPInstance(rtcpGS *gs.GroupSock, totSessionBW uint, cname string,
 
 	reportTime := dTimeNow()
 	rtcp := &RTCPInstance{
-		typeOfEvent:    EVENT_REPORT,
+		typeOfEvent:    eventReport,
 		totSessionBW:   totSessionBW,
 		prevReportTime: reportTime,
 		nextReportTime: reportTime,
@@ -233,7 +233,7 @@ func (r *RTCPInstance) incomingReportHandler() {
 							senderSSRC, _ := gs.Ntohl(packet)
 							packet, packetSize = ADVANCE(packet, packetSize, 4)
 							// We care only about reports about our own transmission, not others'
-							if senderSSRC == r.Sink.SSRC() {
+							if senderSSRC == r.Sink.ssrc() {
 								lossStats, _ = gs.Ntohl(packet)
 								packet, packetSize = ADVANCE(packet, packetSize, 4)
 								highestReceived, _ = gs.Ntohl(packet)
@@ -383,12 +383,12 @@ func (r *RTCPInstance) addBYE() {
 	if r.Source != nil {
 		r.outBuf.enqueueWord(r.Source.ssrc)
 	} else if r.Sink != nil {
-		r.outBuf.enqueueWord(r.Sink.SSRC())
+		r.outBuf.enqueueWord(r.Sink.ssrc())
 	}
 }
 
 func (r *RTCPInstance) addSR() {
-	r.enqueueCommonReportPrefix(RTCP_PT_SR, r.Sink.SSRC(), 5)
+	r.enqueueCommonReportPrefix(RTCP_PT_SR, r.Sink.ssrc(), 5)
 
 	// Now, add the 'sender info' for our sink
 

livemedia/rtp_interface.go

@@ -75,7 +75,7 @@ func (i *RTPInterface) delStreamSocket(socketNum net.Conn, streamChannelID uint)
 
 // normal case: send as a UDP packet, also, send over each of our TCP sockets
 func (i *RTPInterface) sendPacket(packet []byte, packetSize uint) bool {
-	success := i.gs.Output(packet, packetSize, i.gs.TTL())
+	success := i.gs.Output(packet, packetSize)
 
 	var streams *tcpStreamRecord
 	for streams = i.tcpStreams; streams != nil; streams = streams.next {

livemedia/server_media_session.go

@@ -8,7 +8,7 @@ import (
 )
 
 var libNameStr string = "Dor Streaming Media v"
-var libVersionStr string = MEDIA_SERVER_VERSION
+var libVersionStr string = mediaServerVersion
 
 type ServerMediaSession struct {
 	isSSM             bool

main.go

@@ -39,7 +39,7 @@ func main() {
 		!server.SetupTunnelingOverHTTP(8080) {
 		fmt.Printf("We use port %d for optional RTSP-over-HTTP tunneling, "+
 			"or for HTTP live streaming (for indexed Transport Stream files only).\n",
-			server.HttpServerPortNum())
+			server.HTTPServerPortNum())
 	} else {
 		fmt.Println("(RTSP-over-HTTP tunneling is not available.)")
 	}