From 2be68c554c3af8fc777301b472672e3cec0abeed Mon Sep 17 00:00:00 2001
From: Simon Eisenmann <simon@struktur.de>
Date: Wed, 22 Apr 2015 14:16:57 +0200
Subject: [PATCH] Moved default room type to config.

---
 src/app/spreed-webrtc-server/config.go       |  2 ++
 src/app/spreed-webrtc-server/room_manager.go | 18 +++++++-----------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/app/spreed-webrtc-server/config.go b/src/app/spreed-webrtc-server/config.go
index bda9e096..94dbd11f 100644
--- a/src/app/spreed-webrtc-server/config.go
+++ b/src/app/spreed-webrtc-server/config.go
@@ -52,6 +52,7 @@ type Config struct {
 	globalRoomID                    string          // Id of the global room (not exported to Javascript)
 	contentSecurityPolicy           string          // HTML content security policy
 	contentSecurityPolicyReportOnly string          // HTML content security policy in report only mode
+	roomTypeDefault                 string          // New rooms default to this type
 }
 
 func NewConfig(container phoenix.Container, tokens bool) *Config {
@@ -127,6 +128,7 @@ func NewConfig(container phoenix.Container, tokens bool) *Config {
 		globalRoomID:                    container.GetStringDefault("app", "globalRoom", ""),
 		contentSecurityPolicy:           container.GetStringDefault("app", "contentSecurityPolicy", ""),
 		contentSecurityPolicyReportOnly: container.GetStringDefault("app", "contentSecurityPolicyReportOnly", ""),
+		roomTypeDefault:                 "Room",
 	}
 }
 
diff --git a/src/app/spreed-webrtc-server/room_manager.go b/src/app/spreed-webrtc-server/room_manager.go
index 64b5f4bd..76a77faa 100644
--- a/src/app/spreed-webrtc-server/room_manager.go
+++ b/src/app/spreed-webrtc-server/room_manager.go
@@ -53,21 +53,17 @@ type roomManager struct {
 	sync.RWMutex
 	*Config
 	OutgoingEncoder
-	roomTable       map[string]RoomWorker
-	globalRoomID    string
-	defaultRoomID   string
-	roomTypeDefault string
+	roomTable     map[string]RoomWorker
+	globalRoomID  string
+	defaultRoomID string
 }
 
 func NewRoomManager(config *Config, encoder OutgoingEncoder) RoomManager {
 	rm := &roomManager{
-		sync.RWMutex{},
-		config,
-		encoder,
-		make(map[string]RoomWorker),
-		"",
-		"",
-		"Room",
+		RWMutex:         sync.RWMutex{},
+		Config:          config,
+		OutgoingEncoder: encoder,
+		roomTable:       make(map[string]RoomWorker),
 	}
 	rm.globalRoomID = rm.MakeRoomID(config.globalRoomID, "")
 	rm.defaultRoomID = rm.MakeRoomID("", "")