Mercurial > mplayer.hg

comparison libmpdemux/open.c @ 5472:4bd766a5632b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dvdnav functions moved out to dvdnav_steram.c
author arpi
date Wed, 03 Apr 2002 17:55:31 +0000
parents 9451df83c04b
children 194bca17117b
comparison
equal deleted inserted replaced
5471:348c7d83e710 5472:4bd766a5632b
29 int dvd_chapter=1; 29 int dvd_chapter=1;
30 int dvd_last_chapter=0; 30 int dvd_last_chapter=0;
31 int dvd_angle=1; 31 int dvd_angle=1;
32 char* dvd_device=NULL; 32 char* dvd_device=NULL;
33 char* cdrom_device=NULL; 33 char* cdrom_device=NULL;
34 int dvd_nav=0; 34 int dvd_nav=0; /* use libdvdnav? */
35 35
36 #ifdef USE_DVDNAV 36 #ifdef USE_DVDNAV
37 #include <dvdnav.h> 37 #include "dvdnav_stream.h"
38 #endif 38 #endif
39 39
40 #ifdef USE_DVDREAD 40 #ifdef USE_DVDREAD
41 41
42 #include <dvdread/dvd_reader.h> 42 #include <dvdread/dvd_reader.h>
115 #endif 115 #endif
116 116
117 //============ Open DVD title ============== 117 //============ Open DVD title ==============
118 #ifdef USE_DVDNAV 118 #ifdef USE_DVDNAV
119 if(dvd_nav){ 119 if(dvd_nav){
120 dvdnav_t *dvdnav; 120 dvdnav_priv_t *dvdnav_priv;
121 int event,len,tmplen=0; 121 int event,len,tmplen=0;
122 if(!filename) filename=DEFAULT_DVD_DEVICE;
123 if(dvdnav_open(&dvdnav,filename)!=DVDNAV_STATUS_OK) {
124 mp_msg(MSGT_OPEN,MSGL_ERR,MSGTR_CantOpenDVD,filename);
125 return NULL;
126 }
127 122
128 stream=new_stream(-1,STREAMTYPE_DVDNAV); 123 stream=new_stream(-1,STREAMTYPE_DVDNAV);
129 if (!stream) { 124 if (!stream) {
130 mp_msg(MSGT_OPEN,MSGL_ERR,MSGTR_Exit_error); 125 mp_msg(MSGT_OPEN,MSGL_ERR,MSGTR_Exit_error);
131 return NULL; 126 return NULL;
132 } 127 }
133 stream->priv=(void*)dvdnav; 128
129 if(!filename) filename=DEFAULT_DVD_DEVICE;
130 if (!(dvdnav_priv=new_dvdnav_stream(filename))) {
131 mp_msg(MSGT_OPEN,MSGL_ERR,MSGTR_CantOpenDVD,filename);
132 return NULL;
133 }
134
135 stream->priv=(void*)dvdnav_priv;
134 return stream; 136 return stream;
135 } 137 }
136 #endif 138 #endif
137 #ifdef USE_DVDREAD 139 #ifdef USE_DVDREAD
138 if(dvd_title){ 140 if(dvd_title){