GitHub/trunk-server
1
0
Fork 0
mirror of https://github.com/openmhz/trunk-server.git synced 2026-11-13 09:17:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

forward progress

Browse Source
This commit is contained in:
Luke Berndt
2021-01-17 10:52:00 -05:00
parent e20529b7f5
commit 2035855a77
18 changed files with 52 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
frontend-old/src/client/Call/CallPlayer.js
View File

@@ -247,7 +247,7 @@ class CallPlayer extends React.Component {
if (this.state.autoPlay && (currentIndex > 0)) {
const nextCallId = this.props.callsAllIds[currentIndex - 1];
const nextCall = this.props.callsById[nextCallId];
var callUrl = media_server + nextCall.filename;
var callUrl = null;
if (nextCall.url) {
callUrl = nextCall.url;
}
@@ -261,7 +261,7 @@ class CallPlayer extends React.Component {
playCall(data) {
const audio = this.audioRef.current;
var callUrl = media_server + data.call.filename;
var callUrl = null;
if (data.call.url) {
callUrl = data.call.url;
}
@@ -425,10 +425,7 @@ class CallPlayer extends React.Component {
if (call) {
if (call.url) {
this.setState({callUrl: call.url });
} else {
this.setState({callUrl: media_server + call.filename });
}
}
}
}
@@ -469,9 +466,7 @@ class CallPlayer extends React.Component {
callLink = "/system/" + this.props.shortName + "?call-id=" + currentCall._id + "&time=" + (callDate.getTime()+1);
if (currentCall.url) {
callDownload = currentCall.url;
} else {
callDownload = media_server + currentCall.filename;
}
}
}
var archive = freePlanArchive;
if (this.props.system && (this.props.system.planType == proPlanValue)) {

5
frontend-old/src/client/Call/MediaPlayer.js
View File

@@ -81,10 +81,7 @@ componentWillUpdate(nextProps) {
render(){
var playEnabled = { "disabled": true }
var sourceId = "-";
var callUrl = null;
if (this.props.call) {
callUrl = media_server + this.props.call.filename;
}
if (this.props.call) {
if (this.props.call.srcList.length > this.state.sourceIndex) {
sourceId = this.props.call.srcList[this.state.sourceIndex].src;

2
frontend-old/src/server/index.js
View File

@@ -29,7 +29,6 @@ if (isDev) {
var backend_server = process.env['BACKEND_SERVER'] != null ? process.env['BACKEND_SERVER'] : 'https://api.openmhz.com';
var frontend_server = process.env['FRONTEND_SERVER'] != null ? process.env['FRONTEND_SERVER'] : 'https://openmhz.com';
var media_server = process.env['MEDIA_SERVER'] != null ? process.env['MEDIA_SERVER'] : 'https://media.openmhz.com'; //'https://s3.amazonaws.com/robotastic';
var socket_server = process.env['SOCKET_SERVER'] != null ? process.env['SOCKET_SERVER'] : 'wss://api.openmhz.com'; //'https://s3.amazonaws.com/robotastic';
var site_name = process.env['SITE_NAME'] != null ? process.env['SITE_NAME'] : "OpenMHz";
const proPlanValue = process.env['PRO_PLAN'] != null ? process.env['PRO_PLAN'] : 10;
@@ -65,7 +64,6 @@ app.get("*", (req, res, next) => {
/>
<script>
const backend_server = "${backend_server}";
const media_server = "${media_server}";
const socket_server = "${socket_server}";
const proPlanValue = ${proPlanValue};
const freePlanValue = ${freePlanValue};