rpms/vdr/devel timercmd-0.1_1.6.0.diff, NONE, 1.1 .cvsignore, 1.14, 1.15 sources, 1.14, 1.15 vdr.spec, 1.26, 1.27 vdr-1.6.0-plugin-epgsearch-timercmd-0.1.diff, 1.2, NONE
Ville Skytta (scop)
fedora-extras-commits at redhat.com
Sat May 10 16:20:14 UTC 2008
- Previous message (by thread): rpms/vdr/F-9 timercmd-0.1_1.6.0.diff, NONE, 1.1 .cvsignore, 1.14, 1.15 sources, 1.14, 1.15 vdr.spec, 1.26, 1.27 vdr-1.6.0-plugin-epgsearch-timercmd-0.1.diff, 1.2, NONE
- Next message (by thread): comps/po fr.po,1.10,1.11
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: scop
Update of /cvs/pkgs/rpms/vdr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv699/devel
Modified Files:
.cvsignore sources vdr.spec
Added Files:
timercmd-0.1_1.6.0.diff
Removed Files:
vdr-1.6.0-plugin-epgsearch-timercmd-0.1.diff
Log Message:
* Sat May 10 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-3
- Update liemikuutio patch to 1.21.
- Change timercmd patch to the one shipped with epgsearch 0.9.24.
- Include vdr-i18n-to-gettext in -devel.
- Own (%ghost) videodir/.update.
timercmd-0.1_1.6.0.diff:
--- NEW FILE timercmd-0.1_1.6.0.diff ---
diff -Nru vdr-1.6.0/config.c vdr-1.6.0-patched/config.c
--- vdr-1.6.0/config.c 2008-02-17 14:39:00.000000000 +0100
+++ vdr-1.6.0-patched/config.c 2008-04-29 22:55:41.000000000 +0200
@@ -125,6 +125,7 @@
cCommands Commands;
cCommands RecordingCommands;
+cCommands TimerCommands;
// --- cSVDRPhosts -----------------------------------------------------------
diff -Nru vdr-1.6.0/config.h vdr-1.6.0-patched/config.h
--- vdr-1.6.0/config.h 2008-03-23 11:26:10.000000000 +0100
+++ vdr-1.6.0-patched/config.h 2008-04-29 22:55:41.000000000 +0200
@@ -168,6 +168,7 @@
extern cCommands Commands;
extern cCommands RecordingCommands;
+extern cCommands TimerCommands;
extern cSVDRPhosts SVDRPhosts;
class cSetupLine : public cListObject {
diff -Nru vdr-1.6.0/menu.c vdr-1.6.0-patched/menu.c
--- vdr-1.6.0/menu.c 2008-03-16 12:15:28.000000000 +0100
+++ vdr-1.6.0-patched/menu.c 2008-04-29 22:55:41.000000000 +0200
@@ -772,8 +772,20 @@
return state;
}
-// --- cMenuTimerItem --------------------------------------------------------
+// --- cMenuCommands ---------------------------------------------------------
+// declaration shifted so it can be used in cMenuTimers
+class cMenuCommands : public cOsdMenu {
+private:
+ cCommands *commands;
+ char *parameters;
+ eOSState Execute(void);
+public:
+ cMenuCommands(const char *Title, cCommands *Commands, const char *Parameters = NULL);
+ virtual ~cMenuCommands();
+ virtual eOSState ProcessKey(eKeys Key);
+ };
+// --- cMenuTimerItem --------------------------------------------------------
class cMenuTimerItem : public cOsdItem {
private:
cTimer *timer;
@@ -836,6 +848,7 @@
eOSState OnOff(void);
eOSState Info(void);
cTimer *CurrentTimer(void);
+ eOSState Commands(eKeys Key = kNone);
void SetHelpKeys(void);
public:
cMenuTimers(void);
@@ -952,6 +965,53 @@
return osContinue;
}
+#define CHECK_2PTR_NULL(x_,y_) ((x_)? ((y_)? y_:""):"")
+
+eOSState cMenuTimers::Commands(eKeys Key)
+{
+ if (HasSubMenu() || Count() == 0)
+ return osContinue;
+ cTimer *ti = CurrentTimer();
+ if (ti) {
+ char *parameter = NULL;
+ const cEvent *pEvent = ti->Event();
+ int iRecNumber=0;
+
+ if(!pEvent) {
+ Timers.SetEvents();
+ pEvent = ti->Event();
+ }
+ if(pEvent) {
+// create a dummy recording to get the real filename
+ cRecording *rc_dummy = new cRecording(ti, pEvent);
+ Recordings.Load();
+ cRecording *rc = Recordings.GetByName(rc_dummy->FileName());
+
+ delete rc_dummy;
+ if(rc)
+ iRecNumber=rc->Index() + 1;
+ }
+//Parameter format TimerNumber 'ChannelId' Start Stop 'Titel' 'Subtitel' 'file' RecNumer
+// 1 2 3 4 5 6 7 8
+ asprintf(¶meter, "%d '%s' %d %d '%s' '%s' '%s' %d", ti->Index(),
+ *ti->Channel()->GetChannelID().ToString(),
+ (int)ti->StartTime(),
+ (int)ti->StopTime(),
+ CHECK_2PTR_NULL(pEvent, pEvent->Title()),
+ CHECK_2PTR_NULL(pEvent, pEvent->ShortText()),
+ ti->File(),
+ iRecNumber);
+ isyslog("timercmd: %s", parameter);
+ cMenuCommands *menu;
+ eOSState state = AddSubMenu(menu = new cMenuCommands(tr("Timer commands"), &TimerCommands, parameter));
+ free(parameter);
+ if (Key != kNone)
+ state = menu->ProcessKey(Key);
+ return state;
+ }
+ return osContinue;
+}
+
eOSState cMenuTimers::ProcessKey(eKeys Key)
{
int TimerNumber = HasSubMenu() ? Count() : -1;
@@ -966,6 +1026,8 @@
case kInfo:
case kBlue: return Info();
break;
+ case k1...k9: return Commands(Key);
+ case k0: return (TimerCommands.Count()? Commands():osContinue);
default: break;
}
}
@@ -1548,17 +1610,6 @@
// --- cMenuCommands ---------------------------------------------------------
-class cMenuCommands : public cOsdMenu {
-private:
- cCommands *commands;
- char *parameters;
- eOSState Execute(void);
-public:
- cMenuCommands(const char *Title, cCommands *Commands, const char *Parameters = NULL);
- virtual ~cMenuCommands();
- virtual eOSState ProcessKey(eKeys Key);
- };
-
cMenuCommands::cMenuCommands(const char *Title, cCommands *Commands, const char *Parameters)
:cOsdMenu(Title)
{
diff -Nru vdr-1.6.0/po/de_DE.po vdr-1.6.0-patched/po/de_DE.po
--- vdr-1.6.0/po/de_DE.po 2008-03-23 11:31:29.000000000 +0100
+++ vdr-1.6.0-patched/po/de_DE.po 2008-04-29 22:55:41.000000000 +0200
@@ -381,6 +381,9 @@
msgid "Timer still recording - really delete?"
msgstr "Timer zeichnet auf - trotzdem löschen?"
+msgid "Timer commands"
+msgstr "Befehle für Timer"
+
msgid "Event"
msgstr "Sendung"
diff -Nru vdr-1.6.0/vdr.c vdr-1.6.0-patched/vdr.c
--- vdr-1.6.0/vdr.c 2008-03-14 14:22:39.000000000 +0100
+++ vdr-1.6.0-patched/vdr.c 2008-04-29 22:55:41.000000000 +0200
@@ -569,6 +569,7 @@
Timers.Load(AddDirectory(ConfigDirectory, "timers.conf")) &&
Commands.Load(AddDirectory(ConfigDirectory, "commands.conf"), true) &&
RecordingCommands.Load(AddDirectory(ConfigDirectory, "reccmds.conf"), true) &&
+ TimerCommands.Load(AddDirectory(ConfigDirectory, "timercmds.conf"), true) &&
SVDRPhosts.Load(AddDirectory(ConfigDirectory, "svdrphosts.conf"), true) &&
Keys.Load(AddDirectory(ConfigDirectory, "remote.conf")) &&
KeyMacros.Load(AddDirectory(ConfigDirectory, "keymacros.conf"), true)
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore 7 Apr 2008 19:31:02 -0000 1.14
+++ .cvsignore 10 May 2008 16:19:36 -0000 1.15
@@ -1,4 +1,4 @@
vdr_1.4.5-2.ds.diff.gz
vdr-1.6.0.tar.bz2
vdr-1.6.0-ttxtsubs-0.0.5.diff.gz
-vdr-1.6.0-liemikuutio-1.20.diff.gz
+vdr-1.6.0-liemikuutio-1.21.diff.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources 7 Apr 2008 19:31:02 -0000 1.14
+++ sources 10 May 2008 16:19:36 -0000 1.15
@@ -1,4 +1,4 @@
3e9287f726df5a667054a15078235791 vdr_1.4.5-2.ds.diff.gz
76f4ebe6525a35e33313d27a3f8e80c0 vdr-1.6.0.tar.bz2
2e994fcf18766fed279e2a8f2a70e717 vdr-1.6.0-ttxtsubs-0.0.5.diff.gz
-a17349da99994ba6aad5737bf810d458 vdr-1.6.0-liemikuutio-1.20.diff.gz
+f254c57830efc0f19c06c11f302c1195 vdr-1.6.0-liemikuutio-1.21.diff.gz
Index: vdr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/vdr.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- vdr.spec 13 Apr 2008 15:23:36 -0000 1.26
+++ vdr.spec 10 May 2008 16:19:36 -0000 1.27
@@ -21,7 +21,7 @@
Name: vdr
Version: 1.6.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Video Disk Recorder
Group: Applications/Multimedia
@@ -50,7 +50,7 @@
Patch0: %{name}-channel+epg.patch
# TODO
Patch1: http://zap.tartarus.org/~ds/debian/dists/stable/main/source/vdr_1.4.5-2.ds.diff.gz
-Patch2: http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.6.0-liemikuutio-1.20.diff.gz
+Patch2: http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.6.0-liemikuutio-1.21.diff.gz
Patch3: %{name}-1.6.0-scriptnames.patch
Patch4: %{name}-1.6.0-paths.patch
Patch5: %{name}-1.5.18-use-pkgconfig.patch
@@ -64,11 +64,9 @@
# TODO
Patch10: %{name}-1.4.7-hlcutter-0.2.0-finnish.patch
# mainmenuhooks, timercmd and progressbar-support from
-# http://winni.vdr-developer.org/epgsearch/downloads/beta/vdr-epgsearch-0.9.24.beta26.tgz
+# http://winni.vdr-developer.org/epgsearch/downloads/vdr-epgsearch-0.9.24.tgz
Patch11: MainMenuHooks-v1_0.patch
-# timercmd included in epgsearch does not apply yet
-#Patch12: timercmd-0.1_1.5.12.diff
-Patch12: http://www.hoochvdr.info/files/vdr-1.6.0-plugin-epgsearch-timercmd-0.1.diff
+Patch12: timercmd-0.1_1.6.0.diff
Patch13: %{name}-1.5.17-progressbar-support-0.0.1.diff
Patch14: %{name}-1.6.0-includes+pkgconfig.patch
Patch15: %{name}-1.6.0-fedora-pkgconfig.patch
@@ -319,6 +317,8 @@
install -dm 755 $RPM_BUILD_ROOT%{videodir}
install -dm 755 $RPM_BUILD_ROOT%{audiodir}
+touch $RPM_BUILD_ROOT%{videodir}/.update
+
install -dm 755 $RPM_BUILD_ROOT%{plugindir}/bin
sed -e 's|/var/lib/vdr/|%{vardir}/|' < %{SOURCE14} \
> $RPM_BUILD_ROOT%{plugindir}/bin/%{name}-shutdown.sh
@@ -348,6 +348,8 @@
# devel
install -pm 755 %{SOURCE9} $RPM_BUILD_ROOT%{_bindir}/vdr-config
+install -pm 755 i18n-to-gettext.pl \
+ $RPM_BUILD_ROOT%{_bindir}/vdr-i18n-to-gettext
install -pm 755 newplugin $RPM_BUILD_ROOT%{_bindir}/vdr-newplugin
install -pm 644 Make.config $RPM_BUILD_ROOT%{_libdir}/vdr
ln -s $(abs2rel %{_includedir}/vdr/config.h %{_libdir}/vdr) \
@@ -433,6 +435,7 @@
# TODO: tighten ownerships to root:root for some files in %{configdir}
%config(noreplace) %{configdir}/*.conf
%dir %{videodir}/
+%ghost %{videodir}/.update
%dir %{audiodir}/
%ghost %{vardir}/acpi-wakeup
%ghost %{vardir}/themes/*.theme
@@ -452,6 +455,7 @@
%doc PLUGINS.html
%endif # docs
%{_bindir}/vdr-config
+%{_bindir}/vdr-i18n-to-gettext
%{_bindir}/vdr-newplugin
%{_includedir}/libsi/
%{_includedir}/vdr/
@@ -485,6 +489,12 @@
%endif # plugins
%changelog
+* Sat May 10 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-3
+- Update liemikuutio patch to 1.21.
+- Change timercmd patch to the one shipped with epgsearch 0.9.24.
+- Include vdr-i18n-to-gettext in -devel.
+- Own (%%ghost) videodir/.update.
+
* Sun Apr 13 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-2
- Apply upstream 1.6.0-1 maintenance patch.
- Update timer info patch to 0.5 (fixes the "±" sign).
--- vdr-1.6.0-plugin-epgsearch-timercmd-0.1.diff DELETED ---
- Previous message (by thread): rpms/vdr/F-9 timercmd-0.1_1.6.0.diff, NONE, 1.1 .cvsignore, 1.14, 1.15 sources, 1.14, 1.15 vdr.spec, 1.26, 1.27 vdr-1.6.0-plugin-epgsearch-timercmd-0.1.diff, 1.2, NONE
- Next message (by thread): comps/po fr.po,1.10,1.11
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list