vdr

vdr@linuxtv.org

2 participants
6731 discussions

channel scanning cable
by Martin Spears 20 Mar '05

20 Mar '05

i have tried dvbscan in order to scan channels in North America. I am looking for the analog not digital channels. Having a hard time finding a prog to scan with. -- No virus found in this outgoing message. Checked by AVG Anti-Virus. Version: 7.0.308 / Virus Database: 266.7.4 - Release Date: 3/18/2005

1 0

A gap in recording on PID change
by Timo Laitinen 20 Mar '05

20 Mar '05

Hi, I'm having some problems with the changing pids between programs with different language specifications on the YLE mux in Finland. The problem is that the pid changes a bit late on the program start, not during a black screen. As a result, there is a short gap in the beginning of the show, as vdr restarts the recording into a new file. The gap is visible/hearable also on live tv, even without recording taking place. The other muxes don't have this problem (their pids don't change). I'm a bit surprised that I couldn't find anything from the archives on this (or maybe I just failed in the search)... Anyone else experience this? And are there any ways to circumvent it (to disable the stop/start, or to make the switch more fluent)? I've tried this with Nebula PCI DVB-T with kernel stock drivers of 2.6.7 and 2.6.11.5 and vdr 1.3.12 and 1.3.22, and, on a different computer, with Terratec Cinery T2, 2.6.10 and 1.3.22. I'm attaching a clip of a syslog (the actual recording started 2 minutes earlier). Mar 19 20:30:01 localhost vdr[19631]: channel 4 (YLE24) event 20:30 'Tv-uutiset ja s' status 4 Mar 19 20:30:02 localhost vdr[19629]: changing pids of channel 1 from 512+128:650=eng:2321 to 512+128:650=fin:2321 Mar 19 20:30:02 localhost vdr[19625]: stopping recording due to modification of channel 1 Mar 19 20:30:03 localhost vdr[21696]: recording thread ended (pid=21696, tid=262161) Mar 19 20:30:03 localhost vdr[21695]: file writer thread ended (pid=21695, tid=245776) Mar 19 20:30:03 localhost vdr[19625]: buffer stats: 68056 (1%) used Mar 19 20:30:03 localhost vdr[19625]: timer 11 (1 2028-2054 'Tv-uutiset ja s') stop Mar 19 20:30:03 localhost vdr[19625]: retuning due to modification of channel 1 Mar 19 20:30:03 localhost vdr[19625]: switching to channel 1 Mar 19 20:30:03 localhost vdr[19636]: transfer thread ended (pid=19636, tid=147466) Mar 19 20:30:03 localhost vdr[19625]: buffer stats: 97760 (4%) used Mar 19 20:30:03 localhost vdr[19625]: buffer stats: 0 (0%) used Mar 19 20:30:03 localhost vdr[22301]: transfer thread started (pid=22301, tid=278538) Mar 19 20:30:03 localhost vdr[19625]: buffer stats: 14852 (7%) used Mar 19 20:30:03 localhost vdr[19625]: buffer stats: 564 (0%) used Mar 19 20:30:03 localhost vdr[19625]: switching device 1 to channel 1 Mar 19 20:30:03 localhost vdr[19625]: timer 11 (1 2028-2054 'Tv-uutiset ja s') start Best Regards, Timo

4 3

vdr-1.3.23 and libsi Makefile
by Jouni Karvo 20 Mar '05

20 Mar '05

hi, currently setting e.g. CXX=g++-X.X.X in Make.config only affects the main makefile and plugins, but libsi is not affected (the result being that linking libsi with vdr fails) - the following patch should help yours, Jouni --- libsi/Makefile 2004-10-16 16:31:50.000000000 +0300 +++ /home/vdr/vdr/libsi/Makefile 2005-03-06 15:18:19.000000000 +0200 @@ -19,6 +19,8 @@ LIBS += +-include ../Make.config + ### The object files (add further files here): OBJS = util.o si.o section.o descriptor.o

2 1

[PATCH] mp3-0.9.11 signals end of replay too late
by Wolfgang Fritz 20 Mar '05

20 Mar '05

Graphlcd crashes with segfault when stopping an MP3 replay because it calls cMP3Control::GetIndex after the MP3 player object is already destroyed. Reason: MP3 plugin signals end of replay too late. The attaches patch fixes it. =================================================================== --- mp3.c (Revision 228) +++ mp3.c (Arbeitskopie) @@ -261,10 +261,10 @@ cMP3Control::~cMP3Control() { + cStatus::MsgReplaying(this, NULL); delete lastMode; Hide(); Stop(); - cStatus::MsgReplaying(this, NULL); } void cMP3Control::Stop(void)

3 6

Graphic card Volari V3XT for HTPC with HDTV?
by Dr. Werner Fink 20 Mar '05

20 Mar '05

Hi, does anybody know this graphic card? The question is: are there any driver for using it under Linux and is the onboard Mpeg2 decoder usable under Linux? -> http://www.xgitech.com/products/products_2.asp?P=8 -> http://www.wcm.at/story.php?id=7429 Werner -- AC3 loop through sound card http://bitstreamout.sourceforge.net/ Howto http://www.vdr-portal.de/board/thread.php?threadid=1958 ------------------------------------------------------------------ "Having a smoking section in a restaurant is like having a peeing section in a swimming pool." -- Edward Burr

3 2

[patch] easyinput-1.1 for vdr 1.3.22
by Patrick Maier 20 Mar '05

20 Mar '05

Hi, here is the easyinput-patch for VDR 1.3.22 http://www.djdagobert.com/vdr/vdr-1.3.22-easyinput-1.1.diff Greets Patrick -- There are only 10 kind of people who understand binary digits: Those who do - Those who don't...

1 0

schedule oddness
by Craig Sanders 19 Mar '05

19 Mar '05

i've noticed duplicates in the schedule listing in vdr. i use tv_grab.au and xlmtv2vdr to import xmltv listings into vdr. vdr also populates the schedule automatically based on the DVB electronic program guide. i don't know if it's different elsewhere, but the EPG here in Melbourne gives you the details for the current program (on the current channel) and the next program.....this is why i use xmltv to get the next few days worth of program guides. what is happening is that instead of replacing the schedule entry imported by xmltv2vdr, the DVB listing is added to the schedule, so i end up with schedules like the following: 12:00 - 12:30 Stateline [1] 12:03 - 12:30 Stateline [2] 12:30 - 13:00 Australian Story [3] 12:30 - 13:00 Australian Story [4] 13:00 - 13:40 Foreign Correspondent 13:40 - 14:00 Wild Tails 14:00 - 15:00 Naked Planet 15:00 - 15:30 Pilot Globe Guide is there any way to make vdr replace a listing rather than add a new one? this would eliminate duplicates and make it more accurate (the DVB program guide is more up-to-date than the xmltv listing). The DVB entry also has more data (the xmltv listings here usually don't have any details about the program, little more than just the name and the time, while the DVB listing invaribaly has a summary description of the program). e.g. with the two duplicates above, the first of each pair is from xmltv and has no description, while the second is from DVB and has a useful description. [1] Stateline (G) Repeat [2] Stateline VIC news and current affairs presented by Kathy Bowlen. Feature stories and regional reports, interviews with state political, business and community leaders. [3] Australian Story (G) Repeat [4] Australian Story The Gathering Storm Pt:2 - Continues the saga of Beth Heinrich, and her 40-year love affair with with a married priest who went on to become Australia's most senior Anglican bishop. note that the program titles aren't always identical. sometimes there are minor differences in spelling, abbreviations used, or upper/lower case or start/stop time. i think that the best way to handle this is to consider the DVB guide data to be correct, and any conflicting schedule entry to be false....i.e. if a DVB entry is in the same time period as a schedule entry, then just delete the schedule entry. BTW, this is worse than just a cosmetic annoyance. it also causes duplicate recordings if an Auto-Timer is set in vdradmin....it notices that the schedule says there are two programs on the same channel at the same time that match the auto-timer criteria, so it records both. craig -- craig sanders <cas(a)taz.net.au> (part time cyborg)

8 12

mp3-plugin and mp2-streaming
by Burkhardt Petermann 19 Mar '05

19 Mar '05

Hi, I've a problem with streaming from a small DAB-Server (with mp2s) since VDR 1.3.22 and mp3-plugin 0.9.11: mp3: play mp3: player active true done mp3-dvb: using DVB output mp3: heartbeat buffer=0 now=2324 mp3: starting play mgr: bgr-scan -> throttle (16721) mgr: playing DAB - BR Bayern 4 netstream: parsed proto='http' host='vdr:8003' path='/stream/17.mp2' net: name lookup vdr net: connecting to vdr:8003 net: connected net: async read started netstream: -> GET /stream/17.mp2 HTTP/1.0 User-Agent: VDR-MP3/0.9.11 Host: vdr:8003 Accept: audio/mpeg Icy-MetaData: 1 netstream: <- HTTP/1.0 200 OK netstream: <- Date: Tue, 15 Mar 2005 15:02:44 GMT netstream: <- Server: DAB-Server 2.24 netstream: <- Pragma: no-cache netstream: <- Content-type: audio/x-mpeg netstream: <- icy-name:BR Bayern 4 netstream: found header 'icy-name' contents 'BR Bayern 4' netstream: <- x-audiocast-name:BR Bayern 4 netstream: <- Connection: Keep-Alive netstream: <- mp3: isStream=1 levelgood=0 haslevel=0 image: checking image for DAB/DAB - BR Bayern 4 image: check /mp3/DAB/DAB - BR Bayern 4.jpg image: found image: loading image /mp3/DAB/DAB - BR Bayern 4.jpg image: cached mp3: new input sample rate 48000 mp3: decode delayed 1001 ms mp3: heartbeat buffer=0 now=2325 mp3: write delayed 1001 ms mp3: decode delayed 1001 ms mp3: heartbeat buffer=140612 now=2326 mp3: write delayed 1001 ms mp3: decode delayed 1001 ms mp3: write delayed 1001 ms mp3: decode delayed 1001 ms mp3: heartbeat buffer=420692 now=2328 mp3: write delayed 1001 ms mp3: decode delayed 1001 ms mp3: heartbeat buffer=562780 now=2330 mp3: write delayed 1001 ms mp3: decode delayed 1002 ms mp3: write delayed 1002 ms mp3: player active false requested... mp3: decode delayed 1001 ms mp3: stopping play mp3: scale stats clipped=0 peak_clip=0,000000 peak=0,709668 mgr: bgr-scan -> run (24164) mp3: player active false done mgr: background scan idle wakeup mgr: background scan idle mgr: background scan idle wakeup mgr: background scan thread ended (pid=27872) After nearly 5-10 seconds the sound is ok, but before there are some interrupts. Streaming mp3s is ok ... Greetings burki ---------------------------------------------- Burkhardt Petermann Schilcherstr.8a D-86911 Diessen a.A. Phone: 049-8807-4491 Fax: 049-8807-948268 email: bpetermann(a)xyware.de

4 6

expired timers are not deleted
by Vladimir Shved 19 Mar '05

19 Mar '05

On my system, for some reason, expired timers are not deleted, is it a feature or bug? Or is it just me? I mean the timer would complete recording but is not removed after recording, just shifted to the bottom of the list. I have to clean the list every time by hand because timeline plugin shows conflicts. Is there anyway to fix this? Thanks, --Vlad

7 6

[patch] dvd-plugin: resume already whatched dvds
by Patrick Cernko 19 Mar '05

19 Mar '05

hi list, hi dvd maintainers, I created a patch to resume a dvd where it was interupted by the user. It is not yet fully finalized: The computation of the disc-id maybe still needs some work to avoid resuming on the wrong resuming data, but I think it can be used already. I currently takes the disc title, the number of titles on the disc and the overall total number of chapters to form a uniq id. Also what kind of data is stored and resumed might be worth a look. Currently it resumed to the former title and time but the choosen audio and subtitle stream (has anyone a dvd with differnent angles?) might be useful, especially on multi-lingual dvds. The patch is created against todays CVS. I don't know if it also applies cleanly to the last release. Just give it a try! Maybe the maintainers of the dvd plugin can integrate this functionality into the CVS and so in further releases. CU/all -- Patrick Cernko | mailto:errror@errror.org | http://www.errror.org dpkg: Warnung - altes pre-removal-Skript wurde beendet mit Fehler-Status 1 dpkg - probiere stattdessen Skript aus dem neuen Paket ... dpkg: ... sieht so aus, als hätte das geklappt. 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 @@ 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 @@ -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 @@ } +// --- 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<cResumeEntry> { +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(); @@ -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; } + delete resume; } void cDvdPlayer::setController (cDvdPlayerControl *ctrl ) @@ -562,6 +778,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, &currentTitle, &currentChapter) && + (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("<none>\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); @@ -631,6 +941,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) { @@ -1107,6 +1424,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__); @@ -1127,6 +1460,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: { @@ -1853,7 +2191,16 @@ if(!DVDActiveAndRunning()) return; if( running && nav ) { - dvdnav_stop(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; } } @@ -2163,22 +2510,36 @@ (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*/) { int titleNumber; + 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, &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 + 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); } 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 @@ class cDvdPlayerControl ; class cIframeAssembler; +class cDVDPlayerResume; class cDvdPlayer : public cPlayer, cThread { private: @@ -183,6 +184,31 @@ int playPacket(unsigned char *&cache_buf, bool trickMode, bool noAudio); void playSPU(int spuId, unsigned char *data, int datalen); + //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); @@ -313,7 +339,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)

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

vdr