Skip to content

Commit 1168962

Browse files
steveseguinsteveseguin
committed
tweaks to reconnection logic
1 parent 19310dd commit 1168962

File tree

4 files changed

+124
-75
lines changed

4 files changed

+124
-75
lines changed

‎index.html

Lines changed: 52 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
</span>
8383
<script type="text/javascript" crossorigin="anonymous" src="./thirdparty/CodecsHandler.js?ver=28"></script>
8484
<script type="text/javascript" crossorigin="anonymous" src="./thirdparty/aes.js"></script>
85-
<script type="text/javascript" crossorigin="anonymous" src="./webrtc.js?ver=854"></script>
85+
<script type="text/javascript" crossorigin="anonymous" src="./webrtc.js?ver=857"></script>
8686
<input id="zoomSlider" type="range" style="display: none;" />
8787
<span id="electronDragZone" style="display:none;pointer-events: none; z-index:-10; position:absolute;top:0;left:0;width:100%;height:2%;min-height:20px;"></span>
8888
<div id="header">
@@ -1822,8 +1822,52 @@ <h2 title="Use this link in the OBS Browser Source to capture the video or audio
18221822
<button class="btn-HL-green" style="flex: 0 11%;"data-action-type="toggle-group" data-group="7" title="Add/remove from group 7" onclick="changeGroup(this);">
18231823
<span>G7</span>
18241824
</button>
1825-
18261825
</div>
1826+
1827+
<!-- Row of MIDI Buttons -->
1828+
<div class="row hidden advanced midi-controls" title="Remote guest plays out MIDI events. Toggles. Hold CTRL(cmd) to replay instead of toggle.">
1829+
<span style="flex: 1 21%; color: lightgreen; margin: auto 0;">MIDI Ctrls</span>
1830+
<button class="btn-HL-peach" data-action-type="midi-button" data-midi-note="C1" data-midi-mode="toggle" title="Toggle MIDI C1" onclick="buttonMIDI(this);">
1831+
<span>C1</span>
1832+
</button>
1833+
<button class="btn-HL-peach" data-action-type="midi-button" data-midi-note="D1" data-midi-mode="toggle" title="Toggle MIDI D1" onclick="buttonMIDI(this);">
1834+
<span>D1</span>
1835+
</button>
1836+
<button class="btn-HL-peach" data-action-type="midi-button" data-midi-note="E1" data-midi-mode="toggle" title="Toggle MIDI E1" onclick="buttonMIDI(this);">
1837+
<span>E1</span>
1838+
</button>
1839+
<button class="btn-HL-peach" data-action-type="midi-button" data-midi-note="F1" data-midi-mode="toggle" title="Toggle MIDI F1" onclick="buttonMIDI(this);">
1840+
<span>F1</span>
1841+
</button>
1842+
<button class="btn-HL-peach" data-action-type="midi-button" data-midi-note="G1" data-midi-mode="toggle" title="Toggle MIDI G1" onclick="buttonMIDI(this);">
1843+
<span>G1</span>
1844+
</button>
1845+
<button class="btn-HL-peach" data-action-type="midi-button" data-midi-note="A0" data-midi-mode="toggle" title="Toggle MIDI A0" onclick="buttonMIDI(this);">
1846+
<span>A0</span>
1847+
</button>
1848+
</div>
1849+
<div class="row hidden advanced midi-controls" title="Remote guest plays out MIDI events on Ch 1only.">
1850+
<span style="flex: 1 21%; color: lightgreen; margin: auto 0;">MIDI Ch 1</span>
1851+
<button class="btn-HL-purple" data-action-type="midi-button" data-midi-note="C3" data-midi-channel="1" title="Send MIDI C3 on Channel 1" onclick="buttonMIDI(this);">
1852+
<span>C3</span>
1853+
</button>
1854+
<button class="btn-HL-purple" data-action-type="midi-button" data-midi-note="D3" data-midi-channel="1" title="Send MIDI D3 on Channel 1" onclick="buttonMIDI(this);">
1855+
<span>D3</span>
1856+
</button>
1857+
<button class="btn-HL-purple" data-action-type="midi-button" data-midi-note="E3" data-midi-channel="1" title="Send MIDI E3 on Channel 1" onclick="buttonMIDI(this);">
1858+
<span>E3</span>
1859+
</button>
1860+
<button class="btn-HL-purple" data-action-type="midi-button" data-midi-note="F3" data-midi-channel="1" title="Send MIDI F3 on Channel 1" onclick="buttonMIDI(this);">
1861+
<span>F3</span>
1862+
</button>
1863+
<button class="btn-HL-purple" data-action-type="midi-button" data-midi-note="G3" data-midi-channel="1" title="Send MIDI G3 on Channel 1" onclick="buttonMIDI(this);">
1864+
<span>G3</span>
1865+
</button>
1866+
<button class="btn-HL-purple" data-action-type="midi-button" data-midi-note="A3" data-midi-channel="1" title="Send MIDI A3 on Channel 1" onclick="buttonMIDI(this);">
1867+
<span>A3</span>
1868+
</button>
1869+
</div>
1870+
18271871
<!-- Row of Channels -->
18281872
<div class="row advanced">
18291873
<span style="flex: 1 21%;color: lightgreen; margin: auto 0;">Monitor Mix</span>
@@ -2859,14 +2903,15 @@ <h3>Assign to slot:</h3><br />
28592903
// if (!window.location.search){document.body.innerHTML = "";} // uncomment this line, if you wish to try it.
28602904

28612905
var session = WebRTC.Media; // session is a required global variable if configuring manually. Run before loading main.js but after webrtc.js.
2862-
session.version = "27.6"; // updated: default 1080p now + tweaked outbound bandwidth logic
2906+
session.version = "27.7"; // updated: default 1080p now + tweaked outbound bandwidth logic
28632907
session.streamID = session.generateStreamID(); // randomly generates a streamID for this session. You can set your own programmatically if needed
28642908

28652909
session.defaultPassword = "someEncryptionKey123"; // Change this password if self-deploying for added security/privacy
28662910
// session.salt = location.hostname; // used only if password is not == False. You can change to "session.salt = location.hostname+location.pathname;" for greater deployment isolation
28672911

28682912
session.stunServers = [{ urls: ["stun:stun.l.google.com:19302", "stun:stun.cloudflare.com:3478"]}]; // google + cloudflare stun servers. default
28692913

2914+
28702915
/////////////// ------ Custom basic TURN SETUP SECTION STARTS Here --------
28712916
// session.configuration = { // uncomment to disable the default usage of the vdo.ninja turn servers.
28722917
// iceServers: session.stunServers,
@@ -2884,7 +2929,8 @@ <h3>Assign to slot:</h3><br />
28842929
// turn.urls = ["turn:turn2.obs.ninja:443"];
28852930
// session.configuration.iceServers.push(turn);
28862931
/////////////// ------------ END OF TURN SETUP SECTION -------
2887-
2932+
2933+
28882934
/////////////// -------- Alternative custom TURN SETUP SECTION here ---------
28892935
// Use this section if you plan to use the turn-credentials.php sample and its use-auth-secret and static-auth-secret method, rather than a plain password
28902936
//
@@ -2982,8 +3028,7 @@ <h3>Assign to slot:</h3><br />
29823028
// if ("42" != prompt("enter the password")){document.body.innerHTML = "";window.location.href = "";} // if you want a low-effort password for the site
29833029

29843030
</script>
2985-
<script type="text/javascript" crossorigin="anonymous" id="lib-js" src="./lib.js?ver=1310"></script>
2986-
<script type="text/javascript" crossorigin="anonymous" id="main-js" src="./main.js?ver=970"></script>
2987-
<!-- <script type="text/javascript" crossorigin="anonymous" src="./trace.js?ver=1"></script>!-->
3031+
<script type="text/javascript" crossorigin="anonymous" id="lib-js" src="./lib.js?ver=1321"></script>
3032+
<script type="text/javascript" crossorigin="anonymous" id="main-js" src="./main.js?ver=980"></script>
29883033
</body>
29893034
</html>

0 commit comments

Comments
 (0)