summaryrefslogtreecommitdiff
path: root/PLUGINS/src/pictures
diff options
context:
space:
mode:
Diffstat (limited to 'PLUGINS/src/pictures')
-rw-r--r--PLUGINS/src/pictures/HISTORY5
-rwxr-xr-xPLUGINS/src/pictures/pic2mpg9
-rw-r--r--PLUGINS/src/pictures/pictures.c4
-rw-r--r--PLUGINS/src/pictures/po/de_DE.po4
-rw-r--r--PLUGINS/src/pictures/po/fi_FI.po4
-rw-r--r--PLUGINS/src/pictures/po/fr_FR.po8
-rw-r--r--[-rwxr-xr-x]PLUGINS/src/pictures/po/it_IT.po2
7 files changed, 21 insertions, 15 deletions
diff --git a/PLUGINS/src/pictures/HISTORY b/PLUGINS/src/pictures/HISTORY
index 174fd30..243c076 100644
--- a/PLUGINS/src/pictures/HISTORY
+++ b/PLUGINS/src/pictures/HISTORY
@@ -24,3 +24,8 @@ VDR Plugin 'pictures' Revision History
- Fixed setting the OSD area.
- Introduced 'operator const void * ()' in cString to catch cases where operator*()
should be used.
+
+2008-02-29: Version 0.0.6
+
+- Made the 'pic2mpg' script of the 'pictures' plugin work with uppercase filename
+ extensions and relative paths (reported by Stefan Wagner <stefanwag@gmx.at>).
diff --git a/PLUGINS/src/pictures/pic2mpg b/PLUGINS/src/pictures/pic2mpg
index 6cd7435..af58f97 100755
--- a/PLUGINS/src/pictures/pic2mpg
+++ b/PLUGINS/src/pictures/pic2mpg
@@ -7,11 +7,12 @@
#
# See the README file for copyright information and how to reach the author.
#
-# $Id: pic2mpg 1.2 2008/02/02 11:34:43 kls Exp $
+# $Id: pic2mpg 1.4 2008/02/29 14:34:22 kls Exp $
## TODO implement HDTV (1920 x 1080)
use File::Path;
+use File::Spec;
use Getopt::Std;
use Image::Size;
@@ -87,8 +88,8 @@ if (-f $ARGV[0]) {
die "$0: mixed directory and file ('$ARGV[0]' <-> '$ARGV[1]')\n" unless !-e $ARGV[1] || -d $ARGV[1];
-$PICDIR = $ARGV[0];
-$MPGDIR = $ARGV[1];
+$PICDIR = File::Spec->rel2abs($ARGV[0]);
+$MPGDIR = File::Spec->rel2abs($ARGV[1]);
# Convert pictures to mpegs:
@@ -143,7 +144,7 @@ for ($i = 0; $i < 10; $i++) { # dirs might become empty when removing empty subd
sub ConvertFile
{
my ($Pict, $Mpeg) = @_;
- (my $Type) = $Pict =~ /\.([^\.]*)$/;
+ (my $Type) = lc($Pict) =~ /\.([^\.]*)$/;
if (!defined $PNMCONV{$Type}) {
return if ($Ignore);
die "unknown file type '$Type': '$Pict'\n";
diff --git a/PLUGINS/src/pictures/pictures.c b/PLUGINS/src/pictures/pictures.c
index 6e64c4e..bb03c30 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.5 2008/02/09 12:15:52 kls Exp $
+ * $Id: pictures.c 1.6 2008/02/29 14:38:31 kls Exp $
*/
#include <getopt.h>
@@ -11,7 +11,7 @@
#include "menu.h"
#include "player.h"
-static const char *VERSION = "0.0.5";
+static const char *VERSION = "0.0.6";
static const char *DESCRIPTION = trNOOP("A simple picture viewer");
static const char *MAINMENUENTRY = trNOOP("Pictures");
diff --git a/PLUGINS/src/pictures/po/de_DE.po b/PLUGINS/src/pictures/po/de_DE.po
index 48f942e..62811ae 100644
--- a/PLUGINS/src/pictures/po/de_DE.po
+++ b/PLUGINS/src/pictures/po/de_DE.po
@@ -1,11 +1,11 @@
# 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.
-# Klaus Schmidinger <kls@cadsoft.de>, 2008.
+# Klaus Schmidinger <kls@cadsoft.de>, 2008
#
msgid ""
msgstr ""
-"Project-Id-Version: pictures 0.0.1\n"
+"Project-Id-Version: VDR 1.6.0\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"
diff --git a/PLUGINS/src/pictures/po/fi_FI.po b/PLUGINS/src/pictures/po/fi_FI.po
index df5a4a1..932807f 100644
--- a/PLUGINS/src/pictures/po/fi_FI.po
+++ b/PLUGINS/src/pictures/po/fi_FI.po
@@ -1,11 +1,11 @@
# 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.
-# Rolf Ahrenberg <rahrenbe@cc.hut.fi>, 2008.
+# Rolf Ahrenberg <rahrenbe@cc.hut.fi>, 2008
#
msgid ""
msgstr ""
-"Project-Id-Version: pictures 0.0.1\n"
+"Project-Id-Version: VDR 1.6.0\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"
diff --git a/PLUGINS/src/pictures/po/fr_FR.po b/PLUGINS/src/pictures/po/fr_FR.po
index 54933aa..379ee35 100644
--- a/PLUGINS/src/pictures/po/fr_FR.po
+++ b/PLUGINS/src/pictures/po/fr_FR.po
@@ -1,16 +1,16 @@
# 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."
+# Patrice Staudt <ipatrice.staudt@laposte.net>, 2008
#
msgid ""
msgstr ""
-"Project-Id-Version: pictures 0.0.1\n"
+"Project-Id-Version: VDR 1.6.0\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"
+"Last-Translator: Patrice Staudt <ipatrice.staudt@laposte.net>\n"
+"Language-Team: French\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-15\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/PLUGINS/src/pictures/po/it_IT.po b/PLUGINS/src/pictures/po/it_IT.po
index d16fc4c..62d0bdf 100755..100644
--- a/PLUGINS/src/pictures/po/it_IT.po
+++ b/PLUGINS/src/pictures/po/it_IT.po
@@ -5,7 +5,7 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: pictures 0.0.1\n"
+"Project-Id-Version: VDR 1.6.0\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"