Modify display name to EBS; Fix tray icon; Make Evercast the only stream type

Author: skastr0

UI/forms/images/tray_active.png

@@ -218,11 +218,11 @@ AutoConfigStreamPage::AutoConfigStreamPage(QWidget *parent)
 	ui->bitrateLabel->setVisible(false);
 	ui->bitrate->setVisible(false);
 
-	ui->streamType->addItem(obs_service_get_display_name("rtmp_common"));
-	ui->streamType->addItem(obs_service_get_display_name("rtmp_custom"));
+//	ui->streamType->addItem(obs_service_get_display_name("rtmp_common"));
+//	ui->streamType->addItem(obs_service_get_display_name("rtmp_custom"));
 	ui->streamType->addItem(obs_service_get_display_name("webrtc_janus"));
-	ui->streamType->addItem(obs_service_get_display_name("webrtc_spankchain"));
-	ui->streamType->addItem(obs_service_get_display_name("webrtc_millicast"));
+//	ui->streamType->addItem(obs_service_get_display_name("webrtc_spankchain"));
+//	ui->streamType->addItem(obs_service_get_display_name("webrtc_millicast"));
 
 	setTitle(QTStr("Basic.AutoConfig.StreamPage"));
 	setSubTitle(QTStr("Basic.AutoConfig.StreamPage.SubTitle"));

UI/window-basic-auto-config.cpp

@@ -1015,7 +1015,7 @@ bool OBSBasic::LoadService()
 	obs_data_t *data = obs_data_create_from_json_file_safe(serviceJsonPath,
 			"bak");
 
-	obs_data_set_default_string(data, "type", "rtmp_common");
+	obs_data_set_default_string(data, "type", "webrtc_janus");
 	type = obs_data_get_string(data, "type");
 
 	obs_data_t *settings = obs_data_get_obj(data, "settings");
@@ -1039,7 +1039,7 @@ bool OBSBasic::InitService()
 	if (LoadService())
 		return true;
 
-	service = obs_service_create("rtmp_common", "default_service", nullptr,
+	service = obs_service_create("webrtc_janus", "default_service", nullptr,
 			nullptr);
 	if (!service)
 		return false;
@@ -3018,7 +3018,7 @@ void OBSBasic::RenderMain(void *data, uint32_t cx, uint32_t cy)
 obs_service_t *OBSBasic::GetService()
 {
 	if (!service) {
-		service = obs_service_create("rtmp_common", NULL, NULL,
+		service = obs_service_create("webrtc_janus", NULL, NULL,
 				nullptr);
 		obs_service_release(service);
 	}

UI/window-basic-main.cpp

@@ -763,6 +763,7 @@ void OBSBasicSettings::LoadServiceTypes()
 		QString qName = QT_UTF8(name);
 		QString qType = QT_UTF8(type);
 
+		if(qType=="webrtc_janus")
 		ui->streamType->addItem(qName, qType);
 	}
 

UI/window-basic-settings.cpp

@@ -106,7 +106,7 @@ bool JanusWebsocketClientImpl::connect(std::string url, std::string room, std::s
             { "body" ,
               {
                 {"room" , room},
-                {"display" , "OBS"},
+                {"display" , "EBS"},
                 {"ptype"  , "publisher"},
                 {"request" , "join"},
               }