summaryrefslogtreecommitdiff
path: root/kpov_judge/tasks
diff options
context:
space:
mode:
authorjc3202@student.uni-lj.si <jc3202@student.uni-lj.si@5cf9fbd1-b2bc-434c-b4b7-e852f4f63414>2015-01-27 19:39:17 +0000
committerjc3202@student.uni-lj.si <jc3202@student.uni-lj.si@5cf9fbd1-b2bc-434c-b4b7-e852f4f63414>2015-01-27 19:39:17 +0000
commit944bcefbbdcbbc22a9aadf1a1d2eb74bd3d572da (patch)
tree5ee98d884fadb37b6bb69eea2fce131ec04defde /kpov_judge/tasks
parent532d9bab38c17eb25ce2a566a1d8e50ab89537ca (diff)
git-svn-id: https://svn.lusy.fri.uni-lj.si/kpov-public-svn/kpov-public@241 5cf9fbd1-b2bc-434c-b4b7-e852f4f63414
Diffstat (limited to 'kpov_judge/tasks')
-rw-r--r--kpov_judge/tasks/vlc_stream_rtp/howtos/si/index.html60
-rw-r--r--kpov_judge/tasks/vlc_stream_rtp/task.py9
2 files changed, 59 insertions, 10 deletions
diff --git a/kpov_judge/tasks/vlc_stream_rtp/howtos/si/index.html b/kpov_judge/tasks/vlc_stream_rtp/howtos/si/index.html
index a85d5bc..6ce8679 100644
--- a/kpov_judge/tasks/vlc_stream_rtp/howtos/si/index.html
+++ b/kpov_judge/tasks/vlc_stream_rtp/howtos/si/index.html
@@ -7,33 +7,73 @@
<body><font face="Georgia, Times New Roman, Times, serif">
<p>
-<h2>Naloga na hitro</h2>
--Postavi navidezni računalnik SimpleArbiter z diska simpleArbiter. (Virtualko dobiš na: http://polz.si/media/uploads/kpov/virtualke/) <br>
+<h2>Naloga na hitro / Quick review of the task</h2>
+-Postavi navidezni računalnik SimpleArbiter z diska simpleArbiter.
+(Virtualko dobiš na: http://polz.si/media/uploads/kpov/virtualke/) <br>
-Na simpleArbiter preberi naslov filma ter ime toka TOK. <br>
-Poskrbi, da bo film dostopen na Internetu prek RTP z imenom toka TOK <br>
+-Set up a virtual machine SimpleArbiter from the simpleArbiter disk.
+(you can find the virtual disk here: http://polz.si/media/uploads/kpov/virtualke/) <br>
+-Read the movie title and the name of the stream TOK onto the simpleArbiter. <br>
+-Make shure the movie is accessable on the internet via RTP named after the stream TOK. <br>
+
<p>
-<h2>Navodila</h2>
+<h2>Navodila / Instructions</h2>
</p>
<ol>
-<li>Postavi navidezni računalnik SimpleArbiter</li>
+<li>Postavi navidezni računalnik SimpleArbiter / Create virtual machine SimpleArbiter</li>
-<li>Naloži VLC z naslednjimi ukazi <br> V /etc/apt/sources.list v spodnjih vrsticah zamenjaj "wheezy" z "testing" oz. če vrstice niso napisane jih dodaj: <br> <pre> deb http://ftp.at.debian.org/debian wheezy main contrib non-free <br> deb-src http://ftp.at.debian.org/debian wheezy main contrib non-free</pre> Poglej za posodobitve, nato pa naloži VLC z naslednjimi ukazi <pre> apt-get update<br> apt-get install vlc </pre> </li>
+<li>Naloži VLC z naslednjimi ukazi <br>
+Load VLC with following commands <br>
+V /etc/apt/sources.list v spodnjih vrsticah zamenjaj "wheezy" z "testing"
+oz. če vrstice niso napisane jih dodaj: <br>
+Open file /etc/apt/sources.list and in following lines change "wheezy" to "testing".
+If the lines are missing, add them: <br>
+<pre> deb http://ftp.at.debian.org/debian wheezy main contrib non-free <br>
+deb-src http://ftp.at.debian.org/debian wheezy main contrib non-free</pre>
+Poglej za posodobitve, nato pa naloži VLC z naslednjimi ukazi <br>
+Check for updates and load VLC: <pre>
+apt-get update<br> apt-get install vlc </pre> </li>
<img alt="slika-01" src="../images/1.png" style="width: 800px; height: 472px;" /><br/><br>
-<li>Odpri VLC in v menijski vrstici izberi "Media" in nato v drop-down meniju izberi "Stream". Prikaže se okno na sliki: </li><br>
+<li>Odpri VLC in v menijski vrstici izberi "Media" in nato v drop-down meniju izberi "Stream". Prikaže se okno na sliki: <br>
+Open VLC, select "Media" from menu bar, then from drop-down menu select "Stream". A window, shown in this picture should appear: </li><br>
<img alt="slika-02" src="../images/2.png" style="width: 800px; height: 611px;" /><br/><br>
-<li>V zavihku File dodaj vir videa za streamanje in nato klikni na gumb Stream. Odpre se novo okno in ko prideš do Destination Setup v drop-down meniju izbereš RTP/MPEG Transport Stream in klikni Add, kjer nato vpišeš nastavitve, ki so na spodnji sliki </li><br>
+<li>V zavihku File dodaj vir videa za streamanje in nato klikni na gumb
+Stream. Odpre se novo okno in ko prideš do Destination Setup v drop-down
+meniju izbereš RTP/MPEG Transport Stream in klikni Add, kjer nato vpišeš
+nastavitve, ki so na spodnji sliki <br>
+Add the video stream source under the File tab and click the Stream button.
+In the newly opened window open Destination Setup from drop-down menu and
+choose RTP/MPEG Transport Stream. Click Add and enter the settings from the
+following picture: </li><br>
<img alt="slika-03" src="../images/3.png" style="width: 800px; height: 520px;" /><br/><br>
-<li>S klikom na Next se lahko igraš še z nekaj nastavitvami. Ko prideš do naslednjega okna lahko klikneš na gumb, ki je označen na prvi od spodnjih slik in nato se pokaže okno na drugi od spodnjih slik. Tu se lahko poigraš z enkapsulacijo videa, avdio in video nastavitveami in z podnapisi. Ko končas klikni na Save</li><br>
+<li>S klikom na Next se lahko igraš še z nekaj nastavitvami. Ko prideš do
+naslednjega okna lahko klikneš na gumb, ki je označen na prvi od spodnjih
+slik in nato se pokaže okno na drugi od spodnjih slik. Tu se lahko poigraš z
+enkapsulacijo videa, avdio in video nastavitveami in z podnapisi. Ko končas
+klikni na Save <br>
+After clicking Next, you can play arround with a few more settings.
+After you get to the next window, you can click the button, marked in the
+first of the following pictures, to open the window pictured in the second
+picture. Here you can change encapsulation of the video, audio and video
+settings and subtitles. Click Save after you finish.</li><br>
<img alt="slika-04" src="../images/4.png" style="width: 800px; height: 529px;" /><br/><br>
<img alt="slika-05" src="../images/5.png" style="width: 800px; height: 561px;" /><br/><br>
-<li>S klikom na next se v naslednjem oknu pojavi še zadnja nastavitev. Pomembno je obkljukati možnost "Stream all elementary streams" (obkroženo na sliki). Ostane samo še klik na gumb Stream in tako se je stream pripravljen na ogled</li><br>
+<li>S klikom na next se v naslednjem oknu pojavi še zadnja nastavitev.
+Pomembno je obkljukati možnost "Stream all elementary streams" (obkroženo
+na sliki). Ostane samo še klik na gumb Stream in tako se je stream pripravljen
+na ogled <br>
+Clicking Next will get you to the final settings window. It is important that
+you tick the "Stream all elementary streams" box, marked in the picture below.
+After clicking "Stream", your movie is ready for watching.</li><br>
<img alt="slika-06" src="../images/6.png" style="width: 800px; height: 519px;" /><br/><br>
-<li>In tako smo uspešno prišli do konca naloge.</li>
+<li>In tako smo uspešno prišli do konca naloge. <br>
+This is the end of the assignment.</li>
</ol>
</p>
diff --git a/kpov_judge/tasks/vlc_stream_rtp/task.py b/kpov_judge/tasks/vlc_stream_rtp/task.py
index 408fb0c..2878f62 100644
--- a/kpov_judge/tasks/vlc_stream_rtp/task.py
+++ b/kpov_judge/tasks/vlc_stream_rtp/task.py
@@ -15,6 +15,15 @@ Posnemi ali kako drugače ustvari film ter poskrbi, da bo film dostopen na Inter
TOK. Računaj, da bodo film lahko videli tvoji sošolci. Kršenje avtorskih pravic je pri reševanju te naloge
strogo prepovedano.
"""
+ 'en':u"""
+Set up a virtual computer SimpleArbiter from the simpleArbiter disk.
+Read a movie title and stream name for stream TOK onto simpleArbiter. Film or
+otherwise create a movie and make sure the movie is avaliable on the internet
+via RTP with the name of the stream TOK. Take into account that the movie will
+be seen by your classmates. Copyright infrigement while solving this task is
+prohibited.
+
+"""
}
computers = {
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-24 18:20:50 +0000