Show available subtitles in EPG/recording details.

13 files changed, 106 insertions, 56 deletions

diff --git a/HISTORY b/HISTORY
index d0c6b4e..edee476 100644
--- a/HISTORY
+++ b/HISTORY
@@ -17,6 +17,7 @@ VDR-Portal: amair
 - Added: Live TV streaming with Xineliboutput plugin (Ville Skytt�).
 - Improved: Adapt rename recording to Liemikuutio 1.32 (Ville Skytt�).
 - Added: Show recording length in list and details with VDR >= 1.7.21 (Bug report #813, Ville Skytt�).
+- Added: Show available subtitles in EPG/recording details (Ville Skytt�).
 
 2011-06-03: 3.6.8
 - Updated: Dutch translation (Submitted by Roel Koelewijn).
diff --git a/po/cs.po b/po/cs.po
index f248bbe..2b109ab 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: cs\n"
 "Report-Msgid-Bugs-To: Andreas Mair <andreas@vdr-developer.org>\n"
-"POT-Creation-Date: 2011-11-18 22:15+0200\n"
-"PO-Revision-Date: 2006-09-23 13:14+0200\n"
-"Last-Translator: Karel Borkovec <her-ur@her-ur.org>\n"
+"POT-Creation-Date: 2011-11-18 23:36+0200\n"
+"PO-Revision-Date: 2011-11-18 23:43+0200\n"
+"Last-Translator: Ville Skyttä <ville.skytta@iki.fi>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "Language: cs\n"
 "MIME-Version: 1.0\n"
@@ -1219,12 +1219,18 @@ msgstr "hledat"
 msgid "edit"
 msgstr "Upravit"
 
+msgid "Length"
+msgstr ""
+
 msgid "Video tracks:"
 msgstr "Video stopy:"
 
 msgid "Audio tracks:"
 msgstr "Audio stopy:"
 
+msgid "Subtitles:"
+msgstr "Titulky:"
+
 #, fuzzy
 msgid "Video tracks"
 msgstr "Video stopy:"
@@ -1314,9 +1320,6 @@ msgstr "Volno:"
 msgid "Date"
 msgstr "Datum"
 
-msgid "Length"
-msgstr ""
-
 msgid "Total"
 msgstr "Celkem"
 
diff --git a/po/de.po b/po/de.po
index f56a10c..45f9d09 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDRAdmin-AM-3.6.5+cvs\n"
 "Report-Msgid-Bugs-To: Andreas Mair <andreas@vdr-developer.org>\n"
-"POT-Creation-Date: 2011-11-18 22:15+0200\n"
-"PO-Revision-Date: 2009-12-30 19:31+0200\n"
-"Last-Translator: Andreas Mair <mail@andreas.vdr-developer.org>\n"
+"POT-Creation-Date: 2011-11-18 23:36+0200\n"
+"PO-Revision-Date: 2011-11-18 23:43+0200\n"
+"Last-Translator: Ville Skyttä <ville.skytta@iki.fi>\n"
 "Language-Team: German <mail@andreas.vdr-developer.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
@@ -1134,12 +1134,18 @@ msgstr "Wiederholungen"
 msgid "edit"
 msgstr "Bearbeiten"
 
+msgid "Length"
+msgstr ""
+
 msgid "Video tracks:"
 msgstr "Videospuren:"
 
 msgid "Audio tracks:"
 msgstr "Audiospuren:"
 
+msgid "Subtitles:"
+msgstr "Untertitel:"
+
 msgid "Video tracks"
 msgstr "Videospuren"
 
@@ -1224,9 +1230,6 @@ msgstr "Frei:"
 msgid "Date"
 msgstr "Datum"
 
-msgid "Length"
-msgstr ""
-
 msgid "Total"
 msgstr "Gesamt"
 
diff --git a/po/es.po b/po/es.po
index a999d8a..dcf3727 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDRAdmin-AM-3.6.6\n"
 "Report-Msgid-Bugs-To: Andreas Mair <andreas@vdr-developer.org>\n"
-"POT-Creation-Date: 2011-11-18 22:15+0200\n"
-"PO-Revision-Date: 2010-02-11 22:46+0100\n"
-"Last-Translator: Manuel Gomez  <mgrojo@gmail.com>\n"
+"POT-Creation-Date: 2011-11-18 23:36+0200\n"
+"PO-Revision-Date: 2011-11-18 23:42+0200\n"
+"Last-Translator: Ville Skyttä <ville.skytta@iki.fi>\n"
 "Language-Team: Spanish <r_jung@web.de>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
@@ -1247,12 +1247,18 @@ msgstr "repeticiones"
 msgid "edit"
 msgstr "Modificar"
 
+msgid "Length"
+msgstr ""
+
 msgid "Video tracks:"
 msgstr "Pistas de vídeo:"
 
 msgid "Audio tracks:"
 msgstr "Pistas de audio:"
 
+msgid "Subtitles:"
+msgstr "Subtítulos:"
+
 msgid "Video tracks"
 msgstr "Pistas de vídeo:"
 
@@ -1337,9 +1343,6 @@ msgstr "Espacio disponible:"
 msgid "Date"
 msgstr "Fecha"
 
-msgid "Length"
-msgstr ""
-
 msgid "Total"
 msgstr "en total"
 
diff --git a/po/fi.po b/po/fi.po
index 7cb3228..1e6cab5 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDRAdmin-AM-3.6.2\n"
 "Report-Msgid-Bugs-To: Andreas Mair <andreas@vdr-developer.org>\n"
-"POT-Creation-Date: 2011-11-18 22:15+0200\n"
-"PO-Revision-Date: 2011-11-18 22:15+0200\n"
+"POT-Creation-Date: 2011-11-18 23:36+0200\n"
+"PO-Revision-Date: 2011-11-18 23:36+0200\n"
 "Last-Translator: Ville Skyttä <ville.skytta@iki.fi>\n"
 "Language-Team: Finnish <vdr@linuxtv.org>\n"
 "Language: fi\n"
@@ -1133,12 +1133,18 @@ msgstr "Etsi"
 msgid "edit"
 msgstr "Muokkaa"
 
+msgid "Length"
+msgstr "Kesto"
+
 msgid "Video tracks:"
 msgstr "Kuvaraidat:"
 
 msgid "Audio tracks:"
 msgstr "Ääniraidat:"
 
+msgid "Subtitles:"
+msgstr "Tekstitys:"
+
 msgid "Video tracks"
 msgstr "Kuvaraidat"
 
@@ -1223,9 +1229,6 @@ msgstr "Vapaana:"
 msgid "Date"
 msgstr "Päivä"
 
-msgid "Length"
-msgstr "Kesto"
-
 msgid "Total"
 msgstr "kpl"
 
diff --git a/po/fr.po b/po/fr.po
index 39ba8a9..3cdbf02 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDRAdmin-AM-3.6.0\n"
 "Report-Msgid-Bugs-To: Andreas Mair <andreas@vdr-developer.org>\n"
-"POT-Creation-Date: 2011-11-18 22:15+0200\n"
-"PO-Revision-Date: 2007-08-23 10:45+0100\n"
-"Last-Translator: Trois Six <trois.six@free.fr>\n"
+"POT-Creation-Date: 2011-11-18 23:36+0200\n"
+"PO-Revision-Date: 2011-11-18 23:42+0200\n"
+"Last-Translator: Ville Skyttä <ville.skytta@iki.fi>\n"
 "Language-Team: French <trois.six@free.fr>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
@@ -1155,12 +1155,18 @@ msgstr "rechercher"
 msgid "edit"
 msgstr "éditer"
 
+msgid "Length"
+msgstr ""
+
 msgid "Video tracks:"
 msgstr "Piste vidéo :"
 
 msgid "Audio tracks:"
 msgstr "Piste audio :"
 
+msgid "Subtitles:"
+msgstr "Sous-titres:"
+
 msgid "Video tracks"
 msgstr "Pistes vidéo"
 
@@ -1245,9 +1251,6 @@ msgstr "Libre :"
 msgid "Date"
 msgstr "Date"
 
-msgid "Length"
-msgstr ""
-
 msgid "Total"
 msgstr "Total"
 
diff --git a/po/it.po b/po/it.po
index d644ca4..d204e39 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDRAdmin-AM-3.6.6\n"
 "Report-Msgid-Bugs-To: Andreas Mair <andreas@vdr-developer.org>\n"
-"POT-Creation-Date: 2011-11-18 22:15+0200\n"
-"PO-Revision-Date: 2010-03-29 01:02+0100\n"
-"Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
+"POT-Creation-Date: 2011-11-18 23:36+0200\n"
+"PO-Revision-Date: 2011-11-18 23:42+0200\n"
+"Last-Translator: Ville Skyttä <ville.skytta@iki.fi>\n"
 "Language-Team: Italian <vdr-italian@tiscali.it>\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
@@ -1136,12 +1136,18 @@ msgstr "cerca"
 msgid "edit"
 msgstr "modifica"
 
+msgid "Length"
+msgstr ""
+
 msgid "Video tracks:"
 msgstr "Tracce video:"
 
 msgid "Audio tracks:"
 msgstr "Tracce audio:"
 
+msgid "Subtitles:"
+msgstr "Sottotitoli:"
+
 msgid "Video tracks"
 msgstr "Tracce video"
 
@@ -1226,9 +1232,6 @@ msgstr "Disponibile:"
 msgid "Date"
 msgstr "Data"
 
-msgid "Length"
-msgstr ""
-
 msgid "Total"
 msgstr "Totale"
 
diff --git a/po/nl.po b/po/nl.po
index a3686b6..870491f 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDRAdmin-AM-3.6.7\n"
 "Report-Msgid-Bugs-To: Andreas Mair <andreas@vdr-developer.org>\n"
-"POT-Creation-Date: 2011-11-18 22:15+0200\n"
-"PO-Revision-Date: 2010-08-13 13:36+0200\n"
-"Last-Translator: Roel Koelewijn <roel.koelewijn@gmail.com>\n"
+"POT-Creation-Date: 2011-11-18 23:36+0200\n"
+"PO-Revision-Date: 2011-11-18 23:41+0200\n"
+"Last-Translator: Ville Skyttä <ville.skytta@iki.fi>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
@@ -1137,12 +1137,18 @@ msgstr "zoeken"
 msgid "edit"
 msgstr "Bewerken"
 
+msgid "Length"
+msgstr ""
+
 msgid "Video tracks:"
 msgstr "Video tracks:"
 
 msgid "Audio tracks:"
 msgstr "Audio sporen:"
 
+msgid "Subtitles:"
+msgstr "Ondertiteling:"
+
 msgid "Video tracks"
 msgstr "Video sporen:"
 
@@ -1227,9 +1233,6 @@ msgstr "Vrij:"
 msgid "Date"
 msgstr "Datum"
 
-msgid "Length"
-msgstr ""
-
 msgid "Total"
 msgstr "Totaal"
 
diff --git a/po/ru.po b/po/ru.po
index efe10dd..89c5681 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: Andreas Mair <andreas@vdr-developer.org>\n"
-"POT-Creation-Date: 2011-11-18 22:15+0200\n"
-"PO-Revision-Date: 2006-10-27 15:42+0100\n"
-"Last-Translator: Oleg Roitburd <oleg@roitburd.de>\n"
+"POT-Creation-Date: 2011-11-18 23:36+0200\n"
+"PO-Revision-Date: 2011-11-18 23:41+0200\n"
+"Last-Translator: Ville Skyttä <ville.skytta@iki.fi>\n"
 "Language-Team: Russian <LL@li.org>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
@@ -1168,12 +1168,18 @@ msgstr "Повторения"
 msgid "edit"
 msgstr "Редактировать"
 
+msgid "Length"
+msgstr ""
+
 msgid "Video tracks:"
 msgstr "Видео дорожки"
 
 msgid "Audio tracks:"
 msgstr "Аудио дорожки"
 
+msgid "Subtitles:"
+msgstr "Субтитры:"
+
 #, fuzzy
 msgid "Video tracks"
 msgstr "Видео дорожки"
@@ -1261,9 +1267,6 @@ msgstr "Свободно:"
 msgid "Date"
 msgstr "Дата"
 
-msgid "Length"
-msgstr ""
-
 msgid "Total"
 msgstr "Всего"
 
diff --git a/po/vdradmin.pot b/po/vdradmin.pot
index 4e28485..ed11d22 100644
--- a/po/vdradmin.pot
+++ b/po/vdradmin.pot
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDRAdmin-AM 3.6.8\n"
 "Report-Msgid-Bugs-To: Andreas Mair <andreas@vdr-developer.org>\n"
-"POT-Creation-Date: 2011-11-18 22:15+0200\n"
+"POT-Creation-Date: 2011-11-18 23:36+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1146,12 +1146,18 @@ msgstr ""
 msgid "edit"
 msgstr ""
 
+msgid "Length"
+msgstr ""
+
 msgid "Video tracks:"
 msgstr ""
 
 msgid "Audio tracks:"
 msgstr ""
 
+msgid "Subtitles:"
+msgstr ""
+
 msgid "Video tracks"
 msgstr ""
 
@@ -1236,9 +1242,6 @@ msgstr ""
 msgid "Date"
 msgstr ""
 
-msgid "Length"
-msgstr ""
-
 msgid "Total"
 msgstr ""
 
diff --git a/template/default/prog_detail.html b/template/default/prog_detail.html
index 949fc0c..bb99514 100644
--- a/template/default/prog_detail.html
+++ b/template/default/prog_detail.html
@@ -81,6 +81,12 @@
 									<?% audio %?>
 								</div>
 							<?% END %?>
+							<?% IF subs %?>
+								<div class="epg_subs">
+									<h4><?% gettext('Subtitles:') %?></h4>&nbsp;
+									<?% subs %?>
+								</div>
+							<?% END %?>
 							<?% IF epgimages %?>
 								<div class="epg_images">
 									<?% FOREACH ei = epgimages %?>
diff --git a/template/default/style.css b/template/default/style.css
index 68eebe3..e7e3ebb 100644
--- a/template/default/style.css
+++ b/template/default/style.css
@@ -407,7 +407,8 @@ body.help .heading {
 }
 #prog_detail .epg_video h4,
 #prog_detail .epg_audio h4,
-#prog_detail .epg_length h4 {
+#prog_detail .epg_length h4,
+#prog_detail .epg_subs h4 {
 	margin: 0;
 	font-size: 10px;
 	font-weight: bold;
@@ -415,7 +416,8 @@ body.help .heading {
 }
 #prog_detail .epg_video h5,
 #prog_detail .epg_audio h5,
-#prog_detail .epg_length h5 {
+#prog_detail .epg_length h5,
+#prog_detail .epg_subs h5 {
 	margin-left: 1em;
 	display: inline;
 	font-size: 10px;
diff --git a/vdradmind.pl b/vdradmind.pl
index 2d1d09f..56553dc 100755
--- a/vdradmind.pl
+++ b/vdradmind.pl
@@ -1276,8 +1276,8 @@ sub EPG_buildTree {
                 while($_ = shift @$DATA) {
                     if (/^E/) {
                         my ($garbish, $event_id, $time, $duration) = split(/[ \t]+/);
-                        my ($title, $subtitle, $summary, $vps, $video, $audio, @video_raw, @audio_raw);
-                        @video_raw = @audio_raw = ();
+                        my ($title, $subtitle, $summary, $vps, $video, $audio, $subs, @video_raw, @audio_raw, @subs_raw);
+                        @video_raw = @audio_raw = @subs_raw = ();
                         while($_ = shift @$DATA) {
                             # if(/^T (.*)/) { $title = $1;    $title =~ s/\|/<br \/>/sig }
                             # if(/^S (.*)/) { $subtitle = $1; $subtitle =~ s/\|/<br \/>/sig }
@@ -1298,6 +1298,12 @@ sub EPG_buildTree {
                                 $audio .= ", " if ($audio);
                                 $audio .= ($descr ? $descr . " (" . $lang . ")" : $lang);
                             }
+                            elsif (/^X 3 ([^ ]*) (.*)/) {
+                                push (@subs_raw, sprintf "X 3 $1 $2");
+                                my ($lang, $descr) = split(" ", $2, 2);
+                                $subs .= ", " if ($subs);
+                                $subs .= ($descr ? $descr . " (" . $lang . ")" : $lang);
+                            }
                             elsif (/^V (.*)/) { $vps  = $1; }
                             elsif (/^e/)      {
 
@@ -1317,8 +1323,10 @@ sub EPG_buildTree {
                                         event_id     => $event_id,
                                         video        => $video,
                                         audio        => $audio,
+                                        subs         => $subs,
                                         video_raw    => \@video_raw,
                                         audio_raw    => \@audio_raw,
+                                        subs_raw     => \@subs_raw,
                                      }
                                 );
                                 $id++;
@@ -6259,7 +6267,7 @@ sub getRecInfo {
     my $vars;
     if ($FEATURES{VDRVERSION} >= 10325) {
         $SVDRP->command("lstr $id");
-        my ($channel_name, $subtitle, $text, $video, $audio);
+        my ($channel_name, $subtitle, $text, $video, $audio, $subs);
         while ($_ = $SVDRP->readoneline) {
             if (/^C (.*)/) { $channel_name = get_name_from_uniqid($1); }
             #elsif (/^E (.*)/) { $epg = $1; }
@@ -6277,6 +6285,11 @@ sub getRecInfo {
                 $audio .= ", " if ($audio);
                 $audio .= ($descr ? $descr. " (" . $lang . ")"  : $lang);
             }
+            elsif(/^X 3 [^ ]* (.*)/) {
+                my ($lang, $descr) = split(" ", $1, 2);
+                $subs .= ", " if ($subs);
+                $subs .= ($descr ? $descr. " (" . $lang . ")"  : $lang);
+            }
             #elsif (/^V (.*)/) { $vps = $1; }
         }
 
@@ -6322,6 +6335,7 @@ sub getRecInfo {
                   id       => $id,
                   video    => $video,
                   audio    => $audio,
+                  subs     => $subs,
                   length   => $length,
                   referer  => $ref || undef
         };