From db7243489f9ab757c619492c528a0908e4d2ff2e Mon Sep 17 00:00:00 2001
From: Jan Stabenow <moin@jan-stabenow.de>
Date: Mon, 11 Jul 2022 22:40:20 +0200
Subject: [PATCH] Mod combines source and encoding

---
 src/views/Publication/Add.js  | 21 ++++++++++++--------
 src/views/Publication/Edit.js | 37 ++++++++++++++++++++++-------------
 2 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/src/views/Publication/Add.js b/src/views/Publication/Add.js
index 965307c..1dd9ba0 100644
--- a/src/views/Publication/Add.js
+++ b/src/views/Publication/Add.js
@@ -372,9 +372,8 @@ export default function Add(props) {
 							<TabsVerticalGrid>
 								<Tabs orientation="vertical" variant="scrollable" value={$tab} onChange={handleChangeTab} className="tabs">
 									<Tab className="tab" label={<Trans>General</Trans>} value="general" />
+									<Tab className="tab" label={<Trans>Source & Encoding</Trans>} value="encoding" />
 									<Tab className="tab" label={<Trans>Process control</Trans>} value="process" />
-									<Tab className="tab" label={<Trans>Source</Trans>} value="source" />
-									<Tab className="tab" label={<Trans>Encoding</Trans>} value="encoding" />
 								</Tabs>
 								<TabPanel value={$tab} index="general" className="panel">
 									<TabContent service={service}>
@@ -413,13 +412,23 @@ export default function Add(props) {
 										</Grid>
 									</TabContent>
 								</TabPanel>
-								<TabPanel value={$tab} index="source" className="panel">
+								<TabPanel value={$tab} index="encoding" className="panel">
 									<TabContent service={service}>
 										<Grid item xs={12}>
 											<Typography variant="h2">
+												<Trans>Source & Encoding</Trans>
+											</Typography>
+										</Grid>
+										<Grid item xs={12}>
+											<Typography variant="h3">
 												<Trans>Source</Trans>
 											</Typography>
 										</Grid>
+										<Grid item xs={12}>
+											<Typography variant="subheading">
+												<Trans>Select RTMP or SRT (if enabled) for less latency.</Trans>
+											</Typography>
+										</Grid>
 										<Grid item xs={12}>
 											<SourceControl
 												settings={$settings.control.source}
@@ -427,12 +436,8 @@ export default function Add(props) {
 												onChange={handleControlChange('source')}
 											/>
 										</Grid>
-									</TabContent>
-								</TabPanel>
-								<TabPanel value={$tab} index="encoding" className="panel">
-									<TabContent service={service}>
 										<Grid item xs={12}>
-											<Typography variant="h2">
+											<Typography variant="h3">
 												<Trans>Encoding</Trans>
 											</Typography>
 										</Grid>
diff --git a/src/views/Publication/Edit.js b/src/views/Publication/Edit.js
index 3bbf53f..f90a020 100644
--- a/src/views/Publication/Edit.js
+++ b/src/views/Publication/Edit.js
@@ -391,9 +391,8 @@ export default function Edit(props) {
 					<TabsVerticalGrid>
 						<Tabs orientation="vertical" variant="scrollable" value={$tab} onChange={handleChangeTab} className="tabs">
 							<Tab className="tab" label={<Trans>General</Trans>} value="general" />
+							<Tab className="tab" label={<Trans>Source & Encoding</Trans>} value="encoding" />
 							<Tab className="tab" label={<Trans>Process control</Trans>} value="process" />
-							<Tab className="tab" label={<Trans>Source</Trans>} value="source" />
-							<Tab className="tab" label={<Trans>Encoding</Trans>} value="encoding" />
 						</Tabs>
 						<TabPanel value={$tab} index="general" className="panel">
 							<TabContent service={$service}>
@@ -454,22 +453,32 @@ export default function Edit(props) {
 								</Grid>
 							</TabContent>
 						</TabPanel>
-						<TabPanel value={$tab} index="source" className="panel">
-							<TabContent service={$service}>
-								<Grid item xs={12}>
-									<Typography variant="h2">
-										<Trans>Source</Trans>
-									</Typography>
-								</Grid>
-								<Grid item xs={12}>
-									<SourceControl settings={$settings.control.source} sources={$localSources} onChange={handleControlChange('source')} />
-								</Grid>
-							</TabContent>
-						</TabPanel>
 						<TabPanel value={$tab} index="encoding" className="panel">
 							<TabContent service={$service}>
 								<Grid item xs={12}>
 									<Typography variant="h2">
+										<Trans>Source & Encoding</Trans>
+									</Typography>
+								</Grid>
+								<Grid item xs={12}>
+									<Typography variant="h3">
+										<Trans>Source</Trans>
+									</Typography>
+								</Grid>
+								<Grid item xs={12}>
+									<Typography variant="subheading">
+										<Trans>Select RTMP or SRT (if enabled) for less latency.</Trans>
+									</Typography>
+								</Grid>
+								<Grid item xs={12}>
+									<SourceControl
+										settings={$settings.control.source}
+										sources={$localSources}
+										onChange={handleControlChange('source')}
+									/>
+								</Grid>
+								<Grid item xs={12}>
+									<Typography variant="h3">
 										<Trans>Encoding</Trans>
 									</Typography>
 								</Grid>