-
#include "session_manager.hpp"
+#include "browser.hpp"
/* JSON serializers */
std::string config_to_json(const Config& config);
@@ -34,6 +35,8 @@ std::string sources_to_json(const std::list
+
);
diff --git a/webui/src/RemoteSources.js b/webui/src/RemoteSources.js
new file mode 100644
index 0000000..7ebc232
--- /dev/null
+++ b/webui/src/RemoteSources.js
@@ -0,0 +1,196 @@
+//
+// RemoteSource.js
+//
+// Copyright (c) 2019 2020 Andrea Bondavalli. All rights reserved.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see 
+
+ {this.props.sources.length > 0 ?
+
+
+ 
+
+
+ );
+ }
+}
+
+class RemoteSources extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ sources: [],
+ isLoading: false,
+ infoIsOpen: false,
+ infoTitle: ''
+ };
+ this.onInfoClick = this.onInfoClick.bind(this);
+ this.onReloadClick = this.onReloadClick.bind(this);
+ this.openInfo = this.openInfo.bind(this);
+ this.closeInfo = this.closeInfo.bind(this);
+ this.fetchRemoteSources = this.fetchRemoteSources.bind(this);
+ }
+
+ fetchRemoteSources() {
+ this.setState({isLoading: true});
+ RestAPI.getRemoteSources()
+ .then(response => response.json())
+ .then(
+ data => this.setState( { sources: data.remote_sources, isLoading: false }))
+ .catch(err => this.setState( { isLoading: false } ));
+ }
+
+ componentDidMount() {
+ this.fetchRemoteSources();
+ }
+
+ openInfo(title, source) {
+ this.setState({infoIsOpen: true, infoTitle: title, source: source});
+ }
+
+ closeInfo() {
+ this.setState({infoIsOpen: false});
+ this.fetchRemoteSources();
+ }
+
+ onInfoClick(id) {
+ const source = this.state.sources.find(s => s.id === id);
+ this.openInfo("Announced Source Info", source, true);
+ }
+
+ onReloadClick() {
+ this.fetchRemoteSources();
+ }
+
+ render() {
+ this.state.sources.sort((a, b) => (a.id > b.id) ? 1 : -1);
+ const sources = this.state.sources.map((source) => (
+ | Source | +Address | +Name | +RTP Address | +Port | +Last seen | +Period | +
|---|---|---|---|---|---|---|
| No remote sources found. | +
+
+
+ { this.state.isLoading ?
+ );
+ }
+}
+
+export default RemoteSources;
diff --git a/webui/src/Services.js b/webui/src/Services.js
index 0d10323..2d3512b 100644
--- a/webui/src/Services.js
+++ b/webui/src/Services.js
@@ -31,6 +31,7 @@ const source = '/source';
const sdp = '/sdp';
const sink = '/sink';
const status = '/status';
+const browseSources = '/browse/sources';
const defaultParams = {
credentials: 'same-origin',
@@ -75,7 +76,7 @@ export default class RestAPI {
});
}
- static setConfig(log_severity, syslog_proto, syslog_server, rtp_mcast_base, rtp_port, playout_delay, tic_frame_size_at_1fs, sample_rate, max_tic_frame_size, sap_interval) {
+ static setConfig(log_severity, syslog_proto, syslog_server, rtp_mcast_base, rtp_port, playout_delay, tic_frame_size_at_1fs, sample_rate, max_tic_frame_size, sap_mcast_addr, sap_interval) {
return this.doFetch(config, {
body: JSON.stringify({
log_severity: parseInt(log_severity, 10),
@@ -87,6 +88,7 @@ export default class RestAPI {
tic_frame_size_at_1fs: parseInt(tic_frame_size_at_1fs, 10),
sample_rate: parseInt(sample_rate, 10),
max_tic_frame_size: parseInt(max_tic_frame_size, 10),
+ sap_mcast_addr: sap_mcast_addr,
sap_interval: parseInt(sap_interval, 10)
}),
method: 'POST'
@@ -220,4 +222,11 @@ export default class RestAPI {
});
}
+ static getRemoteSources() {
+ return this.doFetch(browseSources).catch(err => {
+ toast.error('Browse sources get failed: ' + err.message)
+ return Promise.reject(Error(err.message));
+ });
+ }
+
}
diff --git a/webui/src/SourceInfo.js b/webui/src/SourceInfo.js
new file mode 100644
index 0000000..e978fb1
--- /dev/null
+++ b/webui/src/SourceInfo.js
@@ -0,0 +1,94 @@
+//
+// SourceInfo.js
+//
+// Copyright (c) 2019 2020 Andrea Bondavalli. All rights reserved.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see
+
+
+
+
+
+
+
+ );
+ }
+}
+
+export default SourceInfo;
diff --git a/webui/src/Sources.js b/webui/src/Sources.js
index e4aa3c5..c16285b 100644
--- a/webui/src/Sources.js
+++ b/webui/src/Sources.js
@@ -25,6 +25,7 @@ import RestAPI from './Services';
import Loader from './Loader';
import SourceEdit from './SourceEdit';
import SourceRemove from './SourceRemove';
+import SourceInfo from './SourceInfo';
require('./styles.css');
@@ -34,6 +35,7 @@ class SourceEntry extends Component {
name: PropTypes.string.isRequired,
channels: PropTypes.number.isRequired,
onEditClick: PropTypes.func.isRequired,
+ onInfoClick: PropTypes.func.isRequired,
onTrashClick: PropTypes.func.isRequired
};
@@ -41,10 +43,15 @@ class SourceEntry extends Component {
super(props);
this.state = {
address: 'n/a',
- port: 'n/a'
+ port: 'n/a',
+ sdp: ''
};
}
+ handleInfoClick = () => {
+ this.props.onInfoClick(this.props.id, this.state.sdp);
+ };
+
handleEditClick = () => {
this.props.onEditClick(this.props.id);
};
@@ -59,6 +66,7 @@ class SourceEntry extends Component {
.then(function(sdp) {
var address = sdp.match(/(c=IN IP4 )([0-9.]+)/g);
var port = sdp.match(/(m=audio )([0-9]+)/g);
+ this.setState({ sdp: sdp });
if (address && port) {
this.setState({ address: address[0].substr(9), port: port[0].substr(8) });
}
@@ -73,6 +81,7 @@ class SourceEntry extends Component {
{this.props.infoTitle}
+ | + | + |
|---|---|
| + | + |
| + | + |
+
+
+
+ 
