davebluke
/
ctbrec
forked from j62/ctbrec
1
0
Fork 0
Code Pull Requests Activity

Fix live preview for wowza servers

This commit is contained in:
0xboobface 2018-10-24 23:39:46 +02:00
parent 0935343dc1
commit ff0d1b5eae
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/ctbrec/sites/mfc/MyFreeCamsModel.java
View File

@ -220,7 +220,7 @@ public class MyFreeCamsModel extends AbstractModel {
try { try {
previewUrl = getLivePreviewUrl(state); previewUrl = getLivePreviewUrl(state);
} catch(Exception e) { } catch(Exception e) {
LOG.debug("Couldn't get live preview. Falling back to avatar", e); LOG.error("Couldn't get live preview. Falling back to avatar", e);
} }
} }
setPreview(previewUrl); setPreview(previewUrl);
@ -252,15 +252,15 @@ public class MyFreeCamsModel extends AbstractModel {
ServerConfig sc = site.getClient().getServerConfig(); ServerConfig sc = site.getClient().getServerConfig();
if(sc.isOnNgServer(state)) { if(sc.isOnNgServer(state)) {
server = sc.ngVideoServers.get(Integer.toString(camserv)); server = sc.ngVideoServers.get(Integer.toString(camserv));
camserv = Integer.parseInt(server.replaceAll("video", "")); camserv = Integer.parseInt(server.replaceAll("[^0-9]+", ""));
previewUrl = "https://snap.mfcimg.com/snapimg/" + camserv + "/320x240/mfc_" + state.getU().getPhase()+ '_' + userChannel; previewUrl = "https://snap.mfcimg.com/snapimg/" + camserv + "/320x240/mfc_" + state.getU().getPhase()+ '_' + userChannel;
} else if(sc.isOnWzObsVideoServer(state)) { } else if(sc.isOnWzObsVideoServer(state)) {
server = sc.wsServers.get(Integer.toString(camserv)); server = sc.wzobsServers.get(Integer.toString(camserv));
camserv = Integer.parseInt(server.replaceAll("video", "")); camserv = Integer.parseInt(server.replaceAll("[^0-9]+", ""));
previewUrl = "https://snap.mfcimg.com/snapimg/" + camserv + "/320x240/mfc_" + state.getU().getPhase()+ '_' + userChannel; previewUrl = "https://snap.mfcimg.com/snapimg/" + camserv + "/320x240/mfc_" + state.getU().getPhase()+ '_' + userChannel;
} else if(sc.isOnHtml5VideoServer(state)) { } else if(sc.isOnHtml5VideoServer(state)) {
server = sc.h5Servers.get(Integer.toString(camserv)); server = sc.h5Servers.get(Integer.toString(camserv));
camserv = Integer.parseInt(server.replaceAll("video", "")); camserv = Integer.parseInt(server.replaceAll("[^0-9]+", ""));
previewUrl = "https://snap.mfcimg.com/snapimg/" + camserv + "/320x240/mfc_" + userChannel; previewUrl = "https://snap.mfcimg.com/snapimg/" + camserv + "/320x240/mfc_" + userChannel;
} else { } else {
if(camserv > 500) camserv -= 500; if(camserv > 500) camserv -= 500;