ringtone -> dialtone

livekit · Oct 22, 2024 · 20d6d46 · 20d6d46
1 parent 4c2195f
commit 20d6d46
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/pkg/sip/client.go b/pkg/sip/client.go
@@ -187,7 +187,7 @@ func (c *Client) createSIPParticipant(ctx context.Context, req *rpc.InternalCrea
 		user:            req.Username,
 		pass:            req.Password,
 		dtmf:            req.Dtmf,
-		ringtone:        req.PlayRingtone,
+		dialtone:        req.PlayDialtone,
 		headers:         req.Headers,
 		headersToAttrs:  req.HeadersToAttributes,
 		ringingTimeout:  req.RingingTimeout.AsDuration(),

diff --git a/pkg/sip/inbound.go b/pkg/sip/inbound.go
@@ -773,10 +773,10 @@ func (c *inboundCall) handleDTMF(tone dtmf.Event) {
 	}
 }
 
-func (c *inboundCall) transferCall(ctx context.Context, transferTo string, ringtone bool) error {
+func (c *inboundCall) transferCall(ctx context.Context, transferTo string, dialtone bool) error {
 	var err error
 
-	if ringtone && c.started.IsBroken() && !c.done.Load() {
+	if dialtone && c.started.IsBroken() && !c.done.Load() {
 		const ringVolume = math.MaxInt16 / 2
 		rctx, rcancel := context.WithCancel(ctx)
 		defer rcancel()

diff --git a/pkg/sip/outbound.go b/pkg/sip/outbound.go
@@ -51,7 +51,7 @@ type sipOutboundConfig struct {
 	user            string
 	pass            string
 	dtmf            string
-	ringtone        bool
+	dialtone        bool
 	headers         map[string]string
 	headersToAttrs  map[string]string
 	ringingTimeout  time.Duration
@@ -248,7 +248,7 @@ func (c *outboundCall) connectToRoom(ctx context.Context, lkNew RoomConfig) erro
 	if err := r.Connect(c.c.conf, lkNew); err != nil {
 		return err
 	}
-	// We have to create the track early because we might play a ringtone while SIP connects.
+	// We have to create the track early because we might play a dialtone while SIP connects.
 	// Thus, we are forced to set full sample rate here instead of letting the codec adapt to the SIP source sample rate.
 	local, err := r.NewParticipantTrack(RoomSampleRate)
 	if err != nil {
@@ -261,12 +261,12 @@ func (c *outboundCall) connectToRoom(ctx context.Context, lkNew RoomConfig) erro
 }
 
 func (c *outboundCall) dialSIP(ctx context.Context) error {
-	if c.sipConf.ringtone {
+	if c.sipConf.dialtone {
 		const ringVolume = math.MaxInt16 / 2
 		rctx, rcancel := context.WithCancel(ctx)
 		defer rcancel()
 
-		// Play a ringtone to the room while participant connects
+		// Play dialtone to the room while participant connects
 		go func() {
 			rctx, span := tracer.Start(rctx, "tones.Play")
 			defer span.End()
@@ -432,10 +432,10 @@ func (c *outboundCall) handleDTMF(ev dtmf.Event) {
 	}, lksdk.WithDataPublishReliable(true))
 }
 
-func (c *outboundCall) transferCall(ctx context.Context, transferTo string, ringtone bool) error {
+func (c *outboundCall) transferCall(ctx context.Context, transferTo string, dialtone bool) error {
 	var err error
 
-	if ringtone && c.started.IsBroken() && !c.stopped.IsBroken() {
+	if dialtone && c.started.IsBroken() && !c.stopped.IsBroken() {
 		const ringVolume = math.MaxInt16 / 2
 		rctx, rcancel := context.WithCancel(ctx)
 		defer rcancel()

diff --git a/pkg/sip/service.go b/pkg/sip/service.go
@@ -151,7 +151,7 @@ func (s *Service) TransferSIPParticipant(ctx context.Context, req *rpc.InternalT
 			ctx, cdone := context.WithTimeout(context.WithoutCancel(ctx), 30*time.Second)
 			defer cdone()
 
-			err := s.processParticipantTransfer(ctx, req.SipCallId, req.TransferTo, req.PlayRingtone)
+			err := s.processParticipantTransfer(ctx, req.SipCallId, req.TransferTo, req.PlayDialtone)
 			transfetResult.Store(&err)
 			close(done)
 
@@ -177,14 +177,14 @@ func (s *Service) TransferSIPParticipant(ctx context.Context, req *rpc.InternalT
 	}
 }
 
-func (s *Service) processParticipantTransfer(ctx context.Context, callID string, transferTo string, ringtone bool) error {
+func (s *Service) processParticipantTransfer(ctx context.Context, callID string, transferTo string, dialtone bool) error {
 	// Look for call both in client (outbound) and server (inbound)
 	s.cli.cmu.Lock()
 	out := s.cli.activeCalls[LocalTag(callID)]
 	s.cli.cmu.Unlock()
 
 	if out != nil {
-		err := out.transferCall(ctx, transferTo, ringtone)
+		err := out.transferCall(ctx, transferTo, dialtone)
 		if err != nil {
 			return err
 		}
@@ -197,7 +197,7 @@ func (s *Service) processParticipantTransfer(ctx context.Context, callID string,
 	s.srv.cmu.Unlock()
 
 	if in != nil {
-		err := in.transferCall(ctx, transferTo, ringtone)
+		err := in.transferCall(ctx, transferTo, dialtone)
 		if err != nil {
 			return err
 		}