annotate stream/stream_dvdnav.c @ 25827:3fc9f549b5d0

remove the spu_set field, replaced by a flag
author ben
date Sat, 26 Jan 2008 13:06:42 +0000
parents d8ed72fc61f8
children 8a1627f693a6
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
1 #include "config.h"
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
2
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
3 #include <stdlib.h>
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
4 #include <stdio.h>
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
5 #include <unistd.h>
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
6 #include <string.h>
25031
5e1e61012a05 report why the dvd couldn't be opened. Patch by Jan Knutar jknutar+nic+fi
nicodvb
parents: 25025
diff changeset
7 #include <errno.h>
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
8 #include "mp_msg.h"
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
9 #include "osdep/timer.h"
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
10 #include "input/input.h"
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
11 #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
12 #include "libmpdemux/demuxer.h"
25539
47f2a9304623 include dvdnav.h from its installation directory rather than appending
nicodvb
parents: 25536
diff changeset
13 #include <dvdnav/dvdnav.h>
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
14 #include "stream_dvdnav.h"
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
15 #include "libvo/video_out.h"
21193
a067e7e18b50 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents: 20851
diff changeset
16 #include "libavutil/common.h"
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
17 #include "spudec.h"
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
18 #include "m_option.h"
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
19 #include "m_struct.h"
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
20 #include "help_mp.h"
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
21 #include "stream_dvd_common.h"
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
22
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
23 /* state flags */
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
24 typedef enum {
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
25 NAV_FLAG_EOF = 1 << 0, /* end of stream has been reached */
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
26 NAV_FLAG_WAIT = 1 << 1, /* wait event */
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
27 NAV_FLAG_WAIT_SKIP = 1 << 2, /* wait skip disable */
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
28 NAV_FLAG_CELL_CHANGED = 1 << 3, /* cell change event */
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
29 NAV_FLAG_WAIT_READ_AUTO = 1 << 4, /* wait read auto mode */
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
30 NAV_FLAG_WAIT_READ = 1 << 5, /* suspend read from stream */
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
31 NAV_FLAG_VTS_DOMAIN = 1 << 6, /* vts domain */
25827
3fc9f549b5d0 remove the spu_set field, replaced by a flag
ben
parents: 25826
diff changeset
32 NAV_FLAG_SPU_SET = 1 << 7, /* spu_clut is valid */
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
33 } dvdnav_state_t;
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
34
25536
a7eec00ebb9c private structures belong to the C file using them, not to header files included somewhere else
nicodvb
parents: 25296
diff changeset
35 typedef struct {
a7eec00ebb9c private structures belong to the C file using them, not to header files included somewhere else
nicodvb
parents: 25296
diff changeset
36 dvdnav_t * dvdnav; /* handle to libdvdnav stuff */
a7eec00ebb9c private structures belong to the C file using them, not to header files included somewhere else
nicodvb
parents: 25296
diff changeset
37 char * filename; /* path */
a7eec00ebb9c private structures belong to the C file using them, not to header files included somewhere else
nicodvb
parents: 25296
diff changeset
38 unsigned int duration; /* in milliseconds */
a7eec00ebb9c private structures belong to the C file using them, not to header files included somewhere else
nicodvb
parents: 25296
diff changeset
39 int mousex, mousey;
a7eec00ebb9c private structures belong to the C file using them, not to header files included somewhere else
nicodvb
parents: 25296
diff changeset
40 int title;
25827
3fc9f549b5d0 remove the spu_set field, replaced by a flag
ben
parents: 25826
diff changeset
41 unsigned int spu_clut[16];
25536
a7eec00ebb9c private structures belong to the C file using them, not to header files included somewhere else
nicodvb
parents: 25296
diff changeset
42 dvdnav_highlight_event_t hlev;
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
43 int still_length; /* still frame duration */
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
44 unsigned int state;
25536
a7eec00ebb9c private structures belong to the C file using them, not to header files included somewhere else
nicodvb
parents: 25296
diff changeset
45 } dvdnav_priv_t;
a7eec00ebb9c private structures belong to the C file using them, not to header files included somewhere else
nicodvb
parents: 25296
diff changeset
46
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
47 extern char *dvd_device;
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
48 extern char *audio_lang, *dvdsub_lang;
25196
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
49 extern char *dvd_audio_stream_channels[6], *dvd_audio_stream_types[8];
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
50
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
51 static struct stream_priv_s {
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
52 int track;
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
53 char* device;
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
54 } 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
55 0,
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
56 NULL
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
57 };
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
58
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
59 #define ST_OFF(f) M_ST_OFF(struct stream_priv_s,f)
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
60 /// URL definition
25242
371a40dcc1cc stream_opts arrays should be const
reimar
parents: 25211
diff changeset
61 static const m_option_t stream_opts_fields[] = {
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
62 {"filename", ST_OFF(device), CONF_TYPE_STRING, 0, 0, 0, NULL },
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
63 {"hostname", ST_OFF(track), CONF_TYPE_INT, 0, 0, 0, NULL},
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
64 { NULL, NULL, 0, 0, 0, 0, NULL }
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
65 };
25691
68015115f63a stream_opts should be const
reimar
parents: 25574
diff changeset
66 static const struct m_struct_st stream_opts = {
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
67 "dvd",
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
68 sizeof(struct stream_priv_s),
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
69 &stream_priv_dflts,
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
70 stream_opts_fields
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
71 };
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
72
19892
2c361743ce69 don't seek until dvdnav_get_position() returns something meaningful
nicodvb
parents: 19851
diff changeset
73 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
74
19914
dfd1bb3fc7c0 made file-static new_dvdnav_stream() and dvdnav_stream_read()
nicodvb
parents: 19912
diff changeset
75 static dvdnav_priv_t * new_dvdnav_stream(char * filename) {
25819
ecab5c5a5349 type expected by dvdnav_get_title_string() is const
ben
parents: 25818
diff changeset
76 const char * title_str;
20809
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
77 dvdnav_priv_t *priv;
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
78
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
79 if (!filename)
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
80 return NULL;
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
81
20809
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
82 if (!(priv=calloc(1,sizeof(dvdnav_priv_t))))
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
83 return NULL;
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
84
20809
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
85 if (!(priv->filename=strdup(filename))) {
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
86 free(priv);
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
87 return NULL;
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
88 }
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
89
20809
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
90 if(dvdnav_open(&(priv->dvdnav),priv->filename)!=DVDNAV_STATUS_OK)
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
91 {
20809
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
92 free(priv->filename);
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
93 free(priv);
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
94 return NULL;
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
95 }
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
96
20809
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
97 if (!priv->dvdnav) {
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
98 free(priv);
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
99 return NULL;
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
100 }
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
101
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
102 if(1) //from vlc: if not used dvdnav from cvs will fail
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
103 {
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
104 int len, event;
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
105 char buf[2048];
20786
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
106
20809
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
107 dvdnav_get_next_block(priv->dvdnav,buf,&event,&len);
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
108 dvdnav_sector_search(priv->dvdnav, 0, SEEK_SET);
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
109 }
20786
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
110
19454
b9a62caeb61b corrected _very_ misleading comment
nicodvb
parents: 19453
diff changeset
111 /* turn off dvdnav caching */
20809
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
112 dvdnav_set_readahead_flag(priv->dvdnav, 0);
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
113 if(dvdnav_set_PGC_positioning_flag(priv->dvdnav, 1) != DVDNAV_STATUS_OK)
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
114 mp_msg(MSGT_OPEN,MSGL_ERR,"stream_dvdnav, failed to set PGC positioning\n");
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
115 #if 1
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
116 /* report the title?! */
20809
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
117 if (dvdnav_get_title_string(priv->dvdnav,&title_str)==DVDNAV_STATUS_OK) {
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
118 mp_msg(MSGT_IDENTIFY, MSGL_INFO,"Title: '%s'\n",title_str);
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
119 }
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
120 #endif
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
121
20809
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
122 //dvdnav_event_clear(priv);
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
123
20809
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
124 return priv;
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
125 }
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
126
21219
8258747951d7 keep nav highlight event in dvdnav priv structure
ben
parents: 21204
diff changeset
127 static void dvdnav_get_highlight (dvdnav_priv_t *priv, int display_mode) {
21193
a067e7e18b50 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents: 20851
diff changeset
128 pci_t *pnavpci = NULL;
21219
8258747951d7 keep nav highlight event in dvdnav priv structure
ben
parents: 21204
diff changeset
129 dvdnav_highlight_event_t *hlev = &(priv->hlev);
8258747951d7 keep nav highlight event in dvdnav priv structure
ben
parents: 21204
diff changeset
130 int btnum;
21198
fbe50a67612a COSMETICS: consistently reformatted after ben's mess
nicodvb
parents: 21197
diff changeset
131
21219
8258747951d7 keep nav highlight event in dvdnav priv structure
ben
parents: 21204
diff changeset
132 if (!priv || !priv->dvdnav)
21193
a067e7e18b50 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents: 20851
diff changeset
133 return;
a067e7e18b50 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents: 20851
diff changeset
134
a067e7e18b50 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents: 20851
diff changeset
135 pnavpci = dvdnav_get_current_nav_pci (priv->dvdnav);
a067e7e18b50 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents: 20851
diff changeset
136 if (!pnavpci)
a067e7e18b50 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents: 20851
diff changeset
137 return;
21198
fbe50a67612a COSMETICS: consistently reformatted after ben's mess
nicodvb
parents: 21197
diff changeset
138
21193
a067e7e18b50 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents: 20851
diff changeset
139 dvdnav_get_current_highlight (priv->dvdnav, &(hlev->buttonN));
a067e7e18b50 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents: 20851
diff changeset
140 hlev->display = display_mode; /* show */
21198
fbe50a67612a COSMETICS: consistently reformatted after ben's mess
nicodvb
parents: 21197
diff changeset
141
21193
a067e7e18b50 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents: 20851
diff changeset
142 if (hlev->buttonN > 0 && pnavpci->hli.hl_gi.btn_ns > 0 && hlev->display) {
a067e7e18b50 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents: 20851
diff changeset
143 for (btnum = 0; btnum < pnavpci->hli.hl_gi.btn_ns; btnum++) {
a067e7e18b50 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents: 20851
diff changeset
144 btni_t *btni = &(pnavpci->hli.btnit[btnum]);
a067e7e18b50 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents: 20851
diff changeset
145
a067e7e18b50 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents: 20851
diff changeset
146 if (hlev->buttonN == btnum + 1) {
a067e7e18b50 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents: 20851
diff changeset
147 hlev->sx = FFMIN (btni->x_start, btni->x_end);
a067e7e18b50 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents: 20851
diff changeset
148 hlev->ex = FFMAX (btni->x_start, btni->x_end);
a067e7e18b50 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents: 20851
diff changeset
149 hlev->sy = FFMIN (btni->y_start, btni->y_end);
a067e7e18b50 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents: 20851
diff changeset
150 hlev->ey = FFMAX (btni->y_start, btni->y_end);
a067e7e18b50 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents: 20851
diff changeset
151
a067e7e18b50 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents: 20851
diff changeset
152 hlev->palette = (btni->btn_coln == 0) ? 0 :
a067e7e18b50 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents: 20851
diff changeset
153 pnavpci->hli.btn_colit.btn_coli[btni->btn_coln - 1][0];
a067e7e18b50 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents: 20851
diff changeset
154 break;
a067e7e18b50 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents: 20851
diff changeset
155 }
a067e7e18b50 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents: 20851
diff changeset
156 }
a067e7e18b50 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents: 20851
diff changeset
157 } else { /* hide button or no button */
a067e7e18b50 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents: 20851
diff changeset
158 hlev->sx = hlev->ex = 0;
a067e7e18b50 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents: 20851
diff changeset
159 hlev->sy = hlev->ey = 0;
a067e7e18b50 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents: 20851
diff changeset
160 hlev->palette = hlev->buttonN = 0;
a067e7e18b50 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents: 20851
diff changeset
161 }
a067e7e18b50 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents: 20851
diff changeset
162 }
a067e7e18b50 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents: 20851
diff changeset
163
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
164 static inline int dvdnav_get_duration (int length) {
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
165 return (length == 255) ? 0 : length * 1000;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
166 }
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
167
20809
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
168 static int dvdnav_stream_read(dvdnav_priv_t * priv, unsigned char *buf, int *len) {
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
169 int event = DVDNAV_NOP;
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
170
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
171 *len=-1;
20809
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
172 if (dvdnav_get_next_block(priv->dvdnav,buf,&event,len)!=DVDNAV_STATUS_OK) {
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
173 mp_msg(MSGT_OPEN,MSGL_V, "Error getting next block from DVD %d (%s)\n",event, dvdnav_err_to_string(priv->dvdnav) );
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
174 *len=-1;
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
175 }
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
176 else if (event!=DVDNAV_BLOCK_OK) {
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
177 // need to handle certain events internally (like skipping stills)
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
178 switch (event) {
21332
7f53c807d593 feed the content of NAV_PACKET to the demuxer
nicodvb
parents: 21219
diff changeset
179 case DVDNAV_NAV_PACKET:
7f53c807d593 feed the content of NAV_PACKET to the demuxer
nicodvb
parents: 21219
diff changeset
180 return event;
20786
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
181 case DVDNAV_STILL_FRAME: {
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
182 dvdnav_still_event_t *still_event = (dvdnav_still_event_t *) buf;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
183 priv->still_length = still_event->length;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
184 /* set still frame duration */
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
185 priv->duration = dvdnav_get_duration (priv->still_length);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
186 if (priv->still_length <= 1) {
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
187 pci_t *pnavpci = dvdnav_get_current_nav_pci (priv->dvdnav);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
188 priv->duration = mp_dvdtimetomsec (&pnavpci->pci_gi.e_eltm);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
189 }
20786
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
190 break;
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
191 }
21193
a067e7e18b50 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents: 20851
diff changeset
192 case DVDNAV_HIGHLIGHT: {
21219
8258747951d7 keep nav highlight event in dvdnav priv structure
ben
parents: 21204
diff changeset
193 dvdnav_get_highlight (priv, 1);
21193
a067e7e18b50 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents: 20851
diff changeset
194 break;
a067e7e18b50 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents: 20851
diff changeset
195 }
20786
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
196 case DVDNAV_CELL_CHANGE: {
19453
087d4a916ea3 implemented STREAM_CTRL_GET_TIME_LENGTH (duration of the pgc playing)
nicodvb
parents: 19452
diff changeset
197 dvdnav_cell_change_event_t *ev = (dvdnav_cell_change_event_t*)buf;
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
198 uint32_t nextstill;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
199
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
200 priv->state &= ~NAV_FLAG_WAIT_SKIP;
19453
087d4a916ea3 implemented STREAM_CTRL_GET_TIME_LENGTH (duration of the pgc playing)
nicodvb
parents: 19452
diff changeset
201 if(ev->pgc_length)
20809
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
202 priv->duration = ev->pgc_length/90;
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
203
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
204 if (dvdnav_is_domain_vts(priv->dvdnav))
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
205 priv->state &= ~NAV_FLAG_VTS_DOMAIN;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
206 else
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
207 priv->state |= NAV_FLAG_VTS_DOMAIN;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
208
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
209 nextstill = dvdnav_get_next_still_flag (priv->dvdnav);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
210 if (nextstill) {
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
211 priv->duration = dvdnav_get_duration (nextstill);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
212 priv->still_length = nextstill;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
213 if (priv->still_length <= 1) {
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
214 pci_t *pnavpci = dvdnav_get_current_nav_pci (priv->dvdnav);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
215 priv->duration = mp_dvdtimetomsec (&pnavpci->pci_gi.e_eltm);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
216 }
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
217 }
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
218
19453
087d4a916ea3 implemented STREAM_CTRL_GET_TIME_LENGTH (duration of the pgc playing)
nicodvb
parents: 19452
diff changeset
219 break;
20786
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
220 }
21538
c9b6588932b5 export spu palette; part of a patch by Otvos Attila
nicodvb
parents: 21424
diff changeset
221 case DVDNAV_SPU_CLUT_CHANGE: {
c9b6588932b5 export spu palette; part of a patch by Otvos Attila
nicodvb
parents: 21424
diff changeset
222 memcpy(priv->spu_clut, buf, 16*sizeof(unsigned int));
25827
3fc9f549b5d0 remove the spu_set field, replaced by a flag
ben
parents: 25826
diff changeset
223 priv->state |= NAV_FLAG_SPU_SET;
21538
c9b6588932b5 export spu palette; part of a patch by Otvos Attila
nicodvb
parents: 21424
diff changeset
224 break;
c9b6588932b5 export spu palette; part of a patch by Otvos Attila
nicodvb
parents: 21424
diff changeset
225 }
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
226 case DVDNAV_WAIT: {
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
227 if ((priv->state & NAV_FLAG_WAIT_SKIP) &&
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
228 !(priv->state & NAV_FLAG_WAIT))
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
229 dvdnav_wait_skip (priv->dvdnav);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
230 else
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
231 priv->state |= NAV_FLAG_WAIT;
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
232 break;
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
233 }
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
234 case DVDNAV_VTS_CHANGE: {
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
235 priv->state &= ~NAV_FLAG_WAIT_SKIP;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
236 break;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
237 }
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
238 }
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
239
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
240 *len=0;
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
241 }
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
242 return event;
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
243 }
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
244
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
245 static void update_title_len(stream_t *stream) {
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
246 dvdnav_priv_t *priv = stream->priv;
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
247 dvdnav_status_t status;
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
248 uint32_t pos = 0, len = 0;
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
249
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
250 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
251 if(status == DVDNAV_STATUS_OK && len) {
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
252 stream->end_pos = (off_t) len * 2048;
19892
2c361743ce69 don't seek until dvdnav_get_position() returns something meaningful
nicodvb
parents: 19851
diff changeset
253 stream->seek = seek;
2c361743ce69 don't seek until dvdnav_get_position() returns something meaningful
nicodvb
parents: 19851
diff changeset
254 } else {
2c361743ce69 don't seek until dvdnav_get_position() returns something meaningful
nicodvb
parents: 19851
diff changeset
255 stream->seek = NULL;
2c361743ce69 don't seek until dvdnav_get_position() returns something meaningful
nicodvb
parents: 19851
diff changeset
256 stream->end_pos = 0;
2c361743ce69 don't seek until dvdnav_get_position() returns something meaningful
nicodvb
parents: 19851
diff changeset
257 }
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
258 }
20786
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
259
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
260
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
261 static int seek(stream_t *s, off_t newpos) {
23990
f57dacd8c419 removed unused variables
nicodvb
parents: 23902
diff changeset
262 uint32_t sector = 0;
20786
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
263 dvdnav_priv_t *priv = s->priv;
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
264
20786
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
265 if(s->end_pos && newpos > s->end_pos)
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
266 newpos = s->end_pos;
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
267 sector = newpos / 2048ULL;
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
268 if(dvdnav_sector_search(priv->dvdnav, (uint64_t) sector, SEEK_SET) != DVDNAV_STATUS_OK)
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
269 goto fail;
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
270
20786
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
271 s->pos = newpos;
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
272
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
273 return 1;
20786
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
274
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
275 fail:
20786
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
276 mp_msg(MSGT_STREAM,MSGL_INFO,"dvdnav_stream, seeking to %"PRIu64" failed: %s\n", newpos, dvdnav_err_to_string(priv->dvdnav));
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
277
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
278 return 1;
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
279 }
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
280
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
281 static void stream_dvdnav_close(stream_t *s) {
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
282 dvdnav_priv_t *priv = s->priv;
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
283 dvdnav_close(priv->dvdnav);
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
284 priv->dvdnav = NULL;
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
285 free(priv);
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
286 }
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
287
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
288
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
289 static int fill_buffer(stream_t *s, char *but, int len)
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
290 {
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
291 int event;
20786
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
292
20809
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
293 dvdnav_priv_t* priv=s->priv;
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
294 if (priv->state & NAV_FLAG_WAIT_READ) /* read is suspended */
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
295 return -1;
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
296 len=0;
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
297 if(!s->end_pos)
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
298 update_title_len(s);
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
299 while(!len) /* grab all event until DVDNAV_BLOCK_OK (len=2048), DVDNAV_STOP or DVDNAV_STILL_FRAME */
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
300 {
20810
4d2c03da592c one more deuglification
nicodvb
parents: 20809
diff changeset
301 event=dvdnav_stream_read(priv, s->buffer, &len);
4d2c03da592c one more deuglification
nicodvb
parents: 20809
diff changeset
302 if(event==-1 || len==-1)
20786
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
303 {
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
304 mp_msg(MSGT_CPLAYER,MSGL_ERR, "DVDNAV stream read error!\n");
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
305 return 0;
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
306 }
25825
4c17a62383a4 automatically set spu button highlight when nav cell has changed
ben
parents: 25824
diff changeset
307 if (event != DVDNAV_BLOCK_OK)
4c17a62383a4 automatically set spu button highlight when nav cell has changed
ben
parents: 25824
diff changeset
308 dvdnav_get_highlight (priv, 1);
20786
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
309 switch (event) {
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
310 case DVDNAV_STOP: {
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
311 priv->state |= NAV_FLAG_EOF;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
312 return len;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
313 }
21333
9e3860c22d99 cosmetical reformatting
nicodvb
parents: 21332
diff changeset
314 case DVDNAV_BLOCK_OK:
9e3860c22d99 cosmetical reformatting
nicodvb
parents: 21332
diff changeset
315 case DVDNAV_NAV_PACKET:
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
316 case DVDNAV_STILL_FRAME:
21333
9e3860c22d99 cosmetical reformatting
nicodvb
parents: 21332
diff changeset
317 return len;
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
318 case DVDNAV_WAIT: {
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
319 if (priv->state & NAV_FLAG_WAIT)
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
320 return len;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
321 break;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
322 }
20786
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
323 case DVDNAV_VTS_CHANGE: {
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
324 int tit = 0, part = 0;
23043
4038852b041e after a DVDNAV_VTS_CHANGE event report the title being played
nicodvb
parents: 22936
diff changeset
325 dvdnav_vts_change_event_t *vts_event = (dvdnav_vts_change_event_t *)s->buffer;
4038852b041e after a DVDNAV_VTS_CHANGE event report the title being played
nicodvb
parents: 22936
diff changeset
326 mp_msg(MSGT_CPLAYER,MSGL_INFO, "DVDNAV, switched to title: %d\r\n", vts_event->new_vtsN);
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
327 priv->state |= NAV_FLAG_CELL_CHANGED;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
328 priv->state &= ~NAV_FLAG_WAIT_SKIP;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
329 priv->state &= ~NAV_FLAG_WAIT;
20786
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
330 s->end_pos = 0;
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
331 update_title_len(s);
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
332 if (priv->state & NAV_FLAG_WAIT_READ_AUTO)
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
333 priv->state |= NAV_FLAG_WAIT_READ;
20809
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
334 if(dvdnav_current_title_info(priv->dvdnav, &tit, &part) == DVDNAV_STATUS_OK) {
20786
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
335 mp_msg(MSGT_CPLAYER,MSGL_V, "\r\nDVDNAV, NEW TITLE %d\r\n", tit);
21219
8258747951d7 keep nav highlight event in dvdnav priv structure
ben
parents: 21204
diff changeset
336 dvdnav_get_highlight (priv, 0);
20809
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
337 if(priv->title > 0 && tit != priv->title)
20786
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
338 return 0;
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
339 }
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
340 break;
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
341 }
20786
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
342 case DVDNAV_CELL_CHANGE: {
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
343 priv->state |= NAV_FLAG_CELL_CHANGED;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
344 priv->state &= ~NAV_FLAG_WAIT_SKIP;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
345 priv->state &= ~NAV_FLAG_WAIT;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
346 if (priv->state & NAV_FLAG_WAIT_READ_AUTO)
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
347 priv->state |= NAV_FLAG_WAIT_READ;
20809
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
348 if(priv->title > 0 && dvd_last_chapter > 0) {
20786
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
349 int tit=0, part=0;
20809
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
350 if(dvdnav_current_title_info(priv->dvdnav, &tit, &part) == DVDNAV_STATUS_OK && part > dvd_last_chapter)
20786
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
351 return 0;
25826
d8ed72fc61f8 this end brace was not correctly indented
ben
parents: 25825
diff changeset
352 }
25825
4c17a62383a4 automatically set spu button highlight when nav cell has changed
ben
parents: 25824
diff changeset
353 dvdnav_get_highlight (priv, 1);
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
354 }
20786
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
355 break;
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
356 }
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
357 }
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
358 mp_msg(MSGT_STREAM,MSGL_DBG2,"DVDNAV fill_buffer len: %d\n",len);
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
359 return len;
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
360 }
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
361
19443
6e618d1fbb23 implemented seeking to chapter
nicodvb
parents: 19312
diff changeset
362 static int control(stream_t *stream, int cmd, void* arg) {
20809
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
363 dvdnav_priv_t* priv=stream->priv;
19443
6e618d1fbb23 implemented seeking to chapter
nicodvb
parents: 19312
diff changeset
364 int tit, part;
6e618d1fbb23 implemented seeking to chapter
nicodvb
parents: 19312
diff changeset
365
6e618d1fbb23 implemented seeking to chapter
nicodvb
parents: 19312
diff changeset
366 switch(cmd)
6e618d1fbb23 implemented seeking to chapter
nicodvb
parents: 19312
diff changeset
367 {
6e618d1fbb23 implemented seeking to chapter
nicodvb
parents: 19312
diff changeset
368 case STREAM_CTRL_SEEK_TO_CHAPTER:
6e618d1fbb23 implemented seeking to chapter
nicodvb
parents: 19312
diff changeset
369 {
6e618d1fbb23 implemented seeking to chapter
nicodvb
parents: 19312
diff changeset
370 int chap = *((unsigned int *)arg)+1;
6e618d1fbb23 implemented seeking to chapter
nicodvb
parents: 19312
diff changeset
371
20809
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
372 if(chap < 1 || dvdnav_current_title_info(priv->dvdnav, &tit, &part) != DVDNAV_STATUS_OK)
19443
6e618d1fbb23 implemented seeking to chapter
nicodvb
parents: 19312
diff changeset
373 break;
20809
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
374 if(dvdnav_part_play(priv->dvdnav, tit, chap) != DVDNAV_STATUS_OK)
19443
6e618d1fbb23 implemented seeking to chapter
nicodvb
parents: 19312
diff changeset
375 break;
6e618d1fbb23 implemented seeking to chapter
nicodvb
parents: 19312
diff changeset
376 return 1;
6e618d1fbb23 implemented seeking to chapter
nicodvb
parents: 19312
diff changeset
377 }
19477
2a6520a36e96 implemented STREAM_CTRL_GET_NUM_CHAPTERS
nicodvb
parents: 19454
diff changeset
378 case STREAM_CTRL_GET_NUM_CHAPTERS:
2a6520a36e96 implemented STREAM_CTRL_GET_NUM_CHAPTERS
nicodvb
parents: 19454
diff changeset
379 {
20809
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
380 if(dvdnav_current_title_info(priv->dvdnav, &tit, &part) != DVDNAV_STATUS_OK)
19477
2a6520a36e96 implemented STREAM_CTRL_GET_NUM_CHAPTERS
nicodvb
parents: 19454
diff changeset
381 break;
20809
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
382 if(dvdnav_get_number_of_parts(priv->dvdnav, tit, &part) != DVDNAV_STATUS_OK)
19477
2a6520a36e96 implemented STREAM_CTRL_GET_NUM_CHAPTERS
nicodvb
parents: 19454
diff changeset
383 break;
2a6520a36e96 implemented STREAM_CTRL_GET_NUM_CHAPTERS
nicodvb
parents: 19454
diff changeset
384 if(!part)
2a6520a36e96 implemented STREAM_CTRL_GET_NUM_CHAPTERS
nicodvb
parents: 19454
diff changeset
385 break;
2a6520a36e96 implemented STREAM_CTRL_GET_NUM_CHAPTERS
nicodvb
parents: 19454
diff changeset
386 *((unsigned int *)arg) = part;
2a6520a36e96 implemented STREAM_CTRL_GET_NUM_CHAPTERS
nicodvb
parents: 19454
diff changeset
387 return 1;
2a6520a36e96 implemented STREAM_CTRL_GET_NUM_CHAPTERS
nicodvb
parents: 19454
diff changeset
388 }
19443
6e618d1fbb23 implemented seeking to chapter
nicodvb
parents: 19312
diff changeset
389 case STREAM_CTRL_GET_CURRENT_CHAPTER:
6e618d1fbb23 implemented seeking to chapter
nicodvb
parents: 19312
diff changeset
390 {
20809
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
391 if(dvdnav_current_title_info(priv->dvdnav, &tit, &part) != DVDNAV_STATUS_OK)
19443
6e618d1fbb23 implemented seeking to chapter
nicodvb
parents: 19312
diff changeset
392 break;
6e618d1fbb23 implemented seeking to chapter
nicodvb
parents: 19312
diff changeset
393 *((unsigned int *)arg) = part - 1;
6e618d1fbb23 implemented seeking to chapter
nicodvb
parents: 19312
diff changeset
394 return 1;
6e618d1fbb23 implemented seeking to chapter
nicodvb
parents: 19312
diff changeset
395 }
19453
087d4a916ea3 implemented STREAM_CTRL_GET_TIME_LENGTH (duration of the pgc playing)
nicodvb
parents: 19452
diff changeset
396 case STREAM_CTRL_GET_TIME_LENGTH:
087d4a916ea3 implemented STREAM_CTRL_GET_TIME_LENGTH (duration of the pgc playing)
nicodvb
parents: 19452
diff changeset
397 {
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
398 if(priv->duration || priv->still_length)
20786
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
399 {
20851
6602a90a06ec consistency fix: STREAM_CTRL_GET_TIME_LENGTH and STREAM_CTRL_GET_CURRENT_TIME now return time in (double) seconds
nicodvb
parents: 20810
diff changeset
400 *((double *)arg) = (double)priv->duration / 1000.0;
20786
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
401 return 1;
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
402 }
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
403 break;
19453
087d4a916ea3 implemented STREAM_CTRL_GET_TIME_LENGTH (duration of the pgc playing)
nicodvb
parents: 19452
diff changeset
404 }
24303
21d181441aa4 implemented STREAM_CTRL_GET_ASPECT_RATIO
nicodvb
parents: 24257
diff changeset
405 case STREAM_CTRL_GET_ASPECT_RATIO:
21d181441aa4 implemented STREAM_CTRL_GET_ASPECT_RATIO
nicodvb
parents: 24257
diff changeset
406 {
21d181441aa4 implemented STREAM_CTRL_GET_ASPECT_RATIO
nicodvb
parents: 24257
diff changeset
407 uint8_t ar = dvdnav_get_video_aspect(priv->dvdnav);
21d181441aa4 implemented STREAM_CTRL_GET_ASPECT_RATIO
nicodvb
parents: 24257
diff changeset
408 *((double *)arg) = !ar ? 4.0/3.0 : 16.0/9.0;
21d181441aa4 implemented STREAM_CTRL_GET_ASPECT_RATIO
nicodvb
parents: 24257
diff changeset
409 return 1;
21d181441aa4 implemented STREAM_CTRL_GET_ASPECT_RATIO
nicodvb
parents: 24257
diff changeset
410 }
22936
a6486d2975d2 implemented STREAM_CTRL_GET_CURRENT_TIME and STREAM_CTRL_SEEK_TO_TIME - dvdnav from mphq required
nicodvb
parents: 21613
diff changeset
411 case STREAM_CTRL_GET_CURRENT_TIME:
a6486d2975d2 implemented STREAM_CTRL_GET_CURRENT_TIME and STREAM_CTRL_SEEK_TO_TIME - dvdnav from mphq required
nicodvb
parents: 21613
diff changeset
412 {
a6486d2975d2 implemented STREAM_CTRL_GET_CURRENT_TIME and STREAM_CTRL_SEEK_TO_TIME - dvdnav from mphq required
nicodvb
parents: 21613
diff changeset
413 double tm;
a6486d2975d2 implemented STREAM_CTRL_GET_CURRENT_TIME and STREAM_CTRL_SEEK_TO_TIME - dvdnav from mphq required
nicodvb
parents: 21613
diff changeset
414 tm = dvdnav_get_current_time(priv->dvdnav)/90000.0f;
a6486d2975d2 implemented STREAM_CTRL_GET_CURRENT_TIME and STREAM_CTRL_SEEK_TO_TIME - dvdnav from mphq required
nicodvb
parents: 21613
diff changeset
415 if(tm != -1)
a6486d2975d2 implemented STREAM_CTRL_GET_CURRENT_TIME and STREAM_CTRL_SEEK_TO_TIME - dvdnav from mphq required
nicodvb
parents: 21613
diff changeset
416 {
a6486d2975d2 implemented STREAM_CTRL_GET_CURRENT_TIME and STREAM_CTRL_SEEK_TO_TIME - dvdnav from mphq required
nicodvb
parents: 21613
diff changeset
417 *((double *)arg) = tm;
a6486d2975d2 implemented STREAM_CTRL_GET_CURRENT_TIME and STREAM_CTRL_SEEK_TO_TIME - dvdnav from mphq required
nicodvb
parents: 21613
diff changeset
418 return 1;
a6486d2975d2 implemented STREAM_CTRL_GET_CURRENT_TIME and STREAM_CTRL_SEEK_TO_TIME - dvdnav from mphq required
nicodvb
parents: 21613
diff changeset
419 }
a6486d2975d2 implemented STREAM_CTRL_GET_CURRENT_TIME and STREAM_CTRL_SEEK_TO_TIME - dvdnav from mphq required
nicodvb
parents: 21613
diff changeset
420 break;
a6486d2975d2 implemented STREAM_CTRL_GET_CURRENT_TIME and STREAM_CTRL_SEEK_TO_TIME - dvdnav from mphq required
nicodvb
parents: 21613
diff changeset
421 }
a6486d2975d2 implemented STREAM_CTRL_GET_CURRENT_TIME and STREAM_CTRL_SEEK_TO_TIME - dvdnav from mphq required
nicodvb
parents: 21613
diff changeset
422 case STREAM_CTRL_SEEK_TO_TIME:
a6486d2975d2 implemented STREAM_CTRL_GET_CURRENT_TIME and STREAM_CTRL_SEEK_TO_TIME - dvdnav from mphq required
nicodvb
parents: 21613
diff changeset
423 {
a6486d2975d2 implemented STREAM_CTRL_GET_CURRENT_TIME and STREAM_CTRL_SEEK_TO_TIME - dvdnav from mphq required
nicodvb
parents: 21613
diff changeset
424 uint64_t tm = (uint64_t) (*((double*)arg) * 90000);
a6486d2975d2 implemented STREAM_CTRL_GET_CURRENT_TIME and STREAM_CTRL_SEEK_TO_TIME - dvdnav from mphq required
nicodvb
parents: 21613
diff changeset
425 if(dvdnav_time_search(priv->dvdnav, tm) == DVDNAV_STATUS_OK)
a6486d2975d2 implemented STREAM_CTRL_GET_CURRENT_TIME and STREAM_CTRL_SEEK_TO_TIME - dvdnav from mphq required
nicodvb
parents: 21613
diff changeset
426 return 1;
a6486d2975d2 implemented STREAM_CTRL_GET_CURRENT_TIME and STREAM_CTRL_SEEK_TO_TIME - dvdnav from mphq required
nicodvb
parents: 21613
diff changeset
427 break;
a6486d2975d2 implemented STREAM_CTRL_GET_CURRENT_TIME and STREAM_CTRL_SEEK_TO_TIME - dvdnav from mphq required
nicodvb
parents: 21613
diff changeset
428 }
25574
bef7f820d179 implemented _ANGLE STREAM_CTRLs, patch by oattila chello hu
nicodvb
parents: 25539
diff changeset
429 case STREAM_CTRL_GET_NUM_ANGLES:
bef7f820d179 implemented _ANGLE STREAM_CTRLs, patch by oattila chello hu
nicodvb
parents: 25539
diff changeset
430 {
bef7f820d179 implemented _ANGLE STREAM_CTRLs, patch by oattila chello hu
nicodvb
parents: 25539
diff changeset
431 uint32_t curr, angles;
bef7f820d179 implemented _ANGLE STREAM_CTRLs, patch by oattila chello hu
nicodvb
parents: 25539
diff changeset
432 if(dvdnav_get_angle_info(priv->dvdnav, &curr, &angles) != DVDNAV_STATUS_OK)
bef7f820d179 implemented _ANGLE STREAM_CTRLs, patch by oattila chello hu
nicodvb
parents: 25539
diff changeset
433 break;
bef7f820d179 implemented _ANGLE STREAM_CTRLs, patch by oattila chello hu
nicodvb
parents: 25539
diff changeset
434 *((int *)arg) = angles;
bef7f820d179 implemented _ANGLE STREAM_CTRLs, patch by oattila chello hu
nicodvb
parents: 25539
diff changeset
435 return 1;
bef7f820d179 implemented _ANGLE STREAM_CTRLs, patch by oattila chello hu
nicodvb
parents: 25539
diff changeset
436 }
bef7f820d179 implemented _ANGLE STREAM_CTRLs, patch by oattila chello hu
nicodvb
parents: 25539
diff changeset
437 case STREAM_CTRL_GET_ANGLE:
bef7f820d179 implemented _ANGLE STREAM_CTRLs, patch by oattila chello hu
nicodvb
parents: 25539
diff changeset
438 {
bef7f820d179 implemented _ANGLE STREAM_CTRLs, patch by oattila chello hu
nicodvb
parents: 25539
diff changeset
439 uint32_t curr, angles;
bef7f820d179 implemented _ANGLE STREAM_CTRLs, patch by oattila chello hu
nicodvb
parents: 25539
diff changeset
440 if(dvdnav_get_angle_info(priv->dvdnav, &curr, &angles) != DVDNAV_STATUS_OK)
bef7f820d179 implemented _ANGLE STREAM_CTRLs, patch by oattila chello hu
nicodvb
parents: 25539
diff changeset
441 break;
bef7f820d179 implemented _ANGLE STREAM_CTRLs, patch by oattila chello hu
nicodvb
parents: 25539
diff changeset
442 *((int *)arg) = curr;
bef7f820d179 implemented _ANGLE STREAM_CTRLs, patch by oattila chello hu
nicodvb
parents: 25539
diff changeset
443 return 1;
bef7f820d179 implemented _ANGLE STREAM_CTRLs, patch by oattila chello hu
nicodvb
parents: 25539
diff changeset
444 }
bef7f820d179 implemented _ANGLE STREAM_CTRLs, patch by oattila chello hu
nicodvb
parents: 25539
diff changeset
445 case STREAM_CTRL_SET_ANGLE:
bef7f820d179 implemented _ANGLE STREAM_CTRLs, patch by oattila chello hu
nicodvb
parents: 25539
diff changeset
446 {
bef7f820d179 implemented _ANGLE STREAM_CTRLs, patch by oattila chello hu
nicodvb
parents: 25539
diff changeset
447 uint32_t curr, angles;
bef7f820d179 implemented _ANGLE STREAM_CTRLs, patch by oattila chello hu
nicodvb
parents: 25539
diff changeset
448 int new_angle = *((int *)arg);
bef7f820d179 implemented _ANGLE STREAM_CTRLs, patch by oattila chello hu
nicodvb
parents: 25539
diff changeset
449 if(dvdnav_get_angle_info(priv->dvdnav, &curr, &angles) != DVDNAV_STATUS_OK)
bef7f820d179 implemented _ANGLE STREAM_CTRLs, patch by oattila chello hu
nicodvb
parents: 25539
diff changeset
450 break;
bef7f820d179 implemented _ANGLE STREAM_CTRLs, patch by oattila chello hu
nicodvb
parents: 25539
diff changeset
451 if(new_angle>angles || new_angle<1)
bef7f820d179 implemented _ANGLE STREAM_CTRLs, patch by oattila chello hu
nicodvb
parents: 25539
diff changeset
452 break;
bef7f820d179 implemented _ANGLE STREAM_CTRLs, patch by oattila chello hu
nicodvb
parents: 25539
diff changeset
453 if(dvdnav_angle_change(priv->dvdnav, new_angle) != DVDNAV_STATUS_OK)
bef7f820d179 implemented _ANGLE STREAM_CTRLs, patch by oattila chello hu
nicodvb
parents: 25539
diff changeset
454 return 1;
bef7f820d179 implemented _ANGLE STREAM_CTRLs, patch by oattila chello hu
nicodvb
parents: 25539
diff changeset
455 }
19443
6e618d1fbb23 implemented seeking to chapter
nicodvb
parents: 19312
diff changeset
456 }
6e618d1fbb23 implemented seeking to chapter
nicodvb
parents: 19312
diff changeset
457
24257
d261f5109660 cosmetics: typo fix UNSUPORTED --> UNSUPPORTED
diego
parents: 24109
diff changeset
458 return STREAM_UNSUPPORTED;
19443
6e618d1fbb23 implemented seeking to chapter
nicodvb
parents: 19312
diff changeset
459 }
6e618d1fbb23 implemented seeking to chapter
nicodvb
parents: 19312
diff changeset
460
25165
4e57fd666c56 -identify chapters of chosen title
nicodvb
parents: 25031
diff changeset
461 static void identify_chapters(dvdnav_t *nav, uint32_t title)
4e57fd666c56 -identify chapters of chosen title
nicodvb
parents: 25031
diff changeset
462 {
25177
a43d99a80f4a -identify also shows the duration(s) of the title(s)
nicodvb
parents: 25176
diff changeset
463 uint64_t *parts=NULL, duration=0;
25165
4e57fd666c56 -identify chapters of chosen title
nicodvb
parents: 25031
diff changeset
464 uint32_t n, i, t;
25177
a43d99a80f4a -identify also shows the duration(s) of the title(s)
nicodvb
parents: 25176
diff changeset
465 n = dvdnav_describe_title_chapters(nav, title, &parts, &duration);
25165
4e57fd666c56 -identify chapters of chosen title
nicodvb
parents: 25031
diff changeset
466 if(parts) {
25177
a43d99a80f4a -identify also shows the duration(s) of the title(s)
nicodvb
parents: 25176
diff changeset
467 t = duration / 90;
a43d99a80f4a -identify also shows the duration(s) of the title(s)
nicodvb
parents: 25176
diff changeset
468 mp_msg(MSGT_IDENTIFY, MSGL_V, "ID_DVD_TITLE_%d_LENGTH=%d.%03d\n", title, t / 1000, t % 1000);
25167
89b5a20fc346 with -identify show the title being described
nicodvb
parents: 25165
diff changeset
469 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "TITLE %u, CHAPTERS: ", title);
25165
4e57fd666c56 -identify chapters of chosen title
nicodvb
parents: 25031
diff changeset
470 for(i=0; i<n; i++) {
4e57fd666c56 -identify chapters of chosen title
nicodvb
parents: 25031
diff changeset
471 t = parts[i] / 90000;
4e57fd666c56 -identify chapters of chosen title
nicodvb
parents: 25031
diff changeset
472 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "%02d:%02d:%02d,", t/3600, (t/60)%60, t%60);
4e57fd666c56 -identify chapters of chosen title
nicodvb
parents: 25031
diff changeset
473 }
4e57fd666c56 -identify chapters of chosen title
nicodvb
parents: 25031
diff changeset
474 free(parts);
4e57fd666c56 -identify chapters of chosen title
nicodvb
parents: 25031
diff changeset
475 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "\n");
4e57fd666c56 -identify chapters of chosen title
nicodvb
parents: 25031
diff changeset
476 }
4e57fd666c56 -identify chapters of chosen title
nicodvb
parents: 25031
diff changeset
477 }
4e57fd666c56 -identify chapters of chosen title
nicodvb
parents: 25031
diff changeset
478
25176
6d9212e61af8 cosmetics: moved identification code to a separate function
nicodvb
parents: 25168
diff changeset
479 static void identify(dvdnav_priv_t *priv, struct stream_priv_s *p)
6d9212e61af8 cosmetics: moved identification code to a separate function
nicodvb
parents: 25168
diff changeset
480 {
6d9212e61af8 cosmetics: moved identification code to a separate function
nicodvb
parents: 25168
diff changeset
481 uint32_t titles=0, i;
6d9212e61af8 cosmetics: moved identification code to a separate function
nicodvb
parents: 25168
diff changeset
482 if(p->track <= 0) {
6d9212e61af8 cosmetics: moved identification code to a separate function
nicodvb
parents: 25168
diff changeset
483 dvdnav_get_number_of_titles(priv->dvdnav, &titles);
6d9212e61af8 cosmetics: moved identification code to a separate function
nicodvb
parents: 25168
diff changeset
484 for(i=0; i<titles; i++)
6d9212e61af8 cosmetics: moved identification code to a separate function
nicodvb
parents: 25168
diff changeset
485 identify_chapters(priv->dvdnav, i);
6d9212e61af8 cosmetics: moved identification code to a separate function
nicodvb
parents: 25168
diff changeset
486 }
6d9212e61af8 cosmetics: moved identification code to a separate function
nicodvb
parents: 25168
diff changeset
487 else
6d9212e61af8 cosmetics: moved identification code to a separate function
nicodvb
parents: 25168
diff changeset
488 identify_chapters(priv->dvdnav, p->track);
6d9212e61af8 cosmetics: moved identification code to a separate function
nicodvb
parents: 25168
diff changeset
489 }
6d9212e61af8 cosmetics: moved identification code to a separate function
nicodvb
parents: 25168
diff changeset
490
25196
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
491 static void show_audio_subs_languages(dvdnav_t *nav)
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
492 {
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
493 uint8_t lg;
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
494 uint16_t i, lang, format, id, channels;
25820
b43eaaa94dd3 array was defined for 6 elements while 7 were declared
ben
parents: 25819
diff changeset
495 int base[7] = {128, 0, 0, 0, 160, 136, 0};
25196
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
496 char tmp[3];
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
497 for(i=0; i<8; i++)
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
498 {
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
499 lg = dvdnav_get_audio_logical_stream(nav, i);
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
500 if(lg == 0xff) continue;
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
501 channels = dvdnav_audio_stream_channels(nav, lg);
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
502 if(channels == 0xFFFF)
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
503 channels = 2; //unknown
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
504 else
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
505 channels--;
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
506 lang = dvdnav_audio_stream_to_lang(nav, lg);
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
507 if(lang == 0xFFFF)
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
508 tmp[0] = tmp[1] = '?';
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
509 else
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
510 {
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
511 tmp[0] = lang >> 8;
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
512 tmp[1] = lang & 0xFF;
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
513 }
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
514 tmp[2] = 0;
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
515 format = dvdnav_audio_stream_format(nav, lg);
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
516 if(format == 0xFFFF || format > 6)
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
517 format = 1; //unknown
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
518 id = i + base[format];
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
519 mp_msg(MSGT_OPEN,MSGL_STATUS,MSGTR_DVDaudioStreamInfo, i,
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
520 dvd_audio_stream_types[format], dvd_audio_stream_channels[channels], tmp, id);
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
521 }
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
522
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
523 for(i=0; i<32; i++)
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
524 {
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
525 lg = dvdnav_get_spu_logical_stream(nav, i);
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
526 if(lg == 0xff) continue;
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
527 lang = dvdnav_spu_stream_to_lang(nav, lg);
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
528 if(lang == 0xFFFF)
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
529 tmp[0] = tmp[1] = '?';
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
530 else
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
531 {
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
532 tmp[0] = lang >> 8;
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
533 tmp[1] = lang & 0xFF;
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
534 }
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
535 tmp[2] = 0;
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
536 mp_msg(MSGT_OPEN,MSGL_STATUS,MSGTR_DVDsubtitleLanguage, i+0x20, tmp);
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
537 }
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
538 }
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
539
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
540 static int open_s(stream_t *stream,int mode, void* opts, int* file_format) {
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
541 struct stream_priv_s* p = (struct stream_priv_s*)opts;
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
542 char *filename;
20809
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
543 dvdnav_priv_t *priv;
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
544
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
545 if(p->device) filename = p->device;
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
546 else if(dvd_device) filename= dvd_device;
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
547 else filename = DEFAULT_DVD_DEVICE;
20809
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
548 if(!(priv=new_dvdnav_stream(filename))) {
25031
5e1e61012a05 report why the dvd couldn't be opened. Patch by Jan Knutar jknutar+nic+fi
nicodvb
parents: 25025
diff changeset
549 mp_msg(MSGT_OPEN,MSGL_ERR,MSGTR_CantOpenDVD,filename, strerror(errno));
24257
d261f5109660 cosmetics: typo fix UNSUPORTED --> UNSUPPORTED
diego
parents: 24109
diff changeset
550 return STREAM_UNSUPPORTED;
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
551 }
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
552
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
553 if(p->track > 0) {
20786
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
554 if(dvd_chapter > 0 && dvd_last_chapter > 0 && dvd_chapter > dvd_last_chapter) {
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
555 mp_msg(MSGT_OPEN,MSGL_FATAL,"dvdnav_stream, invalid chapter range: %d > %d\n", dvd_chapter, dvd_last_chapter);
24257
d261f5109660 cosmetics: typo fix UNSUPORTED --> UNSUPPORTED
diego
parents: 24109
diff changeset
556 return STREAM_UNSUPPORTED;
20786
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
557 }
20809
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
558 priv->title = p->track;
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
559 if(dvdnav_title_play(priv->dvdnav, p->track) != DVDNAV_STATUS_OK) {
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
560 mp_msg(MSGT_OPEN,MSGL_FATAL,"dvdnav_stream, couldn't select title %d, error '%s'\n", p->track, dvdnav_err_to_string(priv->dvdnav));
24257
d261f5109660 cosmetics: typo fix UNSUPORTED --> UNSUPPORTED
diego
parents: 24109
diff changeset
561 return STREAM_UNSUPPORTED;
20786
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
562 }
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
563 if(dvd_chapter > 0)
20809
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
564 dvdnav_part_play(priv->dvdnav, p->track, dvd_chapter);
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
565 } else if (p->track == 0) {
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
566 if(dvdnav_menu_call(priv->dvdnav, DVD_MENU_Root) != DVDNAV_STATUS_OK)
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
567 dvdnav_menu_call(priv->dvdnav, DVD_MENU_Title);
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
568 }
25176
6d9212e61af8 cosmetics: moved identification code to a separate function
nicodvb
parents: 25168
diff changeset
569 if(mp_msg_test(MSGT_IDENTIFY, MSGL_INFO))
6d9212e61af8 cosmetics: moved identification code to a separate function
nicodvb
parents: 25168
diff changeset
570 identify(priv, p);
25196
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
571 if(p->track > 0)
5487d363a9ac at startup show audio and subtitle streams available in the chosen title with all their properties
nicodvb
parents: 25177
diff changeset
572 show_audio_subs_languages(priv->dvdnav);
20754
da4c2344a97c support for -dvdangle
nicodvb
parents: 20409
diff changeset
573 if(dvd_angle > 1)
20809
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
574 dvdnav_angle_change(priv->dvdnav, dvd_angle);
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
575
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
576 stream->sector_size = 2048;
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
577 stream->flags = STREAM_READ | STREAM_SEEK;
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
578 stream->fill_buffer = fill_buffer;
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
579 stream->seek = seek;
19443
6e618d1fbb23 implemented seeking to chapter
nicodvb
parents: 19312
diff changeset
580 stream->control = control;
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
581 stream->close = stream_dvdnav_close;
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
582 stream->type = STREAMTYPE_DVDNAV;
20809
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
583 stream->priv=(void*)priv;
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
584 *file_format = DEMUXER_TYPE_MPEG_PS;
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
585
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
586 update_title_len(stream);
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
587 if(!stream->pos && p->track > 0)
24109
4565ffb49fda Removed uninitialized variable.
cehoyos
parents: 23991
diff changeset
588 mp_msg(MSGT_OPEN,MSGL_ERR, "INIT ERROR: couldn't get init pos %s\r\n", dvdnav_err_to_string(priv->dvdnav));
20786
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
589
20406
831cd8cbf58a spell fix
nicodvb
parents: 20405
diff changeset
590 mp_msg(MSGT_OPEN,MSGL_INFO, "Remember to disable MPlayer's cache when playing dvdnav:// streams (adding -nocache to your command line)\r\n");
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
591
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
592 return STREAM_OK;
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
593 }
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
594
19768
1069a634fc92 added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents: 19764
diff changeset
595
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
596 void mp_dvdnav_handle_input(stream_t *stream, int cmd, int *button) {
20809
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
597 dvdnav_priv_t * priv=(dvdnav_priv_t*)stream->priv;
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
598 dvdnav_t *nav = priv->dvdnav;
19908
b6aa47caeb72 §Ænitial button value is -1. Only (button>0) is a correct button selection.
jonas
parents: 19895
diff changeset
599 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
600 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
601
1069a634fc92 added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents: 19764
diff changeset
602 if(cmd != MP_CMD_DVDNAV_SELECT && !pci)
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
603 return;
19768
1069a634fc92 added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents: 19764
diff changeset
604
1069a634fc92 added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents: 19764
diff changeset
605 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
606 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
607 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
608 break;
1069a634fc92 added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents: 19764
diff changeset
609 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
610 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
611 break;
1069a634fc92 added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents: 19764
diff changeset
612 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
613 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
614 break;
1069a634fc92 added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents: 19764
diff changeset
615 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
616 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
617 break;
1069a634fc92 added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents: 19764
diff changeset
618 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
619 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
620 break;
19777
bb1b570ac7c1 permit to select previous dvdnav menu, in the order chapter->title->root
nicodvb
parents: 19774
diff changeset
621 case MP_CMD_DVDNAV_PREVMENU: {
bb1b570ac7c1 permit to select previous dvdnav menu, in the order chapter->title->root
nicodvb
parents: 19774
diff changeset
622 int title=0, part=0;
bb1b570ac7c1 permit to select previous dvdnav menu, in the order chapter->title->root
nicodvb
parents: 19774
diff changeset
623
bb1b570ac7c1 permit to select previous dvdnav menu, in the order chapter->title->root
nicodvb
parents: 19774
diff changeset
624 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
625 if(title) {
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
626 if((status=dvdnav_menu_call(nav, DVD_MENU_Part)) == DVDNAV_STATUS_OK)
19777
bb1b570ac7c1 permit to select previous dvdnav menu, in the order chapter->title->root
nicodvb
parents: 19774
diff changeset
627 break;
bb1b570ac7c1 permit to select previous dvdnav menu, in the order chapter->title->root
nicodvb
parents: 19774
diff changeset
628 }
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
629 if((status=dvdnav_menu_call(nav, DVD_MENU_Title)) == DVDNAV_STATUS_OK)
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
630 break;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
631 status=dvdnav_menu_call(nav, DVD_MENU_Root);
19777
bb1b570ac7c1 permit to select previous dvdnav menu, in the order chapter->title->root
nicodvb
parents: 19774
diff changeset
632 }
bb1b570ac7c1 permit to select previous dvdnav menu, in the order chapter->title->root
nicodvb
parents: 19774
diff changeset
633 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
634 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
635 status = dvdnav_button_activate(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
636 break;
19912
3fdb44285fe7 introduced new MP_CMD_DVDNAV_MOUSECLICK command (bound to mouse0);
nicodvb
parents: 19909
diff changeset
637 case MP_CMD_DVDNAV_MOUSECLICK:
3fdb44285fe7 introduced new MP_CMD_DVDNAV_MOUSECLICK command (bound to mouse0);
nicodvb
parents: 19909
diff changeset
638 /*
3fdb44285fe7 introduced new MP_CMD_DVDNAV_MOUSECLICK command (bound to mouse0);
nicodvb
parents: 19909
diff changeset
639 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
640 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
641 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
642 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
643 This last call always works well
3fdb44285fe7 introduced new MP_CMD_DVDNAV_MOUSECLICK command (bound to mouse0);
nicodvb
parents: 19909
diff changeset
644 */
20809
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
645 status = dvdnav_mouse_activate(nav, pci, priv->mousex, priv->mousey);
19912
3fdb44285fe7 introduced new MP_CMD_DVDNAV_MOUSECLICK command (bound to mouse0);
nicodvb
parents: 19909
diff changeset
646 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
647 default:
1069a634fc92 added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents: 19764
diff changeset
648 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
649 break;
1069a634fc92 added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents: 19764
diff changeset
650 }
1069a634fc92 added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents: 19764
diff changeset
651
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
652 if(status == DVDNAV_STATUS_OK)
20786
50b5a9e01009 COSMETICS: reformatted this ugly mess in a consistent manner
nicodvb
parents: 20754
diff changeset
653 dvdnav_get_current_highlight(nav, 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
654 }
1069a634fc92 added mp_dvdnav_handle_input to handle user's input (revived from the repository with few changes)
nicodvb
parents: 19764
diff changeset
655
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
656 void mp_dvdnav_update_mouse_pos(stream_t *stream, int32_t x, int32_t y, int* button) {
20809
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
657 dvdnav_priv_t * priv=(dvdnav_priv_t*)stream->priv;
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
658 dvdnav_t *nav = priv->dvdnav;
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
659 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
660 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
661
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
662 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
663
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
664 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
665 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
666 else *button = -1;
20809
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
667 priv->mousex = x;
ab7e5eb57d52 COSMETICS: renamed dvdnav_priv to priv
nicodvb
parents: 20788
diff changeset
668 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
669 }
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
670
21424
3504737c4e96 doxygenized dvdnav_sid_from_lang() and dvdnav_number_of_subs()
nicodvb
parents: 21333
diff changeset
671 /**
21600
ca8327c8d1fb added dvdnav_aid_from_lang() to support -alang
nicodvb
parents: 21560
diff changeset
672 * \brief dvdnav_aid_from_lang() returns the audio id corresponding to the language code 'lang'
ca8327c8d1fb added dvdnav_aid_from_lang() to support -alang
nicodvb
parents: 21560
diff changeset
673 * \param stream: - stream pointer
ca8327c8d1fb added dvdnav_aid_from_lang() to support -alang
nicodvb
parents: 21560
diff changeset
674 * \param lang: 2-characters language code[s], eventually separated by spaces of commas
ca8327c8d1fb added dvdnav_aid_from_lang() to support -alang
nicodvb
parents: 21560
diff changeset
675 * \return -1 on error, current subtitle id if successful
ca8327c8d1fb added dvdnav_aid_from_lang() to support -alang
nicodvb
parents: 21560
diff changeset
676 */
ca8327c8d1fb added dvdnav_aid_from_lang() to support -alang
nicodvb
parents: 21560
diff changeset
677 int dvdnav_aid_from_lang(stream_t *stream, unsigned char *language) {
ca8327c8d1fb added dvdnav_aid_from_lang() to support -alang
nicodvb
parents: 21560
diff changeset
678 dvdnav_priv_t * priv=(dvdnav_priv_t*)stream->priv;
ca8327c8d1fb added dvdnav_aid_from_lang() to support -alang
nicodvb
parents: 21560
diff changeset
679 int k;
ca8327c8d1fb added dvdnav_aid_from_lang() to support -alang
nicodvb
parents: 21560
diff changeset
680 uint8_t format, lg;
ca8327c8d1fb added dvdnav_aid_from_lang() to support -alang
nicodvb
parents: 21560
diff changeset
681 uint16_t lang, lcode;;
ca8327c8d1fb added dvdnav_aid_from_lang() to support -alang
nicodvb
parents: 21560
diff changeset
682
ca8327c8d1fb added dvdnav_aid_from_lang() to support -alang
nicodvb
parents: 21560
diff changeset
683 while(language && strlen(language)>=2) {
ca8327c8d1fb added dvdnav_aid_from_lang() to support -alang
nicodvb
parents: 21560
diff changeset
684 lcode = (language[0] << 8) | (language[1]);
ca8327c8d1fb added dvdnav_aid_from_lang() to support -alang
nicodvb
parents: 21560
diff changeset
685 for(k=0; k<32; k++) {
ca8327c8d1fb added dvdnav_aid_from_lang() to support -alang
nicodvb
parents: 21560
diff changeset
686 lg = dvdnav_get_audio_logical_stream(priv->dvdnav, k);
ca8327c8d1fb added dvdnav_aid_from_lang() to support -alang
nicodvb
parents: 21560
diff changeset
687 if(lg == 0xff) continue;
ca8327c8d1fb added dvdnav_aid_from_lang() to support -alang
nicodvb
parents: 21560
diff changeset
688 lang = dvdnav_audio_stream_to_lang(priv->dvdnav, lg);
ca8327c8d1fb added dvdnav_aid_from_lang() to support -alang
nicodvb
parents: 21560
diff changeset
689 if(lang != 0xFFFF && lang == lcode) {
ca8327c8d1fb added dvdnav_aid_from_lang() to support -alang
nicodvb
parents: 21560
diff changeset
690 format = dvdnav_audio_stream_format(priv->dvdnav, lg);
ca8327c8d1fb added dvdnav_aid_from_lang() to support -alang
nicodvb
parents: 21560
diff changeset
691 switch(format) {
ca8327c8d1fb added dvdnav_aid_from_lang() to support -alang
nicodvb
parents: 21560
diff changeset
692 case DVDNAV_FORMAT_AC3:
ca8327c8d1fb added dvdnav_aid_from_lang() to support -alang
nicodvb
parents: 21560
diff changeset
693 return k+128;
ca8327c8d1fb added dvdnav_aid_from_lang() to support -alang
nicodvb
parents: 21560
diff changeset
694 case DVDNAV_FORMAT_DTS:
ca8327c8d1fb added dvdnav_aid_from_lang() to support -alang
nicodvb
parents: 21560
diff changeset
695 return k+136;
ca8327c8d1fb added dvdnav_aid_from_lang() to support -alang
nicodvb
parents: 21560
diff changeset
696 case DVDNAV_FORMAT_LPCM:
ca8327c8d1fb added dvdnav_aid_from_lang() to support -alang
nicodvb
parents: 21560
diff changeset
697 return k+160;
ca8327c8d1fb added dvdnav_aid_from_lang() to support -alang
nicodvb
parents: 21560
diff changeset
698 case DVDNAV_FORMAT_MPEGAUDIO:
ca8327c8d1fb added dvdnav_aid_from_lang() to support -alang
nicodvb
parents: 21560
diff changeset
699 return k;
ca8327c8d1fb added dvdnav_aid_from_lang() to support -alang
nicodvb
parents: 21560
diff changeset
700 default:
ca8327c8d1fb added dvdnav_aid_from_lang() to support -alang
nicodvb
parents: 21560
diff changeset
701 return -1;
ca8327c8d1fb added dvdnav_aid_from_lang() to support -alang
nicodvb
parents: 21560
diff changeset
702 }
ca8327c8d1fb added dvdnav_aid_from_lang() to support -alang
nicodvb
parents: 21560
diff changeset
703 }
ca8327c8d1fb added dvdnav_aid_from_lang() to support -alang
nicodvb
parents: 21560
diff changeset
704 }
ca8327c8d1fb added dvdnav_aid_from_lang() to support -alang
nicodvb
parents: 21560
diff changeset
705 language += 2;
ca8327c8d1fb added dvdnav_aid_from_lang() to support -alang
nicodvb
parents: 21560
diff changeset
706 while(language[0]==',' || language[0]==' ') ++language;
ca8327c8d1fb added dvdnav_aid_from_lang() to support -alang
nicodvb
parents: 21560
diff changeset
707 }
ca8327c8d1fb added dvdnav_aid_from_lang() to support -alang
nicodvb
parents: 21560
diff changeset
708 return -1;
ca8327c8d1fb added dvdnav_aid_from_lang() to support -alang
nicodvb
parents: 21560
diff changeset
709 }
ca8327c8d1fb added dvdnav_aid_from_lang() to support -alang
nicodvb
parents: 21560
diff changeset
710
21603
4bfdaf8bcae5 implemented dvdnav_lang_from_aid() to retrieve audio language
nicodvb
parents: 21600
diff changeset
711 /**
4bfdaf8bcae5 implemented dvdnav_lang_from_aid() to retrieve audio language
nicodvb
parents: 21600
diff changeset
712 * \brief dvdnav_lang_from_aid() assigns to buf the language corresponding to audio id 'aid'
4bfdaf8bcae5 implemented dvdnav_lang_from_aid() to retrieve audio language
nicodvb
parents: 21600
diff changeset
713 * \param stream: - stream pointer
4bfdaf8bcae5 implemented dvdnav_lang_from_aid() to retrieve audio language
nicodvb
parents: 21600
diff changeset
714 * \param sid: physical subtitle id
4bfdaf8bcae5 implemented dvdnav_lang_from_aid() to retrieve audio language
nicodvb
parents: 21600
diff changeset
715 * \param buf: buffer to contain the 2-chars language string
4bfdaf8bcae5 implemented dvdnav_lang_from_aid() to retrieve audio language
nicodvb
parents: 21600
diff changeset
716 * \return 0 on error, 1 if successful
4bfdaf8bcae5 implemented dvdnav_lang_from_aid() to retrieve audio language
nicodvb
parents: 21600
diff changeset
717 */
4bfdaf8bcae5 implemented dvdnav_lang_from_aid() to retrieve audio language
nicodvb
parents: 21600
diff changeset
718 int dvdnav_lang_from_aid(stream_t *stream, int aid, unsigned char *buf) {
4bfdaf8bcae5 implemented dvdnav_lang_from_aid() to retrieve audio language
nicodvb
parents: 21600
diff changeset
719 uint8_t lg;
4bfdaf8bcae5 implemented dvdnav_lang_from_aid() to retrieve audio language
nicodvb
parents: 21600
diff changeset
720 uint16_t lang;
4bfdaf8bcae5 implemented dvdnav_lang_from_aid() to retrieve audio language
nicodvb
parents: 21600
diff changeset
721 dvdnav_priv_t * priv=(dvdnav_priv_t*)stream->priv;
4bfdaf8bcae5 implemented dvdnav_lang_from_aid() to retrieve audio language
nicodvb
parents: 21600
diff changeset
722
4bfdaf8bcae5 implemented dvdnav_lang_from_aid() to retrieve audio language
nicodvb
parents: 21600
diff changeset
723 if(aid < 0)
4bfdaf8bcae5 implemented dvdnav_lang_from_aid() to retrieve audio language
nicodvb
parents: 21600
diff changeset
724 return 0;
21613
8547ae79e74b simplified aid management in dvdnav_lang_from_aid(); patch by Joakim Patte
nicodvb
parents: 21603
diff changeset
725 lg = dvdnav_get_audio_logical_stream(priv->dvdnav, aid & 0x7);
21603
4bfdaf8bcae5 implemented dvdnav_lang_from_aid() to retrieve audio language
nicodvb
parents: 21600
diff changeset
726 if(lg == 0xff) return 0;
4bfdaf8bcae5 implemented dvdnav_lang_from_aid() to retrieve audio language
nicodvb
parents: 21600
diff changeset
727 lang = dvdnav_audio_stream_to_lang(priv->dvdnav, lg);
4bfdaf8bcae5 implemented dvdnav_lang_from_aid() to retrieve audio language
nicodvb
parents: 21600
diff changeset
728 if(lang == 0xffff) return 0;
4bfdaf8bcae5 implemented dvdnav_lang_from_aid() to retrieve audio language
nicodvb
parents: 21600
diff changeset
729 buf[0] = lang >> 8;
4bfdaf8bcae5 implemented dvdnav_lang_from_aid() to retrieve audio language
nicodvb
parents: 21600
diff changeset
730 buf[1] = lang & 0xFF;
4bfdaf8bcae5 implemented dvdnav_lang_from_aid() to retrieve audio language
nicodvb
parents: 21600
diff changeset
731 buf[2] = 0;
4bfdaf8bcae5 implemented dvdnav_lang_from_aid() to retrieve audio language
nicodvb
parents: 21600
diff changeset
732 return 1;
4bfdaf8bcae5 implemented dvdnav_lang_from_aid() to retrieve audio language
nicodvb
parents: 21600
diff changeset
733 }
4bfdaf8bcae5 implemented dvdnav_lang_from_aid() to retrieve audio language
nicodvb
parents: 21600
diff changeset
734
21600
ca8327c8d1fb added dvdnav_aid_from_lang() to support -alang
nicodvb
parents: 21560
diff changeset
735
ca8327c8d1fb added dvdnav_aid_from_lang() to support -alang
nicodvb
parents: 21560
diff changeset
736 /**
21424
3504737c4e96 doxygenized dvdnav_sid_from_lang() and dvdnav_number_of_subs()
nicodvb
parents: 21333
diff changeset
737 * \brief dvdnav_sid_from_lang() returns the subtitle id corresponding to the language code 'lang'
3504737c4e96 doxygenized dvdnav_sid_from_lang() and dvdnav_number_of_subs()
nicodvb
parents: 21333
diff changeset
738 * \param stream: - stream pointer
3504737c4e96 doxygenized dvdnav_sid_from_lang() and dvdnav_number_of_subs()
nicodvb
parents: 21333
diff changeset
739 * \param lang: 2-characters language code[s], eventually separated by spaces of commas
3504737c4e96 doxygenized dvdnav_sid_from_lang() and dvdnav_number_of_subs()
nicodvb
parents: 21333
diff changeset
740 * \return -1 on error, current subtitle id if successful
3504737c4e96 doxygenized dvdnav_sid_from_lang() and dvdnav_number_of_subs()
nicodvb
parents: 21333
diff changeset
741 */
21197
7ecd9de03435 added code to identify subs language and count; needed for forthcoming support for -slang
nicodvb
parents: 21193
diff changeset
742 int dvdnav_sid_from_lang(stream_t *stream, unsigned char *language) {
7ecd9de03435 added code to identify subs language and count; needed for forthcoming support for -slang
nicodvb
parents: 21193
diff changeset
743 dvdnav_priv_t * priv=(dvdnav_priv_t*)stream->priv;
23990
f57dacd8c419 removed unused variables
nicodvb
parents: 23902
diff changeset
744 uint8_t lg, k;
21204
1ddb1a86e419 support for comma-separated language codes in -slang
nicodvb
parents: 21200
diff changeset
745 uint16_t lang, lcode;
21197
7ecd9de03435 added code to identify subs language and count; needed for forthcoming support for -slang
nicodvb
parents: 21193
diff changeset
746
21204
1ddb1a86e419 support for comma-separated language codes in -slang
nicodvb
parents: 21200
diff changeset
747 while(language && strlen(language)>=2) {
21333
9e3860c22d99 cosmetical reformatting
nicodvb
parents: 21332
diff changeset
748 lcode = (language[0] << 8) | (language[1]);
9e3860c22d99 cosmetical reformatting
nicodvb
parents: 21332
diff changeset
749 for(k=0; k<32; k++) {
9e3860c22d99 cosmetical reformatting
nicodvb
parents: 21332
diff changeset
750 lg = dvdnav_get_spu_logical_stream(priv->dvdnav, k);
9e3860c22d99 cosmetical reformatting
nicodvb
parents: 21332
diff changeset
751 if(lg == 0xff) continue;
9e3860c22d99 cosmetical reformatting
nicodvb
parents: 21332
diff changeset
752 lang = dvdnav_spu_stream_to_lang(priv->dvdnav, lg);
9e3860c22d99 cosmetical reformatting
nicodvb
parents: 21332
diff changeset
753 if(lang != 0xFFFF && lang == lcode) {
9e3860c22d99 cosmetical reformatting
nicodvb
parents: 21332
diff changeset
754 return k;
9e3860c22d99 cosmetical reformatting
nicodvb
parents: 21332
diff changeset
755 }
21197
7ecd9de03435 added code to identify subs language and count; needed for forthcoming support for -slang
nicodvb
parents: 21193
diff changeset
756 }
21333
9e3860c22d99 cosmetical reformatting
nicodvb
parents: 21332
diff changeset
757 language += 2;
9e3860c22d99 cosmetical reformatting
nicodvb
parents: 21332
diff changeset
758 while(language[0]==',' || language[0]==' ') ++language;
21204
1ddb1a86e419 support for comma-separated language codes in -slang
nicodvb
parents: 21200
diff changeset
759 }
21197
7ecd9de03435 added code to identify subs language and count; needed for forthcoming support for -slang
nicodvb
parents: 21193
diff changeset
760 return -1;
7ecd9de03435 added code to identify subs language and count; needed for forthcoming support for -slang
nicodvb
parents: 21193
diff changeset
761 }
7ecd9de03435 added code to identify subs language and count; needed for forthcoming support for -slang
nicodvb
parents: 21193
diff changeset
762
21424
3504737c4e96 doxygenized dvdnav_sid_from_lang() and dvdnav_number_of_subs()
nicodvb
parents: 21333
diff changeset
763 /**
21560
a16219e6d656 added function to return the language of the specified subtitle id. Patch by
nicodvb
parents: 21538
diff changeset
764 * \brief dvdnav_lang_from_sid() assigns to buf the language corresponding to subtitle id 'sid'
a16219e6d656 added function to return the language of the specified subtitle id. Patch by
nicodvb
parents: 21538
diff changeset
765 * \param stream: - stream pointer
a16219e6d656 added function to return the language of the specified subtitle id. Patch by
nicodvb
parents: 21538
diff changeset
766 * \param sid: physical subtitle id
a16219e6d656 added function to return the language of the specified subtitle id. Patch by
nicodvb
parents: 21538
diff changeset
767 * \param buf: buffer to contain the 2-chars language string
a16219e6d656 added function to return the language of the specified subtitle id. Patch by
nicodvb
parents: 21538
diff changeset
768 * \return 0 on error, 1 if successful
a16219e6d656 added function to return the language of the specified subtitle id. Patch by
nicodvb
parents: 21538
diff changeset
769 */
a16219e6d656 added function to return the language of the specified subtitle id. Patch by
nicodvb
parents: 21538
diff changeset
770 int dvdnav_lang_from_sid(stream_t *stream, int sid, unsigned char *buf) {
23990
f57dacd8c419 removed unused variables
nicodvb
parents: 23902
diff changeset
771 uint8_t lg;
21560
a16219e6d656 added function to return the language of the specified subtitle id. Patch by
nicodvb
parents: 21538
diff changeset
772 uint16_t lang;
a16219e6d656 added function to return the language of the specified subtitle id. Patch by
nicodvb
parents: 21538
diff changeset
773 dvdnav_priv_t *priv=(dvdnav_priv_t*)stream->priv;
a16219e6d656 added function to return the language of the specified subtitle id. Patch by
nicodvb
parents: 21538
diff changeset
774 if(sid < 0) return 0;
a16219e6d656 added function to return the language of the specified subtitle id. Patch by
nicodvb
parents: 21538
diff changeset
775 lg = dvdnav_get_spu_logical_stream(priv->dvdnav, sid);
a16219e6d656 added function to return the language of the specified subtitle id. Patch by
nicodvb
parents: 21538
diff changeset
776 lang = dvdnav_spu_stream_to_lang(priv->dvdnav, lg);
a16219e6d656 added function to return the language of the specified subtitle id. Patch by
nicodvb
parents: 21538
diff changeset
777 if(lang == 0xffff) return 0;
a16219e6d656 added function to return the language of the specified subtitle id. Patch by
nicodvb
parents: 21538
diff changeset
778 buf[0] = lang >> 8;
a16219e6d656 added function to return the language of the specified subtitle id. Patch by
nicodvb
parents: 21538
diff changeset
779 buf[1] = lang & 0xFF;
a16219e6d656 added function to return the language of the specified subtitle id. Patch by
nicodvb
parents: 21538
diff changeset
780 buf[2] = 0;
a16219e6d656 added function to return the language of the specified subtitle id. Patch by
nicodvb
parents: 21538
diff changeset
781 return 1;
a16219e6d656 added function to return the language of the specified subtitle id. Patch by
nicodvb
parents: 21538
diff changeset
782 }
a16219e6d656 added function to return the language of the specified subtitle id. Patch by
nicodvb
parents: 21538
diff changeset
783
a16219e6d656 added function to return the language of the specified subtitle id. Patch by
nicodvb
parents: 21538
diff changeset
784 /**
21424
3504737c4e96 doxygenized dvdnav_sid_from_lang() and dvdnav_number_of_subs()
nicodvb
parents: 21333
diff changeset
785 * \brief dvdnav_number_of_subs() returns the count of available subtitles
3504737c4e96 doxygenized dvdnav_sid_from_lang() and dvdnav_number_of_subs()
nicodvb
parents: 21333
diff changeset
786 * \param stream: - stream pointer
3504737c4e96 doxygenized dvdnav_sid_from_lang() and dvdnav_number_of_subs()
nicodvb
parents: 21333
diff changeset
787 * \return 0 on error, something meaningful otherwise
3504737c4e96 doxygenized dvdnav_sid_from_lang() and dvdnav_number_of_subs()
nicodvb
parents: 21333
diff changeset
788 */
21197
7ecd9de03435 added code to identify subs language and count; needed for forthcoming support for -slang
nicodvb
parents: 21193
diff changeset
789 int dvdnav_number_of_subs(stream_t *stream) {
7ecd9de03435 added code to identify subs language and count; needed for forthcoming support for -slang
nicodvb
parents: 21193
diff changeset
790 dvdnav_priv_t * priv=(dvdnav_priv_t*)stream->priv;
7ecd9de03435 added code to identify subs language and count; needed for forthcoming support for -slang
nicodvb
parents: 21193
diff changeset
791 uint8_t lg, k, n=0;
7ecd9de03435 added code to identify subs language and count; needed for forthcoming support for -slang
nicodvb
parents: 21193
diff changeset
792
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
793 if (priv->state & NAV_FLAG_VTS_DOMAIN) return 0;
21197
7ecd9de03435 added code to identify subs language and count; needed for forthcoming support for -slang
nicodvb
parents: 21193
diff changeset
794 for(k=0; k<32; k++) {
7ecd9de03435 added code to identify subs language and count; needed for forthcoming support for -slang
nicodvb
parents: 21193
diff changeset
795 lg = dvdnav_get_spu_logical_stream(priv->dvdnav, k);
7ecd9de03435 added code to identify subs language and count; needed for forthcoming support for -slang
nicodvb
parents: 21193
diff changeset
796 if(lg == 0xff) continue;
7ecd9de03435 added code to identify subs language and count; needed for forthcoming support for -slang
nicodvb
parents: 21193
diff changeset
797 n++;
7ecd9de03435 added code to identify subs language and count; needed for forthcoming support for -slang
nicodvb
parents: 21193
diff changeset
798 }
7ecd9de03435 added code to identify subs language and count; needed for forthcoming support for -slang
nicodvb
parents: 21193
diff changeset
799 return n;
7ecd9de03435 added code to identify subs language and count; needed for forthcoming support for -slang
nicodvb
parents: 21193
diff changeset
800 }
7ecd9de03435 added code to identify subs language and count; needed for forthcoming support for -slang
nicodvb
parents: 21193
diff changeset
801
23902
29f612207c95 More doxygen comments
reimar
parents: 23043
diff changeset
802 /**
29f612207c95 More doxygen comments
reimar
parents: 23043
diff changeset
803 * \brief mp_dvdnav_get_spu_clut() returns the spu clut
29f612207c95 More doxygen comments
reimar
parents: 23043
diff changeset
804 * \param stream: - stream pointer
29f612207c95 More doxygen comments
reimar
parents: 23043
diff changeset
805 * \return spu clut pointer
29f612207c95 More doxygen comments
reimar
parents: 23043
diff changeset
806 */
21538
c9b6588932b5 export spu palette; part of a patch by Otvos Attila
nicodvb
parents: 21424
diff changeset
807 unsigned int *mp_dvdnav_get_spu_clut(stream_t *stream) {
c9b6588932b5 export spu palette; part of a patch by Otvos Attila
nicodvb
parents: 21424
diff changeset
808 dvdnav_priv_t *priv=(dvdnav_priv_t*)stream->priv;
25827
3fc9f549b5d0 remove the spu_set field, replaced by a flag
ben
parents: 25826
diff changeset
809 if (!(priv->state & NAV_FLAG_SPU_SET)) return NULL;
21538
c9b6588932b5 export spu palette; part of a patch by Otvos Attila
nicodvb
parents: 21424
diff changeset
810 return priv->spu_clut;
c9b6588932b5 export spu palette; part of a patch by Otvos Attila
nicodvb
parents: 21424
diff changeset
811 }
c9b6588932b5 export spu palette; part of a patch by Otvos Attila
nicodvb
parents: 21424
diff changeset
812
23902
29f612207c95 More doxygen comments
reimar
parents: 23043
diff changeset
813 /**
29f612207c95 More doxygen comments
reimar
parents: 23043
diff changeset
814 * \brief mp_dvdnav_get_highlight() get dvdnav highlight struct
29f612207c95 More doxygen comments
reimar
parents: 23043
diff changeset
815 * \param stream: - stream pointer
29f612207c95 More doxygen comments
reimar
parents: 23043
diff changeset
816 * \param hl : - highlight struct pointer
29f612207c95 More doxygen comments
reimar
parents: 23043
diff changeset
817 */
21219
8258747951d7 keep nav highlight event in dvdnav priv structure
ben
parents: 21204
diff changeset
818 void mp_dvdnav_get_highlight (stream_t *stream, nav_highlight_t *hl) {
8258747951d7 keep nav highlight event in dvdnav priv structure
ben
parents: 21204
diff changeset
819 dvdnav_priv_t *priv = (dvdnav_priv_t *) stream->priv;
8258747951d7 keep nav highlight event in dvdnav priv structure
ben
parents: 21204
diff changeset
820 dvdnav_highlight_event_t hlev = priv->hlev;
8258747951d7 keep nav highlight event in dvdnav priv structure
ben
parents: 21204
diff changeset
821
8258747951d7 keep nav highlight event in dvdnav priv structure
ben
parents: 21204
diff changeset
822 hl->sx = hlev.sx;
8258747951d7 keep nav highlight event in dvdnav priv structure
ben
parents: 21204
diff changeset
823 hl->sy = hlev.sy;
8258747951d7 keep nav highlight event in dvdnav priv structure
ben
parents: 21204
diff changeset
824 hl->ex = hlev.ex;
8258747951d7 keep nav highlight event in dvdnav priv structure
ben
parents: 21204
diff changeset
825 hl->ey = hlev.ey;
21200
c7b5dd2b2291 better nav highlight handling
ben
parents: 21199
diff changeset
826 }
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
827
25817
883c6c3ae041 Add new command to switch between dvdnav titles
ben
parents: 25691
diff changeset
828 void mp_dvdnav_switch_title (stream_t *stream, int title) {
883c6c3ae041 Add new command to switch between dvdnav titles
ben
parents: 25691
diff changeset
829 dvdnav_priv_t *priv = (dvdnav_priv_t *) stream->priv;
883c6c3ae041 Add new command to switch between dvdnav titles
ben
parents: 25691
diff changeset
830 uint32_t titles;
883c6c3ae041 Add new command to switch between dvdnav titles
ben
parents: 25691
diff changeset
831
883c6c3ae041 Add new command to switch between dvdnav titles
ben
parents: 25691
diff changeset
832 dvdnav_get_number_of_titles (priv->dvdnav, &titles);
883c6c3ae041 Add new command to switch between dvdnav titles
ben
parents: 25691
diff changeset
833 if (title > 0 && title <= titles)
883c6c3ae041 Add new command to switch between dvdnav titles
ben
parents: 25691
diff changeset
834 dvdnav_title_play (priv->dvdnav, title);
883c6c3ae041 Add new command to switch between dvdnav titles
ben
parents: 25691
diff changeset
835 }
883c6c3ae041 Add new command to switch between dvdnav titles
ben
parents: 25691
diff changeset
836
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
837 /**
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
838 * \brief Check if end of stream has been reached
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
839 * \param stream: - stream pointer
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
840 * \return 1 on really eof
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
841 */
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
842 int mp_dvdnav_is_eof (stream_t *stream) {
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
843 return ((dvdnav_priv_t *) stream->priv)->state & NAV_FLAG_EOF;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
844 }
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
845
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
846 /**
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
847 * \brief Skip still frame
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
848 * \param stream: - stream pointer
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
849 * \return 0 on success
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
850 */
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
851 int mp_dvdnav_skip_still (stream_t *stream) {
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
852 dvdnav_priv_t *priv = stream->priv;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
853 if (priv->still_length == 0xff)
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
854 return 1;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
855 dvdnav_still_skip(priv->dvdnav);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
856 return 0;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
857 }
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
858
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
859 /**
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
860 * \brief Skip wait event
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
861 * \param stream: - stream pointer
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
862 * \return 0 on success
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
863 */
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
864 int mp_dvdnav_skip_wait (stream_t *stream) {
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
865 dvdnav_priv_t *priv = stream->priv;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
866 if (!(priv->state & NAV_FLAG_WAIT))
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
867 return 1;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
868 priv->state &= ~NAV_FLAG_WAIT;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
869 dvdnav_wait_skip(priv->dvdnav);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
870 return 0;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
871 }
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
872
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
873 /**
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
874 * \brief Set wait mode
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
875 * \param stream : - stream pointer
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
876 * \param mode : - if true, then suspend block read
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
877 * \param automode: - if true, then VTS or cell change set wait mode
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
878 */
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
879 void mp_dvdnav_read_wait (stream_t *stream, int mode, int automode) {
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
880 dvdnav_priv_t *priv = stream->priv;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
881 if (mode == 0)
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
882 priv->state &= ~NAV_FLAG_WAIT_READ;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
883 if (mode > 0)
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
884 priv->state |= NAV_FLAG_WAIT_READ;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
885 if (automode == 0)
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
886 priv->state &= ~NAV_FLAG_WAIT_READ_AUTO;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
887 if (automode > 0)
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
888 priv->state |= NAV_FLAG_WAIT_READ_AUTO;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
889 }
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
890
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
891 /**
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
892 * \brief Check if cell has changed
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
893 * \param stream: - stream pointer
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
894 * \param clear : - if true, then clear cell change flag
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
895 * \return 1 if cell has changed
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
896 */
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
897 int mp_dvdnav_cell_has_changed (stream_t *stream, int clear) {
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
898 dvdnav_priv_t *priv = stream->priv;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
899 if (!(priv->state & NAV_FLAG_CELL_CHANGED))
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
900 return 0;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
901 if (clear)
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
902 priv->state &= ~NAV_FLAG_CELL_CHANGED;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
903 return 1;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
904 }
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
905
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25820
diff changeset
906
25211
c1d17bd6683c Mark all stream_info_t as const
reimar
parents: 25196
diff changeset
907 const stream_info_t stream_info_dvdnav = {
19302
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
908 "DVDNAV stream",
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
909 "null",
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
910 "",
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
911 "",
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
912 open_s,
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
913 { "dvdnav", NULL },
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
914 &stream_opts,
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
915 1 // Urls are an option string
cc4774869fbc renamed dvdnav_stream to stream_dvdnav for consistency
ben
parents:
diff changeset
916 };