diff --git a/embed/imgs/speaker.svg b/embed/imgs/speaker.svg index fc410864..b4a3bd4f 100644 --- a/embed/imgs/speaker.svg +++ b/embed/imgs/speaker.svg @@ -25,15 +25,15 @@ inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:zoom="19.289873" - inkscape:cx="7.9448655" + inkscape:cx="-2.0603844" inkscape:cy="14.079113" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" - inkscape:window-width="1181" - inkscape:window-height="865" - inkscape:window-x="64" - inkscape:window-y="102" + inkscape:window-width="1918" + inkscape:window-height="1040" + inkscape:window-x="0" + inkscape:window-y="19" inkscape:window-maximized="0"> + id="rect4139" /> diff --git a/embed/imgs/speaker_plain.svg b/embed/imgs/speaker_plain.svg index 29eaeb79..170df4cf 100644 --- a/embed/imgs/speaker_plain.svg +++ b/embed/imgs/speaker_plain.svg @@ -1 +1 @@ -image/svg+xml + image/svg+xml diff --git a/embed/mist.css b/embed/mist.css index edc1ff90..71fddc0c 100644 --- a/embed/mist.css +++ b/embed/mist.css @@ -232,7 +232,7 @@ width: 25px; height: 25px; margin: 0; - background-image: url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+PHN2ZyB4bWxuczpkYz0iaHR0cDovL3B1cmwub3JnL2RjL2VsZW1lbnRzLzEuMS8iIHhtbG5zOmNjPSJodHRwOi8vY3JlYXRpdmVjb21tb25zLm9yZy9ucyMiIHhtbG5zOnJkZj0iaHR0cDovL3d3dy53My5vcmcvMTk5OS8wMi8yMi1yZGYtc3ludGF4LW5zIyIgeG1sbnM6c3ZnPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB2ZXJzaW9uPSIxLjEiIGlkPSJzdmc0NjU5IiBoZWlnaHQ9IjI1IiB3aWR0aD0iMjUiPjxkZWZzIGlkPSJkZWZzNDY2MSIgLz48bWV0YWRhdGEgaWQ9Im1ldGFkYXRhNDY2NCI+PHJkZjpSREY+PGNjOldvcmsgcmRmOmFib3V0PSIiPjxkYzpmb3JtYXQ+aW1hZ2Uvc3ZnK3htbDwvZGM6Zm9ybWF0PjxkYzp0eXBlIHJkZjpyZXNvdXJjZT0iaHR0cDovL3B1cmwub3JnL2RjL2RjbWl0eXBlL1N0aWxsSW1hZ2UiIC8+PGRjOnRpdGxlPjwvZGM6dGl0bGU+PC9jYzpXb3JrPjwvcmRmOlJERj48L21ldGFkYXRhPjxnIHRyYW5zZm9ybT0idHJhbnNsYXRlKDAsLTEwMjcuMzYyMikiIGlkPSJsYXllcjEiPjxwYXRoIGlkPSJyZWN0NDE1OSIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMCwxMDI3LjM2MjIpIiBkPSJNIDAgMCBMIDAgMjUgTCAyNSAyNSBMIDI1IDAgTCAwIDAgeiBNIDE3Ljc4OTA2MiAwLjc0NjA5Mzc1IEMgMTguMjk1MTM5IDAuNzY3NzkwNDMgMTguNzk2OTM2IDAuOTE1NDM0MzggMTkuMjUgMS4xODU1NDY5IEwgMTkuMjUgMjMuODEyNSBDIDE4LjA0MTUxMiAyNC41MzQ2IDE2LjQ4MTgzMiAyNC4zNzc0OTQgMTUuNDQ1MzEyIDIzLjMwODU5NCBMIDEwLjM0MTc5NyAxOC4wNDY4NzUgTCA4LjA4Nzg5MDYgMTguMDQ2ODc1IEMgNi43OTk3OTc2IDE4LjA0Njg3NSA1Ljc1IDE2Ljk2MzI2NiA1Ljc1IDE1LjYzNDc2NiBMIDUuNzUgOS4zNjMyODEyIEMgNS43NSA4LjAzNDg4MTIgNi43OTk3OTc2IDYuOTUxMTcxOSA4LjA4Nzg5MDYgNi45NTExNzE5IEwgMTAuMzQxNzk3IDYuOTUxMTcxOSBMIDE1LjQ0NTMxMiAxLjY4OTQ1MzEgQyAxNi4wOTI3NTkgMS4wMjE3MDMxIDE2Ljk0NTYwMiAwLjcwOTkzMjYyIDE3Ljc4OTA2MiAwLjc0NjA5Mzc1IHogIiBzdHlsZT0ib3BhY2l0eToxO2ZpbGw6IzAwMDAwMDtmaWxsLW9wYWNpdHk6MTtmaWxsLXJ1bGU6ZXZlbm9kZDtzdHJva2U6bm9uZTtzdHJva2Utd2lkdGg6MS41O3N0cm9rZS1taXRlcmxpbWl0OjQ7c3Ryb2tlLWRhc2hhcnJheTpub25lO3N0cm9rZS1kYXNob2Zmc2V0OjA7c3Ryb2tlLW9wYWNpdHk6MSIgLz48cGF0aCBpZD0icmVjdDQ1NzQiIGQ9Im0gMTkuMjUsMTAyOC41NDczIGMgLTEuMjA4MTcsLTAuNzIwMyAtMi43Njk1OTksLTAuNTY0IC0zLjgwNTUxMywwLjUwNDQgbCAtNS4xMDIzNjIsNS4yNjIyIC0yLjI1MzU0MTgsMCBjIC0xLjI4ODA5MywwIC0yLjMzODU4MzIsMS4wODM0IC0yLjMzODU4MzIsMi40MTE4IGwgMCw2LjI3MDkgYyAwLDEuMzI4NSAxLjA1MDQ5MDIsMi40MTE5IDIuMzM4NTgzMiwyLjQxMTkgbCAyLjI1MzU0MTgsMCA1LjEwMjM2Miw1LjI2MjMgYyAxLjAzNjUyLDEuMDY4OSAyLjU5NzAyNSwxLjIyNjMgMy44MDU1MTMsMC41MDQyIGwgMCwtMjIuNjI3NyB6IiBzdHlsZT0iZmlsbDpub25lO2ZpbGwtb3BhY2l0eToxO3N0cm9rZTojZmZmZmZmO3N0cm9rZS13aWR0aDoxLjU7c3Ryb2tlLW1pdGVybGltaXQ6NDtzdHJva2UtZGFzaGFycmF5Om5vbmU7c3Ryb2tlLW9wYWNpdHk6MSIgLz48L2c+PC9zdmc+"); + background-image: url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+PHN2ZyB4bWxuczpkYz0iaHR0cDovL3B1cmwub3JnL2RjL2VsZW1lbnRzLzEuMS8iIHhtbG5zOmNjPSJodHRwOi8vY3JlYXRpdmVjb21tb25zLm9yZy9ucyMiIHhtbG5zOnJkZj0iaHR0cDovL3d3dy53My5vcmcvMTk5OS8wMi8yMi1yZGYtc3ludGF4LW5zIyIgeG1sbnM6c3ZnPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB2ZXJzaW9uPSIxLjEiIGlkPSJzdmc0NjU5IiBoZWlnaHQ9IjI1IiB3aWR0aD0iMjUiPiA8ZGVmcyBpZD0iZGVmczQ2NjEiIC8+IDxtZXRhZGF0YSBpZD0ibWV0YWRhdGE0NjY0Ij4gPHJkZjpSREY+IDxjYzpXb3JrIHJkZjphYm91dD0iIj4gPGRjOmZvcm1hdD5pbWFnZS9zdmcreG1sPC9kYzpmb3JtYXQ+IDxkYzp0eXBlIHJkZjpyZXNvdXJjZT0iaHR0cDovL3B1cmwub3JnL2RjL2RjbWl0eXBlL1N0aWxsSW1hZ2UiIC8+IDxkYzp0aXRsZT48L2RjOnRpdGxlPiA8L2NjOldvcms+IDwvcmRmOlJERj4gPC9tZXRhZGF0YT4gPGcgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMCwtMTAyNy4zNjIyKSIgaWQ9ImxheWVyMSI+IDxwYXRoIGlkPSJyZWN0NDEzOSIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMCwxMDI3LjM2MjIpIiBkPSJNIDAgMCBMIDAgMjUgTCAyNSAyNSBMIDI1IDAgTCAwIDAgeiBNIDE2Ljk1NTA3OCAyLjUxNzU3ODEgQyAxNy4zODE1MDcgMi41MzYwMDIzIDE3LjgwNTc0IDIuNjYxMiAxOC4xODc1IDIuODkwNjI1IEwgMTguMTg3NSAyMi4xMDkzNzUgQyAxNy4xNjkyMDYgMjIuNzIyNjc1IDE1Ljg1Mzg2IDIyLjU4NzQ4NyAxNC45ODA0NjkgMjEuNjc5Njg4IEwgMTAuNjgxNjQxIDE3LjIxMDkzOCBMIDguNzgzMjAzMSAxNy4yMTA5MzggQyA3LjY5NzgzMzEgMTcuMjEwOTM4IDYuODEyNSAxNi4yOTA0MDkgNi44MTI1IDE1LjE2MjEwOSBMIDYuODEyNSA5LjgzNTkzNzUgQyA2LjgxMjUgOC43MDc3Mzc1IDcuNjk3ODMzMSA3Ljc4OTA2MjUgOC43ODMyMDMxIDcuNzg5MDYyNSBMIDEwLjY4MTY0MSA3Ljc4OTA2MjUgTCAxNC45ODA0NjkgMy4zMTgzNTk0IEMgMTUuNTI2MDE5IDIuNzUxMjM0NCAxNi4yNDQzNjMgMi40ODY4NzExIDE2Ljk1NTA3OCAyLjUxNzU3ODEgeiAiIHN0eWxlPSJjb2xvcjojMDAwMDAwO2NsaXAtcnVsZTpub256ZXJvO2Rpc3BsYXk6aW5saW5lO292ZXJmbG93OnZpc2libGU7dmlzaWJpbGl0eTp2aXNpYmxlO29wYWNpdHk6MTtpc29sYXRpb246YXV0bzttaXgtYmxlbmQtbW9kZTpub3JtYWw7Y29sb3ItaW50ZXJwb2xhdGlvbjpzUkdCO2NvbG9yLWludGVycG9sYXRpb24tZmlsdGVyczpsaW5lYXJSR0I7c29saWQtY29sb3I6IzAwMDAwMDtzb2xpZC1vcGFjaXR5OjE7ZmlsbDojMDAwMDAwO2ZpbGwtb3BhY2l0eToxO2ZpbGwtcnVsZTpldmVub2RkO3N0cm9rZTpub25lO3N0cm9rZS13aWR0aDowO3N0cm9rZS1saW5lY2FwOmJ1dHQ7c3Ryb2tlLWxpbmVqb2luOm1pdGVyO3N0cm9rZS1taXRlcmxpbWl0OjQ7c3Ryb2tlLWRhc2hhcnJheTpub25lO3N0cm9rZS1kYXNob2Zmc2V0OjA7c3Ryb2tlLW9wYWNpdHk6MTtjb2xvci1yZW5kZXJpbmc6YXV0bztpbWFnZS1yZW5kZXJpbmc6YXV0bztzaGFwZS1yZW5kZXJpbmc6YXV0bzt0ZXh0LXJlbmRlcmluZzphdXRvO2VuYWJsZS1iYWNrZ3JvdW5kOmFjY3VtdWxhdGUiIC8+IDxwYXRoIGlkPSJyZWN0NDU3NCIgZD0ibSAxOC4xODc2NzQsMTAzMC4yNTMxIGMgLTEuMDE4MDI2LC0wLjYxMTggLTIuMzMzNzE1LC0wLjQ3OSAtMy4yMDY1OTUsMC40Mjg0IGwgLTQuMjk5MzQ0LDQuNDY5MSAtMS44OTg4NzU3LDAgYyAtMS4wODUzNzA4LDAgLTEuOTcwNTMzMSwwLjkyMDEgLTEuOTcwNTMzMSwyLjA0ODMgbCAwLDUuMzI1OCBjIDAsMS4xMjgzIDAuODg1MTYyMywyLjA0ODQgMS45NzA1MzMxLDIuMDQ4NCBsIDEuODk4ODc1NywwIDQuMjk5MzQ0LDQuNDY5MyBjIDAuODczMzkxLDAuOTA3OCAyLjE4ODMwMSwxLjA0MTUgMy4yMDY1OTUsMC40MjgyIGwgMCwtMTkuMjE3NSB6IiBzdHlsZT0iZmlsbDpub25lO2ZpbGwtb3BhY2l0eToxO3N0cm9rZTojZmZmZmZmO3N0cm9rZS13aWR0aDoxLjU7c3Ryb2tlLW1pdGVybGltaXQ6NDtzdHJva2UtZGFzaGFycmF5Om5vbmU7c3Ryb2tlLW9wYWNpdHk6MSIgLz4gPC9nPjwvc3ZnPg=="); position: absolute; top: 30px; background-color: white; diff --git a/embed/test.html b/embed/test.html index e77c8f0c..dbf6d49a 100644 --- a/embed/test.html +++ b/embed/test.html @@ -19,6 +19,7 @@ //host: 'http://thulmk3:8080' //host: 'https://cat.mistserver.org:4433' //host: 'http://localhost:8080' + //host: 'http://live.us.picarto.tv:8080' }; @@ -85,14 +86,14 @@ //tryplayers.push('flash_strobe'); //tryplayers.push('silverlight'); streams = []; - streams.push('live'); - //streams.push('golive+ThePaddedRoom'); + //streams.push('live'); + //streams.push('golive+emitan'); //streams.push('subtel'); //streams.push('ogg'); //streams.push('vids+mist.mp4'); //streams.push('vids+hahalol.mp3'); //streams.push('lama'); - //streams.push('bunny'); + streams.push('bunny'); for (var j in streams) { for (var i in tryplayers) { @@ -105,9 +106,11 @@ maxwidth: 800, forcePlayer: tryplayers[i], //forceType: 'html5/video/mp4', + //forceType: 'html5/audio/mp3', //forceType: 'html5/application/vnd.apple.mpegurl', //forceType: 'dash/video/mp4', - //forceSource: 5, + forceType: 'html5/video/mp2t', + //forceSource: 3, loop: true, //controls: 'stock' }); diff --git a/embed/wrappers/html5.js b/embed/wrappers/html5.js index c4be5e96..d6cce627 100644 --- a/embed/wrappers/html5.js +++ b/embed/wrappers/html5.js @@ -12,8 +12,8 @@ mistplayers.html5 = { var shortmime = mimetype.split('/'); shortmime.shift(); - if ((shortmime[0] == 'audio') && (streaminfo.height)) { - //claim you don't support audio only playback if there is video data + if ((shortmime[0] == 'audio') && (streaminfo.height) && (!options.forceType) && (!options.forceSource)) { + //claim you don't support audio-only playback if there is video data, unless this mime is being forced return false; } diff --git a/lsp/minified.js b/lsp/minified.js index 1d1516e7..cdd390c4 100644 --- a/lsp/minified.js +++ b/lsp/minified.js @@ -1,11 +1,11 @@ -var MD5=function(a){function b(a,b){var g,c,d,h,i;d=a&2147483648;h=b&2147483648;g=a&1073741824;c=b&1073741824;i=(a&1073741823)+(b&1073741823);return g&c?i^2147483648^d^h:g|c?i&1073741824?i^3221225472^d^h:i^1073741824^d^h:i^d^h}function c(a,g,c,d,h,i,f){a=b(a,b(b(g&c|~g&d,h),f));return b(a<>>32-i,g)}function d(a,g,c,d,h,i,f){a=b(a,b(b(g&d|c&~d,h),f));return b(a<>>32-i,g)}function e(a,g,c,d,h,i,f){a=b(a,b(b(g^c^d,h),f));return b(a<>>32-i,g)}function k(a,g,c,d,h,i,f){a=b(a,b(b(c^(g|~d), -h),f));return b(a<>>32-i,g)}function m(a){var b="",g="",c;for(c=0;3>=c;c++)g=a>>>8*c&255,g="0"+g.toString(16),b+=g.substr(g.length-2,2);return b}var f=[],q,p,l,v,h,g,i,j,f=a.replace(/\r\n/g,"\n"),a="";for(q=0;qp?a+=String.fromCharCode(p):(127p?a+=String.fromCharCode(p>>6|192):(a+=String.fromCharCode(p>>12|224),a+=String.fromCharCode(p>>6&63|128)),a+=String.fromCharCode(p&63|128));f=a;a=f.length;q=a+8;p=16*((q-q%64)/64+1);l=Array(p-1);for(h=v=0;h>>29;f=l;h=1732584193;g=4023233417;i=2562383102;j=271733878;for(a=0;ac?1*d:a .menu"),main:$("main"),header:$("header"),connection:{status:$("#connection"),user_and_host:$("#user_and_host"),msg:$("#message")}};UI.buildMenu();UI.stored.getOpts();try{if("mistLogin"in sessionStorage){var a=JSON.parse(sessionStorage.mistLogin);mist.user.name=a.name;mist.user.password=a.password;mist.user.host=a.host}}catch(b){}location.hash&&(a=decodeURIComponent(location.hash).substring(1).split("@")[0].split("&"),mist.user.name=a[0],a[1]&&(mist.user.host= +var MD5=function(a){function b(a,b){var c,d,g,e,h;g=a&2147483648;e=b&2147483648;c=a&1073741824;d=b&1073741824;h=(a&1073741823)+(b&1073741823);return c&d?h^2147483648^g^e:c|d?h&1073741824?h^3221225472^g^e:h^1073741824^g^e:h^g^e}function c(a,c,d,g,e,h,i){a=b(a,b(b(c&d|~c&g,e),i));return b(a<>>32-h,c)}function d(a,c,d,g,e,h,i){a=b(a,b(b(c&g|d&~g,e),i));return b(a<>>32-h,c)}function e(a,c,d,g,e,h,i){a=b(a,b(b(c^d^g,e),i));return b(a<>>32-h,c)}function g(a,c,d,g,e,h,i){a=b(a,b(b(d^(c|~g), +e),i));return b(a<>>32-h,c)}function m(a){var b="",c="",d;for(d=0;3>=d;d++)c=a>>>8*d&255,c="0"+c.toString(16),b+=c.substr(c.length-2,2);return b}var f=[],q,p,l,u,h,i,k,j,f=a.replace(/\r\n/g,"\n"),a="";for(q=0;qp?a+=String.fromCharCode(p):(127p?a+=String.fromCharCode(p>>6|192):(a+=String.fromCharCode(p>>12|224),a+=String.fromCharCode(p>>6&63|128)),a+=String.fromCharCode(p&63|128));f=a;a=f.length;q=a+8;p=16*((q-q%64)/64+1);l=Array(p-1);for(h=u=0;h>>29;f=l;h=1732584193;i=4023233417;k=2562383102;j=271733878;for(a=0;ac?1*d:a .menu"),main:$("main"),header:$("header"),connection:{status:$("#connection"),user_and_host:$("#user_and_host"),msg:$("#message")}};UI.buildMenu();UI.stored.getOpts();try{if("mistLogin"in sessionStorage){var a=JSON.parse(sessionStorage.mistLogin);mist.user.name=a.name;mist.user.password=a.password;mist.user.host=a.host}}catch(b){}location.hash&&(a=decodeURIComponent(location.hash).substring(1).split("@")[0].split("&"),mist.user.name=a[0],a[1]&&(mist.user.host= a[1]));mist.send(function(){$(window).trigger("hashchange")},{},{timeout:5,hide:!0});var c=0;$("body > div.filler").on("scroll",function(){var a=$(this).scrollLeft();a!=c&&UI.elements.header.css("margin-right",-1*a+"px");c=a})});$(window).on("hashchange",function(){var a=decodeURIComponent(location.hash).substring(1).split("@");a[1]||(a[1]="");a=a[1].split("&");""==a[0]&&(a[0]="Overview");UI.showTab(a[0],a[1])}); var otherhost={host:!1,https:!1},UI={debug:!1,elements:{},stored:{getOpts:function(){var a=localStorage.stored;a&&(a=JSON.parse(a));$.extend(!0,this.vars,a);return this.vars},saveOpt:function(a,b){this.vars[a]=b;localStorage.stored=JSON.stringify(this.vars);return this.vars},vars:{helpme:!0}},interval:{clear:function(){"undefined"!=typeof this.opts&&(clearInterval(this.opts.id),delete this.opts)},set:function(a,b){this.opts&&log("[interval]","Set called on interval, but an interval is already active."); this.opts={delay:b,callback:a};this.opts.id=setInterval(a,b)}},returnTab:["Overview"],countrylist:{AF:"Afghanistan",AX:"Åland Islands",AL:"Albania",DZ:"Algeria",AS:"American Samoa",AD:"Andorra",AO:"Angola",AI:"Anguilla",AQ:"Antarctica",AG:"Antigua and Barbuda",AR:"Argentina",AM:"Armenia",AW:"Aruba",AU:"Australia",AT:"Austria",AZ:"Azerbaijan",BS:"Bahamas",BH:"Bahrain",BD:"Bangladesh",BB:"Barbados",BY:"Belarus",BE:"Belgium",BZ:"Belize",BJ:"Benin",BM:"Bermuda",BT:"Bhutan",BO:"Bolivia, Plurinational State of", @@ -21,145 +21,146 @@ clearTimeout(this.hiding);delete this.hiding;var c=$(document).height()-$tooltip "HLS";break;case "html5/video/mp4":b="MP4";break;case "dash/video/mp4":b="DASH";break;case "flash/11":b="HDS";break;case "flash/10":b="RTMP";break;case "flash/7":b="Progressive";break;case "html5/audio/mp3":b="MP3";break;case "html5/video/mp2t":b="TS";break;case "html5/application/vnd.ms-ss":b="Smooth";break;case "html5/text/vtt":b="VTT Subtitles";break;case "html5/text/plain":b="SRT Subtitles";break;case "html5/text/javascript":b="JSON Subtitles"}return b},popup:{element:null,show:function(a){this.element= $("
").attr("id","popup").append($("