From e3887083391d10f8cfcd1d8ac65a99d9978f05f2 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sun, 27 Jan 2008 18:00:00 +0100 Subject: =?UTF-8?q?Version=201.5.14=20-=20Fixed=20the=20Play=20function=20?= =?UTF-8?q?in=20the=20pictures=20plugin.=20-=20Updated=20the=20Finnish=20O?= =?UTF-8?q?SD=20texts=20(thanks=20to=20Rolf=20Ahrenberg).=20-=20Updated=20?= =?UTF-8?q?the=20Makefile=20of=20the=20skincurses=20plugin=20(thanks=20to?= =?UTF-8?q?=20Rolf=20Ahrenberg).=20-=20The=20new=20option=20--localedir=20?= =?UTF-8?q?can=20be=20used=20to=20set=20the=20locale=20directory=20at=20ru?= =?UTF-8?q?ntime=20=20=20(based=20on=20a=20patch=20from=20Stefan=20Huelswi?= =?UTF-8?q?tt).=20-=20Fixed=20finding=20new=20transponders=20(thanks=20to?= =?UTF-8?q?=20Winfried=20K=C3=B6hler).=20-=20Implemented=20handling=20of?= =?UTF-8?q?=20DVB-S2=20(thanks=20to=20Marco=20Schl=C3=BC=C3=9Fler=20and=20?= =?UTF-8?q?Reinhard=20Nissl=20=20=20for=20a=20patch=20that=20was=20used=20?= =?UTF-8?q?to=20implement=20this).=20VDR=20now=20requires=20the=20"multipr?= =?UTF-8?q?oto"=20=20=20DVB=20driver,=20e.g.=20from=20http://jusst.de/hg/m?= =?UTF-8?q?ultiproto.=20-=20Removed=20switching=20to=20the=20next=20higher?= =?UTF-8?q?=20or=20lower=20channel=20if=20the=20current=20channel=20=20=20?= =?UTF-8?q?is=20not=20available,=20in=20order=20to=20allow=20staying=20on?= =?UTF-8?q?=20an=20encrypted=20channel=20that=20takes=20=20=20a=20while=20?= =?UTF-8?q?for=20the=20CAM=20to=20start=20decrypting.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PLUGINS/src/pictures/HISTORY | 6 ++++++ PLUGINS/src/pictures/entry.c | 7 ++++++- PLUGINS/src/pictures/pictures.c | 4 ++-- PLUGINS/src/pictures/player.c | 3 ++- PLUGINS/src/pictures/po/fi_FI.po | 32 ++++++++++++++++++++++++++++++++ PLUGINS/src/skincurses/HISTORY | 4 ++++ PLUGINS/src/skincurses/Makefile | 15 ++++++++------- 7 files changed, 60 insertions(+), 11 deletions(-) create mode 100644 PLUGINS/src/pictures/po/fi_FI.po (limited to 'PLUGINS/src') diff --git a/PLUGINS/src/pictures/HISTORY b/PLUGINS/src/pictures/HISTORY index c04a628..462c02f 100644 --- a/PLUGINS/src/pictures/HISTORY +++ b/PLUGINS/src/pictures/HISTORY @@ -4,3 +4,9 @@ VDR Plugin 'pictures' Revision History 2008-01-13: Version 0.0.1 - Initial revision. + +2008-01-19: Version 0.0.2 + +- 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 ). diff --git a/PLUGINS/src/pictures/entry.c b/PLUGINS/src/pictures/entry.c index 006a359..e03858c 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.1 2008/01/06 09:52:41 kls Exp $ + * $Id: entry.c 1.2 2008/01/18 15:49:51 kls Exp $ */ #include "entry.h" @@ -138,6 +138,11 @@ const cPictureEntry *cPictureEntry::NextPicture(const cPictureEntry *This) const return pe; } } + else if (IsDirectory()) { + const cPictureEntry *p = FirstPicture(); + if (p) + return p; + } if (parent) return parent->NextPicture(this); return NULL; diff --git a/PLUGINS/src/pictures/pictures.c b/PLUGINS/src/pictures/pictures.c index aa06c98..e3015e4 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.1 2008/01/12 14:46:52 kls Exp $ + * $Id: pictures.c 1.2 2008/01/19 11:20:03 kls Exp $ */ #include @@ -11,7 +11,7 @@ #include "menu.h" #include "player.h" -static const char *VERSION = "0.0.1"; +static const char *VERSION = "0.0.2"; 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 9e07fc5..b942be5 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.1 2008/01/13 11:29:27 kls Exp $ + * $Id: player.c 1.2 2008/01/19 11:01:58 kls Exp $ */ #include "player.h" @@ -95,6 +95,7 @@ cPictureControl::cPictureControl(cPictureEntry *Pictures, const cPictureEntry *P pictureEntry = PictureEntry; osd = NULL; lastPath = "/"; + slideShowDelay.Set(SlideShowDelay * 1000); slideShow = SlideShow; alwaysDisplayCaption = false; NextPicture(slideShow && pictureEntry->IsDirectory() ? 1 : 0); diff --git a/PLUGINS/src/pictures/po/fi_FI.po b/PLUGINS/src/pictures/po/fi_FI.po new file mode 100644 index 0000000..df5a4a1 --- /dev/null +++ b/PLUGINS/src/pictures/po/fi_FI.po @@ -0,0 +1,32 @@ +# VDR plugin language source file. +# Copyright (C) 2008 Klaus Schmidinger +# This file is distributed under the same license as the VDR package. +# Rolf Ahrenberg , 2008. +# +msgid "" +msgstr "" +"Project-Id-Version: pictures 0.0.1\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-01-12 17:38+0100\n" +"PO-Revision-Date: 2008-01-12 17:41+0100\n" +"Last-Translator: Rolf Ahrenberg \n" +"Language-Team: Finnish\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 "Kuvat" + +msgid "A simple picture viewer" +msgstr "Yksinkertainen kuvaselain" + +msgid "Picture directory" +msgstr "Kuvahakemisto" + +msgid "Slide show delay (s)" +msgstr "Diaesityksen viive (s)" + +msgid "No picture directory has been defined!" +msgstr "Kuvahakemistoa ei ole määritelty!" diff --git a/PLUGINS/src/skincurses/HISTORY b/PLUGINS/src/skincurses/HISTORY index 34efba9..e5bfa49 100644 --- a/PLUGINS/src/skincurses/HISTORY +++ b/PLUGINS/src/skincurses/HISTORY @@ -61,3 +61,7 @@ VDR Plugin 'skincurses' Revision History 2007-08-26: Version 0.1.4 - Adapted to the new Level parameter of cOsd. + +2008-01-19: + +- Updated the Makefile of the skincurses plugin (thanks to Rolf Ahrenberg). diff --git a/PLUGINS/src/skincurses/Makefile b/PLUGINS/src/skincurses/Makefile index 17f8540..4dc4e28 100644 --- a/PLUGINS/src/skincurses/Makefile +++ b/PLUGINS/src/skincurses/Makefile @@ -1,11 +1,13 @@ # # Makefile for a Video Disk Recorder plugin # -# $Id: Makefile 1.14 2007/11/04 10:52:13 kls Exp $ +# $Id: Makefile 1.15 2008/01/19 11:40:33 kls Exp $ # The official name of this plugin. # This name will be used in the '-P...' option of VDR to load the plugin. # By default the main source file also carries this name. +# IMPORTANT: the presence of this macro is important for the Make.config +# file. So it must be defined, even if it is not used here! # PLUGIN = skincurses @@ -16,7 +18,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri ### The C++ compiler and options: CXX ?= g++ -CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual +CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses ### The directory environment: @@ -56,9 +58,9 @@ all: libvdr-$(PLUGIN).so i18n %.o: %.c $(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $< -# Dependencies: +### Dependencies: -MAKEDEP = g++ -MM -MG +MAKEDEP = $(CXX) -MM -MG DEPFILE = .dependencies $(DEPFILE): Makefile @$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@ @@ -88,7 +90,7 @@ $(I18Nmsgs): $(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo cp $< $@ .PHONY: i18n -i18n: $(I18Nmsgs) +i18n: $(I18Nmsgs) $(I18Npot) ### Targets: @@ -105,5 +107,4 @@ dist: clean @echo Distribution package created as $(PACKAGE).tgz clean: - @-rm -f $(PODIR)/*.mo $(PODIR)/*.pot - @-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~ + @-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~ $(PODIR)/*.mo $(PODIR)/*.pot -- cgit v1.2.3