Merge branch 'master' into master

README.md

@@ -275,13 +275,13 @@ Si localizas algún fallo, o deseas añadir algún canal, puedes contactarme o a
 | Televisión Canaria | [m3u8](http://streaming2.mad.idec.net/rtvcnet/rtvcnet.drb.smil/Playlist.m3u8) | [web](http://www.rtvc.es/television/directo.aspx) | - | [Logo](https://upload.wikimedia.org/wikipedia/commons/thumb/0/01/Logo_de_Televisi%C3%B3n_Canaria.svg/1280px-Logo_de_Televisi%C3%B3n_Canaria.svg.png) | - |
 | Mírame TV | [m3u8](https://593fa17dec176.streamlock.net:455/mirametv/mirametv/master.m3u8) | [web](https://mirametv.com/) | - | [Logo](https://www.mirametv.com/images/wSystem/logo.png) | - |
 | El Día TV | [m3u8](http://vs8.live.opencaster.com/opencaster/zmyrfjHztaoj/playlist.m3u8) | [web](http://eldia.tv/) | - | [Logo](http://eldia.tv/blog/wp-content/uploads/2016/06/eldiatv.png) | - |
-| Lancelot TV | [m3u8](http://62.210.141.18:1935/directo/lancelot.television/playlist.m3u8) | [web](http://www.lancelot.tv/directo)| 576p | [Logo](http://www.lancelot.tv/images/logo.svg) | - |
+| Lancelot TV | [m3u8](http://62.210.141.18:1935/directo/lancelot.television/playlist.m3u8) | [web](http://www.lancelot.tv/directo)| - | [Logo](http://www.lancelot.tv/images/logo.png) | - |
-| Canal 4 Tenerife | [m3u8](https://5940924978228.streamlock.net/Directo2/Directo2/master.m3u8) | [web](http://www.canal4tenerife.tv/) | 576p | [Logo](http://www.canal4tenerife.tv/wp-content/uploads/2017/02/LOGO-CANAL-4-azul-80.png) | - |
+| Canal 4 Tenerife | [m3u8](https://5940924978228.streamlock.net/Directo2/Directo2/chunklist_w588840931.m3u8) | [web](http://www.canal4tenerife.tv/) | - | [Logo](http://www.canal4tenerife.tv/wp-content/uploads/2017/02/LOGO-CANAL-4-azul-80.png) | - |
 | Tindaya TV | [m3u8](https://streaming-fr02.enetres.net/0537FCE9817D4E9E930B6ED4D9C7BD5C021/smil:live.smil/chunklist_w365927815_b1000000.m3u8) | [web](https://www.tindayatv.com/) | - | [Logo](https://3.bp.blogspot.com/-Rq81jbqjWb4/WXifCezpqoI/AAAAAAAAwxc/RycTr3iKG50UqHjLXy1JzlZwLUikE1KQgCLcBGAs/s640/tindaya-tv-.png) | - |
 | Canal 4 TV | - | [web](https://canal4tvtelde.es/en-directo) | - | [Logo](https://canal4tvtelde.es/media/k2/categories/72.jpg) | - |
 | Biosfera TV | - | [web](http://www.biosferatv.es/) | - | [Logo](http://www.biosferatv.es/gallery_gen/c8ad7ac64fa30f24cfb063f403bfe5d5_280x70.png) | - |
-| Este Canal TV | [m3u8](https://playback.akamaized.net/streams/8817409_7051352_lsim8fegxb99bog0ims_1/media/8817409_7051352_lsim8fegxb99bog0ims_1@696000p.m3u8?dw=14400&ts=1544626800&hdnts=exp=1544800323~acl=/streams/8817409_7051352_lsim8fegxb99bog0ims_1/media*~hmac=553953674e4157f1ab0b15ca3126ec170e0f8602e2c14b40441a6271660f64d9) | [web](https://livestream.com/estecanaltv/events/7051352) | - | [Logo](https://pbs.twimg.com/profile_images/1244322522/logo_estacanal.jpg) | - |
+| Este Canal TV | - | [web](https://livestream.com/estecanaltv/events/7051352) | - | [Logo](https://pbs.twimg.com/profile_images/1244322522/logo_estacanal.jpg) | - |
-| Canal 13 Digital | [m3u8](http://212.40.234.65/live/canal13/playlist.m3u8) | [web](https://rtvos5.wixsite.com/canal13) | - | [Logo](https://static.wixstatic.com/media/a9aebc_3c86b1b933ac4eb0884ebd62f1261547~mv2_d_3882_3882_s_4_2.png/v1/crop/x_309,y_0,w_3265,h_3882/fill/w_132,h_168,al_c,q_80,usm_0.66_1.00_0.01/a9aebc_3c86b1b933ac4eb0884ebd62f1261547~mv2_d_3882_3882_s_4_2.webp) | - |
+| Canal 13 Digital | [m3u8](http://212.40.234.65/live/canal13/playlist.m3u8) | [web](https://rtvos5.wixsite.com/canal13) | - | [Logo](https://i1.wp.com/directostv.teleame.com/wp-content/uploads/2018/02/canal-13-digital.png) | - |
 | Gigante TV | [m3u8](http://85.214.130.95:8080/live/stream.m3u8) | [web](http://gigantetv.es/) | - | [Logo](http://gigantetv.es/wp-content/uploads/2017/02/cropped-prueba-gigante2.jpg) | - |
 | Mi Tierra Televisión | - | [web](http://www.mitierratelevision.com/directo/) | - | [Logo](http://www.mitierratelevision.com/wp-content/themes/mitierraTV/gfx/logoMT_sintexto.png) | - |
 | Televisión Mogán | [m3u8](https://5b38ce71f1f00.streamlock.net/8162/8162/chunklist_w1059529458.m3u8) | [web](http://www.mogan.es/45-radio-television-de-mogan/3382-ver-television-mogan) | - | [Logo](https://i2.wp.com/directostv.teleame.com/wp-content/uploads/2018/03/television-mogan.png) | - |

script/public/index.html

@@ -3,22 +3,16 @@
     <meta charset="utf-8"/>
     <title>TDT Channels - Marc Vila</title>
     <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/clappr@latest/dist/clappr.min.js"></script>
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css"
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css">
-          integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO" crossorigin="anonymous">
+    <script src="https://code.jquery.com/jquery-3.3.1.min.js"></script>
-    <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js"
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js"></script>
-            integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo"
+    <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/js/bootstrap.min.js"></script>
-            crossorigin="anonymous"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js"
-            integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49"
-            crossorigin="anonymous"></script>
-    <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/js/bootstrap.min.js"
-            integrity="sha384-ChfqqxuZUCnJSK3+MXmPNIyE6ZbWh2IMqE241rYiqJxyMiZ6OW/JmZQ5stwEULTy"
-            crossorigin="anonymous"></script>
 
+    <script src="./index.js"></script>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 </head>
 <body>
-<div class="container" style="margin-top: 30px; margin-bottom: 30px">
+<div class="container" style="margin-top: 30px; margin-bottom: 30px; padding-bottom: 50px;">
     <h1 class="display-3">TDTChannels</h1>
     <p class="lead">
         Bienvenido al reproductor del proyecto opensource TDTChannels
@@ -37,7 +31,7 @@
             <p class="lead">
                 Reproductor de Televisión
             </p>
-            <p>Formatos soportados: <em>m3u8</em></p>
+
             <div class="input-group mb-3">
                 <input id="input-reproduccion-video" type="text" class="form-control" placeholder="URL de reproducción">
                 <div class="input-group-append">
@@ -47,13 +41,22 @@
                 </div>
             </div>
             <div id="video-player"></div>
+            <div id="video-information" class="shadow-sm p-3 mb-5 bg-white rounded" style="margin-top: 15px">
+                <p class="lead">Información de la reproducción</p>
+                Formatos soportados
+                <br>
+                <em>m3u8</em>
+                <br><br>
+                Resoluciones disponibles
+                <br>
+                <em id="video-resolution"></em>
+            </div>
         </div>
 
         <div id="audio" style="margin-top: 15px">
             <p class="lead">
                 Reproductor de Radio
             </p>
-            <p>Formatos soportados: <em>nsv</em></p>
             <div class="input-group mb-3">
                 <input id="input-reproduccion-audio" type="text" class="form-control" placeholder="URL de reproducción">
                 <div class="input-group-append">
@@ -66,28 +69,29 @@
                 <source id="audio-player" src="" autoplay>
                 Your browser does not support the audio element.
             </audio>
+            <div id="audio-information" class="shadow-sm p-3 mb-5 bg-white rounded" style="margin-top: 15px">
+                <p class="lead">Información de la reproducción</p>
+                Formatos soportados
+                <br>
+                <em>nsv</em>
+            </div>
         </div>
     </div>
 </div>
+
+<div class="navbar fixed-bottom container">
+    <div class="alert alert-warning alert-dismissible fade show" role="alert">
+        <em><strong>Nota</strong>: Esta web está diseñada únicamente para comprobar el funcionamiento con los canales
+            del repositorio. Queda fuera del objetivo algún otro uso. El usuario es el responsable del
+            uso que se le da a la web.</em>
+        <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+            <span aria-hidden="true">&times;</span>
+        </button>
+    </div>
+</div>
 <script>
     // Se espera en la URL este tipo de llamada
     // .html?type={audio,video}&channel={url_a_reproducir}
-
-    var getUrlParameter = function getUrlParameter(sParam) {
-        var sPageURL = decodeURIComponent(window.location.search.substring(1)),
-            sURLVariables = sPageURL.split('&'),
-            sParameterName,
-            i;
-
-        for (i = 0; i < sURLVariables.length; i++) {
-            sParameterName = sURLVariables[i].split('=');
-
-            if (sParameterName[0] === sParam) {
-                return sParameterName[1] === undefined ? true : sParameterName[1];
-            }
-        }
-    };
-
     var player;
 
     var typeToReproduce = getUrlParameter("type");
@@ -130,6 +134,8 @@
                   source: channelToReproduce,
                 });
             }
+            clearResolutions();
+            getResolution(channelToReproduce, updateResolution);
         }
 	}
 
@@ -158,6 +164,22 @@
         }
     }
 
+    function updateResolution(resolutions) {
+        console.log("Resoluciones: " + resolutions);
+
+        for (i = 0; i < resolutions.length; i++) {
+            var resolutionToAdd = resolutions[i];
+            if (i < resolutions.length - 1){
+                resolutionToAdd += ", ";
+            }
+            document.getElementById("video-resolution").innerHTML += resolutionToAdd;
+        }
+    }
+
+    function clearResolutions() {
+        document.getElementById("video-resolution").innerHTML = "";
+    }
+
 </script>
 </body>
 </html>

script/public/index.js

@@ -0,0 +1,32 @@
+function getResolution(from, fn_callback) {
+    $.get(from, function(data) {
+        $response = data.split("\n");
+
+        $resolutions=[];
+        $.each($response, function( index, value ) {
+            $line_separated_value = value.split(",");
+            for (i = 0; i < $line_separated_value.length; i++) {
+                if ($line_separated_value[i].indexOf("RESOLUTION=") != -1) {
+                    $resolutions.push($line_separated_value[i].split('=')[1]);
+                }
+            }
+        });
+
+        fn_callback($resolutions);
+    });
+}
+
+function getUrlParameter(sParam) {
+    var sPageURL = decodeURIComponent(window.location.search.substring(1)),
+        sURLVariables = sPageURL.split('&'),
+        sParameterName,
+        i;
+
+    for (i = 0; i < sURLVariables.length; i++) {
+        sParameterName = sURLVariables[i].split('=');
+
+        if (sParameterName[0] === sParam) {
+            return sParameterName[1] === undefined ? true : sParameterName[1];
+        }
+    }
+};