Mercurial > mplayer.hg
annotate stream/stream_dvdnav.c @ 20304:c9c6db3c2645
Remove stray line.
author | diego |
---|---|
date | Thu, 19 Oct 2006 21:00:35 +0000 |
parents | b0a938df89ed |
children | a11a208925b9 |
rev | line source |
---|---|
19302 | 1 #include "config.h" |
2 | |
3 #include <stdlib.h> | |
4 #include <stdio.h> | |
5 #include <unistd.h> | |
6 #include <string.h> | |
7 #include "mp_msg.h" | |
8 #include "osdep/timer.h" | |
9 #include "input/input.h" | |
10 #include "stream.h" | |
19312
ab8d6b6deb63
proper inclusion of demuxer.h (including libmpdemux in Makefile only was to make previous split easier)
ben
parents:
19302
diff
changeset
|
11 #include "libmpdemux/demuxer.h" |
19302 | 12 #include "stream_dvdnav.h" |
13 #include "libvo/video_out.h" | |
14 #include "spudec.h" | |
15 #include "m_option.h" | |
16 #include "m_struct.h" | |
17 #include "help_mp.h" | |
18 | |
19 extern char *dvd_device; | |
20 extern char *audio_lang, *dvdsub_lang; | |
21 | |
22 static struct stream_priv_s { | |
23 int track; | |
24 char* device; | |
25 } stream_priv_dflts = { | |
19764
499e5525d706
if no track number specified play the whole disc, or the menus can't be shown at start
nicodvb
parents:
19477
diff
changeset
|
26 0, |
19302 | 27 NULL |
28 }; | |
29 | |
30 #define ST_OFF(f) M_ST_OFF(struct stream_priv_s,f) | |
31 /// URL definition | |
32 static m_option_t stream_opts_fields[] = { | |
33 {"filename", ST_OFF(device), CONF_TYPE_STRING, 0, 0, 0, NULL }, | |
34 {"hostname", ST_OFF(track), CONF_TYPE_INT, 0, 0, 0, NULL}, | |
35 { NULL, NULL, 0, 0, 0, 0, NULL } | |
36 }; | |
37 static struct m_struct_st stream_opts = { | |
38 "dvd", | |
39 sizeof(struct stream_priv_s), | |
40 &stream_priv_dflts, | |
41 stream_opts_fields | |
42 }; | |
43 | |
44 int dvd_nav_skip_opening=0; /* skip opening stalls? */ | |
45 int osd_show_dvd_nav_delay=0; /* count down for dvd nav text on OSD */ | |
46 char dvd_nav_text[50]; /* for reporting stuff to OSD */ | |
47 int osd_show_dvd_nav_highlight; /* show highlight area */ | |
48 int osd_show_dvd_nav_sx; /* start x .... */ | |
49 int osd_show_dvd_nav_ex; | |
50 int osd_show_dvd_nav_sy; | |
51 int osd_show_dvd_nav_ey; | |
52 int dvd_nav_still=0; /* are we on a still picture? */ | |
53 | |
19892
2c361743ce69
don't seek until dvdnav_get_position() returns something meaningful
nicodvb
parents:
19851
diff
changeset
|
54 static int seek(stream_t *s, off_t newpos); |
2c361743ce69
don't seek until dvdnav_get_position() returns something meaningful
nicodvb
parents:
19851
diff
changeset
|
55 |
19914
dfd1bb3fc7c0
made file-static new_dvdnav_stream() and dvdnav_stream_read()
nicodvb
parents:
19912
diff
changeset
|
56 static dvdnav_priv_t * new_dvdnav_stream(char * filename) { |
19302 | 57 char * title_str; |
58 dvdnav_priv_t *dvdnav_priv; | |
59 | |
60 if (!filename) | |
61 return NULL; | |
62 | |
63 if (!(dvdnav_priv=calloc(1,sizeof(*dvdnav_priv)))) | |
64 return NULL; | |
65 | |
66 if (!(dvdnav_priv->filename=strdup(filename))) { | |
67 free(dvdnav_priv); | |
68 return NULL; | |
69 } | |
70 | |
71 if(dvdnav_open(&(dvdnav_priv->dvdnav),dvdnav_priv->filename)!=DVDNAV_STATUS_OK) | |
72 { | |
73 free(dvdnav_priv->filename); | |
74 free(dvdnav_priv); | |
75 return NULL; | |
76 } | |
77 | |
78 if (!dvdnav_priv->dvdnav) { | |
79 free(dvdnav_priv); | |
80 return NULL; | |
81 } | |
82 | |
83 if(1) //from vlc: if not used dvdnav from cvs will fail | |
84 { | |
85 int len, event; | |
86 char buf[2048]; | |
87 | |
88 dvdnav_get_next_block(dvdnav_priv->dvdnav,buf,&event,&len); | |
19781
61cc28c4236a
at start, reset dvdnav at the beginning of the stream after the first read (that is done to workaround a bug in dvdnav from cvs)
nicodvb
parents:
19780
diff
changeset
|
89 dvdnav_sector_search(dvdnav_priv->dvdnav, 0, SEEK_SET); |
19302 | 90 } |
91 | |
19454 | 92 /* turn off dvdnav caching */ |
19302 | 93 dvdnav_set_readahead_flag(dvdnav_priv->dvdnav, 0); |
94 if(dvdnav_set_PGC_positioning_flag(dvdnav_priv->dvdnav, 1) != DVDNAV_STATUS_OK) | |
95 mp_msg(MSGT_OPEN,MSGL_ERR,"stream_dvdnav, failed to set PGC positioning\n"); | |
96 #if 1 | |
97 /* report the title?! */ | |
98 if (dvdnav_get_title_string(dvdnav_priv->dvdnav,&title_str)==DVDNAV_STATUS_OK) { | |
99 mp_msg(MSGT_IDENTIFY, MSGL_INFO,"Title: '%s'\n",title_str); | |
100 } | |
101 #endif | |
102 | |
103 //dvdnav_event_clear(dvdnav_priv); | |
104 | |
105 return dvdnav_priv; | |
106 } | |
107 | |
19914
dfd1bb3fc7c0
made file-static new_dvdnav_stream() and dvdnav_stream_read()
nicodvb
parents:
19912
diff
changeset
|
108 static int dvdnav_stream_read(dvdnav_priv_t * dvdnav_priv, unsigned char *buf, int *len) { |
19302 | 109 int event = DVDNAV_NOP; |
110 | |
111 if (!len) return -1; | |
112 *len=-1; | |
113 if (!dvdnav_priv) return -1; | |
114 if (!buf) return -1; | |
115 | |
116 if (dvd_nav_still) { | |
117 mp_msg(MSGT_OPEN,MSGL_V, "%s: got a stream_read while I should be asleep!\n",__FUNCTION__); | |
118 *len=0; | |
119 return -1; | |
120 } | |
121 | |
122 if (dvdnav_get_next_block(dvdnav_priv->dvdnav,buf,&event,len)!=DVDNAV_STATUS_OK) { | |
123 mp_msg(MSGT_OPEN,MSGL_V, "Error getting next block from DVD %d (%s)\n",event, dvdnav_err_to_string(dvdnav_priv->dvdnav) ); | |
124 *len=-1; | |
125 } | |
126 else if (event!=DVDNAV_BLOCK_OK) { | |
127 | |
128 // need to handle certain events internally (like skipping stills) | |
129 switch (event) { | |
130 case DVDNAV_STILL_FRAME: { | |
131 dvdnav_still_event_t *still_event = (dvdnav_still_event_t*)(buf); | |
132 //if (dvdnav_priv->started) dvd_nav_still=1; | |
133 //else | |
134 dvdnav_still_skip(dvdnav_priv->dvdnav); // don't let dvdnav stall on this image | |
135 | |
136 break; | |
19451 | 137 } |
19453
087d4a916ea3
implemented STREAM_CTRL_GET_TIME_LENGTH (duration of the pgc playing)
nicodvb
parents:
19452
diff
changeset
|
138 case DVDNAV_CELL_CHANGE: { |
087d4a916ea3
implemented STREAM_CTRL_GET_TIME_LENGTH (duration of the pgc playing)
nicodvb
parents:
19452
diff
changeset
|
139 dvdnav_cell_change_event_t *ev = (dvdnav_cell_change_event_t*)buf; |
087d4a916ea3
implemented STREAM_CTRL_GET_TIME_LENGTH (duration of the pgc playing)
nicodvb
parents:
19452
diff
changeset
|
140 if(ev->pgc_length) |
087d4a916ea3
implemented STREAM_CTRL_GET_TIME_LENGTH (duration of the pgc playing)
nicodvb
parents:
19452
diff
changeset
|
141 dvdnav_priv->duration = ev->pgc_length/90; |
087d4a916ea3
implemented STREAM_CTRL_GET_TIME_LENGTH (duration of the pgc playing)
nicodvb
parents:
19452
diff
changeset
|
142 break; |
087d4a916ea3
implemented STREAM_CTRL_GET_TIME_LENGTH (duration of the pgc playing)
nicodvb
parents:
19452
diff
changeset
|
143 } |
19302 | 144 case DVDNAV_WAIT: |
145 dvdnav_wait_skip(dvdnav_priv->dvdnav); | |
146 break; | |
147 } | |
148 | |
149 *len=0; | |
150 } | |
151 return event; | |
152 } | |
153 | |
154 static void update_title_len(stream_t *stream) { | |
155 dvdnav_priv_t *priv = stream->priv; | |
156 dvdnav_status_t status; | |
157 uint32_t pos = 0, len = 0; | |
158 | |
159 status = dvdnav_get_position(priv->dvdnav, &pos, &len); | |
19892
2c361743ce69
don't seek until dvdnav_get_position() returns something meaningful
nicodvb
parents:
19851
diff
changeset
|
160 if(status == DVDNAV_STATUS_OK && len) { |
19302 | 161 stream->end_pos = (off_t) len * 2048; |
19892
2c361743ce69
don't seek until dvdnav_get_position() returns something meaningful
nicodvb
parents:
19851
diff
changeset
|
162 stream->seek = seek; |
2c361743ce69
don't seek until dvdnav_get_position() returns something meaningful
nicodvb
parents:
19851
diff
changeset
|
163 } else { |
2c361743ce69
don't seek until dvdnav_get_position() returns something meaningful
nicodvb
parents:
19851
diff
changeset
|
164 stream->seek = NULL; |
2c361743ce69
don't seek until dvdnav_get_position() returns something meaningful
nicodvb
parents:
19851
diff
changeset
|
165 stream->end_pos = 0; |
2c361743ce69
don't seek until dvdnav_get_position() returns something meaningful
nicodvb
parents:
19851
diff
changeset
|
166 } |
19302 | 167 } |
168 | |
169 | |
170 static int seek(stream_t *s, off_t newpos) { | |
171 uint32_t pos = 0, len = 0, sector = 0; | |
172 dvdnav_priv_t *priv = s->priv; | |
173 | |
174 if(s->end_pos && newpos > s->end_pos) | |
175 newpos = s->end_pos; | |
176 sector = newpos / 2048ULL; | |
177 if(dvdnav_sector_search(priv->dvdnav, (uint64_t) sector, SEEK_SET) != DVDNAV_STATUS_OK) | |
178 goto fail; | |
179 | |
180 s->pos = newpos; | |
181 | |
182 return 1; | |
183 | |
184 fail: | |
185 mp_msg(MSGT_STREAM,MSGL_INFO,"dvdnav_stream, seeking to %"PRIu64" failed: %s\n", newpos, dvdnav_err_to_string(priv->dvdnav)); | |
186 | |
187 return 1; | |
188 } | |
189 | |
190 static void stream_dvdnav_close(stream_t *s) { | |
191 dvdnav_priv_t *priv = s->priv; | |
192 dvdnav_close(priv->dvdnav); | |
193 priv->dvdnav = NULL; | |
194 free(priv); | |
195 } | |
196 | |
197 | |
198 static int fill_buffer(stream_t *s, char *but, int len) | |
199 { | |
200 int event; | |
201 dvdnav_priv_t* dvdnav_priv=s->priv; | |
202 len=0; | |
203 if(!s->end_pos) | |
204 update_title_len(s); | |
205 while(!len) /* grab all event until DVDNAV_BLOCK_OK (len=2048), DVDNAV_STOP or DVDNAV_STILL_FRAME */ | |
206 { | |
207 if(-1==(event=dvdnav_stream_read(dvdnav_priv, s->buffer, &len)) || len==-1) | |
208 { | |
209 mp_msg(MSGT_CPLAYER,MSGL_ERR, "DVDNAV stream read error!\n"); | |
210 return 0; | |
211 } | |
212 switch (event) { | |
213 case DVDNAV_STOP: return len; | |
214 case DVDNAV_BLOCK_OK: return len; | |
19893
9440915a76f1
at titleset change call update_title_len() to reset stream->end_pos
nicodvb
parents:
19892
diff
changeset
|
215 case DVDNAV_VTS_CHANGE: { |
19894
bec5c0d5fb17
in the previous commit I forgot to set s->end_pos=0
nicodvb
parents:
19893
diff
changeset
|
216 s->end_pos = 0; |
19893
9440915a76f1
at titleset change call update_title_len() to reset stream->end_pos
nicodvb
parents:
19892
diff
changeset
|
217 update_title_len(s); |
9440915a76f1
at titleset change call update_title_len() to reset stream->end_pos
nicodvb
parents:
19892
diff
changeset
|
218 break; |
9440915a76f1
at titleset change call update_title_len() to reset stream->end_pos
nicodvb
parents:
19892
diff
changeset
|
219 } |
19302 | 220 } |
221 } | |
222 mp_msg(MSGT_STREAM,MSGL_DBG2,"DVDNAV fill_buffer len: %d\n",len); | |
223 return len; | |
224 } | |
225 | |
19443 | 226 static int control(stream_t *stream, int cmd, void* arg) { |
227 dvdnav_priv_t* dvdnav_priv=stream->priv; | |
228 int tit, part; | |
229 | |
230 switch(cmd) | |
231 { | |
232 case STREAM_CTRL_SEEK_TO_CHAPTER: | |
233 { | |
234 int chap = *((unsigned int *)arg)+1; | |
235 | |
236 if(chap < 1 || dvdnav_current_title_info(dvdnav_priv->dvdnav, &tit, &part) != DVDNAV_STATUS_OK) | |
237 break; | |
238 if(dvdnav_part_play(dvdnav_priv->dvdnav, tit, chap) != DVDNAV_STATUS_OK) | |
239 break; | |
240 return 1; | |
241 } | |
19477 | 242 case STREAM_CTRL_GET_NUM_CHAPTERS: |
243 { | |
244 if(dvdnav_current_title_info(dvdnav_priv->dvdnav, &tit, &part) != DVDNAV_STATUS_OK) | |
245 break; | |
246 if(dvdnav_get_number_of_parts(dvdnav_priv->dvdnav, tit, &part) != DVDNAV_STATUS_OK) | |
247 break; | |
248 if(!part) | |
249 break; | |
250 *((unsigned int *)arg) = part; | |
251 return 1; | |
252 } | |
19443 | 253 case STREAM_CTRL_GET_CURRENT_CHAPTER: |
254 { | |
255 if(dvdnav_current_title_info(dvdnav_priv->dvdnav, &tit, &part) != DVDNAV_STATUS_OK) | |
256 break; | |
257 *((unsigned int *)arg) = part - 1; | |
258 return 1; | |
259 } | |
19453
087d4a916ea3
implemented STREAM_CTRL_GET_TIME_LENGTH (duration of the pgc playing)
nicodvb
parents:
19452
diff
changeset
|
260 case STREAM_CTRL_GET_TIME_LENGTH: |
087d4a916ea3
implemented STREAM_CTRL_GET_TIME_LENGTH (duration of the pgc playing)
nicodvb
parents:
19452
diff
changeset
|
261 { |
087d4a916ea3
implemented STREAM_CTRL_GET_TIME_LENGTH (duration of the pgc playing)
nicodvb
parents:
19452
diff
changeset
|
262 if(dvdnav_priv->duration) |
087d4a916ea3
implemented STREAM_CTRL_GET_TIME_LENGTH (duration of the pgc playing)
nicodvb
parents:
19452
diff
changeset
|
263 { |
087d4a916ea3
implemented STREAM_CTRL_GET_TIME_LENGTH (duration of the pgc playing)
nicodvb
parents:
19452
diff
changeset
|
264 *((unsigned int *)arg) = dvdnav_priv->duration; |
087d4a916ea3
implemented STREAM_CTRL_GET_TIME_LENGTH (duration of the pgc playing)
nicodvb
parents:
19452
diff
changeset
|
265 return 1; |
087d4a916ea3
implemented STREAM_CTRL_GET_TIME_LENGTH (duration of the pgc playing)
nicodvb
parents:
19452
diff
changeset
|
266 } |
087d4a916ea3
implemented STREAM_CTRL_GET_TIME_LENGTH (duration of the pgc playing)
nicodvb
parents:
19452
diff
changeset
|
267 } |
19443 | 268 } |
269 | |
270 return STREAM_UNSUPORTED; | |
271 } | |
272 | |
19302 | 273 static int open_s(stream_t *stream,int mode, void* opts, int* file_format) { |
274 struct stream_priv_s* p = (struct stream_priv_s*)opts; | |
275 char *filename; | |
276 int event,len,tmplen=0; | |
277 uint32_t pos, l2; | |
278 dvdnav_priv_t *dvdnav_priv; | |
279 dvdnav_status_t status; | |
280 | |
281 if(p->device) filename = p->device; | |
282 else if(dvd_device) filename= dvd_device; | |
283 else filename = DEFAULT_DVD_DEVICE; | |
284 if(!(dvdnav_priv=new_dvdnav_stream(filename))) { | |
285 mp_msg(MSGT_OPEN,MSGL_ERR,MSGTR_CantOpenDVD,filename); | |
286 return STREAM_UNSUPORTED; | |
287 } | |
288 | |
19764
499e5525d706
if no track number specified play the whole disc, or the menus can't be shown at start
nicodvb
parents:
19477
diff
changeset
|
289 if(p->track > 0) { |
19302 | 290 if(dvdnav_title_play(dvdnav_priv->dvdnav, p->track) != DVDNAV_STATUS_OK) { |
291 mp_msg(MSGT_OPEN,MSGL_FATAL,"dvdnav_stream, couldn't select title %d, error '%s'\n", p->track, dvdnav_err_to_string(dvdnav_priv->dvdnav)); | |
292 return STREAM_UNSUPORTED; | |
293 } | |
19780
49d6e27228bc
try to start from the root menu skipping all intros when playing dvdnav://-1; it's not guaranteed to work
nicodvb
parents:
19777
diff
changeset
|
294 } else if(p->track == -1) |
49d6e27228bc
try to start from the root menu skipping all intros when playing dvdnav://-1; it's not guaranteed to work
nicodvb
parents:
19777
diff
changeset
|
295 dvdnav_menu_call(dvdnav_priv->dvdnav, DVD_MENU_Root); |
19842
a43fa4ad378e
at start, when not playing a specific titleset, try to call the Title menu (as is common practice among players)
nicodvb
parents:
19840
diff
changeset
|
296 else { |
19764
499e5525d706
if no track number specified play the whole disc, or the menus can't be shown at start
nicodvb
parents:
19477
diff
changeset
|
297 mp_msg(MSGT_OPEN,MSGL_INFO,"dvdnav_stream, you didn't specify a track number (as in dvdnav://1), playing whole disc\n"); |
19842
a43fa4ad378e
at start, when not playing a specific titleset, try to call the Title menu (as is common practice among players)
nicodvb
parents:
19840
diff
changeset
|
298 dvdnav_menu_call(dvdnav_priv->dvdnav, DVD_MENU_Title); |
a43fa4ad378e
at start, when not playing a specific titleset, try to call the Title menu (as is common practice among players)
nicodvb
parents:
19840
diff
changeset
|
299 } |
19302 | 300 |
301 stream->sector_size = 2048; | |
302 stream->flags = STREAM_READ | STREAM_SEEK; | |
303 stream->fill_buffer = fill_buffer; | |
304 stream->seek = seek; | |
19443 | 305 stream->control = control; |
19302 | 306 stream->close = stream_dvdnav_close; |
307 stream->type = STREAMTYPE_DVDNAV; | |
308 stream->priv=(void*)dvdnav_priv; | |
309 *file_format = DEMUXER_TYPE_MPEG_PS; | |
310 | |
311 update_title_len(stream); | |
312 if(!stream->pos) | |
313 mp_msg(MSGT_OPEN,MSGL_ERR, "INIT ERROR: %d, couldn't get init pos %s\r\n", status, dvdnav_err_to_string(dvdnav_priv->dvdnav)); | |
20026
b0a938df89ed
warn the user to disable the cache when playing dvdnav streams
nicodvb
parents:
19914
diff
changeset
|
314 |
b0a938df89ed
warn the user to disable the cache when playing dvdnav streams
nicodvb
parents:
19914
diff
changeset
|
315 mp_msg(MSGT_OPEN,MSGL_INFO, "Remember to disable MPlayer's cache when playing dvdnav:// streams (adding -nocache to your command like)\r\n"); |
19302 | 316 |
317 return STREAM_OK; | |
318 } | |
319 | |
19768
1069a634fc92
added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents:
19764
diff
changeset
|
320 |
19774
109e241c0cca
in mp_dvdnav_handle_input() assign the currently selected button, shown in the OSD by main()
nicodvb
parents:
19768
diff
changeset
|
321 int mp_dvdnav_handle_input(stream_t *stream, int cmd, int *button) { |
19768
1069a634fc92
added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents:
19764
diff
changeset
|
322 dvdnav_priv_t * dvdnav_priv=(dvdnav_priv_t*)stream->priv; |
1069a634fc92
added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents:
19764
diff
changeset
|
323 dvdnav_t *nav = dvdnav_priv->dvdnav; |
19908
b6aa47caeb72
§Ænitial button value is -1. Only (button>0) is a correct button selection.
jonas
parents:
19895
diff
changeset
|
324 dvdnav_status_t status=DVDNAV_STATUS_ERR; |
19768
1069a634fc92
added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents:
19764
diff
changeset
|
325 pci_t *pci = dvdnav_get_current_nav_pci(nav); |
1069a634fc92
added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents:
19764
diff
changeset
|
326 int reset = 0; |
1069a634fc92
added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents:
19764
diff
changeset
|
327 |
1069a634fc92
added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents:
19764
diff
changeset
|
328 if(cmd != MP_CMD_DVDNAV_SELECT && !pci) |
1069a634fc92
added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents:
19764
diff
changeset
|
329 return 0; |
1069a634fc92
added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents:
19764
diff
changeset
|
330 |
1069a634fc92
added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents:
19764
diff
changeset
|
331 switch(cmd) { |
1069a634fc92
added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents:
19764
diff
changeset
|
332 case MP_CMD_DVDNAV_UP: |
1069a634fc92
added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents:
19764
diff
changeset
|
333 status = dvdnav_upper_button_select(nav, pci); |
1069a634fc92
added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents:
19764
diff
changeset
|
334 break; |
1069a634fc92
added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents:
19764
diff
changeset
|
335 case MP_CMD_DVDNAV_DOWN: |
1069a634fc92
added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents:
19764
diff
changeset
|
336 status = dvdnav_lower_button_select(nav, pci); |
1069a634fc92
added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents:
19764
diff
changeset
|
337 break; |
1069a634fc92
added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents:
19764
diff
changeset
|
338 case MP_CMD_DVDNAV_LEFT: |
1069a634fc92
added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents:
19764
diff
changeset
|
339 status = dvdnav_left_button_select(nav, pci); |
1069a634fc92
added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents:
19764
diff
changeset
|
340 break; |
1069a634fc92
added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents:
19764
diff
changeset
|
341 case MP_CMD_DVDNAV_RIGHT: |
1069a634fc92
added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents:
19764
diff
changeset
|
342 status = dvdnav_right_button_select(nav, pci); |
1069a634fc92
added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents:
19764
diff
changeset
|
343 break; |
1069a634fc92
added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents:
19764
diff
changeset
|
344 case MP_CMD_DVDNAV_MENU: |
1069a634fc92
added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents:
19764
diff
changeset
|
345 status = dvdnav_menu_call(nav,DVD_MENU_Root); |
1069a634fc92
added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents:
19764
diff
changeset
|
346 reset = 1; |
1069a634fc92
added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents:
19764
diff
changeset
|
347 break; |
19777
bb1b570ac7c1
permit to select previous dvdnav menu, in the order chapter->title->root
nicodvb
parents:
19774
diff
changeset
|
348 case MP_CMD_DVDNAV_PREVMENU: { |
bb1b570ac7c1
permit to select previous dvdnav menu, in the order chapter->title->root
nicodvb
parents:
19774
diff
changeset
|
349 int title=0, part=0; |
bb1b570ac7c1
permit to select previous dvdnav menu, in the order chapter->title->root
nicodvb
parents:
19774
diff
changeset
|
350 |
bb1b570ac7c1
permit to select previous dvdnav menu, in the order chapter->title->root
nicodvb
parents:
19774
diff
changeset
|
351 dvdnav_current_title_info(nav, &title, &part); |
bb1b570ac7c1
permit to select previous dvdnav menu, in the order chapter->title->root
nicodvb
parents:
19774
diff
changeset
|
352 if(title) { |
bb1b570ac7c1
permit to select previous dvdnav menu, in the order chapter->title->root
nicodvb
parents:
19774
diff
changeset
|
353 if(dvdnav_menu_call(nav, DVD_MENU_Part) == DVDNAV_STATUS_OK |
bb1b570ac7c1
permit to select previous dvdnav menu, in the order chapter->title->root
nicodvb
parents:
19774
diff
changeset
|
354 || dvdnav_menu_call(nav, DVD_MENU_Title) == DVDNAV_STATUS_OK) { |
bb1b570ac7c1
permit to select previous dvdnav menu, in the order chapter->title->root
nicodvb
parents:
19774
diff
changeset
|
355 reset = 1; |
bb1b570ac7c1
permit to select previous dvdnav menu, in the order chapter->title->root
nicodvb
parents:
19774
diff
changeset
|
356 break; |
bb1b570ac7c1
permit to select previous dvdnav menu, in the order chapter->title->root
nicodvb
parents:
19774
diff
changeset
|
357 } |
bb1b570ac7c1
permit to select previous dvdnav menu, in the order chapter->title->root
nicodvb
parents:
19774
diff
changeset
|
358 } |
bb1b570ac7c1
permit to select previous dvdnav menu, in the order chapter->title->root
nicodvb
parents:
19774
diff
changeset
|
359 if(dvdnav_menu_call(nav, DVD_MENU_Root) == DVDNAV_STATUS_OK) |
bb1b570ac7c1
permit to select previous dvdnav menu, in the order chapter->title->root
nicodvb
parents:
19774
diff
changeset
|
360 reset = 1; |
bb1b570ac7c1
permit to select previous dvdnav menu, in the order chapter->title->root
nicodvb
parents:
19774
diff
changeset
|
361 } |
bb1b570ac7c1
permit to select previous dvdnav menu, in the order chapter->title->root
nicodvb
parents:
19774
diff
changeset
|
362 break; |
19768
1069a634fc92
added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents:
19764
diff
changeset
|
363 case MP_CMD_DVDNAV_SELECT: |
1069a634fc92
added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents:
19764
diff
changeset
|
364 status = dvdnav_button_activate(nav, pci); |
19836
9470f7630ee4
when cmd == MP_CMD_DVDNAV_SELECT set reset=1 only if dvdnav_button_activate() succeeds, to avoid unneeded resets in main()
nicodvb
parents:
19781
diff
changeset
|
365 if(status == DVDNAV_STATUS_OK) reset = 1; |
19768
1069a634fc92
added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents:
19764
diff
changeset
|
366 break; |
19912
3fdb44285fe7
introduced new MP_CMD_DVDNAV_MOUSECLICK command (bound to mouse0);
nicodvb
parents:
19909
diff
changeset
|
367 case MP_CMD_DVDNAV_MOUSECLICK: |
3fdb44285fe7
introduced new MP_CMD_DVDNAV_MOUSECLICK command (bound to mouse0);
nicodvb
parents:
19909
diff
changeset
|
368 /* |
3fdb44285fe7
introduced new MP_CMD_DVDNAV_MOUSECLICK command (bound to mouse0);
nicodvb
parents:
19909
diff
changeset
|
369 this is a workaround: in theory the simple dvdnav_lower_button_select()+dvdnav_button_activate() |
3fdb44285fe7
introduced new MP_CMD_DVDNAV_MOUSECLICK command (bound to mouse0);
nicodvb
parents:
19909
diff
changeset
|
370 should be enough (and generally it is), but there are cases when the calls to dvdnav_lower_button_select() |
3fdb44285fe7
introduced new MP_CMD_DVDNAV_MOUSECLICK command (bound to mouse0);
nicodvb
parents:
19909
diff
changeset
|
371 and friends fail! Hence we have to call dvdnav_mouse_activate(priv->mousex, priv->mousey) with |
3fdb44285fe7
introduced new MP_CMD_DVDNAV_MOUSECLICK command (bound to mouse0);
nicodvb
parents:
19909
diff
changeset
|
372 the coodinates saved by mp_dvdnav_update_mouse_pos(). |
3fdb44285fe7
introduced new MP_CMD_DVDNAV_MOUSECLICK command (bound to mouse0);
nicodvb
parents:
19909
diff
changeset
|
373 This last call always works well |
3fdb44285fe7
introduced new MP_CMD_DVDNAV_MOUSECLICK command (bound to mouse0);
nicodvb
parents:
19909
diff
changeset
|
374 */ |
3fdb44285fe7
introduced new MP_CMD_DVDNAV_MOUSECLICK command (bound to mouse0);
nicodvb
parents:
19909
diff
changeset
|
375 status = dvdnav_mouse_activate(nav, pci, dvdnav_priv->mousex, dvdnav_priv->mousey); |
3fdb44285fe7
introduced new MP_CMD_DVDNAV_MOUSECLICK command (bound to mouse0);
nicodvb
parents:
19909
diff
changeset
|
376 break; |
19768
1069a634fc92
added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents:
19764
diff
changeset
|
377 default: |
1069a634fc92
added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents:
19764
diff
changeset
|
378 mp_msg(MSGT_CPLAYER, MSGL_V, "Unknown DVDNAV cmd %d\n", cmd); |
1069a634fc92
added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents:
19764
diff
changeset
|
379 break; |
1069a634fc92
added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents:
19764
diff
changeset
|
380 } |
1069a634fc92
added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents:
19764
diff
changeset
|
381 |
19840
ba3b77867047
in mp_dvdnav_handle_input() update current button only if the status of the previous operation succeeded; patch by Jonas Jermann
nicodvb
parents:
19839
diff
changeset
|
382 if(status == DVDNAV_STATUS_OK) |
ba3b77867047
in mp_dvdnav_handle_input() update current button only if the status of the previous operation succeeded; patch by Jonas Jermann
nicodvb
parents:
19839
diff
changeset
|
383 dvdnav_get_current_highlight(nav, button); |
19774
109e241c0cca
in mp_dvdnav_handle_input() assign the currently selected button, shown in the OSD by main()
nicodvb
parents:
19768
diff
changeset
|
384 |
19768
1069a634fc92
added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents:
19764
diff
changeset
|
385 return reset; |
1069a634fc92
added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents:
19764
diff
changeset
|
386 } |
1069a634fc92
added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents:
19764
diff
changeset
|
387 |
19851
adfd08588514
report mouse coordinates after movement to dvdnav; this permits to enable button selection using the mouse; patch by Jonas Jermann and me
nicodvb
parents:
19842
diff
changeset
|
388 void mp_dvdnav_update_mouse_pos(stream_t *stream, int32_t x, int32_t y, int* button) { |
adfd08588514
report mouse coordinates after movement to dvdnav; this permits to enable button selection using the mouse; patch by Jonas Jermann and me
nicodvb
parents:
19842
diff
changeset
|
389 dvdnav_priv_t * dvdnav_priv=(dvdnav_priv_t*)stream->priv; |
adfd08588514
report mouse coordinates after movement to dvdnav; this permits to enable button selection using the mouse; patch by Jonas Jermann and me
nicodvb
parents:
19842
diff
changeset
|
390 dvdnav_t *nav = dvdnav_priv->dvdnav; |
adfd08588514
report mouse coordinates after movement to dvdnav; this permits to enable button selection using the mouse; patch by Jonas Jermann and me
nicodvb
parents:
19842
diff
changeset
|
391 dvdnav_status_t status; |
adfd08588514
report mouse coordinates after movement to dvdnav; this permits to enable button selection using the mouse; patch by Jonas Jermann and me
nicodvb
parents:
19842
diff
changeset
|
392 pci_t *pci = dvdnav_get_current_nav_pci(nav); |
adfd08588514
report mouse coordinates after movement to dvdnav; this permits to enable button selection using the mouse; patch by Jonas Jermann and me
nicodvb
parents:
19842
diff
changeset
|
393 |
adfd08588514
report mouse coordinates after movement to dvdnav; this permits to enable button selection using the mouse; patch by Jonas Jermann and me
nicodvb
parents:
19842
diff
changeset
|
394 if(!pci) return; |
adfd08588514
report mouse coordinates after movement to dvdnav; this permits to enable button selection using the mouse; patch by Jonas Jermann and me
nicodvb
parents:
19842
diff
changeset
|
395 |
adfd08588514
report mouse coordinates after movement to dvdnav; this permits to enable button selection using the mouse; patch by Jonas Jermann and me
nicodvb
parents:
19842
diff
changeset
|
396 status = dvdnav_mouse_select(nav, pci, x, y); |
adfd08588514
report mouse coordinates after movement to dvdnav; this permits to enable button selection using the mouse; patch by Jonas Jermann and me
nicodvb
parents:
19842
diff
changeset
|
397 if(status == DVDNAV_STATUS_OK) dvdnav_get_current_highlight(nav, button); |
adfd08588514
report mouse coordinates after movement to dvdnav; this permits to enable button selection using the mouse; patch by Jonas Jermann and me
nicodvb
parents:
19842
diff
changeset
|
398 else *button = -1; |
19912
3fdb44285fe7
introduced new MP_CMD_DVDNAV_MOUSECLICK command (bound to mouse0);
nicodvb
parents:
19909
diff
changeset
|
399 dvdnav_priv->mousex = x; |
3fdb44285fe7
introduced new MP_CMD_DVDNAV_MOUSECLICK command (bound to mouse0);
nicodvb
parents:
19909
diff
changeset
|
400 dvdnav_priv->mousey = y; |
19851
adfd08588514
report mouse coordinates after movement to dvdnav; this permits to enable button selection using the mouse; patch by Jonas Jermann and me
nicodvb
parents:
19842
diff
changeset
|
401 } |
adfd08588514
report mouse coordinates after movement to dvdnav; this permits to enable button selection using the mouse; patch by Jonas Jermann and me
nicodvb
parents:
19842
diff
changeset
|
402 |
adfd08588514
report mouse coordinates after movement to dvdnav; this permits to enable button selection using the mouse; patch by Jonas Jermann and me
nicodvb
parents:
19842
diff
changeset
|
403 |
19302 | 404 stream_info_t stream_info_dvdnav = { |
405 "DVDNAV stream", | |
406 "null", | |
407 "", | |
408 "", | |
409 open_s, | |
410 { "dvdnav", NULL }, | |
411 &stream_opts, | |
412 1 // Urls are an option string | |
413 }; |