diff --git a/lib/PiTube/Controller/Stream.pm b/lib/PiTube/Controller/Stream.pm index 3967581b8adcef6b8a9ab26d71872e58eb31c36f..8cf043f3a457ba50738f2a9419c91a0ceae658e7 100644 --- a/lib/PiTube/Controller/Stream.pm +++ b/lib/PiTube/Controller/Stream.pm @@ -27,7 +27,7 @@ sub player { my $c = shift; # stream - my $stream = $c->schema->resultset('Stream')->find({ + my $stream = $c->schema->resultset('Stream_view')->find({ key => $c->stash->{key} }); diff --git a/templates/stream/403.html.ep b/templates/stream/403.html.ep index fc221ac0385ccbb3e226ed6f2b5aa2dd74b9a1b0..4fb0ee3c93d169b4a18f2d1462c6009fa3798abb 100644 --- a/templates/stream/403.html.ep +++ b/templates/stream/403.html.ep @@ -3,3 +3,8 @@ <p class="Error"> Nemáte oprávnění ke sledování streamu <strong>"<%= $c->stash->{stream}->name %>"</strong> </p> +% if ( $c->is('publisher')) { +<p> +stream rtp url: <%= $ENV{RTMP_BASE_URL} %>/<%= $c->stash->{stream}->key %>?token=<%= $c->current_user->token %> +</p> +% } diff --git a/templates/stream/list.html.ep b/templates/stream/list.html.ep index 2807aa5eb3ea4a0a09b9b32bf81263abc7e84c63..9efe871f689fed458efe71c81250fafbe190abbb 100644 --- a/templates/stream/list.html.ep +++ b/templates/stream/list.html.ep @@ -4,16 +4,13 @@ <th>stream</th> <th>veřejny</th> <th>vysíla</th> -% if ( $c->is('publisher')) { - <th>rtmp url</th> -% } </tr> </thead> <tbody> % while ( my $stream = $c->stash->{streams}->next()) { <tr> <td> -% if ( $stream->is_live && $stream->is_granted($c) ) { +% if ( $stream->is_live || $c->is('publisher') ) { <a href="/play/<%= $stream->key %>"><%= $stream->name %></a> % } else { <%= $stream->name %> @@ -25,9 +22,6 @@ <%= $stream->publish_user_name %> % } </td> -% if ( $c->is('publisher')) { - <td><%= $ENV{RTMP_BASE_URL} %>/<%= $stream->key %>?token=<%= $c->current_user->token %></td> -% } </tr> % } </tbody> diff --git a/templates/stream/player.html.ep b/templates/stream/player.html.ep index 5605a6e75d24c629abc688013713bf6f8f7563a5..2a2443458ebae78a5ff5057e452ed348e1df1af5 100644 --- a/templates/stream/player.html.ep +++ b/templates/stream/player.html.ep @@ -20,3 +20,8 @@ var player = videojs('#player',{ player.play(); </script> +% if ( $c->is('publisher')) { +<p> +stream rtp url: <%= $ENV{RTMP_BASE_URL} %>/<%= $c->stash->{stream}->key %>?token=<%= $c->current_user->token %> +</p> +% }