* wip still on new ftue. also push release branches to repository VRFS-1639

2014-04-22 17:53:41 +00:00 · 2014-04-22 17:53:41 +00:00 · 30ca8d7c5c
parent 0a811a147c
commit 30ca8d7c5c
13 changed files with 328 additions and 154 deletions
--- a/4
+++ b/4
@ -66,7 +66,7 @@ DEB_SERVER=http://localhost:9010/apt-`uname -p`
 GEM_SERVER=http://localhost:9000/gems

  # if still going, then push all debs up
-  if [[ "$GIT_BRANCH" == *develop* || "$GIT_BRANCH" == *master*  ]]; then
+  if [[ "$GIT_BRANCH" == *develop* || "$GIT_BRANCH" == *master* || "$GIT_BRANCH" == *release* ]]; then

      echo ""
      echo "PUSHING DB ARTIFACTS"
@ -129,7 +129,7 @@ GEM_SERVER=http://localhost:9000/gems
      popd > /dev/null

  else
-      echo "Skipping publish since branch is neither master or develop..."
+      echo "Skipping publish since branch is not master, develop, or release/*.  branch is $GIT_BRANCH"
  fi

 fi
--- a/ruby/lib/jam_ruby/lib/em_helper.rb
+++ b/ruby/lib/jam_ruby/lib/em_helper.rb
@ -65,7 +65,6 @@ module JamWebEventMachine
  end

  def self.run
-
    current = Thread.current
    Thread.new do
      run_em(current)
--- a/web/app/assets/javascripts/banner.js
+++ b/web/app/assets/javascripts/banner.js
@ -66,6 +66,7 @@
    var me = {
      initialize: initialize,
      show: show,
+      showAlert: showAlert,
      hide: hide
    }

--- a/web/app/assets/javascripts/gear_wizard.js
+++ b/web/app/assets/javascripts/gear_wizard.js
@ -6,18 +6,22 @@
  context.JK = context.JK || {};
  context.JK.GearWizard = function (app) {

+
    var $dialog = null;
    var $wizardSteps = null;
    var $currentWizardStep = null;
    var step = 0;
    var $templateSteps = null;
    var $templateButtons = null;
+    var $templateAudioPort = null;
    var $ftueButtons = null;
    var self = null;
    var operatingSystem = null;

    // populated by loadDevices
    var deviceInformation = null;
+    var musicInputPorts = null;
+    var musicOutputPorts = null;

    // SELECT DEVICE STATE
    var validScore = false;
@ -33,6 +37,10 @@
    var STEP_ROUTER_NETWORK = 5;
    var STEP_SUCCESS = 6;

+    var PROFILE_DEV_SEP_TOKEN = '^';
+
+    var iCheckIgnore = false;
+
    var audioDeviceBehavior = {
      MacOSX_builtin: {
        display: 'MacOSX Built-In',
@ -81,6 +89,9 @@
      var $inputPorts = $currentWizardStep.find('.input-ports');
      var $outputPorts = $currentWizardStep.find('.output-ports');
      var $scoreReport = $currentWizardStep.find('.results');
+      var $latencyScore = $scoreReport.find('.latency-score');
+      var $ioRateScore = $scoreReport.find('.io-rate-score');
+      var $ioVarScore = $scoreReport.find('.io-var-score');
      var $nextButton = $ftueButtons.find('.btn-next');

      // should return one of:
@ -128,19 +139,21 @@
          deviceInfo.id = deviceId;
          deviceInfo.type = determineDeviceType(deviceId, displayName);
          deviceInfo.displayType = audioDeviceBehavior[deviceInfo.type].display;
-          deviceInfo.displayName = deviceInfo.displayName;
+          deviceInfo.displayName = displayName;

          loadedDevices[deviceId] = deviceInfo;
+
+          logger.debug("loaded device: ", deviceInfo);
        })

-        deviceInformation = context._.keys(loadedDevices).sort();
+        deviceInformation = loadedDevices;

        logger.debug(context.JK.dlen(deviceInformation) + " devices loaded.", deviceInformation);
      }

-      // returns a deviceInfo hash for the device matching the deviceId, or null.
+      // returns a deviceInfo hash for the device matching the deviceId, or undefined.
      function findDevice(deviceId) {
-        return {};
+        return deviceInformation[deviceId];
      }

      function selectedAudioInput() {
@ -164,8 +177,6 @@
      }

      function initializeNextButtonState() {
-        console.log(context.jamClient.FTUEGetDevices(false));
-        console.log("chat devices", jamClient.FTUEGetChatInputs());
        $nextButton.removeClass('button-orange button-grey');

        if (validScore)  $nextButton.addClass('button-orange');
@ -176,10 +187,11 @@
        var optionsHtml = '';
        optionsHtml = '<option selected="selected" value="">Choose...</option>';
        context._.each(deviceInformation, function (deviceInfo, deviceId) {
+
+          console.log(arguments)
          optionsHtml += '<option title="' + deviceInfo.displayName + '" value="' + deviceId + '">' + deviceInfo.displayName + '</option>';
        });
        $audioInput.html(optionsHtml);
-        alert(optionsHtml)
        context.JK.dropdown($audioInput);

        initializeAudioInputChanged();
@ -198,7 +210,142 @@
      }

      function initializeFramesize() {
+        context.JK.dropdown($frameSize);
+      }

+      function initializeBuffers() {
+        context.JK.dropdown($bufferIn);
+        context.JK.dropdown($bufferOut);
+      }
+
+      // finds out if the $port argument is from a different port pair than what's currently selected
+      function isNewlySelectedPair($port) {
+        var portId = $port.attr('data-id');
+        // get all inputs currently selected except this one
+        var $selectedInputs = $inputPorts.find('input[type="checkbox"]:checked').filter('[data-id="' + portId + '"]');
+
+        console.log("$selectedInputs", $selectedInputs);
+        var isNewlySelected = true;
+        context._.each($selectedInputs, function($current) {
+          var testPairInfo = $($current).data('pair');
+
+          context._.each(testPairInfo.ports, function(port) {
+            // if we can find the newly selected item in this pair, then it's not a different pair...
+            if(port.id == portId) {
+              isNewlySelected = false;
+              return false; // break loop
+            }
+          });
+
+          if(isNewlySelected) return false; // break loop
+        });
+
+        return isNewlySelected;
+      }
+
+      // set checkbox state for all items in the pair
+      function setCheckedForAllInPair($portBox, pairInfo, checked, signalBackend) {
+        context._.each(pairInfo.ports, function(port) {
+          var portId = port.id;
+          var $input = $portBox.find('input[type="checkbox"][data-id="' + portId + '"]');
+          if($input.is(':checked') != checked) {
+            if(checked) {
+              $input.iCheck('check').attr('checked', 'checked');
+              //context.jamClient.FTUESetMusicInput2($input.id);
+            }
+            else  {
+              $input.iCheck('uncheck').removeAttr('checked');
+              //context.jamClient.FTUEUnsetMusicInput2($input.id);
+            }
+          }
+        })
+      }
+
+      function inputPortChanged() {
+        if(iCheckIgnore) return;
+
+        var $checkbox = $(this);
+        var portId = $checkbox.data('data-id');
+        var inputPortChecked = $checkbox.is(':checked');
+        console.log('inputPortChecked: ' + inputPortChecked);
+
+        if(inputPortChecked) {
+          if(isNewlySelectedPair($checkbox)) {
+            setCheckedForAllInPair($inputPorts, $checkbox.data('pair'), true, true);
+          }
+          else {
+            //context.jamClient.FTUESetMusicInput2($input.id);
+          }
+        }
+        else {
+          // context.jamClient.FTUEUnsetMusicInput2($input.id);;
+        }
+      }
+
+      // should be called in a ifChanged callback if you want to cancel. bleh.
+      function cancelICheckChange($checkbox) {
+        iCheckIgnore = true;
+        var checked = $checkbox.is(':checked');
+        setTimeout(function() {
+          if(checked) $checkbox.iCheck('uncheck').removeAttr('checked');
+          else        $checkbox.iCheck('check').attr('checked', 'checked');
+          iCheckIgnore = false;
+        }, 1);
+      }
+
+      function outputPortChanged() {
+        if(iCheckIgnore) return;
+
+        var $checkbox = $(this);
+        var portId = $checkbox.data('data-id');
+        var outputPortChecked = $checkbox.is(':checked');
+        console.log('outputPortChecked: ' + outputPortChecked);
+
+        if(outputPortChecked) {
+          var $selectedInputs = $outputPorts.find('input[type="checkbox"]:checked').filter('[data-id="' + portId + '"]');
+          $selectedInputs.iCheck('uncheck').removeAttr('checked');
+          var pairInfo = $checkbox.data('pair');
+          setCheckedForAllInPair($outputPorts, pairInfo, true, false);
+          console.log("Setting music output");
+          context.jamClient.FTUESetMusicOutput(pairInfo.ports.map(function(i) {return i.id}).join(PROFILE_DEV_SEP_TOKEN));
+        }
+        else {
+          context.JK.Banner.showAlert('You must have at least one output pair selected.');
+          // can't allow uncheck of last output
+          cancelICheckChange($checkbox);
+        }
+      }
+
+      function initializeInputPorts(inputPorts) {
+        context._.each(inputPorts, function(inputPairs) {
+          // there is no guarantee that a pair has two items.
+          context._.each(inputPairs.ports, function(inputInPair) {
+            var inputPort = $(context._.template($templateAudioPort.html(), inputInPair, { variable: 'data' }));
+            var $checkbox = inputPort.find('input');
+            $checkbox.data('pair', inputPairs); // so when it's selected, we can see what other ports, if any, are in the same pair
+            context.JK.checkbox($checkbox);
+            $checkbox.on('ifChanged', inputPortChanged);
+            $inputPorts.append(inputPort);
+          });
+        });
+      }
+
+      function initializeOutputPorts(outputPorts) {
+        var first = true;
+        context._.each(outputPorts, function(outputPairs) {
+          context._.each(outputPairs.ports, function(outputInPair) {
+            var outputPort = $(context._.template($templateAudioPort.html(), outputInPair, { variable: 'data' }));
+            var $checkbox = outputPort.find('input');
+            $checkbox.data('pair', outputPairs); // so when it's selected, we can see what other ports, if any, are in the same pair
+            context.JK.checkbox($checkbox);
+            $checkbox.on('ifChanged', outputPortChanged);
+            $outputPorts.append(outputPort);
+          });
+          if(first) {
+            first = false;
+            setCheckedForAllInPair($outputPorts, outputPairs, true, false);
+          }
+        });
      }

      function initializeFormElements() {
@ -225,7 +372,9 @@
      }

      function resetScoreReport() {
-        $scoreReport.empty();
+        $ioRateScore.empty();
+        $ioVarScore.empty();
+        $latencyScore.empty();
      }

      function updateScoreReport(latencyResult) {
@ -233,9 +382,9 @@
        var latencyValue = 'N/A';
        var validLatency = false;
        if (latencyResult && latencyResult.latencyknown) {
-          var latency = latencyResult.latency;
+          var latencyValue = latencyResult.latency;
          latencyValue = Math.round(latencyValue * 100) / 100;
-          if (latency.latency <= 10) {
+          if (latencyValue <= 10) {
            latencyClass = "good";
            validLatency = true;
          } else if (latency.latency <= 20) {
@ -248,57 +397,9 @@

        validScore = validLatency; // validScore may become based on IO variance too

-        $scoreReport.html(latencyValue);
+        $latencyScore.html(latencyValue + ' ms');
      }

-      function loadAudioDrivers() {
-        var drivers = context.jamClient.FTUEGetDevices(false);
-        var chatDrivers = jamClient.FTUEGetChatInputs();
-        var optionsHtml = '<option selected="selected" value="">Choose...</option>';
-        var chatOptionsHtml = '<option selected="selected" value="">Choose...</option>';
-
-
-        var driverOptionFunc = function (driverKey, index, list) {
-          if(!drivers[driverKey]) {
-            logger.debug("skipping unknown device:", driverKey)
-          }
-          else {
-            optionsHtml += '<option title="' + drivers[driverKey] + '" value="' + driverKey + '">' + drivers[driverKey] + '</option>';
-          }
-        };
-
-        var chatOptionFunc = function (driverKey, index, list) {
-          chatOptionsHtml += '<option value="' + driverKey + '">' + chatDrivers[driverKey]+ '</option>';
-        };
-
-        var selectors = [
-          '[layout-wizard-step="0"] .settings-2-device select',
-          '[layout-wizard-step="2"] .settings-driver select'
-        ];
-
-        // handle standard devices
-        var sortedDeviceKeys = context._.keys(drivers).sort();
-        context._.each(sortedDeviceKeys, driverOptionFunc);
-        $.each(selectors, function (index, selector) {
-          var $select = $(selector);
-          $select.empty();
-          $select.html(optionsHtml);
-          context.JK.dropdown($select);
-        });
-
-        selectors = ['[layout-wizard-step="0"] .settings-2-voice select'];
-        var sortedVoiceDeviceKeys = context._.keys(chatDrivers).sort();
-
-        // handle voice inputs
-        context._.each(sortedVoiceDeviceKeys, chatOptionFunc);
-        $.each(selectors, function (index, selector) {
-          var $select = $(selector);
-          $select.empty();
-          $select.html(chatOptionsHtml);
-          context.JK.dropdown($select);
-        });
-
-      }
      function audioInputDeviceUnselected() {
        validScore = false;
        initializeNextButtonState();
@ -420,9 +521,25 @@
            return false;
          }

+
+
          renderScoringStarted();

          jamClient.FTUESetMusicDevice(audioDeviceId);
+
+          // enumerate input and output ports
+          musicInputPorts = jamClient.FTUEGetMusicInputs2();
+          console.log(JSON.stringify(musicInputPorts));
+          // [{"inputs":[{"id":"i~5~Built-in Microph~0~0","name":"Built-in Microph - Left"},{"id":"i~5~Built-in Microph~1~0","name":"Built-in Microph - Right"}]}]
+          musicOutputPorts = jamClient.FTUEGetMusicOutputs2();
+          console.log(JSON.stringify(musicOutputPorts));
+          // [{"outputs":[{"id":"o~5~Built-in Output~0~0","name":"Built-in Output - Left"},{"id":"o~5~Built-in Output~1~0","name":"Built-in Output - Right"}]}]
+
+
+          initializeInputPorts(musicInputPorts);
+          initializeOutputPorts(musicOutputPorts);
+
+
          jamClient.FTUESetInputLatency(selectedAudioInput());
          jamClient.FTUESetOutputLatency(selectedAudioOutput());
          jamClient.FTUESetFrameSize(selectedFramesize());
@ -433,6 +550,7 @@
          var latency = jamClient.FTUEGetExpectedLatency();
          console.log("FTUEGetExpectedLatency: %o", latency);

+          updateScoreReport(latency);
          renderScoringStopped();
        });
      }
@ -498,7 +616,9 @@
    function beforeShowStep($step) {
      var stepInfo = STEPS[step];

-      if(!stepInfo) {throw "unknown step: " + step;}
+      if (!stepInfo) {
+        throw "unknown step: " + step;
+      }

      stepInfo.beforeShow.call(self);
    }
@ -599,6 +719,7 @@
    function route() {

    }
+
    function initialize() {

      var dialogBindings = { beforeShow: beforeShow, afterShow: afterShow, afterHide: afterHide };
@ -609,6 +730,7 @@
      $wizardSteps = $dialog.find('.wizard-step');
      $templateSteps = $('#template-ftuesteps');
      $templateButtons = $('#template-ftue-buttons');
+      $templateAudioPort = $('#template-audio-port');
      $ftueButtons = $dialog.find('.ftue-buttons');

      operatingSystem = context.jamClient.GetOSAsString();
--- a/web/app/assets/stylesheets/client/gearWizard.css.scss
+++ b/web/app/assets/stylesheets/client/gearWizard.css.scss
@ -184,8 +184,30 @@
          width:45%;
      }

+
+      .buffers {
+        .easydropdown-wrapper:nth-of-type(1) {
+          left:5px;
+        }
+        .easydropdown-wrapper:nth-of-type(2) {
+          left:35px;
+        }
+        .easydropdown, .easydropdown-wrapper {
+          width:15px;
+        }
+      }
+
+
+
      .ftue-box.results {
        height: 230px !important;
+        padding:0;
+
+        .scoring-section {
+          font-size:15px;
+          @include border_box_sizing;
+          height:64px;
+        }
      }

      .audio-output {
@ -510,8 +532,8 @@
      .subcolumn.third {
        right:0px;
      }
-
    }
+
    .settings-controls {

      clear:both;
--- a/web/app/assets/stylesheets/client/jamkazam.css.scss
+++ b/web/app/assets/stylesheets/client/jamkazam.css.scss
@ -559,3 +559,8 @@ hr {
  height:20px;
  text-align:center;
 }
+
+body.jam .icheckbox_minimal {
+  display:inline-block;
+  position:relative;
+}
--- a/web/app/views/clients/gear/_gear_wizard.html.haml
+++ b/web/app/views/clients/gear/_gear_wizard.html.haml
@ -83,6 +83,15 @@
        .wizard-step-column
          %h2 Test Results
          .ftue-box.results
+            .left.w50.gold-fill.center.white.scoring-section
+              .p5
+                .latency LATENCY
+                %span.latency-score
+            .left.w50.green-fill.center.white.scoring-section
+              .p5
+                .io I/O
+                %span.io-rate-score
+                %span.io-var-score

        .clearall

@ -195,5 +204,11 @@
    %a.button-orange.btn-next{href:'#'} NEXT
    %a.button-orange.btn-close{href:'#', 'layout-action' => 'close'} CLOSE

+%script{type: 'text/template', id: 'template-audio-port'}
+  .audio-port
+    %input{ type: 'checkbox', 'data-id' => '{{data.id}}' }
+    %span
+      = '{{data.name}}'
+


--- a/web/app/views/layouts/client.html.erb
+++ b/web/app/views/layouts/client.html.erb
@ -7,12 +7,14 @@
    <![endif]-->
    <script src="//ajax.googleapis.com/ajax/libs/webfont/1.4.7/webfont.js"></script>
    <script>
+      if (window.WebFont) {
        WebFont.load({
          google: {
            families: ['Raleway:100,200,300,400,500,600,700']
          },
          timeout :5000
        });
+      }
    </script>
    <!--<link href='http://fonts.googleapis.com/css?family=Raleway:100,200,300,400,500,600,700' rel='stylesheet' type='text/css'>-->
    <%= stylesheet_link_tag    "client/client", media: "all" %>
--- a/web/app/views/layouts/corporate.html.erb
+++ b/web/app/views/layouts/corporate.html.erb
@ -4,12 +4,14 @@
  <title><%= full_title(yield(:title)) %></title>
  <script src="//ajax.googleapis.com/ajax/libs/webfont/1.4.7/webfont.js"></script>
  <script>
+    if (window.WebFont) {
      WebFont.load({
        google: {
          families: ['Raleway:100,200,300,400,500,600,700']
        },
        timeout :5000
      });
+    }
  </script>
  <!--<link href='http://fonts.googleapis.com/css?family=Raleway:100,200,300,400,500,600,700' rel='stylesheet' type='text/css'>-->
  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
--- a/web/app/views/layouts/landing.erb
+++ b/web/app/views/layouts/landing.erb
@ -8,12 +8,14 @@
        <![endif]-->
        <script src="//ajax.googleapis.com/ajax/libs/webfont/1.4.7/webfont.js"></script>
        <script>
+          if(window.WebFont){
            WebFont.load({
              google: {
                families: ['Raleway:100,200,300,400,500,600,700']
              },
              timeout :5000
            });
+          }
        </script>
        <!--<link href='http://fonts.googleapis.com/css?family=Raleway:100,200,300,400,500,600,700' rel='stylesheet' type='text/css'>-->
        <%= stylesheet_link_tag    "landing/landing", media: "all" %>
--- a/web/app/views/layouts/minimal.html.erb
+++ b/web/app/views/layouts/minimal.html.erb
@ -8,12 +8,14 @@
        <![endif]-->
        <script src="//ajax.googleapis.com/ajax/libs/webfont/1.4.7/webfont.js"></script>
        <script>
+          if (window.WebFont) {
            WebFont.load({
              google: {
                families: ['Raleway:100,200,300,400,500,600,700']
              },
              timeout :5000
            });
+          }
        </script>
        <!--<link href='http://fonts.googleapis.com/css?family=Raleway:100,200,300,400,500,600,700' rel='stylesheet' type='text/css'>-->
        <%= stylesheet_link_tag    "minimal/minimal", media: "all" %>
--- a/web/app/views/layouts/web.html.erb
+++ b/web/app/views/layouts/web.html.erb
@ -8,12 +8,14 @@
    <![endif]-->
    <script src="//ajax.googleapis.com/ajax/libs/webfont/1.4.7/webfont.js"></script>
    <script>
+      if (window.WebFont) {
        WebFont.load({
          google: {
            families: ['Raleway:100,200,300,400,500,600,700']
          },
          timeout:5000
        });
+      }
    </script>
    <!--<link href='http://fonts.googleapis.com/css?family=Raleway:100,200,300,400,500,600,700' rel='stylesheet' type='text/css'>-->
    <%= stylesheet_link_tag "web/web", media: "all" %>