# HG changeset patch # User mroi # Date 1072889772 0 # Node ID eb503714e1c21c7f9783949ad50a9b0ca8b14a26 # Parent 20d9e588f52cdd9665420e097d39db52ae333d7b these variables are not needed any more diff -r 20d9e588f52c -r eb503714e1c2 dvdnav.c --- a/dvdnav.c Fri Nov 14 18:55:52 2003 +0000 +++ b/dvdnav.c Wed Dec 31 16:56:12 2003 +0000 @@ -46,8 +46,6 @@ if (this->file) DVDCloseFile(this->file); this->file = NULL; - this->open_vtsN = -1; - this->open_domain = -1; memset(&this->pci,0,sizeof(this->pci)); memset(&this->dsi,0,sizeof(this->dsi)); @@ -231,7 +229,7 @@ /* * Returns 1 if block contains NAV packet, 0 otherwise. - * Precesses said NAV packet if present. + * Processes said NAV packet if present. * * Most of the code in here is copied from xine's MPEG demuxer * so any bugs which are found in that should be corrected here also. @@ -522,8 +520,8 @@ this->file = NULL; } - vts_event->old_vtsN = this->open_vtsN; - vts_event->old_domain = this->open_domain; + vts_event->old_vtsN = this->position_current.vts; + vts_event->old_domain = this->position_current.domain; /* Use the DOMAIN to find whether to open menu or title VOBs */ switch(this->position_next.domain) { diff -r 20d9e588f52c -r eb503714e1c2 dvdnav_internal.h --- a/dvdnav_internal.h Fri Nov 14 18:55:52 2003 +0000 +++ b/dvdnav_internal.h Wed Dec 31 16:56:12 2003 +0000 @@ -126,8 +126,6 @@ /* General data */ char path[MAX_PATH_LEN]; /* Path to DVD device/dir */ dvd_file_t *file; /* Currently opened file */ - int open_vtsN; /* The domain and number of the... */ - int open_domain; /* ..currently opened VOB */ /* Position data */ vm_position_t position_next;