diff options
| author | Michael Roitzsch <mroi@users.sourceforge.net> | 2003-04-07 18:10:44 +0000 |
|---|---|---|
| committer | Michael Roitzsch <mroi@users.sourceforge.net> | 2003-04-07 18:10:44 +0000 |
| commit | de54959b5fe2e67da266e2ce2febb18886b43775 (patch) | |
| tree | a8882df042ca834ccb898d740fdcc3851fe8c9f6 /src/input/libdvdnav/searching.c | |
| parent | e1e28d7ef37ac58c6ac272200bca02fed97108db (diff) | |
| download | xine-lib-de54959b5fe2e67da266e2ce2febb18886b43775.tar.gz xine-lib-de54959b5fe2e67da266e2ce2febb18886b43775.tar.bz2 | |
merging libdvdnav, since some nice fixes took place
CVS patchset: 4565
CVS date: 2003/04/07 18:10:44
Diffstat (limited to 'src/input/libdvdnav/searching.c')
| -rw-r--r-- | src/input/libdvdnav/searching.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/src/input/libdvdnav/searching.c b/src/input/libdvdnav/searching.c index a09b7b04f..1efc1a67d 100644 --- a/src/input/libdvdnav/searching.c +++ b/src/input/libdvdnav/searching.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: searching.c,v 1.13 2003/03/29 13:19:09 mroi Exp $ + * $Id: searching.c,v 1.14 2003/04/07 18:10:50 mroi Exp $ * */ @@ -357,6 +357,20 @@ dvdnav_status_t dvdnav_menu_call(dvdnav_t *this, DVDMenuID_t menu) { /* make a copy of current VM and try to navigate the copy to the menu */ try_vm = vm_new_copy(this->vm); + if ( (menu == DVD_MENU_Escape) && (this->vm->state.domain != VTS_DOMAIN)) { + /* Try resume */ + if (vm_jump_resume(try_vm) && !try_vm->stopped) { + /* merge changes on success */ + vm_merge(this->vm, try_vm); + vm_free_copy(try_vm); + this->position_current.still = 0; + this->vm->hop_channel++; + pthread_mutex_unlock(&this->vm_lock); + return S_OK; + } + } + if (menu == DVD_MENU_Escape) menu = DVD_MENU_Title; + if (vm_jump_menu(try_vm, menu) && !try_vm->stopped) { /* merge changes on success */ vm_merge(this->vm, try_vm); |