Embed

- HTTPS

embed/core.js

@@ -572,6 +572,14 @@ function mistPlay(streamName,options) {
     //embedLog('Stream info contents: '+JSON.stringify(streaminfo));
     streaminfo.initTime = new Date();
     
+    //sort the sources by priority, but prefer HTTPS
+    streaminfo.source.sort(function(a,b){
+      function g(s) {
+        return s.priority + (s.url.indexOf('https://') > -1 ? 0.1 : 0)
+      }
+      return g(b) - g(a);
+    })
+    
     var mistPlayer = false;
     var source;
     var forceType = false;
@@ -615,12 +623,10 @@ function mistPlay(streamName,options) {
       return false;
     }
     function checkMime(p_shortname,mime) {
-      embedLog('Checking if Mist broadcasts '+mime+'..');
       for (var s in streaminfo.source) {
         if (streaminfo.source[s].type == mime) {
-          embedLog('Yup! Checking browser support..');
           if (mistplayers[p_shortname].isBrowserSupported(mime)) {
-            embedLog('Yup! This is a working player/source combo.');
+            embedLog('Found a working combo: '+mistplayers[p_shortname].name+' with '+mime+' @ '+streaminfo.source[s].url);
             streaminfo.working[p_shortname].push(mime);
             if (!source) {
               mistPlayer = p_shortname;
@@ -632,6 +638,8 @@ function mistPlay(streamName,options) {
           }
         }
       }
+      embedLog('Mist doesn\'t broadcast '+mime+' or there is no browser support.');
+      
       return false;
     }
     
@@ -652,8 +660,6 @@ function mistPlay(streamName,options) {
     }
     
     if (mistPlayer) {
-      embedLog('Preparing to build '+mistplayers[mistPlayer].name);
-      
       //create the options to send to the player
       var playerOpts = {
         src: source.url+(('urlappend' in options) && (options.urlappend) ? options.urlappend : '' ),

embed/test.html

@@ -15,7 +15,8 @@
     <script>
       // global options can be set here
       var mistoptions = {
-        host: 'http://cattop:8080'
+        //host: 'http://cat.mistserver.org:8080'
+        host: 'https://cat.mistserver.org:4433'
       };
     </script>
     
@@ -28,8 +29,6 @@
     <script src=wrappers/silverlight.js></script>
     <script src=wrappers/polytrope.js></script>
     
-    <script src=http://ajax.googleapis.com/ajax/libs/swfobject/2.2/swfobject.js>
-    
     <script src=players/dash.js></script>
 
     <link rel=stylesheet href=mist.css id=mist_player_css>
@@ -67,11 +66,15 @@
         
         //tryplayers = Object.keys(mistplayers);
         tryplayers = [];
-        //tryplayers.push('html5');
-        //tryplayers.push('dashjs');
-        tryplayers.push('flash_strobe');
+        tryplayers.push('html5');
+        tryplayers.push('dashjs');
+        //tryplayers.push('flash_strobe');
         //tryplayers.push('silverlight');
-        streams = ['live'];
+        streams = [];
+        //streams.push('live');
+        //streams.push('vids+mist.mp4');
+        //streams.push('lama');
+        streams.push('bunny');
         
         for (var j in streams) {
           for (var i in tryplayers) {
@@ -80,9 +83,6 @@
             c.title = tryplayers[i];
             document.body.appendChild(c);
             mistPlay(streams[j],{
-            //mistPlay('vids+mist.mp4',{
-            //mistPlay('lama',{
-            //mistPlay('bunny',{
               target: c,
               forcePlayer: tryplayers[i],
               loop: true