debian/0000755000000000000000000000000012145064721007170 5ustar debian/prerm0000644000000000000000000000226512126022502010233 0ustar #! /bin/sh # prerm script for vdr-plugin-dvd # # see: dh_installdeb(1) set -e # summary of how this script can be called: # * `remove' # * `upgrade' # * `failed-upgrade' # * `remove' `in-favour' # * `deconfigure' `in-favour' # `removing' # # for details, see http://www.debian.org/doc/debian-policy/ or # the debian-policy package case "$1" in remove) # Delete the dvd link when removing the package rm -f /var/cache/vdr/dvd > /dev/null 2>&1 || true # remove vdr from the groups required by this plugin, if no other # packages need vdr to be a member in these groups sh /usr/lib/vdr/vdr-groups.sh --remove vdr-plugin-dvd ;; upgrade|deconfigure) ;; failed-upgrade) ;; *) echo "prerm called with unknown argument \`$1'" >&2 exit 1 ;; esac # dh_installdeb will replace this with shell code automatically # generated by other debhelper scripts. #DEBHELPER# exit 0 debian/patches/0000755000000000000000000000000012126022502010605 5ustar debian/patches/13_fix-dvdnav-using-c++-keywords.patch0000644000000000000000000000100312126022502017527 0ustar Description: When including dvdnvav.h define/undefine the "this" keyword, used in dvdnav.h Author: Tobias Grimm Bug-Debian: http://bugs.debian.org/642673 --- vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013.orig/player-dvd.h +++ vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013/player-dvd.h @@ -11,8 +11,10 @@ #ifndef __PLAYER_DVD_H #define __PLAYER_DVD_H +#define this _this #include #include +#undef this #include #include debian/patches/12_dvd-fixed-german-spelling.patch0000644000000000000000000000662512126022502017075 0ustar #! /bin/sh /usr/share/dpatch/dpatch-run ## 12_dvd-fixed-german-spelling.dpatch by Thomas Günther ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: Fixed spelling errors in german translation. @DPATCH@ Index: vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013/i18n.c =================================================================== --- vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013.orig/i18n.c 2008-12-23 18:26:32.000000000 +0100 +++ vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013/i18n.c 2011-04-09 17:23:49.000000000 +0200 @@ -125,7 +125,7 @@ }, { "Setup.DVD$Preferred menu language", // English - "Bevorzugte Spache für Menüs", // Deutsch + "Bevorzugte Sprache für Menüs", // Deutsch "Prednostni jezik za menije", // Slovenski "menu - linguaggio preferito", // Italiano "Taalkeuze voor menu", // Nederlands @@ -177,7 +177,7 @@ }, { "Setup.DVD$Preferred subtitle language", // English - "Bevorzugte Spache für Untertitel", // Deutsch + "Bevorzugte Sprache für Untertitel", // Deutsch "Prednostni jezik za podnapise", // Slovenski "sottotitoli - linguaggio preferito", // Italiano "Taalkeuze voor ondertitels", // Nederlands @@ -333,7 +333,7 @@ }, { "Error.DVD$Error opening DVD!", // English - "Fehler beim öffnen der DVD!", // Deutsch + "Fehler beim Öffnen der DVD!", // Deutsch "Napaka pri odpiranju DVD-ja!", // Slovenski "", // Italiano "Fout bij het openen van de DVD!", // Nederlands @@ -359,7 +359,7 @@ }, { "Error.DVD$Error fetching data from DVD!", // English - "Fehler beim lesen von der DVD!", // Deutsch + "Fehler beim Lesen von der DVD!", // Deutsch "Napaka pri branju podatkov iz DVD-ja!", // Slovenski "", // Italiano "Error bij het verkrijgen van data van de DVD!", // Nederlands Index: vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013/po/de_DE.po =================================================================== --- vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013.orig/po/de_DE.po 2008-12-23 17:56:17.000000000 +0100 +++ vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013/po/de_DE.po 2011-04-09 17:23:49.000000000 +0200 @@ -25,19 +25,19 @@ msgstr "DVD" msgid "Error.DVD$Error opening DVD!" -msgstr "Fehler beim öffnen der DVD!" +msgstr "Fehler beim Öffnen der DVD!" msgid "Error.DVD$Error fetching data from DVD!" -msgstr "Fehler beim lesen von der DVD!" +msgstr "Fehler beim Lesen von der DVD!" msgid "Setup.DVD$Preferred menu language" -msgstr "Bevorzugte Spache für Menüs" +msgstr "Bevorzugte Sprache für Menüs" msgid "Setup.DVD$Preferred audio language" msgstr "Bevorzugte Sprache für Dialog" msgid "Setup.DVD$Preferred subtitle language" -msgstr "Bevorzugte Spache für Untertitel" +msgstr "Bevorzugte Sprache für Untertitel" msgid "Setup.DVD$Player region code" msgstr "Regionalkode für DVD Spieler" debian/patches/05_stdint.patch0000644000000000000000000000153212126022502013440 0ustar #! /bin/sh /usr/share/dpatch/dpatch-run ## 05_stdint.dpatch by Tobias Grimm ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: Define __STDC_LIMIT_MACROS to make the C limit macros available to the ## DP: C++ code. @DPATCH@ Index: vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013/Makefile =================================================================== --- vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013.orig/Makefile 2011-04-09 17:23:33.000000000 +0200 +++ vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013/Makefile 2011-04-09 17:23:40.000000000 +0200 @@ -43,7 +43,7 @@ INCLUDES += -I$(VDRDIR)/include -I$(NAVDIR) -DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' +DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -D__STDC_LIMIT_MACROS # to use xine videoout: ifdef POLLTIMEOUTS_BEFORE_DEVICECLEAR debian/patches/11_allow-non-existing-dvd-drive.patch0000644000000000000000000000200612126022502017545 0ustar #! /bin/sh /usr/share/dpatch/dpatch-run ## 11_allow-non-existing-dvd-drive.dpatch by Tobias Grimm ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: Don't let VDR be unstartable, if the DVD drive is not accessible, ## DP: just log a warning and continue. @DPATCH@ Index: vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013/dvd.c =================================================================== --- vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013.orig/dvd.c 2011-04-09 17:23:43.000000000 +0200 +++ vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013/dvd.c 2011-04-09 17:23:46.000000000 +0200 @@ -76,8 +76,7 @@ // fprintf(stderr, "arg: %s\n", optarg); cDVD::SetDeviceName(optarg); if (!cDVD::DriveExists()) { - esyslog("vdr: DVD drive not found: %s", optarg); - return false; + esyslog("WARNING - DVD drive not found: %s\n", optarg); } break; default: debian/patches/10_dvd.c.patch0000644000000000000000000000152012126022502013122 0ustar #! /bin/sh /usr/share/dpatch/dpatch-run ## dvd.c patch ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: Removes stderr output on correctly parsed -C parameter @DPATCH@ Index: vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013/dvd.c =================================================================== --- vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013.orig/dvd.c 2007-09-16 18:31:50.000000000 +0200 +++ vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013/dvd.c 2011-04-09 17:23:43.000000000 +0200 @@ -73,7 +73,7 @@ #endif switch (c) { case 'C': - fprintf(stderr, "arg: %s\n", optarg); + // fprintf(stderr, "arg: %s\n", optarg); cDVD::SetDeviceName(optarg); if (!cDVD::DriveExists()) { esyslog("vdr: DVD drive not found: %s", optarg); debian/patches/series0000644000000000000000000000024712126022502012025 0ustar 04_vdr-dvd_resume.patch 05_stdint.patch 10_dvd.c.patch 11_allow-non-existing-dvd-drive.patch 12_dvd-fixed-german-spelling.patch 13_fix-dvdnav-using-c++-keywords.patch debian/patches/04_vdr-dvd_resume.patch0000644000000000000000000004411712126022502015066 0ustar #! /bin/sh /usr/share/dpatch/dpatch-run ## 04_vdr-dvd_resume.dpatch by Patrick Cernko ## http://www.vdrportal.de/board/thread.php?threadid=31685 ## ## Thomas Günther : ## - adapted to dvd plugin version cvs20070813 ## - adapted to dvd plugin version cvs20090426.0013 ## ## 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@ Index: vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013/Makefile =================================================================== --- vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013.orig/Makefile 2008-12-23 17:49:04.000000000 +0100 +++ vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013/Makefile 2011-04-09 17:23:33.000000000 +0200 @@ -64,6 +64,10 @@ 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 \ Index: vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013/player-dvd.c =================================================================== --- vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013.orig/player-dvd.c 2009-01-18 14:58:42.000000000 +0100 +++ vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013/player-dvd.c 2011-04-09 17:23:33.000000000 +0200 @@ -21,6 +21,8 @@ #include #include #include +// for VideoDirectory variable +#include #ifdef HAVE_CONFIG_H #include "config.h" @@ -231,6 +233,216 @@ } +// --- cResumeEntry ------------------------------------------------------------ + +// borrowed from the mplayer plugin code and adapted to the dvd resume requirements +class cResumeEntry : public cListObject { +public: + char *key; + int title; + int chapter; + int64_t second; + // + cResumeEntry(void); + ~cResumeEntry(); + }; + +cResumeEntry::cResumeEntry(void) +{ + key=0; +} + +cResumeEntry::~cResumeEntry() +{ + free(key); +} + +// --- cDVDPlayerResume ---------------------------------------------------------- + +// store resume database to this file ... +#define RESUME_FILE "dvdplayer.resume" + +// ... in this directory (default: /video) +#ifndef RESUMEDIR +#define RESUMEDIR VideoDirectory +#endif + + +// borrowed from the mplayer plugin code and adapted to the dvd resume requirements +class cDVDPlayerResume : public cList { +private: + char* resfile; // the full pathname of resume file + bool modified; // flag to indicate that memory database was modified and needs to be saved + /** + * LoadResume(): + * reads in the resume database file from resfile. + */ + void LoadResume(); + /** + * SaveResume(): + * saves the resume database to the file resfile. + * returns true on successful save. + */ + bool SaveResume(void); + /** + * search the (loaded) resume database for the given key. + * returns the cResumeEntry* if the key was found + * or NULL if no resume entry was found for the given key. + */ + cResumeEntry *FindResume(const char* key); +public: + cDVDPlayerResume(void); + ~cDVDPlayerResume(); + /** + * SetResume(): + * set the given resume values for the given key into the resume database. + * the resume database is loaded from file if not yet loaded. + */ + void SetResume(const char* key, int title, int chapter, int64_t second); + /** + * GetResume(): + * tries looking up the given key into the resume database. + * the resume database is loaded from file if not yet loaded. + * returns true if resume data could be found. In this case + * the givven arguments are filled with the resume data. Otherwise + * the arguments are not modified! + */ + bool GetResume(const char* key, int& title, int& chapter, int64_t& second); + }; + +cDVDPlayerResume::cDVDPlayerResume(void) +{ + // initialize the resume filename string. + asprintf(&resfile, "%s/%s", RESUMEDIR, RESUME_FILE); +} + +cDVDPlayerResume::~cDVDPlayerResume() +{ + // save resume data to disc before self-destruction. + SaveResume(); + // free the resume filename string, allocated in C'tor by asprintf + free(resfile); +} + +void cDVDPlayerResume::SetResume(const char* key, int title, int chapter, int64_t second) +{ + // (re)load resume data from file to be actual + LoadResume(); + cResumeEntry* re = FindResume(key); + if (re) { + // found a resume entry, so we can update it. + DEBUGDVD("resume: setting resume %d:%d:%lld (update)", title, chapter, second); + } else { + // no resume entry found yet, creating a new one + re = new cResumeEntry; + re->key = strdup(key); + Add(re); + DEBUGDVD("resume: setting resume %d:%d:%lld (new)", title, chapter, second); + } + // set the new resume data for the found/created entry + re->title = title; + re->chapter = chapter; + re->second = second; + // and mark memory database as modified to be saved. + modified = true; + // save it now (sync!) + SaveResume(); +} + +bool cDVDPlayerResume::GetResume(const char* key, int& title, int& chapter, int64_t& second) +{ + // (re)load the resume file to have actual values + LoadResume(); + cResumeEntry* re = FindResume(key); + if (re) { + // found a resume entry, copy values + title = re->title; + chapter = re->chapter; + second = re->second; + // indicate successful search + return true; + } + // no resume entry found in database + return false; +} + +void cDVDPlayerResume::LoadResume() +{ + // we will load the file for sure and add all entries, clear all old entries. + Clear(); + // no entries == no modifications + modified = false; + DEBUGDVD("resume: resume file is \"%s\"\n",resfile); + FILE *f = fopen(resfile,"r"); + if (f) { + DEBUGDVD("resume: successfully opened resume file\n"); + char line[768]; + // read file line by line + while(fgets(line,sizeof(line),f)) { + char key[512]; + int t, c; + int64_t s; + // parse line as "title:chapter:second:key" + if(sscanf(line,"%d:%d:%lld:%511[^\n]",&t,&c,&s,key) == 4) { + // successful parse, save in resume entry + cResumeEntry *re = new cResumeEntry; + re->key = strdup(key); + re->title = t; + re->chapter = c; + re->second = s; + // and add it to memory database + Add(re); + } + } + // don't forget to close what you have opened! + fclose(f); + } + // unsuccessful open leads to empty database as the file does not exists +} + +bool cDVDPlayerResume::SaveResume(void) +{ + if(modified) { + // modification indicated, save the database to the resume file + DEBUGDVD("resume: saving resume file\n"); + cSafeFile f(resfile); + if(f.Open()) { + // forall resume entries in the memory database + for (cResumeEntry *re=First(); re; re=Next(re)) { + // save the as one line in the format "title:chapter:second:key" + fprintf(f, "%d:%d:%lld:%s\n", re->title, re->chapter, re->second, re->key); + } + // don't forget to close what you have opened! + f.Close(); + // signal successful save + return true; + } else { + DEBUGDVD("resume: failed to save resume file\n"); + // saving did not succeed!!!! + return false; + } + } else { + // no modifications -> successful "save" :-) + return true; + } +} + +cResumeEntry *cDVDPlayerResume::FindResume(const char* key) +{ + DEBUGDVD("resume: searching resume position for \"%s\"\n", key); + // iterate over all entries in the memory database + for(cResumeEntry *re=First(); re; re=Next(re)) { + if (!strcasecmp(re->key, key)) { + // return the entry iff the keys match + DEBUGDVD("resume: found resume position %d:%d:%lld\n",re->title, re->chapter, re->second); + return re; + } + } + DEBUGDVD("resume: no resume position found\n"); + return NULL; +} + + // --- cDvdPlayer ------------------------------------------------------------ //XXX+ also used in recorder.c - find a better place??? @@ -287,6 +499,9 @@ skipPlayVideo=false; fastWindFactor=1; + // resume + resume = new cDVDPlayerResume; + clearSeenSubpStream(); clearSeenAudioTrack(); @@ -333,6 +548,8 @@ if(aspect_str) free(aspect_str); + + delete resume; } void cDvdPlayer::setController (cDvdPlayerControl *ctrl ) @@ -566,6 +783,100 @@ #endif } +char* cDvdPlayer::GetDVDResumeKey() const { + // first we fetch the total number of titles of the current dvd + int totalTitles; + if (dvdnav_get_number_of_titles(nav, &totalTitles)) { + // then we sum up the numbers of chapters for each title + int totalChapters = 0; + for (int t = 1; t <= totalTitles; t++) { + int curChapters; + dvdnav_get_number_of_parts(nav, t, &curChapters); + totalChapters += curChapters; + DEBUGDVD("resume: cDvdPlayer::Action() Title %d has %d chapters.\n", t, curChapters); + } + DEBUGDVD("resume: cDvdPlayer::Action() Titles: %d with %d chapters all together, Title: \"%s\"\n", + totalTitles, totalChapters, title_str); + // finally the key is build as "DVDName_TotalTitles_OverallChapters" + char* key; + asprintf(&key, "%s_%d_%d", title_str, totalTitles, totalChapters); + // note: this is not completly unique. Maybe some other informations are more suitable, like: + // - the "serial number" of the dvd as displayed in the libdvdnav debug output, but: + // it is not available through the current libdvdnav api + // - the total bytes of the dvd (quiet unique!!!), but: + // also not available through the libdvdnav api and no idea how to get it for a media not mounted. + // - any other ideas??? + return key; + } else { + // if we cannot fetch the total number of titles of the current disc, there must be something wrong! + // Who needs a key for resuming then? + return NULL; + } +} + +void cDvdPlayer::SaveResume() { + // make sure resume database is allocated (might be a possibility to completly disable resuming!) + if (resume) { + // fetch the current title and chapter number via libdvdnav api + int currentTitle, currentChapter; + if (dvdnav_current_title_info(nav, ¤tTitle, ¤tChapter) && + (0 != currentTitle)) { + // fetch current time position through own class api + int64_t currentSec, totalSec; + GetPositionInSec(currentSec, totalSec); + // compute the resume key for the current dvd + char* key = GetDVDResumeKey(); + if (key) { + // store computed/fetched resume data in database + DEBUGDVD("resume->SetResume(\"%s\", %d, %d, %lld)\n", key, currentTitle, currentChapter, currentSec); + resume->SetResume(key, currentTitle, currentChapter, currentSec); + // free the key string memory allocated by GetDVDResumeKey() + free(key); + } else { + DEBUGDVD("resume: ERROR computing resume key for this dvd!\n"); + } + } else { + // in a menu title and chapter seams to be always 0 -> no way to resume there! + DEBUGDVD("resume: ERROR fetching current title and chapter (maybe in menus?).\n"); + } + } +} + +bool cDvdPlayer::LoadResume(int& title, int& chapter, int64_t& second) { + // helper variable for the return value + bool retval = false; + // make sure resume database is allocated (might be a possibility to completly disable resuming!) + if(resume) { + // compute the resume key for the current dvd + char* key = GetDVDResumeKey(); + if (key) { + DEBUGDVD("resume->GetResume(\"%s\", ...): ", key); + // try loading the resume data for the computed key into the given arguments + if (resume->GetResume(key, title, chapter, second)) { + DEBUGDVD("%d:%d:%lld\n", title, chapter, second); + // continuing at the very same position might be inappropriate (vdr's recordings also rewind some seconds) + int ResumeRewind = 30; // rewind 30s if possible + // note: I used a variable here to show up, that this value might be made + // possible to configure (in the setup dialog). Doing so myself was + // not yet nesseccary and is so left to the plugin maintainers. + // make sure we do not rewind before the beginning + if (second > ResumeRewind) { + second -= ResumeRewind; + } + retval = true; + } else { + DEBUGDVD("\n"); + retval = false; + } + // free the key string memory allocated by GetDVDResumeKey() + free(key); + } else { + DEBUGDVD("resume: ERROR computing resume key for this dvd.\n"); + } + } + return retval; +} + void cDvdPlayer::Action(void) { memset(event_buf, 0, sizeof(uint8_t)*4096); @@ -635,6 +946,13 @@ 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 + bool next_cell_change = false; + // and seek the the exact time stored here + int64_t resSecond = 0; + while(running && nav) { if (!pframe) { @@ -1110,6 +1428,22 @@ SetTitleInfoString(); SetTitleString(); SetAspectString(); + if (first_vts_change) { + first_vts_change = false; + + // now all data for computing the resume key is available, so trying to resume + int resTitle, resChapter; + if (LoadResume(resTitle, resChapter, resSecond)) { + // if resume data could be found seek to the found title and chapter NOW + GotoTitle(resTitle, resChapter); + // and wait for the next cell change (= title and chapter reached) + // to seek to the exact time + next_cell_change = true; + // note: seeking to the exact time HERE leads to an error on the libdvdnav console: + // "dvd error dvdnav_sector_search: New position not yet determined." and is + // slightly ignored :-( . + } + } break; case DVDNAV_CELL_CHANGE: { DEBUG_NAV("%s:%d:NAV CELL CHANGE\n", __FILE__, __LINE__); @@ -1130,6 +1464,11 @@ // 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); + } break; } case DVDNAV_NAV_PACKET: { @@ -1887,8 +2226,18 @@ if (!DVDActiveAndRunning()) return; - if (running && nav) + if (running && nav) { + // we will stop replay now. Its time to save the current possition + // for later resuming. + SaveResume(); + dvdnav_stop(nav); + + // don't know why Stop() is called twice, but this prevents from + // twice save resume data and calling dvdnav_stop() twice. + // Comments from maintainers are welcome. + running = false; + } } void cDvdPlayer::Play(void) @@ -2204,24 +2553,41 @@ GotoAngle(++angleNumber); } -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*/) { int titleNumbers; + int targetTitle = Title; + int chapterNumber; if (!DVDActiveAndRunning()) return -1; 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, &titleNumbers); if (Title > titleNumbers) - Title = 1; + targetTitle = 1; if (Title <= 0) - Title = titleNumbers; + targetTitle = titleNumbers; + + // 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 + dvdnav_get_number_of_parts(nav, Title, &chapterNumber); + if (Chapter > chapterNumber) + Chapter = 1; + if (Chapter <= 0) + Chapter = chapterNumber; + } else { + // 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); } Index: vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013/player-dvd.h =================================================================== --- vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013.orig/player-dvd.h 2007-09-17 21:04:43.000000000 +0200 +++ vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013/player-dvd.h 2011-04-09 17:23:33.000000000 +0200 @@ -52,6 +52,7 @@ class cDvdPlayerControl ; class cIframeAssembler; +class cDVDPlayerResume; class cDvdPlayer : public cPlayer, cThread { private: @@ -184,6 +185,32 @@ int GetAudioStreamNumbers(void) const ; uint16_t GetSubtitleLanguageCode(int Channel) const; int GetSubtitleStreamNumbers(void) const ; + + //resuming + /** + * the resume database + */ + cDVDPlayerResume* resume; + /** + * GetDVDResumeKey(): + * computes a (hopefully) unique id for storing the resume data of the current disc. + * + * this get returns a new allocated memory area .. + * must be freed by callee .. + */ + char* GetDVDResumeKey() const; + /** + * SaveResume(): + * handles everything to save the current position on the disc for later resuming. + */ + void SaveResume(); + /** + * LoadResume(): + * loads the resume data for the current disc and stores it in the given arguments. + * returns false if no resume data for the disc can be found or and error occured while loading. + */ + bool LoadResume(int& title, int& chapter, int64_t& second); + protected: //Player virtual void Activate(bool On); virtual void Action(void); @@ -316,7 +343,8 @@ * * 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) debian/copyright0000644000000000000000000000307312126022502011114 0ustar Upstream Homepage: http://sourceforge.net/projects/dvdplugin Upstream Authors: Andreas Schultz Sven Goethel Marco Schluessler Miko Wohlgemuth Debian Maintainers: Tobias Grimm Thomas Günther Thomas Schmidt Copyright: (C) 2001 - 2002 Andreas Schultz Copyright (parts of dvbspu.[ch]): (C) 2000 Samuel Hocevar, Michel Lespinasse Copyright (Debian packaging): (C) 2002 - 2013 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. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. The complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-2 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-2. debian/source/0000755000000000000000000000000012126022502010456 5ustar debian/source/format0000644000000000000000000000001412126022502011664 0ustar 3.0 (quilt) debian/changelog0000644000000000000000000006455612126022502011050 0ustar vdr-plugin-dvd (0.3.6~b03+cvs20090426.0013-19) unstable; urgency=low * Build-depend on vdr-dev (>= 2.0.0) -- Tobias Grimm Sun, 31 Mar 2013 14:00:02 +0200 vdr-plugin-dvd (0.3.6~b03+cvs20090426.0013-18) unstable; urgency=low * Build-depend on vdr-dev (>= 1.7.42) -- Tobias Grimm Sat, 23 Mar 2013 20:48:05 +0100 vdr-plugin-dvd (0.3.6~b03+cvs20090426.0013-17) unstable; urgency=low * Build-depend on vdr-dev (>= 1.7.41) -- Tobias Grimm Sun, 17 Mar 2013 19:44:18 +0100 vdr-plugin-dvd (0.3.6~b03+cvs20090426.0013-16) unstable; urgency=low * Build-depend on vdr-dev (>= 1.7.40) -- Tobias Grimm Sun, 10 Mar 2013 18:50:35 +0100 vdr-plugin-dvd (0.3.6~b03+cvs20090426.0013-15) unstable; urgency=low * Debhelper 9 * Build-depend on vdr-dev (>= 1.7.39) -- Tobias Grimm Tue, 05 Mar 2013 19:38:05 +0100 vdr-plugin-dvd (0.3.6~b03+cvs20090426.0013-14) unstable; urgency=low * Build-depend on vdr-dev (>= 1.7.28) -- Tobias Grimm Sat, 09 Jun 2012 13:13:59 +0200 vdr-plugin-dvd (0.3.6~b03+cvs20090426.0013-13) unstable; urgency=low * Build-depend on vdr-dev (>= 1.7.27) -- Tobias Grimm Thu, 19 Apr 2012 23:03:12 +0200 vdr-plugin-dvd (0.3.6~b03+cvs20090426.0013-12) unstable; urgency=low * Build-depend on vdr-dev (>= 1.7.26) * Standards-Version: 3.9.3 -- Tobias Grimm Sun, 25 Mar 2012 13:35:52 +0200 vdr-plugin-dvd (0.3.6~b03+cvs20090426.0013-11) unstable; urgency=low * Build-depend on vdr-dev (>= 1.7.23) -- Tobias Grimm Sun, 29 Jan 2012 19:05:15 +0100 vdr-plugin-dvd (0.3.6~b03+cvs20090426.0013-10) unstable; urgency=low * Build-depend on vdr-dev (>= 1.7.22) * When including dvdnvav.h define/undefine the "this" keyword, used in dvdnav.h (Closes: #642673) -- Tobias Grimm Mon, 12 Dec 2011 20:22:27 +0100 vdr-plugin-dvd (0.3.6~b03+cvs20090426.0013-9) unstable; urgency=low * Switched to GIT using pristine tar -- Tobias Grimm Sat, 29 Oct 2011 20:09:34 +0200 vdr-plugin-dvd (0.3.6~b03+cvs20090426.0013-8) unstable; urgency=low * Build-depend on vdr-dev (>= 1.7.21) -- Tobias Grimm Sun, 18 Sep 2011 18:23:54 +0200 vdr-plugin-dvd (0.3.6~b03+cvs20090426.0013-7) unstable; urgency=low * Build-depend on vdr-dev (>= 1.7.20) * Standards-Version: 3.9.2 -- Tobias Grimm Sat, 20 Aug 2011 15:25:38 +0200 vdr-plugin-dvd (0.3.6~b03+cvs20090426.0013-6) unstable; urgency=low * Build-depend on vdr-dev (>= 1.7.19) * Fixed package description -- Tobias Grimm Sun, 19 Jun 2011 22:31:49 +0200 vdr-plugin-dvd (0.3.6~b03+cvs20090426.0013-5) unstable; urgency=low * Build-depend on vdr-dev (>= 1.7.18) -- Tobias Grimm Sun, 17 Apr 2011 20:06:35 +0200 vdr-plugin-dvd (0.3.6~b03+cvs20090426.0013-4) unstable; urgency=low * Build-depend on vdr-dev >= 1.7.17 * Updated debian/copyright * Standards-Version: 3.9.1 * Switched to debhelper 7 and dropped cdbs -- Tobias Grimm Sat, 09 Apr 2011 17:21:23 +0200 vdr-plugin-dvd (0.3.6~b03+cvs20090426.0013-3) unstable; urgency=low * Build-depend on vdr-dev >= 1.6.0-16 * Bumped standards version to 3.8.4 * Minor debian/copyright update -- Tobias Grimm Sun, 28 Mar 2010 14:54:26 +0200 vdr-plugin-dvd (0.3.6~b03+cvs20090426.0013-2) unstable; urgency=low * Removed non-standard shebang line from debian/rules (Closes: #552640) * Added README.source * Standards-Version: 3.8.3 -- Tobias Grimm Sun, 08 Nov 2009 23:20:21 +0100 vdr-plugin-dvd (0.3.6~b03+cvs20090426.0013-1) unstable; urgency=low * New Upstream Snapshot * Adapted 04_vdr-dvd_resume.dpatch * Adapted 10_dvd.c.dpatch * Adapted 11_allow-non-existing-dvd-drive.dpatch * Added 12_dvd-fixed-german-spelling.dpatch * Added gettext to Build-Depends * Added installation of locale files * Added ${misc:Depends} * Bumped standards version to 3.8.1 * Updated debian/copyright * Changed section to "video" * Added get-orig-source target to debian/rules to download the newest cvs-snapshot * Fixed command-with-path-in-maintainer-script -- Thomas Günther Sat, 02 May 2009 17:17:45 +0200 vdr-plugin-dvd (0.3.6~b03+cvs20070813-12) unstable; urgency=low * Added 11_allow-non-existing-dvd-drive,dpatch to fix problem with VDR beeing unstartable, when the DVD device can not be accessed (Closes: #501337) -- Tobias Grimm Sat, 29 Nov 2008 12:29:17 +0100 vdr-plugin-dvd (0.3.6~b03+cvs20070813-11) unstable; urgency=low * Changed my maintainer/uploader email address * Fixed debian/watch * Added missing description to 05_stdint.dpatch -- Tobias Grimm Sat, 15 Nov 2008 10:48:19 +0100 vdr-plugin-dvd (0.3.6~b03+cvs20070813-10) unstable; urgency=medium [ Thomas Schmidt ] * Build-Depend on libdvdnav-dev (>=4.1.2-3) [ Tobias Grimm ] * Dropped patchlevel control field * Build-Depend on vdr-dev (>=1.6.0-5) * Bumped Standards-Version to 3.8.0 * Added 05_stdint.dpatch (Closes: #479876) -- Thomas Schmidt Mon, 21 Jul 2008 23:21:46 +0200 vdr-plugin-dvd (0.3.6~b03+cvs20070813-9) unstable; urgency=low * Upload to unstable -- Thomas Schmidt Wed, 21 May 2008 22:21:24 +0200 vdr-plugin-dvd (0.3.6~b03+cvs20070813-8) experimental; urgency=low * Increased package version to force rebuild for vdr 1.6.0-1ctvdr7 -- Tobias Grimm Mon, 12 May 2008 12:53:20 +0200 vdr-plugin-dvd (0.3.6~b03+cvs20070813-7) experimental; urgency=low [ Thomas Schmidt ] * Build-Depend on vdr-dev (>=1.6.0) * Switched Build-System to cdbs, Build-Depend on cdbs * Added Homepage field to debian/control * Renamed XS-Vcs-* fields to Vcs-* in debian/control * Bumped Standards-Version to 3.7.3 [ Tobias Grimm ] * Using COMPAT=5 now -- Tobias Grimm Fri, 04 Apr 2008 00:35:31 +0200 vdr-plugin-dvd (0.3.6~b03+cvs20070813-6) experimental; urgency=low * Force rebuild for vdr 1.5.15 -- Tobias Grimm Mon, 18 Feb 2008 21:07:39 +0100 vdr-plugin-dvd (0.3.6~b03+cvs20070813-5) unstable; urgency=low * Release for vdrdevel 1.5.13 -- Thomas Günther Wed, 16 Jan 2008 10:31:30 +0100 vdr-plugin-dvd (0.3.6~b03+cvs20070813-4) unstable; urgency=low * Release for vdrdevel 1.5.12 -- Thomas Günther Tue, 20 Nov 2007 23:46:14 +0100 vdr-plugin-dvd (0.3.6~b03+cvs20070813-3) unstable; urgency=low * Release for vdrdevel 1.5.11 -- Thomas Günther Tue, 6 Nov 2007 23:34:09 +0100 vdr-plugin-dvd (0.3.6~b03+cvs20070813-2) unstable; urgency=low * Release for vdrdevel 1.5.10 -- Thomas Günther Tue, 16 Oct 2007 23:50:50 +0200 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 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 -- Thomas Günther Tue, 14 Aug 2007 01:46:09 +0200 vdr-plugin-dvd (0.3.6~b03-9) unstable; urgency=low * Release for vdrdevel 1.5.5 -- Thomas Günther Wed, 27 Jun 2007 23:02:30 +0200 vdr-plugin-dvd (0.3.6~b03-8) unstable; urgency=low * Added XS-Vcs-Svn and XS-Vcs-Browser fields to debian/control * Removed version from Build-Dependancy to dpatch - even Sarge has the required version -- Thomas Schmidt Mon, 28 May 2007 18:47:25 +0200 vdr-plugin-dvd (0.3.6~b03-7) experimental; urgency=low * The package now adds / removes vdr to the group cdrom, using the new vdr-groups.sh script in vdr 1.4.6-2 * debian/copyright: - Added full GPL license header - Added copyright years -- Tobias Grimm Sun, 6 May 2007 20:52:34 +0200 vdr-plugin-dvd (0.3.6~b03-6) experimental; urgency=low * Release for vdrdevel 1.5.2 -- Thomas Günther Sat, 28 Apr 2007 00:00:20 +0200 vdr-plugin-dvd (0.3.6~b03-5) experimental; urgency=low * Release for vdrdevel 1.5.1 -- Thomas Günther Tue, 27 Feb 2007 19:59:11 +0100 vdr-plugin-dvd (0.3.6~b03-4) experimental; urgency=low * Added 91_dvd-1.5.0.dpatch * Added myself to Uploaders -- Thomas Günther Sun, 21 Jan 2007 15:37:14 +0100 vdr-plugin-dvd (0.3.6~b03-3) experimental; urgency=low [ Thomas Günther ] * Replaced VDRdevel adaptions in debian/rules with make-special-vdr * Adapted call of dependencies.sh and patchlevel.sh to the new location in /usr/share/vdr-dev/ [ Tobias Grimm ] * Build-Depend on vdr-dev (>=1.4.5-1) -- Tobias Grimm Sun, 14 Jan 2007 20:19:35 +0100 vdr-plugin-dvd (0.3.6~b03-2) unstable; urgency=low * Build-Depend on vdr-dev (>=1.4.4-1) * Edited package description -- Tobias Grimm Sun, 5 Nov 2006 13:45:22 +0100 vdr-plugin-dvd (0.3.6~b03-1) unstable; urgency=low * Build-Depend on vdr-dev (>=1.4.3-1) * Changed upstream version number to use ~ -- Thomas Schmidt Wed, 27 Sep 2006 08:24:30 +0200 vdr-plugin-dvd (0.3.5.2+0.3.6b03-22) unstable; urgency=low * Bumped Standards-Version to 3.7.2 * Added note about the Debian Maintainers to debian/copyright * Added Tobias Grimm to Uploaders * Build-Depend on vdr-dev (>=1.4.2-1) -- Thomas Schmidt Mon, 28 Aug 2006 20:58:24 +0200 vdr-plugin-dvd (0.3.5.2+0.3.6b03-21) unstable; urgency=low * Thomas Schmidt - Build-Depend on vdr-dev (>=1.4.1-1) -- Debian VDR Team Sun, 18 Jun 2006 15:54:22 +0200 vdr-plugin-dvd (0.3.5.2+0.3.6b03-20) unstable; urgency=low * Thomas Schmidt - Build-Depend on vdr-dev (>=1.4.0-1) -- Debian VDR Team Sun, 30 Apr 2006 21:11:50 +0200 vdr-plugin-dvd (0.3.5.2+0.3.6b03-19) unstable; urgency=low * Thomas Schmidt - Build-Depend on vdr-dev (>=1.3.48-1) * Tobias Grimm - Added 90_APIVERSION.dpatch -- Debian VDR Team Mon, 24 Apr 2006 20:16:52 +0200 vdr-plugin-dvd (0.3.5.2+0.3.6b03-18) unstable; urgency=low * Thomas Günther - Added 04_vdr-dvd_resume.dpatch -- Debian VDR Team Fri, 14 Apr 2006 21:19:52 +0200 vdr-plugin-dvd (0.3.5.2+0.3.6b03-17) unstable; urgency=low * Thomas Schmidt - Build-Depend on vdr-dev (>=1.3.46-1) -- Debian VDR Team Thu, 13 Apr 2006 00:28:49 +0200 vdr-plugin-dvd (0.3.5.2+0.3.6b03-16) unstable; urgency=low * Thomas Schmidt - Build-Depend on vdr-dev (>=1.3.45-1) -- Debian VDR Team Mon, 27 Mar 2006 23:17:45 +0200 vdr-plugin-dvd (0.3.5.2+0.3.6b03-15) unstable; urgency=low * Tobias Grimm - Depend/Build-Depend on vdr (>=1.3.41-1) -- Debian VDR Team Tue, 31 Jan 2006 20:03:22 +0100 vdr-plugin-dvd (0.3.5.2+0.3.6b03-14) unstable; urgency=low * Tobias Grimm - Build-Depend on vdr-dev (>=1.3.40-1) -- Debian VDR Team Thu, 26 Jan 2006 19:09:38 +0100 vdr-plugin-dvd (0.3.5.2+0.3.6b03-13) unstable; urgency=low * Thomas Schmidt - Build-Depend on vdr-dev (>=1.3.39-1) -- Debian VDR Team Sun, 22 Jan 2006 12:25:34 +0100 vdr-plugin-dvd (0.3.5.2+0.3.6b03-12) unstable; urgency=low * Thomas Schmidt - Build-Depend on vdr (>=1.3.38-1) - Added 03_vdr-1.3.38-fix.dpatch * Tobias Grimm - Updated debian/copyright -- Debian VDR Team Tue, 10 Jan 2006 16:38:00 +0100 vdr-plugin-dvd (0.3.5.2+0.3.6b03-11) unstable; urgency=low * Thomas Schmidt - Build-Depend on vdr (>=1.3.37-1) - Delete the link /var/cache/vdr/dvd in prerm when removing the package, not in postrm (closes: #340194) -- Debian VDR Team Mon, 28 Nov 2005 22:50:38 +0100 vdr-plugin-dvd (0.3.5.2+0.3.6b03-10) unstable; urgency=low * Thomas Schmidt - Build-Depend on vdr (>=1.3.35-1) -- Debian VDR Team Wed, 2 Nov 2005 16:41:35 +0100 vdr-plugin-dvd (0.3.5.2+0.3.6b03-9) unstable; urgency=low * Thomas Schmidt - Build-Depend on vdr (>=1.3.33-1) -- Debian VDR Team Sun, 2 Oct 2005 12:14:55 +0200 vdr-plugin-dvd (0.3.5.2+0.3.6b03-8) unstable; urgency=low * Thomas Schmidt - Build-Depend on vdr (>=1.3.32-1) * Thomas Günther - Updated debian/watch -- Debian VDR Team Sun, 11 Sep 2005 18:41:39 +0200 vdr-plugin-dvd (0.3.5.2+0.3.6b03-7) unstable; urgency=low * Thomas Schmidt - Build-Depend on vdr (>=1.3.31-1) - Use dependencies.sh from vdr-dev to set vdr dependencies and conflicts to the right vdr version when building the package - Fixed debian/watch -- Debian VDR Team Fri, 2 Sep 2005 17:40:11 +0200 vdr-plugin-dvd (0.3.5.2+0.3.6b03-6) unstable; urgency=low * Tobias Grimm - Depend/Build-Depend on vdr (>=1.3.30-1) - Conflict with vdr (>=1.3.30.99) -- Debian VDR Team Tue, 23 Aug 2005 19:18:54 +0200 vdr-plugin-dvd (0.3.5.2+0.3.6b03-5) unstable; urgency=low * Thomas Schmidt - Depend/Build-Depend on vdr (>=1.3.29-1) - Conflict with vdr (>=1.3.29.99) -- Debian VDR Team Mon, 15 Aug 2005 18:18:53 +0200 vdr-plugin-dvd (0.3.5.2+0.3.6b03-4) unstable; urgency=low * Thomas Schmidt - Depend/Build-Depend on vdr (>=1.3.28-1) - Conflict with vdr (>=1.3.29) -- Debian VDR Team Tue, 9 Aug 2005 21:29:20 +0200 vdr-plugin-dvd (0.3.5.2+0.3.6b03-3) unstable; urgency=low * Thomas Günther - Removed HISTORY from debian/docs (already installed as changelog) - Using debian/compat now - Replaced tabs with spaces - Now using debian/watch from vdrdevel - Shortened debian/copyright -- Debian VDR Team Wed, 6 Jul 2005 22:28:19 +0200 vdr-plugin-dvd (0.3.5.2+0.3.6b03-2) unstable; urgency=low * Thomas Schmidt - Bumped Standards-Version to 3.6.2 -- Debian VDR Team Wed, 29 Jun 2005 17:15:28 +0200 vdr-plugin-dvd (0.3.5.2+0.3.6b03-1) unstable; urgency=low * Thomas Schmidt - Changed upstream version number to 0.3.5.2+0.3.6b03 because underscores are not allowed in debian version numbers -- Debian VDR Team Sun, 26 Jun 2005 12:37:57 +0200 vdr-plugin-dvd (0.3.5.1+0.3.6_b03-4) unstable; urgency=low * Thomas Schmidt - Depend/Build-Depend on vdr (>=1.3.27-1) - Conflict with vdr (>=1.3.28) -- Debian VDR Team Sun, 19 Jun 2005 17:47:11 +0200 vdr-plugin-dvd (0.3.5.1+0.3.6_b03-3) unstable; urgency=low * Thomas Schmidt - Depend/Build-Depend on vdr (>=1.3.26-1) - Conflict with vdr (>=1.3.27) -- Debian VDR Team Sun, 12 Jun 2005 17:00:30 +0200 vdr-plugin-dvd (0.3.5.1+0.3.6_b03-2) experimental; urgency=low * Thomas Schmidt - Depend/Build-Depend on vdr (>=1.3.25-1) - Conflict with vdr (>=1.3.26) -- Debian VDR Team Tue, 31 May 2005 14:41:02 +0200 vdr-plugin-dvd (0.3.5.1+0.3.6_b03-1) experimental; urgency=low * Thomas Schmidt - New upstream release -- Debian VDR Team Sun, 22 May 2005 11:05:34 +0200 vdr-plugin-dvd (0.3.5+cvs20050410-2) experimental; urgency=low * Thomas Schmidt - Depend/Build-Depend on vdr (>=1.3.24-1) - Conflict with vdr (>=1.3.25) -- Debian VDR Team Mon, 9 May 2005 18:53:47 +0200 vdr-plugin-dvd (0.3.5+cvs20050410-1) experimental; urgency=low * Thomas Schmidt - New upstream cvs release - Depend/Build-Depend on vdr (>=1.3.23-1) - Conflict with vdr (>=1.3.24) - Updated 01_Makefile-fPIC-fix.dpatch -- Debian VDR Team Sun, 10 Apr 2005 13:03:27 +0200 vdr-plugin-dvd (0.3.4-rc10-5) unstable; urgency=low * Tobias Grimm - Make default DVD device /var/cache/vdr/dvd pointing to /dev/dvd in order to make it possible for vdr to change this link when not running as root - Added patch to don't let the plugin abort the VDR start, when the DVD device provided by the command line parameter -C does not exist - Don't explicitly specify NAVDIR anymore * Thomas Schmidt - Added 10_dvd.c.dpatch from Tobias to remove the stderr output on correctly parsed -C parameters -- Debian VDR Team Fri, 01 Apr 2005 13:43:03 +0200 vdr-plugin-dvd (0.3.4-rc10-2) unstable; urgency=low * Thomas Schmidt - Use patchlevel.sh subst in debian/rules not the old code, therefore Build-Depend on vdr (>=1.2.6-7) - Changed my email-address to the debian one -- Debian VDR Team Sat, 26 Mar 2005 16:27:05 +0100 vdr-plugin-dvd (0.3.4-rc10-1) unstable; urgency=low * Thomas Schmidt - Renamed upstream-version to 0.3.4-rc10, because upstream will not release 0.3.4 anymore, it is at 0.3.5b06 allready (which can not be packaged for vdr 1.2.6) - Build-depend on dpatch (>= 2.0.9) - Converted existing dpatch-file to the new short format -- Debian VDR Team Sat, 04 Dec 2004 12:53:16 +0100 vdr-plugin-dvd (0.3.3-jau-p8+0.3.4-rc10-5) unstable; urgency=low * Thomas Schmidt - Use dpatch, so build-dep on dpatch - Add 01_Makefile-fPIC-fix.dpatch, to fix FTBFS (closes: #262641) -- Debian VDR Team Fri, 30 Jul 2004 20:53:13 +0200 vdr-plugin-dvd (0.3.3-jau-p8+0.3.4-rc10-4) unstable; urgency=low * Thomas Schmidt - Now really changed architecture to any -- Debian VDR Team Sun, 11 Jul 2004 13:36:21 +0200 vdr-plugin-dvd (0.3.3-jau-p8+0.3.4-rc10-3) unstable; urgency=low * Thomas Schmidt: - Changed architecture to any - Changed maintainer to Debian VDR and DVB Packaging Team - Cleanup debian/rules - First upload to official Debian-archive (closes: Bug#229221) - Added watch-file - Added patchlevel-mechanism, to be compatible with c't-vdr -- Thomas Schmidt Fri, 2 Jul 2004 18:57:33 +0200 vdr-plugin-dvd (0.3.3-jau-p8+0.3.4-rc10-1) unstable; urgency=low * New upstream release -- Thomas Schmidt Sun, 16 Nov 2003 13:52:48 +0100 vdr-plugin-dvd (0.3.3-jau-p8+0.3.4-rc4-1) unstable; urgency=low * New upstream release -- Thomas Schmidt Sun, 12 Oct 2003 12:54:25 +0200 vdr-plugin-dvd (0.3.3-jau-p8+0.3.4-rc2-2) unstable; urgency=low * Integrated patch to change bitstreamout-detection -- Thomas Schmidt Fri, 10 Oct 2003 17:28:52 +0200 vdr-plugin-dvd (0.3.3-jau-p8+0.3.4-rc2-1) unstable; urgency=low * New upstream release -- Thomas Schmidt Thu, 9 Oct 2003 18:59:49 +0200 vdr-plugin-dvd (0.3.3-jau-p8-1) unstable; urgency=low * New upstream release (Sven Goethel is now the official new maintainer of the dvd-plugin) -- Thomas Schmidt Wed, 8 Oct 2003 20:06:07 +0200 vdr-plugin-dvd (0.3.3-jau-p7-1) unstable; urgency=low * New upstream release - consider source from Sven Goethel as new upstream, changed debian/copyright accordingly -- Thomas Schmidt Mon, 6 Oct 2003 19:09:25 +0200 vdr-plugin-dvd (0.3.3-5.jau.p3) unstable; urgency=low * applied patch from Sven Goethel -- Thomas Schmidt Sat, 4 Oct 2003 23:14:38 +0200 vdr-plugin-dvd (0.3.3-4) unstable; urgency=low * Rebuild for vdr 1.2.5 -- Thomas Schmidt Wed, 17 Sep 2003 20:13:16 +0200 vdr-plugin-dvd (0.3.3-3) unstable; urgency=low * changed the plugin-dir to /usr/lib/vdr/plugins, to be FHS compliant Thanks to Henning Glawe for pointing me to this one -- Thomas Schmidt Sun, 14 Sep 2003 16:22:24 +0200 vdr-plugin-dvd (0.3.3-2) unstable; urgency=low * Changed debian/rules and debian/control (added debian/control.template), so that the correct dependancy to vdr is filled out automatically on the version of vdr-dev, you have installed * Bump Standards-Version to 3.6.1 -- Thomas Schmidt Wed, 10 Sep 2003 14:20:44 +0200 vdr-plugin-dvd (0.3.3-1) unstable; urgency=low * New upstream release -- Thomas Schmidt Tue, 26 Aug 2003 15:51:04 +0200 vdr-plugin-dvd (0.3.2a-4) unstable; urgency=low * Rebuild for vdr 1.2.2 * Bump Standards-Version to 3.6.0 -- Thomas Schmidt Wed, 13 Aug 2003 10:37:14 +0200 vdr-plugin-dvd (0.3.2a-3) unstable; urgency=low * Rebuild for vdr-1.2.1 -- Thomas Schmidt Mon, 9 Jun 2003 19:02:13 +0200 vdr-plugin-dvd (0.3.2a-2) unstable; urgency=low * Rebuild for vdr-1.2.0 -- Thomas Schmidt Sun, 1 Jun 2003 21:36:18 +0200 vdr-plugin-dvd (0.3.2a-1) unstable; urgency=low * New upstream release * Rebuild for vdr-1.1.29 -- Thomas Schmidt Wed, 30 Apr 2003 18:11:10 +0200 vdr-plugin-dvd (0.3.1-3) unstable; urgency=low * Rebuild for vdr-1.1.28 * Bump Standards-Version to 3.5.9 -- Thomas Schmidt Tue, 22 Apr 2003 12:41:52 +0200 vdr-plugin-dvd (0.3.1-2) unstable; urgency=low * rebuild for vdr-1.1.27 -- Thomas Schmidt Sun, 13 Apr 2003 15:11:07 +0200 vdr-plugin-dvd (0.3.1-1) unstable; urgency=low * New upstream release -- Thomas Schmidt Wed, 5 Mar 2003 20:29:42 +0100 vdr-plugin-dvd (0.2.0-16) unstable; urgency=low * add Suggests: libdvdcss2 to debian/control -- Thomas Schmidt Mon, 17 Feb 2003 17:53:55 +0100 vdr-plugin-dvd (0.2.0-15) unstable; urgency=low * include Andres Schultz modified libdvdnav and link it statically into the plugin, to make it distributable by debian -- Thomas Schmidt Sun, 22 Dec 2002 02:40:46 +0100 vdr-plugin-dvd (0.2.0-14) unstable; urgency=low * rebuild for vdr-1.1.20 -- Thomas Schmidt Sun, 15 Dec 2002 18:46:46 +0100 vdr-plugin-dvd (0.2.0-13) unstable; urgency=low * rebuild for vdr-1.1.19 -- Thomas Schmidt Mon, 9 Dec 2002 23:43:27 +0100 vdr-plugin-dvd (0.2.0-12) unstable; urgency=low * rebuild for vdr-1.1.18 -- Thomas Schmidt Mon, 2 Dec 2002 12:45:45 +0100 vdr-plugin-dvd (0.2.0-11) unstable; urgency=low * corrected a few lintian errors -- Thomas Schmidt Sun, 24 Nov 2002 19:44:47 +0100 vdr-plugin-dvd (0.2.0-10) unstable; urgency=low * rebuild for vdr-1.1.15 -- Thomas Schmidt Mon, 11 Nov 2002 11:34:14 +0100 vdr-plugin-dvd (0.2.0-9) unstable; urgency=low * rebuild for vdr-1.1.15 -- Thomas Schmidt Mon, 4 Nov 2002 00:55:58 +0100 vdr-plugin-dvd (0.2.0-8) unstable; urgency=low * revert last change -- Thomas Schmidt Tue, 29 Oct 2002 12:12:33 +0100 vdr-plugin-dvd (0.2.0-7) unstable; urgency=low * changed Depends/Build-Depends from libdvdnav to libdvdnav-as -- Thomas Schmidt Tue, 29 Oct 2002 11:56:01 +0100 vdr-plugin-dvd (0.2.0-6) unstable; urgency=low * recompiled for vdr 1.1.14 -- Thomas Schmidt Tue, 29 Oct 2002 10:55:27 +0100 vdr-plugin-dvd (0.2.0-5) unstable; urgency=low * do not create /usr/share/vdr/plugins/lib, only /usr/share/vdr/plugins -- Thomas Schmidt Sun, 20 Oct 2002 17:25:02 +0200 vdr-plugin-dvd (0.2.0-4) unstable; urgency=low * changed libdvdread depend to version >=0.9.3 -- Thomas Schmidt Fri, 18 Oct 2002 14:29:24 +0200 vdr-plugin-dvd (0.2.0-3) unstable; urgency=low * chanded depends a little bit -- Thomas Schmidt Fri, 18 Oct 2002 14:06:27 +0200 vdr-plugin-dvd (0.2.0-2) unstable; urgency=low * changed DVB-Dir in Makefile to /usr/src/modules/dvb-driver -- Thomas Schmidt Fri, 18 Oct 2002 13:57:16 +0200 vdr-plugin-dvd (0.2.0-1) unstable; urgency=low * Initial Release. -- Thomas Schmidt Fri, 18 Oct 2002 13:53:51 +0200 debian/vdr-plugin-dvd.groups0000644000000000000000000000017012126022502013257 0ustar # # The DVD plugin requires vdr to be a member of the group 'cdrom' in order to # get access to the DVD drive. # cdrom debian/docs0000644000000000000000000000000712126022502010026 0ustar README debian/get-vcs-snapshot.rb0000644000000000000000000000106012126022502012705 0ustar File.open("debian/changelog").first =~ /(.*) \((.*)\+.*-.*\)/ package = $1 upstream_version = $2 cvs_version=`date --utc +%0Y%0m%0d.%0k%0M`.chomp new_version="#{upstream_version}+cvs#{cvs_version}" puts "Downloading #{package} version #{new_version}" puts `cvs -d:pserver:anonymous@dvdplugin.cvs.sourceforge.net:/cvsroot/dvdplugin export -D NOW -d #{package}-#{new_version} dvd` puts `tar czf ../#{package}_#{new_version}.orig.tar.gz #{package}-#{new_version}` puts `rm -rf #{package}-#{new_version}` puts `dch -v "#{new_version}-1" "New Upstream Snapshot"` debian/plugin.dvd.conf0000644000000000000000000000002612126022502012075 0ustar -C /var/cache/vdr/dvd debian/compat0000644000000000000000000000000212126022502010354 0ustar 9 debian/control0000644000000000000000000000146512126022502010567 0ustar Source: vdr-plugin-dvd Section: video Priority: extra Maintainer: Debian VDR Team Uploaders: Thomas Schmidt , Tobias Grimm , Thomas Günther Build-Depends: debhelper (>= 9), vdr-dev (>= 2.0.0), pkg-config, gettext, libdvdnav-dev (>=4.1.2-3), liba52-0.7.4-dev Standards-Version: 3.9.3 Homepage: http://sourceforge.net/projects/dvdplugin Vcs-Git: git://git.debian.org/git/pkg-vdr-dvb/vdr-plugin-dvd.git Vcs-Browser: http://git.debian.org/?p=pkg-vdr-dvb/vdr-plugin-dvd.git Package: vdr-plugin-dvd Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, ${vdr:Depends} Suggests: libdvdcss2 Description: DVD playback plugin for VDR This plugin for VDR allows one to play back DVD Video discs from within VDR. debian/postinst0000644000000000000000000000117712126022502010772 0ustar #! /bin/sh # postinst script for vdr-plugin-dvd # # see: dh_installdeb(1) set -e # # main() # case "$1" in configure) if [ ! -L /var/cache/vdr/dvd ] ; then ln -s /dev/dvd /var/cache/vdr/dvd || true fi # Make vdr a member of the groups required by the plugin sh /usr/lib/vdr/vdr-groups.sh --add vdr-plugin-dvd ;; abort-upgrade|abort-remove|abort-deconfigure) ;; *) echo "postinst called with unknown argument '$1'" >&2 exit 1 esac # dh_installdeb will replace this with shell code automatically # generated by other debhelper scripts. #DEBHELPER# exit 0 debian/install0000644000000000000000000000031112126022502010542 0ustar libvdr-dvd.so.* usr/lib/vdr/plugins/ debian/plugin.dvd.conf etc/vdr/plugins/ debian/vdr-plugin-dvd.groups usr/share/vdr/groups.d/ locale usr/share/ debian/rules0000755000000000000000000000100012126022502010225 0ustar #!/usr/bin/make -f # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 MAKE_OPTIONS = VDRDIR=/usr/include/vdr LIBDIR=. LOCALEDIR=locale CXXFLAGS += $(shell pkg-config vdr --variable=cxxflags) %: dh $@ override_dh_auto_build: dh_auto_build -- all $(MAKE_OPTIONS) override_dh_auto_clean: $(MAKE) -o .dependencies clean $(MAKE_OPTIONS) rm -rf locale libvdr-*.so.* override_dh_gencontrol: sh /usr/share/vdr-dev/dependencies.sh dh_gencontrol get-vcs-snapshot: ruby debian/get-vcs-snapshot.rb debian/watch0000644000000000000000000000014512126022502010207 0ustar version=3 opts="uversionmangle=s/_/\~/g" \ http://sf.net/dvdplugin/vdr-dvd-(.*)\.(?:tgz|tar|bz2)