diff --git a/web/app/assets/javascripts/globals.js b/web/app/assets/javascripts/globals.js index cfa56ee75..b8ef696c2 100644 --- a/web/app/assets/javascripts/globals.js +++ b/web/app/assets/javascripts/globals.js @@ -225,31 +225,31 @@ context.JK.AUDIO_DEVICE_BEHAVIOR = { MacOSX_builtin: { display: 'MacOSX Built-In', - videoURL: undefined, + videoURL: "https://www.youtube.com/watch?v=7-9PW50ygHk", showKnobs: false, showASIO: false }, MacOSX_interface: { display: 'MacOSX external interface', - videoURL: undefined, + videoURL: "https://www.youtube.com/watch?v=7BLld6ogm14", showKnobs: false, showASIO: false }, Win32_wdm: { display: 'Windows WDM', - videoURL: undefined, + videoURL: "https://www.youtube.com/watch?v=L36UBkAV14c", showKnobs: true, showASIO: false }, Win32_asio: { display: 'Windows ASIO', - videoURL: undefined, + videoURL: "https://www.youtube.com/watch?v=PGUmISTVVMY", showKnobs: false, showASIO: true }, Win32_asio4all: { display: 'Windows ASIO4ALL', - videoURL: undefined, + videoURL: "https://www.youtube.com/watch?v=PGUmISTVVMY", showKnobs: false, showASIO: true }, diff --git a/web/app/assets/javascripts/networkTestHelper.js b/web/app/assets/javascripts/networkTestHelper.js index b61773924..06a00dd57 100644 --- a/web/app/assets/javascripts/networkTestHelper.js +++ b/web/app/assets/javascripts/networkTestHelper.js @@ -34,6 +34,7 @@ var $currentScore = null; var $scoredClients = null; var $subscore = null; + var $watchVideo = null; var backendGuardTimeout = null; var serverClientId = ''; @@ -43,6 +44,7 @@ var $self = $(this); var scoringZoneWidth = 100;//px var inGearWizard = false; + var operatingSystem = null; var NETWORK_TEST_START = 'network_test.start'; var NETWORK_TEST_DONE = 'network_test.done'; @@ -490,6 +492,14 @@ } + function initializeVideoWatchButton() { + if(operatingSystem == "Win32") { + $watchVideo.attr('href', 'https://www.youtube.com/watch?v=rhAdCVuwhBc'); + } + else { + $watchVideo.attr('href', 'https://www.youtube.com/watch?v=0r1py0AYJ4Y'); + } + } function initialize(_$step, _inGearWizard) { $step = _$step; inGearWizard = _inGearWizard; @@ -507,7 +517,11 @@ $currentScore = $step.find('.current-score'); $scoredClients= $step.find('.scored-clients'); $subscore = $step.find('.subscore'); + $watchVideo = $step.find('.watch-video'); $startNetworkTestBtn.on('click', startNetworkTest); + operatingSystem = context.JK.GetOSAsString(); + + initializeVideoWatchButton(); // if this network test is instantiated anywhere else than the gearWizard, or a dialog, then this will have to be expanded if(inGearWizard) { diff --git a/web/app/views/clients/wizard/gear/_gear_wizard.html.haml b/web/app/views/clients/wizard/gear/_gear_wizard.html.haml index 516d54136..37450ac88 100644 --- a/web/app/views/clients/wizard/gear/_gear_wizard.html.haml +++ b/web/app/views/clients/wizard/gear/_gear_wizard.html.haml @@ -73,7 +73,7 @@ %li Drag and drop the input port(s) from your audio interface to each track. %li Select the instrument for each track. .center - %a.button-orange.watch-video{href:'#'} WATCH VIDEO + %a.button-orange.watch-video{href:'https://www.youtube.com/watch?v=SjMeMZpKNR4', rel:'external'} WATCH VIDEO .wizard-step-column %h2 Unassigned Ports .unassigned-input-channels.channels-holder @@ -97,7 +97,7 @@ %p Determine if you need to set up a voice chat input. %p If you do, then assign the audio input to use to capture voice chat. .center - %a.button-orange.watch-video{href:'#'} WATCH VIDEO + %a.button-orange.watch-video{href:'https://www.youtube.com/watch?v=f7niycdWm7Y', rel:'external'} WATCH VIDEO .wizard-step-column %h2.sub-header Select Voice Chat Option %form.voice @@ -134,7 +134,7 @@ %li If a button, push it into its off position. %li If a knob, turn it so that 100% of audio is from your computer, and 0% is from the direct monitor. .center - %a.button-orange.watch-video{href:'#'} WATCH VIDEO + %a.button-orange.watch-video{href:'https://www.youtube.com/watch?v=-nC-D3JBHnk', rel:'external'} WATCH VIDEO .wizard-step-column .help-content When you have fully turned off the direct monitoring control (if any) on your audio interface,