From 6fe5591560bcb46c9f6c2c364e3be748bda79d8a Mon Sep 17 00:00:00 2001
From: Paul Wells <paulwe@gmail.com>
Date: Tue, 13 Aug 2024 05:28:28 -0700
Subject: [PATCH] merge

---
 rpc/roommanager.proto    | 43 ----------------------------------------
 rpc/roommanager.psrpc.go |  2 +-
 rpc/signal.psrpc.go      |  2 +-
 rpc/sip.psrpc.go         |  2 +-
 4 files changed, 3 insertions(+), 46 deletions(-)
 delete mode 100644 rpc/roommanager.proto

diff --git a/rpc/roommanager.proto b/rpc/roommanager.proto
deleted file mode 100644
index 7bc4a77c..00000000
--- a/rpc/roommanager.proto
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2023 LiveKit, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-syntax = "proto3";
-
-package rpc;
-
-option go_package = "github.com/livekit/livekit/pkg/service/rpc";
-
-import "options.proto";
-import "livekit_internal.proto";
-import "livekit_rtc.proto";
-
-service RoomManager {
-  rpc StartRoom(rpc.StartRoomRequest) returns (rpc.StartRoomResponse) {
-    option (psrpc.options) = {
-      topics: true
-      topic_params: {
-        names: ["node_id"]
-        typed: true
-        single_server: true
-      };
-    };
-  };
-}
-
-message StartRoomRequest {
-  string name = 1;
-  string identity = 2;
-}
-
-message StartRoomResponse {}
diff --git a/rpc/roommanager.psrpc.go b/rpc/roommanager.psrpc.go
index e11b0119..1c33c1e8 100644
--- a/rpc/roommanager.psrpc.go
+++ b/rpc/roommanager.psrpc.go
@@ -138,7 +138,7 @@ func (s *roomManagerServer[NodeIdTopicType]) Kill() {
 	s.rpc.Close(true)
 }
 
-var psrpcFileDescriptor7 = []byte{
+var psrpcFileDescriptor8 = []byte{
 	// 185 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x44, 0xcd, 0x4d, 0x0a, 0xc2, 0x30,
 	0x10, 0x05, 0x60, 0x8a, 0xa2, 0x10, 0x29, 0x68, 0xb0, 0xa0, 0xd9, 0x88, 0x1e, 0x20, 0x01, 0xbd,
diff --git a/rpc/signal.psrpc.go b/rpc/signal.psrpc.go
index 8cc328da..61b1109b 100644
--- a/rpc/signal.psrpc.go
+++ b/rpc/signal.psrpc.go
@@ -136,7 +136,7 @@ func (s *signalServer[NodeIdTopicType]) Kill() {
 	s.rpc.Close(true)
 }
 
-var psrpcFileDescriptor8 = []byte{
+var psrpcFileDescriptor9 = []byte{
 	// 313 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x91, 0x4f, 0x4e, 0xf3, 0x30,
 	0x10, 0xc5, 0xe5, 0x2f, 0x69, 0xbf, 0xe2, 0x52, 0xa9, 0xb8, 0xd0, 0x9a, 0x48, 0x88, 0xd0, 0x55,
diff --git a/rpc/sip.psrpc.go b/rpc/sip.psrpc.go
index 6e6c00af..b611db18 100644
--- a/rpc/sip.psrpc.go
+++ b/rpc/sip.psrpc.go
@@ -121,7 +121,7 @@ func (s *sIPInternalServer) Kill() {
 	s.rpc.Close(true)
 }
 
-var psrpcFileDescriptor9 = []byte{
+var psrpcFileDescriptor10 = []byte{
 	// 550 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x54, 0xd1, 0x6e, 0xd3, 0x3c,
 	0x14, 0x56, 0xd6, 0xad, 0x5b, 0x4f, 0xd7, 0xae, 0xf3, 0xdf, 0xee, 0xb7, 0x82, 0x04, 0xa5, 0x03,