r5390 - in /vdr/vdr-plugin-dvd/trunk/debian: ./ patches/
tom-guest at users.alioth.debian.org
tom-guest at users.alioth.debian.org
Tue Aug 28 23:39:44 UTC 2007
Author: tom-guest
Date: Tue Aug 28 23:39:44 2007
New Revision: 5390
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=5390
Log:
New upstream cvs release 0.3.6~b03+cvs20070813
Removed:
vdr/vdr-plugin-dvd/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
vdr/vdr-plugin-dvd/trunk/debian/patches/02_ignore_not_existing_drive.dpatch
vdr/vdr-plugin-dvd/trunk/debian/patches/03_vdr-1.3.38-fix.dpatch
vdr/vdr-plugin-dvd/trunk/debian/patches/90_APIVERSION.dpatch
vdr/vdr-plugin-dvd/trunk/debian/patches/91_dvd-1.5.0.dpatch
Modified:
vdr/vdr-plugin-dvd/trunk/debian/changelog
vdr/vdr-plugin-dvd/trunk/debian/copyright
vdr/vdr-plugin-dvd/trunk/debian/patches/00list
vdr/vdr-plugin-dvd/trunk/debian/patches/04_vdr-dvd_resume.dpatch
Modified: vdr/vdr-plugin-dvd/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-dvd/trunk/debian/changelog?rev=5390&op=diff
==============================================================================
--- vdr/vdr-plugin-dvd/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-dvd/trunk/debian/changelog Tue Aug 28 23:39:44 2007
@@ -1,3 +1,16 @@
+vdr-plugin-dvd (0.3.6~b03+cvs20070813-1) unstable; urgency=low
+
+ * New upstream cvs release
+ * Removed 01_Makefile-fPIC-fix.dpatch
+ * Removed 02_ignore_not_existing_drive.dpatch
+ * Removed 03_vdr-1.3.38-fix.dpatch
+ * Removed 90_APIVERSION.dpatch
+ * Removed 91_dvd-1.5.0.dpatch
+ * Adapted 04_vdr-dvd_resume.dpatch
+ * Corrected license in debian/copyright
+
+ -- Thomas Günther <tom at toms-cafe.de> Wed, 29 Aug 2007 00:55:28 +0200
+
vdr-plugin-dvd (0.3.6~b03-10) unstable; urgency=low
* Release for vdrdevel 1.5.6
Modified: vdr/vdr-plugin-dvd/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-dvd/trunk/debian/copyright?rev=5390&op=diff
==============================================================================
--- vdr/vdr-plugin-dvd/trunk/debian/copyright (original)
+++ vdr/vdr-plugin-dvd/trunk/debian/copyright Tue Aug 28 23:39:44 2007
@@ -1,7 +1,5 @@
-This package was debianized by Thomas Schmidt <thomas.schmidt at in.stud.tu-ilmenau.de> on
-Fri, 18 Oct 2002 13:45:37 +0200.
-
-It was downloaded from http://sourceforge.net/projects/dvdplugin
+Upstream Homepage:
+ http://sourceforge.net/projects/dvdplugin
Upstream Authors:
Andreas Schultz <aschultz at warp10.net>
@@ -11,17 +9,20 @@
Debian Maintainers:
Tobias Grimm <tg at e-tobi.net>
+ Thomas Günther <tom at toms-cafe.de>
Thomas Schmidt <tschmidt at debian.org>
-
+
Copyright:
- (C) 2001 - 2002 Andreas Schultz
+ (C) 2001 - 2002 Andreas Schultz
(C) 2000 Samuel Hocevar, Michel Lespinasse
+
+Copyright (Debian packaging):
+ (C) 2002 - 2007 Tobias Grimm, Thomas Günther, Thomas Schmidt
License:
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+ the Free Software Foundation; version 2 dated June, 1991.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -35,3 +36,7 @@
The complete text of the GNU General Public License can be found
in /usr/share/common-licenses/GPL on most Debian systems.
+
+License (Debian packaging):
+ The Debian packaging is licensed under the GPL, version 2 or any
+ later version, see /usr/share/common-licenses/GPL.
Modified: vdr/vdr-plugin-dvd/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-dvd/trunk/debian/patches/00list?rev=5390&op=diff
==============================================================================
--- vdr/vdr-plugin-dvd/trunk/debian/patches/00list (original)
+++ vdr/vdr-plugin-dvd/trunk/debian/patches/00list Tue Aug 28 23:39:44 2007
@@ -1,8 +1,2 @@
-01_Makefile-fPIC-fix
-02_ignore_not_existing_drive
-03_vdr-1.3.38-fix
04_vdr-dvd_resume
10_dvd.c
-
-90_APIVERSION
-91_dvd-1.5.0
Modified: vdr/vdr-plugin-dvd/trunk/debian/patches/04_vdr-dvd_resume.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-dvd/trunk/debian/patches/04_vdr-dvd_resume.dpatch?rev=5390&op=diff
==============================================================================
--- vdr/vdr-plugin-dvd/trunk/debian/patches/04_vdr-dvd_resume.dpatch (original)
+++ vdr/vdr-plugin-dvd/trunk/debian/patches/04_vdr-dvd_resume.dpatch Tue Aug 28 23:39:44 2007
@@ -1,41 +1,44 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## 04_vdr-dvd_resume.dpatch by Patrick Cernko <errror at errror.org>
## http://www.vdrportal.de/board/thread.php?threadid=31685
+##
+## Thomas Günther <tom at toms-cafe.de>:
+## - adapted to dvd plugin version cvs20070813
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Patch to resume a dvd where it was interupted by the user.
@DPATCH@
-diff -Naur --exclude CVS dvd.orig/Makefile dvd/Makefile
---- dvd.orig/Makefile 2005-03-19 15:35:05.000000000 +0100
-+++ dvd/Makefile 2005-03-18 17:53:03.000000000 +0100
-@@ -65,6 +65,10 @@
+diff -Naurp dvd-0.3.6~b03+cvs20070813/Makefile dvd-0.3.6~b03+cvs20070813-resume/Makefile
+--- dvd-0.3.6~b03+cvs20070813/Makefile 2007-08-27 18:09:14.000000000 +0000
++++ dvd-0.3.6~b03+cvs20070813-resume/Makefile 2007-08-27 18:33:53.000000000 +0000
+@@ -64,6 +64,10 @@ CXXFLAGS += -O3
LDFLAGS += -O3 -Wl,--retain-symbols-file,retain-sym
endif
-
+
+ifdef RESUMEDIR
+ DEFINES += -DRESUMEDIR=\"$(RESUMEDIR)\"
+endif
+
### The object files (add further files here):
-
+
OBJS = $(PLUGIN).o dvddev.o player-dvd.o control-dvd.o dvdspu.o \
-diff -Naur --exclude CVS dvd.orig/player-dvd.c dvd/player-dvd.c
---- dvd.orig/player-dvd.c 2005-03-19 15:35:05.000000000 +0100
-+++ dvd/player-dvd.c 2005-03-19 15:32:27.000000000 +0100
+diff -Naurp dvd-0.3.6~b03+cvs20070813/player-dvd.c dvd-0.3.6~b03+cvs20070813-resume/player-dvd.c
+--- dvd-0.3.6~b03+cvs20070813/player-dvd.c 2007-08-27 18:09:14.000000000 +0000
++++ dvd-0.3.6~b03+cvs20070813-resume/player-dvd.c 2007-08-27 18:41:01.000000000 +0000
@@ -21,6 +21,8 @@
#include <vdr/thread.h>
#include <vdr/device.h>
#include <vdr/plugin.h>
+// for VideoDirectory variable
+#include <vdr/videodir.h>
-
+
#ifdef HAVE_CONFIG_H
#include "config.h"
-@@ -231,6 +233,216 @@
+@@ -231,6 +233,216 @@ void cIframeAssembler::Put(unsigned char
}
-
-
+
+
+// --- cResumeEntry ------------------------------------------------------------
+
+// borrowed from the mplayer plugin code and adapted to the dvd resume requirements
@@ -247,30 +250,31 @@
+
+
// --- cDvdPlayer ------------------------------------------------------------
-
+
//XXX+ also used in recorder.c - find a better place???
-@@ -287,6 +499,9 @@
+@@ -287,6 +499,9 @@ cDvdPlayer::cDvdPlayer(void): cThread("d
skipPlayVideo=false;
fastWindFactor=1;
-
+
+ // resume
+ resume = new cDVDPlayerResume;
+
clearSeenSubpStream();
clearSeenAudioTrack();
-
-@@ -329,6 +544,7 @@
- if(titleinfo_str) { free(titleinfo_str); titleinfo_str=0; }
- if(title_str) { free(title_str); title_str=0; }
- if(aspect_str) { free(aspect_str); aspect_str=0; }
+
+@@ -334,6 +549,8 @@ cDvdPlayer::~cDvdPlayer()
+
+ if(aspect_str)
+ free(aspect_str);
++
+ delete resume;
}
-
+
void cDvdPlayer::setController (cDvdPlayerControl *ctrl )
-@@ -562,6 +778,100 @@
+@@ -567,6 +784,100 @@ uint64_t cDvdPlayer::delay_ticks(uint64_
#endif
}
-
+
+char* cDvdPlayer::GetDVDResumeKey() const {
+ // first we fetch the total number of titles of the current dvd
+ int totalTitles;
@@ -367,11 +371,11 @@
+
void cDvdPlayer::Action(void) {
memset(event_buf, 0, sizeof(uint8_t)*4096);
-
-@@ -631,6 +941,13 @@
-
+
+@@ -636,6 +947,13 @@ void cDvdPlayer::Action(void) {
+
bool firstClear = true;
-
+
+ // we need to know the very first VTS change to hook inthe resume call
+ bool first_vts_change = true;
+ // we cannot directly resume to the exact time, so we hook on the next cell change when resuming
@@ -379,10 +383,10 @@
+ // and seek the the exact time stored here
+ int64_t resSecond = 0;
+
- while( running && nav ) {
-
+ while(running && nav) {
+
if (!pframe) {
-@@ -1107,6 +1424,22 @@
+@@ -1112,6 +1430,22 @@ void cDvdPlayer::Action(void) {
SetTitleInfoString();
SetTitleString();
SetAspectString();
@@ -405,21 +409,21 @@
break;
case DVDNAV_CELL_CHANGE: {
DEBUG_NAV("%s:%d:NAV CELL CHANGE\n", __FILE__, __LINE__);
-@@ -1127,6 +1460,11 @@
+@@ -1132,6 +1466,11 @@ void cDvdPlayer::Action(void) {
// cell change .. game over ..
changeNavSubpStreamOnceInSameCell=false;
- SetTitleInfoString();
-+ if (next_cell_change) {
-+ next_cell_change = false;
-+ // we are resuming the current dvd. NOW its time to seek to the correct second.
-+ Goto(resSecond);
-+ }
+ SetTitleInfoString();
++ if (next_cell_change) {
++ next_cell_change = false;
++ // we are resuming the current dvd. NOW its time to seek to the correct second.
++ Goto(resSecond);
++ }
break;
}
case DVDNAV_NAV_PACKET: {
-@@ -1853,7 +2191,16 @@
+@@ -1874,7 +2213,16 @@ void cDvdPlayer::Stop(void)
if(!DVDActiveAndRunning()) return;
-
+
if( running && nav ) {
- dvdnav_stop(nav);
+ // we will stop replay now. Its time to save the current possition
@@ -434,11 +438,11 @@
+ running = false;
}
}
-
-@@ -2163,22 +2510,36 @@
+
+@@ -2189,22 +2537,36 @@ void cDvdPlayer::NextAngle()
(void) GotoAngle(++cur_angle);
}
-
+
-int cDvdPlayer::GotoTitle(int title)
+// GotoTitle now optionally takes a chapter to seek to in the given title.
+int cDvdPlayer::GotoTitle(int title, int chapter /*= 1*/)
@@ -450,15 +454,14 @@
LOCK_THREAD;
DEBUG_NAV("DVD NAV SPU clear & empty %s:%d\n", __FILE__, __LINE__);
Empty();
-
+
+ // check if the given title is in the title range of this dvd
dvdnav_get_number_of_titles(nav, &titleNumber);
--
++ if(title>titleNumber) targetTitle=1;
++ if(title<=0) targetTitle=titleNumber;
+
- if(title>titleNumber) title=1;
- if(title<=0) title=titleNumber;
-+ if(title>titleNumber) targetTitle=1;
-+ if(title<=0) targetTitle=titleNumber;
-+
+ // if given title is in the bounds of this dvd's title range
+ if (title == targetTitle) {
+ // check if the chapter is in the title's chapter range
@@ -469,29 +472,29 @@
+ // otherwise reset it to the first chapter.
+ chapter = 1;
+ }
-
+
if (stillTimer == 0)
{
- dvdnav_part_play(nav, title, 1);
+ dvdnav_part_play(nav, title, chapter);
// dvdnav_title_play(nav, title);
}
-
-diff -Naur --exclude CVS dvd.orig/player-dvd.h dvd/player-dvd.h
---- dvd.orig/player-dvd.h 2005-03-19 15:35:05.000000000 +0100
-+++ dvd/player-dvd.h 2005-03-19 15:15:50.000000000 +0100
-@@ -52,6 +52,7 @@
-
+
+diff -Naurp dvd-0.3.6~b03+cvs20070813/player-dvd.h dvd-0.3.6~b03+cvs20070813-resume/player-dvd.h
+--- dvd-0.3.6~b03+cvs20070813/player-dvd.h 2007-08-27 18:09:14.000000000 +0000
++++ dvd-0.3.6~b03+cvs20070813-resume/player-dvd.h 2007-08-27 18:33:53.000000000 +0000
+@@ -52,6 +52,7 @@ class IntegerListObject : public cListOb
+
class cDvdPlayerControl ;
class cIframeAssembler;
+class cDVDPlayerResume;
-
+
class cDvdPlayer : public cPlayer, cThread {
private:
-@@ -183,6 +184,31 @@
+@@ -183,6 +184,31 @@ class cDvdPlayer : public cPlayer, cThre
int playPacket(unsigned char *&cache_buf, bool trickMode, bool noAudio);
void playSPU(int spuId, unsigned char *data, int datalen);
-
+
+ //resuming
+ /**
+ * the resume database
@@ -520,13 +523,13 @@
protected: //Player
virtual void Activate(bool On);
virtual void Action(void);
-@@ -313,7 +339,8 @@
+@@ -313,7 +339,8 @@ public:
*
* return set title ..
*/
- int GotoTitle(int title);
+ // GotoTitle now optionally takes a chapter to seek to in the given title.
+ int GotoTitle(int title, int chapter = 1);
-
+
/**
* jump to the previous Title (rotate)
More information about the pkg-vdr-dvb-changes
mailing list