remove old code
This commit is contained in:
parent
ee82c7082c
commit
97e345d888
3 changed files with 3 additions and 10 deletions
|
@ -26,8 +26,8 @@ def show_player(appname, hlsindex):
|
||||||
playerTemplate = '%s/player.html.j2' % zomstream.configuration['template_folder']
|
playerTemplate = '%s/player.html.j2' % zomstream.configuration['template_folder']
|
||||||
page = flask.render_template(
|
page = flask.render_template(
|
||||||
playerTemplate,
|
playerTemplate,
|
||||||
hlsindex=hlsindex,
|
|
||||||
appname=appname,
|
appname=appname,
|
||||||
|
hlsindex=hlsindex,
|
||||||
configuration=zomstream.configuration
|
configuration=zomstream.configuration
|
||||||
)
|
)
|
||||||
return page
|
return page
|
||||||
|
|
|
@ -27,26 +27,19 @@
|
||||||
<th></th>
|
<th></th>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td>RTMP substream {{ item[2] }}</td>
|
<td>RTMP substream }}</td>
|
||||||
<td><em class="url">rtmp://{{ configuration["rtmp_base"] }}/{{ item[0] }}/{{ item[2] }}</em></td>
|
<td><em class="url">rtmp://{{ configuration["rtmp_base"] }}/{{ item[0] }}/{{ item[2] }}</em></td>
|
||||||
<td class="btn"><a href="rtmp://{{ configuration['rtmp_base'] }}/{{ item[0] }}/{{ item[2] }}" class="btn btn-red">▶<br/>RTMP</a></td>
|
<td class="btn"><a href="rtmp://{{ configuration['rtmp_base'] }}/{{ item[0] }}/{{ item[2] }}" class="btn btn-red">▶<br/>RTMP</a></td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td>HLS m3u8</td>
|
<td>HLS m3u8</td>
|
||||||
<td><em class="url">{{ configuration['web_proto'] }}://{{ configuration['base_url'] }}/hls/{{ item[1] }}/index.m3u8</em></td>
|
<td><em class="url">{{ configuration['web_proto'] }}://{{ configuration['base_url'] }}/hls/{{ item[1] }}/index.m3u8</em></td>
|
||||||
<!-- <td class="btn"><a href="{{ configuration['web_proto'] }}://{{ configuration['base_url'] }}/player/{{ item[1] }}" class="btn btn-green">▶<br/>HLS.js</a></td> -->
|
|
||||||
<td class="btn"><a href="{{ url_for('frontend.show_player', appname=item[0], hlsindex=item[1]) }}" class="btn btn-green">▶<br/>HLS.js</a></td>
|
<td class="btn"><a href="{{ url_for('frontend.show_player', appname=item[0], hlsindex=item[1]) }}" class="btn btn-green">▶<br/>HLS.js</a></td>
|
||||||
</tr>
|
</tr>
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
</article>
|
</article>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
|
||||||
<a href="{{ url_for('frontend.show_player', streamname=item[1], appname=item[0]) }}"
|
|
||||||
class="btn-large btn-green">
|
|
||||||
▷ Web Player
|
|
||||||
</a>
|
|
||||||
|
|
||||||
</main>
|
</main>
|
||||||
<footer>
|
<footer>
|
||||||
{{ configuration["footer"] }}
|
{{ configuration["footer"] }}
|
||||||
|
|
|
@ -41,7 +41,7 @@ class Zomstream:
|
||||||
name = stream.find('name')
|
name = stream.find('name')
|
||||||
rate = stream.find('bw_video')
|
rate = stream.find('bw_video')
|
||||||
streamname = name.text
|
streamname = name.text
|
||||||
hlsindex = streamname.split('_'[0]
|
hlsindex = streamname.split('_')[0]
|
||||||
if rate.text != "0":
|
if rate.text != "0":
|
||||||
self.streamnames.append( [appname.text, hlsindex, streamname] )
|
self.streamnames.append( [appname.text, hlsindex, streamname] )
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue