diff options
Diffstat (limited to 'PLUGINS/src/pictures')
| -rw-r--r-- | PLUGINS/src/pictures/HISTORY | 14 | ||||
| -rw-r--r-- | PLUGINS/src/pictures/entry.c | 4 | ||||
| -rwxr-xr-x | PLUGINS/src/pictures/pic2mpg | 13 | ||||
| -rw-r--r-- | PLUGINS/src/pictures/pictures.c | 4 | ||||
| -rw-r--r-- | PLUGINS/src/pictures/player.c | 6 | ||||
| -rw-r--r-- | PLUGINS/src/pictures/po/fr_FR.po | 32 | ||||
| -rwxr-xr-x | PLUGINS/src/pictures/po/it_IT.po | 32 |
7 files changed, 94 insertions, 11 deletions
diff --git a/PLUGINS/src/pictures/HISTORY b/PLUGINS/src/pictures/HISTORY index 462c02f..174fd30 100644 --- a/PLUGINS/src/pictures/HISTORY +++ b/PLUGINS/src/pictures/HISTORY @@ -10,3 +10,17 @@ VDR Plugin 'pictures' Revision History - Fixed the Play function (when used from a directory in the pictures menu it always started with the next directory). - Added Finnish texts (thanks to Rolf Ahrenberg <rahrenbe@cc.hut.fi>). + +2008-01-27: Version 0.0.3 + +- Added French texts (thanks to Patrice Staudt <ipatrice.staudt@laposte.net>). + +2008-02-02: Version 0.0.4 + +- Added option -i to pic2mpg to ignore unknown file types. + +2008-02-17: Version 0.0.5 + +- Fixed setting the OSD area. +- Introduced 'operator const void * ()' in cString to catch cases where operator*() + should be used. diff --git a/PLUGINS/src/pictures/entry.c b/PLUGINS/src/pictures/entry.c index e03858c..427585e 100644 --- a/PLUGINS/src/pictures/entry.c +++ b/PLUGINS/src/pictures/entry.c @@ -3,7 +3,7 @@ * * See the README file for copyright information and how to reach the author. * - * $Id: entry.c 1.2 2008/01/18 15:49:51 kls Exp $ + * $Id: entry.c 1.3 2008/02/17 13:42:34 kls Exp $ */ #include "entry.h" @@ -37,7 +37,7 @@ int cPictureEntry::Compare(const cListObject &ListObject) const cString cPictureEntry::Path(void) const { - return parent ? AddDirectory(parent->Path(), name) : name; + return parent ? *AddDirectory(parent->Path(), name) : name; } void cPictureEntry::Load(void) const diff --git a/PLUGINS/src/pictures/pic2mpg b/PLUGINS/src/pictures/pic2mpg index 5791685..6cd7435 100755 --- a/PLUGINS/src/pictures/pic2mpg +++ b/PLUGINS/src/pictures/pic2mpg @@ -7,7 +7,7 @@ # # See the README file for copyright information and how to reach the author. # -# $Id: pic2mpg 1.1 2008/01/13 11:09:12 kls Exp $ +# $Id: pic2mpg 1.2 2008/02/02 11:34:43 kls Exp $ ## TODO implement HDTV (1920 x 1080) @@ -20,20 +20,22 @@ Usage: $0 [options] picture-dir mpeg-dir $0 [options] picture-file mpeg-file Options: -a Aspect ratio 4:3 (default is 16:9) - -h print Help -f Force conversion + -h print Help + -i Ignore unknown file types -n NTSC (default is PAL) -v num Verbose (0=none, 1=list files, 2=detailed) -x percent X overscan in percent -y percent Y overscan in percent }; -getopts("ahfnv:x:y:") || die $Usage; +getopts("afhinv:x:y:") || die $Usage; die $Usage if $opt_h; $Aspect = $opt_a; $Force = $opt_f; +$Ignore = $opt_i; $NTSC = $opt_n; $Verbose = $opt_v; $OverscanX = $opt_x; @@ -142,7 +144,10 @@ sub ConvertFile { my ($Pict, $Mpeg) = @_; (my $Type) = $Pict =~ /\.([^\.]*)$/; - die "unknown file type '$Type': '$Pict'\n" unless defined $PNMCONV{$Type}; + if (!defined $PNMCONV{$Type}) { + return if ($Ignore); + die "unknown file type '$Type': '$Pict'\n"; + } my ($w, $h) = imgsize($Pict); print "image size is $w x $h\n" if ($Detailed); if ($w / $h <= $ScreenRatio) { diff --git a/PLUGINS/src/pictures/pictures.c b/PLUGINS/src/pictures/pictures.c index e3015e4..6e64c4e 100644 --- a/PLUGINS/src/pictures/pictures.c +++ b/PLUGINS/src/pictures/pictures.c @@ -3,7 +3,7 @@ * * See the README file for copyright information and how to reach the author. * - * $Id: pictures.c 1.2 2008/01/19 11:20:03 kls Exp $ + * $Id: pictures.c 1.5 2008/02/09 12:15:52 kls Exp $ */ #include <getopt.h> @@ -11,7 +11,7 @@ #include "menu.h" #include "player.h" -static const char *VERSION = "0.0.2"; +static const char *VERSION = "0.0.5"; static const char *DESCRIPTION = trNOOP("A simple picture viewer"); static const char *MAINMENUENTRY = trNOOP("Pictures"); diff --git a/PLUGINS/src/pictures/player.c b/PLUGINS/src/pictures/player.c index b942be5..8981b60 100644 --- a/PLUGINS/src/pictures/player.c +++ b/PLUGINS/src/pictures/player.c @@ -3,7 +3,7 @@ * * See the README file for copyright information and how to reach the author. * - * $Id: player.c 1.2 2008/01/19 11:01:58 kls Exp $ + * $Id: player.c 1.3 2008/02/09 12:13:10 kls Exp $ */ #include "player.h" @@ -173,11 +173,11 @@ void cPictureControl::DisplayCaption(void) int h = 2 * Font->Height(); if (!osd) { osd = cOsdProvider::NewOsd(cOsd::OsdLeft(), cOsd::OsdTop() + cOsd::OsdHeight() - h, OSD_LEVEL_SUBTITLES); - tArea Areas[] = { { 0, 0, w, h, 8 } }; + tArea Areas[] = { { 0, 0, w - 1, h - 1, 8 } }; if (Setup.AntiAlias && osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk) osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea)); else { - tArea Areas[] = { { 0, 0, w, h, 4 } }; + tArea Areas[] = { { 0, 0, w - 1, h - 1, 4 } }; osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea)); } } diff --git a/PLUGINS/src/pictures/po/fr_FR.po b/PLUGINS/src/pictures/po/fr_FR.po new file mode 100644 index 0000000..54933aa --- /dev/null +++ b/PLUGINS/src/pictures/po/fr_FR.po @@ -0,0 +1,32 @@ +# VDR plugin language source file. +# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de> +# This file is distributed under the same license as the VDR package. +# Patrice Staudt <patrice.staudt@laposte.net>, 2008." +# +msgid "" +msgstr "" +"Project-Id-Version: pictures 0.0.1\n" +"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n" +"POT-Creation-Date: 2008-01-12 17:38+0100\n" +"PO-Revision-Date: 2008-01-12 17:41+0100\n" +"Last-Translator: Patrice Staudt <patrice.staudt@laposte.net>\n" +"Language-Team: France\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-15\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +msgid "Pictures" +msgstr "Images" + +msgid "A simple picture viewer" +msgstr "Un simple visualiseur d'images" + +msgid "Picture directory" +msgstr "Dossier des images" + +msgid "Slide show delay (s)" +msgstr "Pause entre deux images (s)" + +msgid "No picture directory has been defined!" +msgstr "Aucun dossier n'est définit!" diff --git a/PLUGINS/src/pictures/po/it_IT.po b/PLUGINS/src/pictures/po/it_IT.po new file mode 100755 index 0000000..d16fc4c --- /dev/null +++ b/PLUGINS/src/pictures/po/it_IT.po @@ -0,0 +1,32 @@ +# VDR plugin language source file. +# Copyright (C) 2008 Klaus Schmidinger <kls@cadsoft.de> +# This file is distributed under the same license as the VDR package. +# Diego Pierotto <vdr-italian@tiscali.it>, 2008 +# +msgid "" +msgstr "" +"Project-Id-Version: pictures 0.0.1\n" +"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n" +"POT-Creation-Date: 2008-01-12 17:38+0100\n" +"PO-Revision-Date: 2008-01-27 20:22+0100\n" +"Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n" +"Language-Team: Italian\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-15\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +msgid "Pictures" +msgstr "Immagini" + +msgid "A simple picture viewer" +msgstr "Un semplice visualizzatore immagini" + +msgid "Picture directory" +msgstr "Directory immagini" + +msgid "Slide show delay (s)" +msgstr "Ritardo diapositive (s)" + +msgid "No picture directory has been defined!" +msgstr "Nessuna directory immagini impostata!" |