Mercurial > mplayer.hg
annotate command.c @ 33230:ff132cb56f40
Fix DVD angle cycling up.
Patch by Έτ?? [houhongxun gmail com]
author | reimar |
---|---|
date | Sat, 23 Apr 2011 16:48:36 +0000 |
parents | 71c65ab3c204 |
children | 7d13ed4e80f2 |
rev | line source |
---|---|
30429
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30345
diff
changeset
|
1 /* |
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30345
diff
changeset
|
2 * This file is part of MPlayer. |
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30345
diff
changeset
|
3 * |
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30345
diff
changeset
|
4 * MPlayer is free software; you can redistribute it and/or modify |
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30345
diff
changeset
|
5 * it under the terms of the GNU General Public License as published by |
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30345
diff
changeset
|
6 * the Free Software Foundation; either version 2 of the License, or |
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30345
diff
changeset
|
7 * (at your option) any later version. |
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30345
diff
changeset
|
8 * |
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30345
diff
changeset
|
9 * MPlayer is distributed in the hope that it will be useful, |
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30345
diff
changeset
|
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30345
diff
changeset
|
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30345
diff
changeset
|
12 * GNU General Public License for more details. |
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30345
diff
changeset
|
13 * |
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30345
diff
changeset
|
14 * You should have received a copy of the GNU General Public License along |
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30345
diff
changeset
|
15 * with MPlayer; if not, write to the Free Software Foundation, Inc., |
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30345
diff
changeset
|
16 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30345
diff
changeset
|
17 */ |
c1a3f1bbba26
Add license header to all top-level files missing them.
diego
parents:
30345
diff
changeset
|
18 |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
19 #include <stdlib.h> |
22478 | 20 #include <inttypes.h> |
21 #include <unistd.h> | |
22483 | 22 #include <string.h> |
22478 | 23 |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
24 #include "config.h" |
26263 | 25 #include "command.h" |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
26 #include "input/input.h" |
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
27 #include "stream/stream.h" |
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
28 #include "libmpdemux/demuxer.h" |
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
29 #include "libmpdemux/stheader.h" |
23394
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
30 #include "codec-cfg.h" |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
31 #include "mplayer.h" |
32467 | 32 #include "sub/sub.h" |
22478 | 33 #include "m_option.h" |
34 #include "m_property.h" | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
35 #include "help_mp.h" |
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
36 #include "metadata.h" |
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
37 #include "libmpcodecs/vf.h" |
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
38 #include "libmpcodecs/vd.h" |
22478 | 39 #include "libvo/video_out.h" |
32466
9e627a1793b1
Move font_load.[ch], font_load_ft.c and osd_font.h from libvo to sub.
cigaes
parents:
32461
diff
changeset
|
40 #include "sub/font_load.h" |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
41 #include "playtree.h" |
22478 | 42 #include "libao2/audio_out.h" |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
43 #include "mpcommon.h" |
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
44 #include "mixer.h" |
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
45 #include "libmpcodecs/dec_video.h" |
29759
d287e2785570
Move teletext specific code from stream into libmpcodecs.
cehoyos
parents:
29668
diff
changeset
|
46 #include "libmpcodecs/dec_teletext.h" |
32459
1a605463f62b
Move vobsub.[ch] and unrar_exec.[ch] to the sub directory.
cigaes
parents:
32456
diff
changeset
|
47 #include "sub/vobsub.h" |
32456 | 48 #include "sub/spudec.h" |
30901 | 49 #include "path.h" |
22478 | 50 #include "stream/tv.h" |
51 #include "stream/stream_radio.h" | |
23244
e5e8ac0bd7fc
support for PVR channel navigation (patch by Sven Gothel <sgothel at jausoft dot com>)
ben
parents:
23077
diff
changeset
|
52 #include "stream/pvr.h" |
27370
14c5017f40d2
Change a bunch of video/audio-output-specific preprocessor directives from
diego
parents:
27345
diff
changeset
|
53 #ifdef CONFIG_DVBIN |
22478 | 54 #include "stream/dvbin.h" |
55 #endif | |
31877
e30fe0cb79cd
Add incomplete clipinf reading support to display audio
reimar
parents:
31805
diff
changeset
|
56 #include "stream/stream_bd.h" |
29433
3495ccd3aef8
Only #include stream/stream_dvd.h when libdvdread is enabled.
diego
parents:
29429
diff
changeset
|
57 #ifdef CONFIG_DVDREAD |
22478 | 58 #include "stream/stream_dvd.h" |
29433
3495ccd3aef8
Only #include stream/stream_dvd.h when libdvdread is enabled.
diego
parents:
29429
diff
changeset
|
59 #endif |
22478 | 60 #include "stream/stream_dvdnav.h" |
32461 | 61 #include "sub/ass_mp.h" |
25461 | 62 #include "m_struct.h" |
63 #include "libmenu/menu.h" | |
23077 | 64 #include "gui/interface.h" |
32460 | 65 #include "sub/eosd.h" |
32442
bf593e3827d9
EOSD: overlay_add: use read_pnm instead of the internal reimplementation.
cigaes
parents:
32438
diff
changeset
|
66 #include "pnm_loader.h" |
22478 | 67 |
68 #include "mp_core.h" | |
24162 | 69 #include "mp_fifo.h" |
26095 | 70 #include "libavutil/avstring.h" |
31957
49848f9a8f30
Add -edl-start-pts option to Adjust positions in EDL records according
reynaldo
parents:
31904
diff
changeset
|
71 #include "edl.h" |
22478 | 72 |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
73 static void rescale_input_coordinates(int ix, int iy, double *dx, double *dy) |
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
74 { |
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
75 //remove the borders, if any, and rescale to the range [0,1],[0,1] |
31077 | 76 if (vo_fs) { //we are in full-screen mode |
77 if (vo_screenwidth > vo_dwidth) //there are borders along the x axis | |
78 ix -= (vo_screenwidth - vo_dwidth) / 2; | |
79 if (vo_screenheight > vo_dheight) //there are borders along the y axis (usual way) | |
80 iy -= (vo_screenheight - vo_dheight) / 2; | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
81 |
31077 | 82 if (ix < 0 || ix > vo_dwidth) { |
83 *dx = *dy = -1.0; | |
84 return; | |
85 } //we are on one of the borders | |
86 if (iy < 0 || iy > vo_dheight) { | |
87 *dx = *dy = -1.0; | |
88 return; | |
89 } //we are on one of the borders | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
90 } |
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
91 |
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
92 *dx = (double) ix / (double) vo_dwidth; |
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
93 *dy = (double) iy / (double) vo_dheight; |
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
94 |
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
95 mp_msg(MSGT_CPLAYER, MSGL_V, |
32352
76f94c00a69f
1000l, %lf is not valid format string for printf (only for scanf) and actually
reimar
parents:
32209
diff
changeset
|
96 "\r\nrescaled coordinates: %.3f, %.3f, screen (%d x %d), vodisplay: (%d, %d), fullscreen: %d\r\n", |
31077 | 97 *dx, *dy, vo_screenwidth, vo_screenheight, vo_dwidth, |
98 vo_dheight, vo_fs); | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
99 } |
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
100 |
31612
7fc1f051a19f
Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents:
31312
diff
changeset
|
101 static int sub_pos_by_source(MPContext *mpctx, int src) |
7fc1f051a19f
Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents:
31312
diff
changeset
|
102 { |
7fc1f051a19f
Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents:
31312
diff
changeset
|
103 int i, cnt = 0; |
7fc1f051a19f
Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents:
31312
diff
changeset
|
104 if (src >= SUB_SOURCES || mpctx->sub_counts[src] == 0) |
7fc1f051a19f
Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents:
31312
diff
changeset
|
105 return -1; |
7fc1f051a19f
Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents:
31312
diff
changeset
|
106 for (i = 0; i < src; i++) |
7fc1f051a19f
Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents:
31312
diff
changeset
|
107 cnt += mpctx->sub_counts[i]; |
7fc1f051a19f
Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents:
31312
diff
changeset
|
108 return cnt; |
7fc1f051a19f
Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents:
31312
diff
changeset
|
109 } |
7fc1f051a19f
Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents:
31312
diff
changeset
|
110 |
7fc1f051a19f
Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents:
31312
diff
changeset
|
111 static int sub_source_and_index_by_pos(MPContext *mpctx, int *pos) |
7fc1f051a19f
Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents:
31312
diff
changeset
|
112 { |
7fc1f051a19f
Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents:
31312
diff
changeset
|
113 int start = 0; |
22478 | 114 int i; |
115 for (i = 0; i < SUB_SOURCES; i++) { | |
31612
7fc1f051a19f
Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents:
31312
diff
changeset
|
116 int cnt = mpctx->sub_counts[i]; |
7fc1f051a19f
Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents:
31312
diff
changeset
|
117 if (*pos >= start && *pos < start + cnt) { |
7fc1f051a19f
Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents:
31312
diff
changeset
|
118 *pos -= start; |
7fc1f051a19f
Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents:
31312
diff
changeset
|
119 return i; |
31077 | 120 } |
31612
7fc1f051a19f
Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents:
31312
diff
changeset
|
121 start += cnt; |
22478 | 122 } |
31612
7fc1f051a19f
Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents:
31312
diff
changeset
|
123 *pos = -1; |
7fc1f051a19f
Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents:
31312
diff
changeset
|
124 return -1; |
7fc1f051a19f
Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents:
31312
diff
changeset
|
125 } |
7fc1f051a19f
Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents:
31312
diff
changeset
|
126 |
7fc1f051a19f
Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents:
31312
diff
changeset
|
127 static int sub_source_by_pos(MPContext *mpctx, int pos) |
7fc1f051a19f
Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents:
31312
diff
changeset
|
128 { |
7fc1f051a19f
Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents:
31312
diff
changeset
|
129 return sub_source_and_index_by_pos(mpctx, &pos); |
7fc1f051a19f
Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents:
31312
diff
changeset
|
130 } |
7fc1f051a19f
Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents:
31312
diff
changeset
|
131 |
7fc1f051a19f
Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents:
31312
diff
changeset
|
132 static int sub_source_pos(MPContext *mpctx) |
7fc1f051a19f
Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents:
31312
diff
changeset
|
133 { |
7fc1f051a19f
Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents:
31312
diff
changeset
|
134 int pos = mpctx->global_sub_pos; |
7fc1f051a19f
Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents:
31312
diff
changeset
|
135 sub_source_and_index_by_pos(mpctx, &pos); |
7fc1f051a19f
Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents:
31312
diff
changeset
|
136 return pos; |
22478 | 137 } |
138 | |
31156 | 139 static int sub_source(MPContext *mpctx) |
25129
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
140 { |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
141 return sub_source_by_pos(mpctx, mpctx->global_sub_pos); |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
142 } |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
143 |
31788 | 144 static void update_global_sub_size(MPContext *mpctx) |
145 { | |
146 int i; | |
147 int cnt = 0; | |
148 | |
149 // update number of demuxer sub streams | |
150 for (i = 0; i < MAX_S_STREAMS; i++) | |
151 if (mpctx->demuxer->s_streams[i]) | |
152 cnt++; | |
153 if (cnt > mpctx->sub_counts[SUB_SOURCE_DEMUX]) | |
154 mpctx->sub_counts[SUB_SOURCE_DEMUX] = cnt; | |
155 | |
156 // update global size | |
157 mpctx->global_sub_size = 0; | |
158 for (i = 0; i < SUB_SOURCES; i++) | |
159 mpctx->global_sub_size += mpctx->sub_counts[i]; | |
160 | |
161 // update global_sub_pos if we auto-detected a demuxer sub | |
31805
05ca6dd36faf
Fix subtitle selection: make selecting -sid 0 work again by replacing the
reimar
parents:
31792
diff
changeset
|
162 if (mpctx->global_sub_pos == -1) { |
05ca6dd36faf
Fix subtitle selection: make selecting -sid 0 work again by replacing the
reimar
parents:
31792
diff
changeset
|
163 int sub_id = -1; |
05ca6dd36faf
Fix subtitle selection: make selecting -sid 0 work again by replacing the
reimar
parents:
31792
diff
changeset
|
164 if (mpctx->demuxer->sub) |
05ca6dd36faf
Fix subtitle selection: make selecting -sid 0 work again by replacing the
reimar
parents:
31792
diff
changeset
|
165 sub_id = mpctx->demuxer->sub->id; |
05ca6dd36faf
Fix subtitle selection: make selecting -sid 0 work again by replacing the
reimar
parents:
31792
diff
changeset
|
166 if (sub_id < 0) |
05ca6dd36faf
Fix subtitle selection: make selecting -sid 0 work again by replacing the
reimar
parents:
31792
diff
changeset
|
167 sub_id = dvdsub_id; |
05ca6dd36faf
Fix subtitle selection: make selecting -sid 0 work again by replacing the
reimar
parents:
31792
diff
changeset
|
168 if (sub_id >= 0 && sub_id < mpctx->sub_counts[SUB_SOURCE_DEMUX]) |
05ca6dd36faf
Fix subtitle selection: make selecting -sid 0 work again by replacing the
reimar
parents:
31792
diff
changeset
|
169 mpctx->global_sub_pos = sub_pos_by_source(mpctx, SUB_SOURCE_DEMUX) + |
05ca6dd36faf
Fix subtitle selection: make selecting -sid 0 work again by replacing the
reimar
parents:
31792
diff
changeset
|
170 sub_id; |
05ca6dd36faf
Fix subtitle selection: make selecting -sid 0 work again by replacing the
reimar
parents:
31792
diff
changeset
|
171 } |
31788 | 172 } |
173 | |
22478 | 174 /** |
175 * \brief Log the currently displayed subtitle to a file | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
176 * |
22478 | 177 * Logs the current or last displayed subtitle together with filename |
178 * and time information to ~/.mplayer/subtitle_log | |
179 * | |
180 * Intended purpose is to allow convenient marking of bogus subtitles | |
181 * which need to be fixed while watching the movie. | |
182 */ | |
183 | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
184 static void log_sub(void) |
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
185 { |
22478 | 186 char *fname; |
187 FILE *f; | |
188 int i; | |
189 | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
190 if (subdata == NULL || vo_sub_last == NULL) |
31077 | 191 return; |
22478 | 192 fname = get_path("subtitle_log"); |
193 f = fopen(fname, "a"); | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
194 if (!f) |
31077 | 195 return; |
22478 | 196 fprintf(f, "----------------------------------------------------------\n"); |
197 if (subdata->sub_uses_time) { | |
31077 | 198 fprintf(f, |
199 "N: %s S: %02ld:%02ld:%02ld.%02ld E: %02ld:%02ld:%02ld.%02ld\n", | |
200 filename, vo_sub_last->start / 360000, | |
201 (vo_sub_last->start / 6000) % 60, | |
202 (vo_sub_last->start / 100) % 60, vo_sub_last->start % 100, | |
203 vo_sub_last->end / 360000, (vo_sub_last->end / 6000) % 60, | |
204 (vo_sub_last->end / 100) % 60, vo_sub_last->end % 100); | |
22478 | 205 } else { |
31077 | 206 fprintf(f, "N: %s S: %ld E: %ld\n", filename, vo_sub_last->start, |
207 vo_sub_last->end); | |
22478 | 208 } |
209 for (i = 0; i < vo_sub_last->lines; i++) { | |
31077 | 210 fprintf(f, "%s\n", vo_sub_last->text[i]); |
22478 | 211 } |
212 fclose(f); | |
213 } | |
214 | |
215 | |
216 /// \defgroup Properties | |
217 ///@{ | |
218 | |
219 /// \defgroup GeneralProperties General properties | |
220 /// \ingroup Properties | |
221 ///@{ | |
222 | |
223 /// OSD level (RW) | |
31156 | 224 static int mp_property_osdlevel(m_option_t *prop, int action, void *arg, |
225 MPContext *mpctx) | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
226 { |
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
227 return m_property_choice(prop, action, arg, &osd_level); |
22478 | 228 } |
229 | |
23727 | 230 /// Loop (RW) |
31156 | 231 static int mp_property_loop(m_option_t *prop, int action, void *arg, |
232 MPContext *mpctx) | |
23727 | 233 { |
234 switch (action) { | |
235 case M_PROPERTY_PRINT: | |
236 if (!arg) return M_PROPERTY_ERROR; | |
237 if (mpctx->loop_times < 0) | |
238 *(char**)arg = strdup("off"); | |
239 else if (mpctx->loop_times == 0) | |
240 *(char**)arg = strdup("inf"); | |
241 else | |
242 break; | |
243 return M_PROPERTY_OK; | |
244 } | |
245 return m_property_int_range(prop, action, arg, &mpctx->loop_times); | |
246 } | |
247 | |
22478 | 248 /// Playback speed (RW) |
31156 | 249 static int mp_property_playback_speed(m_option_t *prop, int action, |
250 void *arg, MPContext *mpctx) | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
251 { |
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
252 switch (action) { |
22478 | 253 case M_PROPERTY_SET: |
31077 | 254 if (!arg) |
255 return M_PROPERTY_ERROR; | |
256 M_PROPERTY_CLAMP(prop, *(float *) arg); | |
257 playback_speed = *(float *) arg; | |
32561
17bb5a38ae2e
build_afilter_chain is not safe to use directly, thus make it
reimar
parents:
32511
diff
changeset
|
258 reinit_audio_chain(); |
31077 | 259 return M_PROPERTY_OK; |
22478 | 260 case M_PROPERTY_STEP_UP: |
261 case M_PROPERTY_STEP_DOWN: | |
31077 | 262 playback_speed += (arg ? *(float *) arg : 0.1) * |
263 (action == M_PROPERTY_STEP_DOWN ? -1 : 1); | |
264 M_PROPERTY_CLAMP(prop, playback_speed); | |
32561
17bb5a38ae2e
build_afilter_chain is not safe to use directly, thus make it
reimar
parents:
32511
diff
changeset
|
265 reinit_audio_chain(); |
31077 | 266 return M_PROPERTY_OK; |
22478 | 267 } |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
268 return m_property_float_range(prop, action, arg, &playback_speed); |
22478 | 269 } |
270 | |
271 /// filename with path (RO) | |
31156 | 272 static int mp_property_path(m_option_t *prop, int action, void *arg, |
273 MPContext *mpctx) | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
274 { |
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
275 return m_property_string_ro(prop, action, arg, filename); |
22478 | 276 } |
277 | |
278 /// filename without path (RO) | |
31156 | 279 static int mp_property_filename(m_option_t *prop, int action, void *arg, |
280 MPContext *mpctx) | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
281 { |
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
282 char *f; |
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
283 if (!filename) |
31077 | 284 return M_PROPERTY_UNAVAILABLE; |
32588 | 285 f = (char *)mp_basename(filename); |
286 if (!*f) | |
31077 | 287 f = filename; |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
288 return m_property_string_ro(prop, action, arg, f); |
22478 | 289 } |
290 | |
291 /// Demuxer name (RO) | |
31156 | 292 static int mp_property_demuxer(m_option_t *prop, int action, void *arg, |
293 MPContext *mpctx) | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
294 { |
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
295 if (!mpctx->demuxer) |
31077 | 296 return M_PROPERTY_UNAVAILABLE; |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
297 return m_property_string_ro(prop, action, arg, |
31077 | 298 (char *) mpctx->demuxer->desc->name); |
22478 | 299 } |
300 | |
301 /// Position in the stream (RW) | |
31156 | 302 static int mp_property_stream_pos(m_option_t *prop, int action, void *arg, |
303 MPContext *mpctx) | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
304 { |
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
305 if (!mpctx->demuxer || !mpctx->demuxer->stream) |
31077 | 306 return M_PROPERTY_UNAVAILABLE; |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
307 if (!arg) |
31077 | 308 return M_PROPERTY_ERROR; |
22478 | 309 switch (action) { |
310 case M_PROPERTY_GET: | |
31077 | 311 *(off_t *) arg = stream_tell(mpctx->demuxer->stream); |
312 return M_PROPERTY_OK; | |
22478 | 313 case M_PROPERTY_SET: |
31077 | 314 M_PROPERTY_CLAMP(prop, *(off_t *) arg); |
315 stream_seek(mpctx->demuxer->stream, *(off_t *) arg); | |
316 return M_PROPERTY_OK; | |
22478 | 317 } |
318 return M_PROPERTY_NOT_IMPLEMENTED; | |
319 } | |
320 | |
321 /// Stream start offset (RO) | |
31156 | 322 static int mp_property_stream_start(m_option_t *prop, int action, |
323 void *arg, MPContext *mpctx) | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
324 { |
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
325 if (!mpctx->demuxer || !mpctx->demuxer->stream) |
31077 | 326 return M_PROPERTY_UNAVAILABLE; |
22478 | 327 switch (action) { |
328 case M_PROPERTY_GET: | |
31077 | 329 *(off_t *) arg = mpctx->demuxer->stream->start_pos; |
330 return M_PROPERTY_OK; | |
22478 | 331 } |
332 return M_PROPERTY_NOT_IMPLEMENTED; | |
333 } | |
334 | |
335 /// Stream end offset (RO) | |
31156 | 336 static int mp_property_stream_end(m_option_t *prop, int action, void *arg, |
337 MPContext *mpctx) | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
338 { |
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
339 if (!mpctx->demuxer || !mpctx->demuxer->stream) |
31077 | 340 return M_PROPERTY_UNAVAILABLE; |
22478 | 341 switch (action) { |
342 case M_PROPERTY_GET: | |
31077 | 343 *(off_t *) arg = mpctx->demuxer->stream->end_pos; |
344 return M_PROPERTY_OK; | |
22478 | 345 } |
346 return M_PROPERTY_NOT_IMPLEMENTED; | |
347 } | |
348 | |
349 /// Stream length (RO) | |
31156 | 350 static int mp_property_stream_length(m_option_t *prop, int action, |
351 void *arg, MPContext *mpctx) | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
352 { |
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
353 if (!mpctx->demuxer || !mpctx->demuxer->stream) |
31077 | 354 return M_PROPERTY_UNAVAILABLE; |
22478 | 355 switch (action) { |
356 case M_PROPERTY_GET: | |
31077 | 357 *(off_t *) arg = |
358 mpctx->demuxer->stream->end_pos - mpctx->demuxer->stream->start_pos; | |
359 return M_PROPERTY_OK; | |
22478 | 360 } |
361 return M_PROPERTY_NOT_IMPLEMENTED; | |
362 } | |
363 | |
31728 | 364 /// Current stream position in seconds (RO) |
365 static int mp_property_stream_time_pos(m_option_t *prop, int action, | |
366 void *arg, MPContext *mpctx) | |
367 { | |
368 if (!mpctx->demuxer || mpctx->demuxer->stream_pts == MP_NOPTS_VALUE) | |
369 return M_PROPERTY_UNAVAILABLE; | |
370 | |
371 return m_property_time_ro(prop, action, arg, mpctx->demuxer->stream_pts); | |
372 } | |
373 | |
374 | |
22478 | 375 /// Media length in seconds (RO) |
31156 | 376 static int mp_property_length(m_option_t *prop, int action, void *arg, |
377 MPContext *mpctx) | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
378 { |
22478 | 379 double len; |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
380 |
22478 | 381 if (!mpctx->demuxer || |
31077 | 382 !(int) (len = demuxer_get_time_length(mpctx->demuxer))) |
383 return M_PROPERTY_UNAVAILABLE; | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
384 |
23416
ae4237717601
Move the time printing code out of the length property.
albeu
parents:
23412
diff
changeset
|
385 return m_property_time_ro(prop, action, arg, len); |
22478 | 386 } |
387 | |
23418 | 388 /// Current position in percent (RW) |
31156 | 389 static int mp_property_percent_pos(m_option_t *prop, int action, |
390 void *arg, MPContext *mpctx) { | |
23418 | 391 int pos; |
392 | |
393 if (!mpctx->demuxer) | |
31077 | 394 return M_PROPERTY_UNAVAILABLE; |
23418 | 395 |
396 switch(action) { | |
397 case M_PROPERTY_SET: | |
398 if(!arg) return M_PROPERTY_ERROR; | |
399 M_PROPERTY_CLAMP(prop, *(int*)arg); | |
400 pos = *(int*)arg; | |
401 break; | |
402 case M_PROPERTY_STEP_UP: | |
403 case M_PROPERTY_STEP_DOWN: | |
404 pos = demuxer_get_percent_pos(mpctx->demuxer); | |
405 pos += (arg ? *(int*)arg : 10) * | |
406 (action == M_PROPERTY_STEP_UP ? 1 : -1); | |
407 M_PROPERTY_CLAMP(prop, pos); | |
408 break; | |
409 default: | |
410 return m_property_int_ro(prop, action, arg, | |
411 demuxer_get_percent_pos(mpctx->demuxer)); | |
412 } | |
413 | |
25884
f6697d25b040
More places that should use SEEK_ABSOLUTE / SEEK_FACTOR
reimar
parents:
25878
diff
changeset
|
414 abs_seek_pos = SEEK_ABSOLUTE | SEEK_FACTOR; |
23418 | 415 rel_seek_secs = pos / 100.0; |
416 return M_PROPERTY_OK; | |
417 } | |
418 | |
419 /// Current position in seconds (RW) | |
31156 | 420 static int mp_property_time_pos(m_option_t *prop, int action, |
421 void *arg, MPContext *mpctx) { | |
23418 | 422 if (!(mpctx->sh_video || (mpctx->sh_audio && mpctx->audio_out))) |
423 return M_PROPERTY_UNAVAILABLE; | |
424 | |
425 switch(action) { | |
426 case M_PROPERTY_SET: | |
427 if(!arg) return M_PROPERTY_ERROR; | |
428 M_PROPERTY_CLAMP(prop, *(double*)arg); | |
25884
f6697d25b040
More places that should use SEEK_ABSOLUTE / SEEK_FACTOR
reimar
parents:
25878
diff
changeset
|
429 abs_seek_pos = SEEK_ABSOLUTE; |
23418 | 430 rel_seek_secs = *(double*)arg; |
431 return M_PROPERTY_OK; | |
432 case M_PROPERTY_STEP_UP: | |
433 case M_PROPERTY_STEP_DOWN: | |
434 rel_seek_secs += (arg ? *(double*)arg : 10.0) * | |
435 (action == M_PROPERTY_STEP_UP ? 1.0 : -1.0); | |
436 return M_PROPERTY_OK; | |
437 } | |
438 return m_property_time_ro(prop, action, arg, | |
439 mpctx->sh_video ? mpctx->sh_video->pts : | |
440 playing_audio_pts(mpctx->sh_audio, | |
441 mpctx->d_audio, | |
442 mpctx->audio_out)); | |
443 } | |
444 | |
25363 | 445 /// Current chapter (RW) |
446 static int mp_property_chapter(m_option_t *prop, int action, void *arg, | |
447 MPContext *mpctx) | |
448 { | |
27382
aff29422c652
Fixes unsafe 'chapter' command with get_property() call.
ben
parents:
27381
diff
changeset
|
449 int chapter = -1; |
25363 | 450 float next_pts = 0; |
451 int chapter_num; | |
452 int step_all; | |
453 char *chapter_name = NULL; | |
454 | |
27382
aff29422c652
Fixes unsafe 'chapter' command with get_property() call.
ben
parents:
27381
diff
changeset
|
455 if (mpctx->demuxer) |
27383 | 456 chapter = demuxer_get_current_chapter(mpctx->demuxer); |
25462
3e033aabc9d2
Combine common code for check whether chapter is available.
ulion
parents:
25461
diff
changeset
|
457 if (chapter < 0) |
3e033aabc9d2
Combine common code for check whether chapter is available.
ulion
parents:
25461
diff
changeset
|
458 return M_PROPERTY_UNAVAILABLE; |
3e033aabc9d2
Combine common code for check whether chapter is available.
ulion
parents:
25461
diff
changeset
|
459 |
25363 | 460 switch (action) { |
461 case M_PROPERTY_GET: | |
462 if (!arg) | |
463 return M_PROPERTY_ERROR; | |
25402
f8f596bad3bd
Modified for using chapter property for $(NAME:TEXT) or ?(NAME:TEXT).
ulion
parents:
25377
diff
changeset
|
464 *(int *) arg = chapter; |
25363 | 465 return M_PROPERTY_OK; |
466 case M_PROPERTY_PRINT: { | |
467 if (!arg) | |
468 return M_PROPERTY_ERROR; | |
469 chapter_name = demuxer_chapter_display_name(mpctx->demuxer, chapter); | |
470 if (!chapter_name) | |
471 return M_PROPERTY_UNAVAILABLE; | |
472 *(char **) arg = chapter_name; | |
473 return M_PROPERTY_OK; | |
474 } | |
475 case M_PROPERTY_SET: | |
476 if (!arg) | |
477 return M_PROPERTY_ERROR; | |
478 M_PROPERTY_CLAMP(prop, *(int*)arg); | |
29365
794a26e68c2c
Make set_property chapter 0-based like all other chapter-related
reimar
parents:
29333
diff
changeset
|
479 step_all = *(int *)arg - chapter; |
25363 | 480 chapter += step_all; |
481 break; | |
482 case M_PROPERTY_STEP_UP: | |
483 case M_PROPERTY_STEP_DOWN: { | |
484 step_all = (arg && *(int*)arg != 0 ? *(int*)arg : 1) | |
485 * (action == M_PROPERTY_STEP_UP ? 1 : -1); | |
486 chapter += step_all; | |
487 if (chapter < 0) | |
488 chapter = 0; | |
489 break; | |
490 } | |
491 default: | |
492 return M_PROPERTY_NOT_IMPLEMENTED; | |
493 } | |
494 rel_seek_secs = 0; | |
495 abs_seek_pos = 0; | |
496 chapter = demuxer_seek_chapter(mpctx->demuxer, chapter, 1, | |
497 &next_pts, &chapter_num, &chapter_name); | |
498 if (chapter >= 0) { | |
499 if (next_pts > -1.0) { | |
25884
f6697d25b040
More places that should use SEEK_ABSOLUTE / SEEK_FACTOR
reimar
parents:
25878
diff
changeset
|
500 abs_seek_pos = SEEK_ABSOLUTE; |
25363 | 501 rel_seek_secs = next_pts; |
502 } | |
503 if (chapter_name) | |
504 set_osd_msg(OSD_MSG_TEXT, 1, osd_duration, | |
505 MSGTR_OSDChapter, chapter + 1, chapter_name); | |
506 } | |
507 else if (step_all > 0) | |
508 rel_seek_secs = 1000000000.; | |
509 else | |
510 set_osd_msg(OSD_MSG_TEXT, 1, osd_duration, | |
511 MSGTR_OSDChapter, 0, MSGTR_Unknown); | |
32511
b39155e98ac3
Remove some useless NULL pointer checks before invoking free() on the pointer.
diego
parents:
32467
diff
changeset
|
512 free(chapter_name); |
25363 | 513 return M_PROPERTY_OK; |
514 } | |
515 | |
27635
22bdd7ba8892
slave command to get the number of chapters; patch by Kevin DeKorte - kdekorte gmail com
nicodvb
parents:
27457
diff
changeset
|
516 /// Number of chapters in file |
22bdd7ba8892
slave command to get the number of chapters; patch by Kevin DeKorte - kdekorte gmail com
nicodvb
parents:
27457
diff
changeset
|
517 static int mp_property_chapters(m_option_t *prop, int action, void *arg, |
22bdd7ba8892
slave command to get the number of chapters; patch by Kevin DeKorte - kdekorte gmail com
nicodvb
parents:
27457
diff
changeset
|
518 MPContext *mpctx) |
22bdd7ba8892
slave command to get the number of chapters; patch by Kevin DeKorte - kdekorte gmail com
nicodvb
parents:
27457
diff
changeset
|
519 { |
22bdd7ba8892
slave command to get the number of chapters; patch by Kevin DeKorte - kdekorte gmail com
nicodvb
parents:
27457
diff
changeset
|
520 if (!mpctx->demuxer) |
22bdd7ba8892
slave command to get the number of chapters; patch by Kevin DeKorte - kdekorte gmail com
nicodvb
parents:
27457
diff
changeset
|
521 return M_PROPERTY_UNAVAILABLE; |
22bdd7ba8892
slave command to get the number of chapters; patch by Kevin DeKorte - kdekorte gmail com
nicodvb
parents:
27457
diff
changeset
|
522 if (mpctx->demuxer->num_chapters == 0) |
22bdd7ba8892
slave command to get the number of chapters; patch by Kevin DeKorte - kdekorte gmail com
nicodvb
parents:
27457
diff
changeset
|
523 stream_control(mpctx->demuxer->stream, STREAM_CTRL_GET_NUM_CHAPTERS, &mpctx->demuxer->num_chapters); |
22bdd7ba8892
slave command to get the number of chapters; patch by Kevin DeKorte - kdekorte gmail com
nicodvb
parents:
27457
diff
changeset
|
524 return m_property_int_ro(prop, action, arg, mpctx->demuxer->num_chapters); |
22bdd7ba8892
slave command to get the number of chapters; patch by Kevin DeKorte - kdekorte gmail com
nicodvb
parents:
27457
diff
changeset
|
525 } |
22bdd7ba8892
slave command to get the number of chapters; patch by Kevin DeKorte - kdekorte gmail com
nicodvb
parents:
27457
diff
changeset
|
526 |
25577
f1ea96323643
properties to get and set angle; patch by oattila chello hu
nicodvb
parents:
25567
diff
changeset
|
527 /// Current dvd angle (RW) |
f1ea96323643
properties to get and set angle; patch by oattila chello hu
nicodvb
parents:
25567
diff
changeset
|
528 static int mp_property_angle(m_option_t *prop, int action, void *arg, |
f1ea96323643
properties to get and set angle; patch by oattila chello hu
nicodvb
parents:
25567
diff
changeset
|
529 MPContext *mpctx) |
f1ea96323643
properties to get and set angle; patch by oattila chello hu
nicodvb
parents:
25567
diff
changeset
|
530 { |
27380
843db879a6b2
Fixes unsafe 'angle' command with get_property() call.
ben
parents:
27379
diff
changeset
|
531 int angle = -1; |
25577
f1ea96323643
properties to get and set angle; patch by oattila chello hu
nicodvb
parents:
25567
diff
changeset
|
532 int angles; |
f1ea96323643
properties to get and set angle; patch by oattila chello hu
nicodvb
parents:
25567
diff
changeset
|
533 char *angle_name = NULL; |
f1ea96323643
properties to get and set angle; patch by oattila chello hu
nicodvb
parents:
25567
diff
changeset
|
534 |
27380
843db879a6b2
Fixes unsafe 'angle' command with get_property() call.
ben
parents:
27379
diff
changeset
|
535 if (mpctx->demuxer) |
27381 | 536 angle = demuxer_get_current_angle(mpctx->demuxer); |
25577
f1ea96323643
properties to get and set angle; patch by oattila chello hu
nicodvb
parents:
25567
diff
changeset
|
537 if (angle < 0) |
f1ea96323643
properties to get and set angle; patch by oattila chello hu
nicodvb
parents:
25567
diff
changeset
|
538 return M_PROPERTY_UNAVAILABLE; |
f1ea96323643
properties to get and set angle; patch by oattila chello hu
nicodvb
parents:
25567
diff
changeset
|
539 angles = demuxer_angles_count(mpctx->demuxer); |
f1ea96323643
properties to get and set angle; patch by oattila chello hu
nicodvb
parents:
25567
diff
changeset
|
540 if (angles <= 1) |
f1ea96323643
properties to get and set angle; patch by oattila chello hu
nicodvb
parents:
25567
diff
changeset
|
541 return M_PROPERTY_UNAVAILABLE; |
f1ea96323643
properties to get and set angle; patch by oattila chello hu
nicodvb
parents:
25567
diff
changeset
|
542 |
f1ea96323643
properties to get and set angle; patch by oattila chello hu
nicodvb
parents:
25567
diff
changeset
|
543 switch (action) { |
f1ea96323643
properties to get and set angle; patch by oattila chello hu
nicodvb
parents:
25567
diff
changeset
|
544 case M_PROPERTY_GET: |
f1ea96323643
properties to get and set angle; patch by oattila chello hu
nicodvb
parents:
25567
diff
changeset
|
545 if (!arg) |
f1ea96323643
properties to get and set angle; patch by oattila chello hu
nicodvb
parents:
25567
diff
changeset
|
546 return M_PROPERTY_ERROR; |
f1ea96323643
properties to get and set angle; patch by oattila chello hu
nicodvb
parents:
25567
diff
changeset
|
547 *(int *) arg = angle; |
f1ea96323643
properties to get and set angle; patch by oattila chello hu
nicodvb
parents:
25567
diff
changeset
|
548 return M_PROPERTY_OK; |
f1ea96323643
properties to get and set angle; patch by oattila chello hu
nicodvb
parents:
25567
diff
changeset
|
549 case M_PROPERTY_PRINT: { |
f1ea96323643
properties to get and set angle; patch by oattila chello hu
nicodvb
parents:
25567
diff
changeset
|
550 if (!arg) |
f1ea96323643
properties to get and set angle; patch by oattila chello hu
nicodvb
parents:
25567
diff
changeset
|
551 return M_PROPERTY_ERROR; |
f1ea96323643
properties to get and set angle; patch by oattila chello hu
nicodvb
parents:
25567
diff
changeset
|
552 angle_name = calloc(1, 64); |
f1ea96323643
properties to get and set angle; patch by oattila chello hu
nicodvb
parents:
25567
diff
changeset
|
553 if (!angle_name) |
f1ea96323643
properties to get and set angle; patch by oattila chello hu
nicodvb
parents:
25567
diff
changeset
|
554 return M_PROPERTY_UNAVAILABLE; |
f1ea96323643
properties to get and set angle; patch by oattila chello hu
nicodvb
parents:
25567
diff
changeset
|
555 snprintf(angle_name, 64, "%d/%d", angle, angles); |
f1ea96323643
properties to get and set angle; patch by oattila chello hu
nicodvb
parents:
25567
diff
changeset
|
556 *(char **) arg = angle_name; |
f1ea96323643
properties to get and set angle; patch by oattila chello hu
nicodvb
parents:
25567
diff
changeset
|
557 return M_PROPERTY_OK; |
f1ea96323643
properties to get and set angle; patch by oattila chello hu
nicodvb
parents:
25567
diff
changeset
|
558 } |
f1ea96323643
properties to get and set angle; patch by oattila chello hu
nicodvb
parents:
25567
diff
changeset
|
559 case M_PROPERTY_SET: |
f1ea96323643
properties to get and set angle; patch by oattila chello hu
nicodvb
parents:
25567
diff
changeset
|
560 if (!arg) |
f1ea96323643
properties to get and set angle; patch by oattila chello hu
nicodvb
parents:
25567
diff
changeset
|
561 return M_PROPERTY_ERROR; |
f1ea96323643
properties to get and set angle; patch by oattila chello hu
nicodvb
parents:
25567
diff
changeset
|
562 angle = *(int *)arg; |
f1ea96323643
properties to get and set angle; patch by oattila chello hu
nicodvb
parents:
25567
diff
changeset
|
563 M_PROPERTY_CLAMP(prop, angle); |
f1ea96323643
properties to get and set angle; patch by oattila chello hu
nicodvb
parents:
25567
diff
changeset
|
564 break; |
f1ea96323643
properties to get and set angle; patch by oattila chello hu
nicodvb
parents:
25567
diff
changeset
|
565 case M_PROPERTY_STEP_UP: |
f1ea96323643
properties to get and set angle; patch by oattila chello hu
nicodvb
parents:
25567
diff
changeset
|
566 case M_PROPERTY_STEP_DOWN: { |
f1ea96323643
properties to get and set angle; patch by oattila chello hu
nicodvb
parents:
25567
diff
changeset
|
567 int step = 0; |
f1ea96323643
properties to get and set angle; patch by oattila chello hu
nicodvb
parents:
25567
diff
changeset
|
568 if(arg) |
f1ea96323643
properties to get and set angle; patch by oattila chello hu
nicodvb
parents:
25567
diff
changeset
|
569 step = *(int*)arg; |
f1ea96323643
properties to get and set angle; patch by oattila chello hu
nicodvb
parents:
25567
diff
changeset
|
570 if(!step) |
f1ea96323643
properties to get and set angle; patch by oattila chello hu
nicodvb
parents:
25567
diff
changeset
|
571 step = 1; |
f1ea96323643
properties to get and set angle; patch by oattila chello hu
nicodvb
parents:
25567
diff
changeset
|
572 step *= (action == M_PROPERTY_STEP_UP ? 1 : -1); |
f1ea96323643
properties to get and set angle; patch by oattila chello hu
nicodvb
parents:
25567
diff
changeset
|
573 angle += step; |
f1ea96323643
properties to get and set angle; patch by oattila chello hu
nicodvb
parents:
25567
diff
changeset
|
574 if (angle < 1) //cycle |
f1ea96323643
properties to get and set angle; patch by oattila chello hu
nicodvb
parents:
25567
diff
changeset
|
575 angle = angles; |
33230 | 576 else if (angle > angles) |
577 angle = 1; | |
25577
f1ea96323643
properties to get and set angle; patch by oattila chello hu
nicodvb
parents:
25567
diff
changeset
|
578 break; |
f1ea96323643
properties to get and set angle; patch by oattila chello hu
nicodvb
parents:
25567
diff
changeset
|
579 } |
f1ea96323643
properties to get and set angle; patch by oattila chello hu
nicodvb
parents:
25567
diff
changeset
|
580 default: |
f1ea96323643
properties to get and set angle; patch by oattila chello hu
nicodvb
parents:
25567
diff
changeset
|
581 return M_PROPERTY_NOT_IMPLEMENTED; |
f1ea96323643
properties to get and set angle; patch by oattila chello hu
nicodvb
parents:
25567
diff
changeset
|
582 } |
f1ea96323643
properties to get and set angle; patch by oattila chello hu
nicodvb
parents:
25567
diff
changeset
|
583 angle = demuxer_set_angle(mpctx->demuxer, angle); |
f1ea96323643
properties to get and set angle; patch by oattila chello hu
nicodvb
parents:
25567
diff
changeset
|
584 set_osd_msg(OSD_MSG_TEXT, 1, osd_duration, |
f1ea96323643
properties to get and set angle; patch by oattila chello hu
nicodvb
parents:
25567
diff
changeset
|
585 MSGTR_OSDAngle, angle, angles); |
32511
b39155e98ac3
Remove some useless NULL pointer checks before invoking free() on the pointer.
diego
parents:
32467
diff
changeset
|
586 free(angle_name); |
25577
f1ea96323643
properties to get and set angle; patch by oattila chello hu
nicodvb
parents:
25567
diff
changeset
|
587 return M_PROPERTY_OK; |
f1ea96323643
properties to get and set angle; patch by oattila chello hu
nicodvb
parents:
25567
diff
changeset
|
588 } |
f1ea96323643
properties to get and set angle; patch by oattila chello hu
nicodvb
parents:
25567
diff
changeset
|
589 |
23394
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
590 /// Demuxer meta data |
31156 | 591 static int mp_property_metadata(m_option_t *prop, int action, void *arg, |
592 MPContext *mpctx) { | |
23394
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
593 m_property_action_t* ka; |
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
594 char* meta; |
31200 | 595 static const m_option_t key_type = |
23394
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
596 { "metadata", NULL, CONF_TYPE_STRING, 0, 0, 0, NULL }; |
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
597 if (!mpctx->demuxer) |
31077 | 598 return M_PROPERTY_UNAVAILABLE; |
23394
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
599 |
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
600 switch(action) { |
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
601 case M_PROPERTY_GET: |
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
602 if(!arg) return M_PROPERTY_ERROR; |
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
603 *(char***)arg = mpctx->demuxer->info; |
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
604 return M_PROPERTY_OK; |
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
605 case M_PROPERTY_KEY_ACTION: |
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
606 if(!arg) return M_PROPERTY_ERROR; |
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
607 ka = arg; |
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
608 if(!(meta = demux_info_get(mpctx->demuxer,ka->key))) |
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
609 return M_PROPERTY_UNKNOWN; |
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
610 switch(ka->action) { |
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
611 case M_PROPERTY_GET: |
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
612 if(!ka->arg) return M_PROPERTY_ERROR; |
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
613 *(char**)ka->arg = meta; |
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
614 return M_PROPERTY_OK; |
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
615 case M_PROPERTY_GET_TYPE: |
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
616 if(!ka->arg) return M_PROPERTY_ERROR; |
31729 | 617 *(const m_option_t**)ka->arg = &key_type; |
23394
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
618 return M_PROPERTY_OK; |
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
619 } |
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
620 } |
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
621 return M_PROPERTY_NOT_IMPLEMENTED; |
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
622 } |
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
623 |
31156 | 624 static int mp_property_pause(m_option_t *prop, int action, void *arg, |
625 MPContext *mpctx) | |
27648
427fec163870
Add a "pause" property to allow checking if MPlayer is paused.
reimar
parents:
27635
diff
changeset
|
626 { |
427fec163870
Add a "pause" property to allow checking if MPlayer is paused.
reimar
parents:
27635
diff
changeset
|
627 return m_property_flag_ro(prop, action, arg, mpctx->osd_function == OSD_PAUSE); |
427fec163870
Add a "pause" property to allow checking if MPlayer is paused.
reimar
parents:
27635
diff
changeset
|
628 } |
427fec163870
Add a "pause" property to allow checking if MPlayer is paused.
reimar
parents:
27635
diff
changeset
|
629 |
23394
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
630 |
22478 | 631 ///@} |
632 | |
633 /// \defgroup AudioProperties Audio properties | |
634 /// \ingroup Properties | |
635 ///@{ | |
636 | |
637 /// Volume (RW) | |
31156 | 638 static int mp_property_volume(m_option_t *prop, int action, void *arg, |
639 MPContext *mpctx) | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
640 { |
22478 | 641 |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
642 if (!mpctx->sh_audio) |
31077 | 643 return M_PROPERTY_UNAVAILABLE; |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
644 |
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
645 switch (action) { |
22478 | 646 case M_PROPERTY_GET: |
31077 | 647 if (!arg) |
648 return M_PROPERTY_ERROR; | |
649 mixer_getbothvolume(&mpctx->mixer, arg); | |
650 return M_PROPERTY_OK; | |
22478 | 651 case M_PROPERTY_PRINT:{ |
31077 | 652 float vol; |
653 if (!arg) | |
654 return M_PROPERTY_ERROR; | |
655 mixer_getbothvolume(&mpctx->mixer, &vol); | |
656 return m_property_float_range(prop, action, arg, &vol); | |
657 } | |
22478 | 658 case M_PROPERTY_STEP_UP: |
659 case M_PROPERTY_STEP_DOWN: | |
660 case M_PROPERTY_SET: | |
31077 | 661 break; |
22478 | 662 default: |
31077 | 663 return M_PROPERTY_NOT_IMPLEMENTED; |
22478 | 664 } |
665 | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
666 if (mpctx->edl_muted) |
31077 | 667 return M_PROPERTY_DISABLED; |
22478 | 668 mpctx->user_muted = 0; |
669 | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
670 switch (action) { |
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
671 case M_PROPERTY_SET: |
31077 | 672 if (!arg) |
673 return M_PROPERTY_ERROR; | |
674 M_PROPERTY_CLAMP(prop, *(float *) arg); | |
675 mixer_setvolume(&mpctx->mixer, *(float *) arg, *(float *) arg); | |
676 return M_PROPERTY_OK; | |
22478 | 677 case M_PROPERTY_STEP_UP: |
31077 | 678 if (arg && *(float *) arg <= 0) |
679 mixer_decvolume(&mpctx->mixer); | |
680 else | |
681 mixer_incvolume(&mpctx->mixer); | |
682 return M_PROPERTY_OK; | |
22478 | 683 case M_PROPERTY_STEP_DOWN: |
31077 | 684 if (arg && *(float *) arg <= 0) |
685 mixer_incvolume(&mpctx->mixer); | |
686 else | |
687 mixer_decvolume(&mpctx->mixer); | |
688 return M_PROPERTY_OK; | |
22478 | 689 } |
690 return M_PROPERTY_NOT_IMPLEMENTED; | |
691 } | |
692 | |
693 /// Mute (RW) | |
31156 | 694 static int mp_property_mute(m_option_t *prop, int action, void *arg, |
695 MPContext *mpctx) | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
696 { |
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
697 |
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
698 if (!mpctx->sh_audio) |
31077 | 699 return M_PROPERTY_UNAVAILABLE; |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
700 |
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
701 switch (action) { |
22478 | 702 case M_PROPERTY_SET: |
31077 | 703 if (mpctx->edl_muted) |
704 return M_PROPERTY_DISABLED; | |
705 if (!arg) | |
706 return M_PROPERTY_ERROR; | |
707 if ((!!*(int *) arg) != mpctx->mixer.muted) | |
708 mixer_mute(&mpctx->mixer); | |
709 mpctx->user_muted = mpctx->mixer.muted; | |
710 return M_PROPERTY_OK; | |
22478 | 711 case M_PROPERTY_STEP_UP: |
712 case M_PROPERTY_STEP_DOWN: | |
31077 | 713 if (mpctx->edl_muted) |
714 return M_PROPERTY_DISABLED; | |
715 mixer_mute(&mpctx->mixer); | |
716 mpctx->user_muted = mpctx->mixer.muted; | |
717 return M_PROPERTY_OK; | |
22478 | 718 case M_PROPERTY_PRINT: |
31077 | 719 if (!arg) |
720 return M_PROPERTY_ERROR; | |
721 if (mpctx->edl_muted) { | |
722 *(char **) arg = strdup(MSGTR_EnabledEdl); | |
723 return M_PROPERTY_OK; | |
724 } | |
22478 | 725 default: |
31077 | 726 return m_property_flag(prop, action, arg, &mpctx->mixer.muted); |
22478 | 727 |
728 } | |
729 } | |
730 | |
731 /// Audio delay (RW) | |
31156 | 732 static int mp_property_audio_delay(m_option_t *prop, int action, |
733 void *arg, MPContext *mpctx) | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
734 { |
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
735 if (!(mpctx->sh_audio && mpctx->sh_video)) |
31077 | 736 return M_PROPERTY_UNAVAILABLE; |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
737 switch (action) { |
22478 | 738 case M_PROPERTY_SET: |
739 case M_PROPERTY_STEP_UP: | |
25567
ca62d466a9fc
Fix property audio_delay bug when step up/down with arg value NULL.
ulion
parents:
25495
diff
changeset
|
740 case M_PROPERTY_STEP_DOWN: { |
31077 | 741 int ret; |
742 float delay = audio_delay; | |
743 ret = m_property_delay(prop, action, arg, &audio_delay); | |
744 if (ret != M_PROPERTY_OK) | |
745 return ret; | |
746 if (mpctx->sh_audio) | |
747 mpctx->delay -= audio_delay - delay; | |
748 } | |
749 return M_PROPERTY_OK; | |
22478 | 750 default: |
31077 | 751 return m_property_delay(prop, action, arg, &audio_delay); |
22478 | 752 } |
753 } | |
754 | |
755 /// Audio codec tag (RO) | |
31156 | 756 static int mp_property_audio_format(m_option_t *prop, int action, |
757 void *arg, MPContext *mpctx) | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
758 { |
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
759 if (!mpctx->sh_audio) |
31077 | 760 return M_PROPERTY_UNAVAILABLE; |
22478 | 761 return m_property_int_ro(prop, action, arg, mpctx->sh_audio->format); |
762 } | |
763 | |
23394
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
764 /// Audio codec name (RO) |
31156 | 765 static int mp_property_audio_codec(m_option_t *prop, int action, |
766 void *arg, MPContext *mpctx) | |
23394
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
767 { |
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
768 if (!mpctx->sh_audio || !mpctx->sh_audio->codec) |
31077 | 769 return M_PROPERTY_UNAVAILABLE; |
23394
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
770 return m_property_string_ro(prop, action, arg, mpctx->sh_audio->codec->name); |
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
771 } |
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
772 |
22478 | 773 /// Audio bitrate (RO) |
31156 | 774 static int mp_property_audio_bitrate(m_option_t *prop, int action, |
775 void *arg, MPContext *mpctx) | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
776 { |
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
777 if (!mpctx->sh_audio) |
31077 | 778 return M_PROPERTY_UNAVAILABLE; |
23394
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
779 return m_property_bitrate(prop, action, arg, mpctx->sh_audio->i_bps); |
22478 | 780 } |
781 | |
782 /// Samplerate (RO) | |
31156 | 783 static int mp_property_samplerate(m_option_t *prop, int action, void *arg, |
784 MPContext *mpctx) | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
785 { |
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
786 if (!mpctx->sh_audio) |
31077 | 787 return M_PROPERTY_UNAVAILABLE; |
23396 | 788 switch(action) { |
789 case M_PROPERTY_PRINT: | |
790 if(!arg) return M_PROPERTY_ERROR; | |
791 *(char**)arg = malloc(16); | |
792 sprintf(*(char**)arg,"%d kHz",mpctx->sh_audio->samplerate/1000); | |
793 return M_PROPERTY_OK; | |
794 } | |
22478 | 795 return m_property_int_ro(prop, action, arg, mpctx->sh_audio->samplerate); |
796 } | |
797 | |
798 /// Number of channels (RO) | |
31156 | 799 static int mp_property_channels(m_option_t *prop, int action, void *arg, |
800 MPContext *mpctx) | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
801 { |
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
802 if (!mpctx->sh_audio) |
31077 | 803 return M_PROPERTY_UNAVAILABLE; |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
804 switch (action) { |
22478 | 805 case M_PROPERTY_PRINT: |
31077 | 806 if (!arg) |
807 return M_PROPERTY_ERROR; | |
808 switch (mpctx->sh_audio->channels) { | |
809 case 1: | |
810 *(char **) arg = strdup("mono"); | |
811 break; | |
812 case 2: | |
813 *(char **) arg = strdup("stereo"); | |
814 break; | |
815 default: | |
816 *(char **) arg = malloc(32); | |
817 sprintf(*(char **) arg, "%d channels", mpctx->sh_audio->channels); | |
818 } | |
819 return M_PROPERTY_OK; | |
22478 | 820 } |
821 return m_property_int_ro(prop, action, arg, mpctx->sh_audio->channels); | |
822 } | |
823 | |
23568 | 824 /// Balance (RW) |
31156 | 825 static int mp_property_balance(m_option_t *prop, int action, void *arg, |
826 MPContext *mpctx) | |
23568 | 827 { |
828 float bal; | |
829 | |
830 if (!mpctx->sh_audio || mpctx->sh_audio->channels < 2) | |
31077 | 831 return M_PROPERTY_UNAVAILABLE; |
23568 | 832 |
833 switch (action) { | |
834 case M_PROPERTY_GET: | |
31077 | 835 if (!arg) |
836 return M_PROPERTY_ERROR; | |
837 mixer_getbalance(&mpctx->mixer, arg); | |
838 return M_PROPERTY_OK; | |
23568 | 839 case M_PROPERTY_PRINT: { |
31077 | 840 char** str = arg; |
841 if (!arg) | |
842 return M_PROPERTY_ERROR; | |
843 mixer_getbalance(&mpctx->mixer, &bal); | |
844 if (bal == 0.f) | |
845 *str = strdup("center"); | |
846 else if (bal == -1.f) | |
847 *str = strdup("left only"); | |
848 else if (bal == 1.f) | |
849 *str = strdup("right only"); | |
850 else { | |
851 unsigned right = (bal + 1.f) / 2.f * 100.f; | |
852 *str = malloc(sizeof("left xxx%, right xxx%")); | |
853 sprintf(*str, "left %d%%, right %d%%", 100 - right, right); | |
854 } | |
855 return M_PROPERTY_OK; | |
856 } | |
23568 | 857 case M_PROPERTY_STEP_UP: |
858 case M_PROPERTY_STEP_DOWN: | |
31077 | 859 mixer_getbalance(&mpctx->mixer, &bal); |
860 bal += (arg ? *(float*)arg : .1f) * | |
861 (action == M_PROPERTY_STEP_UP ? 1.f : -1.f); | |
862 M_PROPERTY_CLAMP(prop, bal); | |
863 mixer_setbalance(&mpctx->mixer, bal); | |
864 return M_PROPERTY_OK; | |
23568 | 865 case M_PROPERTY_SET: |
31077 | 866 if (!arg) |
867 return M_PROPERTY_ERROR; | |
868 M_PROPERTY_CLAMP(prop, *(float*)arg); | |
869 mixer_setbalance(&mpctx->mixer, *(float*)arg); | |
870 return M_PROPERTY_OK; | |
23568 | 871 } |
872 return M_PROPERTY_NOT_IMPLEMENTED; | |
873 } | |
874 | |
22478 | 875 /// Selected audio id (RW) |
31156 | 876 static int mp_property_audio(m_option_t *prop, int action, void *arg, |
877 MPContext *mpctx) | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
878 { |
30082
446f2ea148a4
Return the actually playing audio/video id for get_property, not the one
reimar
parents:
30080
diff
changeset
|
879 int current_id, tmp; |
30079
4bd9b89b2b85
Use the same condition to decide if the audio/video id property is
reimar
parents:
30078
diff
changeset
|
880 if (!mpctx->demuxer || !mpctx->demuxer->audio) |
4bd9b89b2b85
Use the same condition to decide if the audio/video id property is
reimar
parents:
30078
diff
changeset
|
881 return M_PROPERTY_UNAVAILABLE; |
30082
446f2ea148a4
Return the actually playing audio/video id for get_property, not the one
reimar
parents:
30080
diff
changeset
|
882 current_id = mpctx->demuxer->audio->id; |
33229
71c65ab3c204
Fix audio/video ID mapping for slave commands to correspond to the
reimar
parents:
32738
diff
changeset
|
883 if (current_id >= 0) |
71c65ab3c204
Fix audio/video ID mapping for slave commands to correspond to the
reimar
parents:
32738
diff
changeset
|
884 audio_id = ((sh_audio_t *)mpctx->demuxer->a_streams[current_id])->aid; |
22478 | 885 |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
886 switch (action) { |
22478 | 887 case M_PROPERTY_GET: |
31077 | 888 if (!arg) |
889 return M_PROPERTY_ERROR; | |
33229
71c65ab3c204
Fix audio/video ID mapping for slave commands to correspond to the
reimar
parents:
32738
diff
changeset
|
890 *(int *) arg = audio_id; |
31077 | 891 return M_PROPERTY_OK; |
22478 | 892 case M_PROPERTY_PRINT: |
31077 | 893 if (!arg) |
894 return M_PROPERTY_ERROR; | |
22478 | 895 |
31077 | 896 if (current_id < 0) |
897 *(char **) arg = strdup(MSGTR_Disabled); | |
898 else { | |
899 char lang[40] = MSGTR_Unknown; | |
26083
19fa7a56ed04
Fill sh_audio_t.lang in lavf and mkv demuxers. Use it for printing audio track
eugeni
parents:
25962
diff
changeset
|
900 sh_audio_t* sh = mpctx->sh_audio; |
19fa7a56ed04
Fill sh_audio_t.lang in lavf and mkv demuxers. Use it for printing audio track
eugeni
parents:
25962
diff
changeset
|
901 if (sh && sh->lang) |
19fa7a56ed04
Fill sh_audio_t.lang in lavf and mkv demuxers. Use it for printing audio track
eugeni
parents:
25962
diff
changeset
|
902 av_strlcpy(lang, sh->lang, 40); |
31877
e30fe0cb79cd
Add incomplete clipinf reading support to display audio
reimar
parents:
31805
diff
changeset
|
903 // TODO: use a proper STREAM_CTRL instead of this mess |
e30fe0cb79cd
Add incomplete clipinf reading support to display audio
reimar
parents:
31805
diff
changeset
|
904 else if (sh && mpctx->stream->type == STREAMTYPE_BD) { |
33229
71c65ab3c204
Fix audio/video ID mapping for slave commands to correspond to the
reimar
parents:
32738
diff
changeset
|
905 const char *l = bd_lang_from_id(mpctx->stream, audio_id); |
31877
e30fe0cb79cd
Add incomplete clipinf reading support to display audio
reimar
parents:
31805
diff
changeset
|
906 if (l) |
e30fe0cb79cd
Add incomplete clipinf reading support to display audio
reimar
parents:
31805
diff
changeset
|
907 av_strlcpy(lang, l, sizeof(lang)); |
e30fe0cb79cd
Add incomplete clipinf reading support to display audio
reimar
parents:
31805
diff
changeset
|
908 } |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27069
diff
changeset
|
909 #ifdef CONFIG_DVDREAD |
31077 | 910 else if (mpctx->stream->type == STREAMTYPE_DVD) { |
911 int code = dvd_lang_from_aid(mpctx->stream, current_id); | |
912 if (code) { | |
913 lang[0] = code >> 8; | |
914 lang[1] = code; | |
915 lang[2] = 0; | |
916 } | |
917 } | |
22478 | 918 #endif |
919 | |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27069
diff
changeset
|
920 #ifdef CONFIG_DVDNAV |
31077 | 921 else if (mpctx->stream->type == STREAMTYPE_DVDNAV) |
922 mp_dvdnav_lang_from_aid(mpctx->stream, current_id, lang); | |
22478 | 923 #endif |
31077 | 924 *(char **) arg = malloc(64); |
33229
71c65ab3c204
Fix audio/video ID mapping for slave commands to correspond to the
reimar
parents:
32738
diff
changeset
|
925 snprintf(*(char **) arg, 64, "(%d) %s", audio_id, lang); |
31077 | 926 } |
927 return M_PROPERTY_OK; | |
22478 | 928 |
929 case M_PROPERTY_STEP_UP: | |
930 case M_PROPERTY_SET: | |
31077 | 931 if (action == M_PROPERTY_SET && arg) |
932 tmp = *((int *) arg); | |
933 else | |
934 tmp = -1; | |
33229
71c65ab3c204
Fix audio/video ID mapping for slave commands to correspond to the
reimar
parents:
32738
diff
changeset
|
935 tmp = demuxer_switch_audio(mpctx->demuxer, tmp); |
71c65ab3c204
Fix audio/video ID mapping for slave commands to correspond to the
reimar
parents:
32738
diff
changeset
|
936 if (tmp == -2 |
71c65ab3c204
Fix audio/video ID mapping for slave commands to correspond to the
reimar
parents:
32738
diff
changeset
|
937 || (tmp > -1 |
71c65ab3c204
Fix audio/video ID mapping for slave commands to correspond to the
reimar
parents:
32738
diff
changeset
|
938 && mpctx->demuxer->audio->id != current_id && current_id != -2)) { |
31077 | 939 uninit_player(INITIALIZED_AO | INITIALIZED_ACODEC); |
33229
71c65ab3c204
Fix audio/video ID mapping for slave commands to correspond to the
reimar
parents:
32738
diff
changeset
|
940 audio_id = tmp; |
71c65ab3c204
Fix audio/video ID mapping for slave commands to correspond to the
reimar
parents:
32738
diff
changeset
|
941 } |
71c65ab3c204
Fix audio/video ID mapping for slave commands to correspond to the
reimar
parents:
32738
diff
changeset
|
942 if (tmp > -1 && mpctx->demuxer->audio->id != current_id) { |
31077 | 943 sh_audio_t *sh2; |
944 sh2 = mpctx->demuxer->a_streams[mpctx->demuxer->audio->id]; | |
945 if (sh2) { | |
33229
71c65ab3c204
Fix audio/video ID mapping for slave commands to correspond to the
reimar
parents:
32738
diff
changeset
|
946 audio_id = sh2->aid; |
31077 | 947 sh2->ds = mpctx->demuxer->audio; |
948 mpctx->sh_audio = sh2; | |
949 reinit_audio_chain(); | |
950 } | |
951 } | |
952 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AUDIO_TRACK=%d\n", audio_id); | |
953 return M_PROPERTY_OK; | |
22478 | 954 default: |
31077 | 955 return M_PROPERTY_NOT_IMPLEMENTED; |
22478 | 956 } |
957 | |
958 } | |
959 | |
960 /// Selected video id (RW) | |
31156 | 961 static int mp_property_video(m_option_t *prop, int action, void *arg, |
962 MPContext *mpctx) | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
963 { |
30082
446f2ea148a4
Return the actually playing audio/video id for get_property, not the one
reimar
parents:
30080
diff
changeset
|
964 int current_id, tmp; |
30079
4bd9b89b2b85
Use the same condition to decide if the audio/video id property is
reimar
parents:
30078
diff
changeset
|
965 if (!mpctx->demuxer || !mpctx->demuxer->video) |
4bd9b89b2b85
Use the same condition to decide if the audio/video id property is
reimar
parents:
30078
diff
changeset
|
966 return M_PROPERTY_UNAVAILABLE; |
30082
446f2ea148a4
Return the actually playing audio/video id for get_property, not the one
reimar
parents:
30080
diff
changeset
|
967 current_id = mpctx->demuxer->video->id; |
33229
71c65ab3c204
Fix audio/video ID mapping for slave commands to correspond to the
reimar
parents:
32738
diff
changeset
|
968 if (current_id >= 0) |
71c65ab3c204
Fix audio/video ID mapping for slave commands to correspond to the
reimar
parents:
32738
diff
changeset
|
969 video_id = ((sh_video_t *)mpctx->demuxer->v_streams[current_id])->vid; |
22478 | 970 |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
971 switch (action) { |
22478 | 972 case M_PROPERTY_GET: |
31077 | 973 if (!arg) |
974 return M_PROPERTY_ERROR; | |
33229
71c65ab3c204
Fix audio/video ID mapping for slave commands to correspond to the
reimar
parents:
32738
diff
changeset
|
975 *(int *) arg = video_id; |
31077 | 976 return M_PROPERTY_OK; |
22478 | 977 case M_PROPERTY_PRINT: |
31077 | 978 if (!arg) |
979 return M_PROPERTY_ERROR; | |
22478 | 980 |
31077 | 981 if (current_id < 0) |
982 *(char **) arg = strdup(MSGTR_Disabled); | |
983 else { | |
984 char lang[40] = MSGTR_Unknown; | |
985 *(char **) arg = malloc(64); | |
33229
71c65ab3c204
Fix audio/video ID mapping for slave commands to correspond to the
reimar
parents:
32738
diff
changeset
|
986 snprintf(*(char **) arg, 64, "(%d) %s", video_id, lang); |
31077 | 987 } |
988 return M_PROPERTY_OK; | |
22478 | 989 |
990 case M_PROPERTY_STEP_UP: | |
991 case M_PROPERTY_SET: | |
31077 | 992 if (action == M_PROPERTY_SET && arg) |
993 tmp = *((int *) arg); | |
994 else | |
995 tmp = -1; | |
33229
71c65ab3c204
Fix audio/video ID mapping for slave commands to correspond to the
reimar
parents:
32738
diff
changeset
|
996 tmp = demuxer_switch_video(mpctx->demuxer, tmp); |
71c65ab3c204
Fix audio/video ID mapping for slave commands to correspond to the
reimar
parents:
32738
diff
changeset
|
997 if (tmp == -2 |
71c65ab3c204
Fix audio/video ID mapping for slave commands to correspond to the
reimar
parents:
32738
diff
changeset
|
998 || (tmp > -1 && mpctx->demuxer->video->id != current_id |
71c65ab3c204
Fix audio/video ID mapping for slave commands to correspond to the
reimar
parents:
32738
diff
changeset
|
999 && current_id != -2)) { |
31077 | 1000 uninit_player(INITIALIZED_VCODEC | |
33229
71c65ab3c204
Fix audio/video ID mapping for slave commands to correspond to the
reimar
parents:
32738
diff
changeset
|
1001 (fixed_vo && tmp != -2 ? 0 : INITIALIZED_VO)); |
71c65ab3c204
Fix audio/video ID mapping for slave commands to correspond to the
reimar
parents:
32738
diff
changeset
|
1002 video_id = tmp; |
71c65ab3c204
Fix audio/video ID mapping for slave commands to correspond to the
reimar
parents:
32738
diff
changeset
|
1003 } |
71c65ab3c204
Fix audio/video ID mapping for slave commands to correspond to the
reimar
parents:
32738
diff
changeset
|
1004 if (tmp > -1 && mpctx->demuxer->video->id != current_id) { |
31077 | 1005 sh_video_t *sh2; |
1006 sh2 = mpctx->demuxer->v_streams[mpctx->demuxer->video->id]; | |
1007 if (sh2) { | |
33229
71c65ab3c204
Fix audio/video ID mapping for slave commands to correspond to the
reimar
parents:
32738
diff
changeset
|
1008 video_id = sh2->vid; |
31077 | 1009 sh2->ds = mpctx->demuxer->video; |
1010 mpctx->sh_video = sh2; | |
1011 reinit_video_chain(); | |
1012 } | |
1013 } | |
1014 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_TRACK=%d\n", video_id); | |
1015 return M_PROPERTY_OK; | |
22478 | 1016 |
1017 default: | |
31077 | 1018 return M_PROPERTY_NOT_IMPLEMENTED; |
22478 | 1019 } |
1020 } | |
1021 | |
31156 | 1022 static int mp_property_program(m_option_t *prop, int action, void *arg, |
1023 MPContext *mpctx) | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
1024 { |
22478 | 1025 demux_program_t prog; |
1026 | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
1027 switch (action) { |
22478 | 1028 case M_PROPERTY_STEP_UP: |
1029 case M_PROPERTY_SET: | |
31077 | 1030 if (action == M_PROPERTY_SET && arg) |
1031 prog.progid = *((int *) arg); | |
1032 else | |
1033 prog.progid = -1; | |
1034 if (demux_control | |
1035 (mpctx->demuxer, DEMUXER_CTRL_IDENTIFY_PROGRAM, | |
1036 &prog) == DEMUXER_CTRL_NOTIMPL) | |
1037 return M_PROPERTY_ERROR; | |
22478 | 1038 |
31077 | 1039 if (prog.aid < 0 && prog.vid < 0) { |
1040 mp_msg(MSGT_CPLAYER, MSGL_ERR, "Selected program contains no audio or video streams!\n"); | |
1041 return M_PROPERTY_ERROR; | |
1042 } | |
1043 mp_property_do("switch_audio", M_PROPERTY_SET, &prog.aid, mpctx); | |
1044 mp_property_do("switch_video", M_PROPERTY_SET, &prog.vid, mpctx); | |
1045 return M_PROPERTY_OK; | |
22478 | 1046 |
1047 default: | |
31077 | 1048 return M_PROPERTY_NOT_IMPLEMENTED; |
22478 | 1049 } |
1050 } | |
1051 | |
1052 ///@} | |
1053 | |
1054 /// \defgroup VideoProperties Video properties | |
1055 /// \ingroup Properties | |
1056 ///@{ | |
1057 | |
1058 /// Fullscreen state (RW) | |
31156 | 1059 static int mp_property_fullscreen(m_option_t *prop, int action, void *arg, |
1060 MPContext *mpctx) | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
1061 { |
22478 | 1062 |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
1063 if (!mpctx->video_out) |
31077 | 1064 return M_PROPERTY_UNAVAILABLE; |
22478 | 1065 |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
1066 switch (action) { |
22478 | 1067 case M_PROPERTY_SET: |
31077 | 1068 if (!arg) |
1069 return M_PROPERTY_ERROR; | |
1070 M_PROPERTY_CLAMP(prop, *(int *) arg); | |
1071 if (vo_fs == !!*(int *) arg) | |
1072 return M_PROPERTY_OK; | |
22478 | 1073 case M_PROPERTY_STEP_UP: |
1074 case M_PROPERTY_STEP_DOWN: | |
27343 | 1075 #ifdef CONFIG_GUI |
31077 | 1076 if (use_gui) |
31312
0b7792622c88
Remove Gui-specific slave commands and associated key-bindings and other code.
reimar
parents:
31200
diff
changeset
|
1077 guiGetEvent(guiIEvent, (char *) MP_CMD_VO_FULLSCREEN); |
31077 | 1078 else |
22478 | 1079 #endif |
31077 | 1080 if (vo_config_count) |
1081 mpctx->video_out->control(VOCTRL_FULLSCREEN, 0); | |
1082 return M_PROPERTY_OK; | |
22478 | 1083 default: |
31077 | 1084 return m_property_flag(prop, action, arg, &vo_fs); |
22478 | 1085 } |
1086 } | |
1087 | |
31156 | 1088 static int mp_property_deinterlace(m_option_t *prop, int action, |
1089 void *arg, MPContext *mpctx) | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
1090 { |
22478 | 1091 int deinterlace; |
1092 vf_instance_t *vf; | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
1093 if (!mpctx->sh_video || !mpctx->sh_video->vfilter) |
31077 | 1094 return M_PROPERTY_UNAVAILABLE; |
22478 | 1095 vf = mpctx->sh_video->vfilter; |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
1096 switch (action) { |
22478 | 1097 case M_PROPERTY_GET: |
31077 | 1098 if (!arg) |
1099 return M_PROPERTY_ERROR; | |
1100 vf->control(vf, VFCTRL_GET_DEINTERLACE, arg); | |
1101 return M_PROPERTY_OK; | |
22478 | 1102 case M_PROPERTY_SET: |
31077 | 1103 if (!arg) |
1104 return M_PROPERTY_ERROR; | |
1105 M_PROPERTY_CLAMP(prop, *(int *) arg); | |
1106 vf->control(vf, VFCTRL_SET_DEINTERLACE, arg); | |
1107 return M_PROPERTY_OK; | |
22478 | 1108 case M_PROPERTY_STEP_UP: |
1109 case M_PROPERTY_STEP_DOWN: | |
31077 | 1110 vf->control(vf, VFCTRL_GET_DEINTERLACE, &deinterlace); |
1111 deinterlace = !deinterlace; | |
1112 vf->control(vf, VFCTRL_SET_DEINTERLACE, &deinterlace); | |
1113 set_osd_msg(OSD_MSG_SPEED, 1, osd_duration, MSGTR_OSDDeinterlace, | |
1114 deinterlace ? MSGTR_Enabled : MSGTR_Disabled); | |
1115 return M_PROPERTY_OK; | |
22478 | 1116 } |
1117 return M_PROPERTY_NOT_IMPLEMENTED; | |
1118 } | |
1119 | |
32438
faefba58f413
Implement a basic capture feature, available through -capture.
diego
parents:
32419
diff
changeset
|
1120 static int mp_property_capture(m_option_t *prop, int action, |
faefba58f413
Implement a basic capture feature, available through -capture.
diego
parents:
32419
diff
changeset
|
1121 void *arg, MPContext *mpctx) |
faefba58f413
Implement a basic capture feature, available through -capture.
diego
parents:
32419
diff
changeset
|
1122 { |
faefba58f413
Implement a basic capture feature, available through -capture.
diego
parents:
32419
diff
changeset
|
1123 int ret; |
faefba58f413
Implement a basic capture feature, available through -capture.
diego
parents:
32419
diff
changeset
|
1124 int capturing = !!mpctx->stream->capture_file; |
faefba58f413
Implement a basic capture feature, available through -capture.
diego
parents:
32419
diff
changeset
|
1125 |
faefba58f413
Implement a basic capture feature, available through -capture.
diego
parents:
32419
diff
changeset
|
1126 if (!mpctx->stream) |
faefba58f413
Implement a basic capture feature, available through -capture.
diego
parents:
32419
diff
changeset
|
1127 return M_PROPERTY_UNAVAILABLE; |
32443
5aae26f4bb59
Simplify and fix capture feature to not always return an error.
reimar
parents:
32442
diff
changeset
|
1128 if (!capture_dump) { |
5aae26f4bb59
Simplify and fix capture feature to not always return an error.
reimar
parents:
32442
diff
changeset
|
1129 mp_msg(MSGT_GLOBAL, MSGL_ERR, |
5aae26f4bb59
Simplify and fix capture feature to not always return an error.
reimar
parents:
32442
diff
changeset
|
1130 "Capturing not enabled (forgot -capture parameter?)\n"); |
5aae26f4bb59
Simplify and fix capture feature to not always return an error.
reimar
parents:
32442
diff
changeset
|
1131 return M_PROPERTY_ERROR; |
5aae26f4bb59
Simplify and fix capture feature to not always return an error.
reimar
parents:
32442
diff
changeset
|
1132 } |
32438
faefba58f413
Implement a basic capture feature, available through -capture.
diego
parents:
32419
diff
changeset
|
1133 |
faefba58f413
Implement a basic capture feature, available through -capture.
diego
parents:
32419
diff
changeset
|
1134 ret = m_property_flag(prop, action, arg, &capturing); |
faefba58f413
Implement a basic capture feature, available through -capture.
diego
parents:
32419
diff
changeset
|
1135 if (ret == M_PROPERTY_OK && capturing != !!mpctx->stream->capture_file) { |
faefba58f413
Implement a basic capture feature, available through -capture.
diego
parents:
32419
diff
changeset
|
1136 if (capturing) { |
32444
99efb38a4f4e
Change capture feature to append to file instead of overwriting.
reimar
parents:
32443
diff
changeset
|
1137 mpctx->stream->capture_file = fopen(stream_dump_name, "ab"); |
32443
5aae26f4bb59
Simplify and fix capture feature to not always return an error.
reimar
parents:
32442
diff
changeset
|
1138 if (!mpctx->stream->capture_file) { |
32438
faefba58f413
Implement a basic capture feature, available through -capture.
diego
parents:
32419
diff
changeset
|
1139 mp_msg(MSGT_GLOBAL, MSGL_ERR, |
faefba58f413
Implement a basic capture feature, available through -capture.
diego
parents:
32419
diff
changeset
|
1140 "Error opening capture file: %s\n", strerror(errno)); |
faefba58f413
Implement a basic capture feature, available through -capture.
diego
parents:
32419
diff
changeset
|
1141 ret = M_PROPERTY_ERROR; |
faefba58f413
Implement a basic capture feature, available through -capture.
diego
parents:
32419
diff
changeset
|
1142 } |
faefba58f413
Implement a basic capture feature, available through -capture.
diego
parents:
32419
diff
changeset
|
1143 } else { |
faefba58f413
Implement a basic capture feature, available through -capture.
diego
parents:
32419
diff
changeset
|
1144 fclose(mpctx->stream->capture_file); |
faefba58f413
Implement a basic capture feature, available through -capture.
diego
parents:
32419
diff
changeset
|
1145 mpctx->stream->capture_file = NULL; |
faefba58f413
Implement a basic capture feature, available through -capture.
diego
parents:
32419
diff
changeset
|
1146 } |
faefba58f413
Implement a basic capture feature, available through -capture.
diego
parents:
32419
diff
changeset
|
1147 } |
faefba58f413
Implement a basic capture feature, available through -capture.
diego
parents:
32419
diff
changeset
|
1148 |
faefba58f413
Implement a basic capture feature, available through -capture.
diego
parents:
32419
diff
changeset
|
1149 switch (ret) { |
faefba58f413
Implement a basic capture feature, available through -capture.
diego
parents:
32419
diff
changeset
|
1150 case M_PROPERTY_ERROR: |
faefba58f413
Implement a basic capture feature, available through -capture.
diego
parents:
32419
diff
changeset
|
1151 set_osd_msg(OSD_MSG_SPEED, 1, osd_duration, MSGTR_OSDCapturingFailure); |
faefba58f413
Implement a basic capture feature, available through -capture.
diego
parents:
32419
diff
changeset
|
1152 break; |
faefba58f413
Implement a basic capture feature, available through -capture.
diego
parents:
32419
diff
changeset
|
1153 case M_PROPERTY_OK: |
faefba58f413
Implement a basic capture feature, available through -capture.
diego
parents:
32419
diff
changeset
|
1154 set_osd_msg(OSD_MSG_SPEED, 1, osd_duration, MSGTR_OSDCapturing, |
faefba58f413
Implement a basic capture feature, available through -capture.
diego
parents:
32419
diff
changeset
|
1155 mpctx->stream->capture_file ? MSGTR_Enabled : MSGTR_Disabled); |
faefba58f413
Implement a basic capture feature, available through -capture.
diego
parents:
32419
diff
changeset
|
1156 break; |
faefba58f413
Implement a basic capture feature, available through -capture.
diego
parents:
32419
diff
changeset
|
1157 default: |
faefba58f413
Implement a basic capture feature, available through -capture.
diego
parents:
32419
diff
changeset
|
1158 break; |
faefba58f413
Implement a basic capture feature, available through -capture.
diego
parents:
32419
diff
changeset
|
1159 } |
faefba58f413
Implement a basic capture feature, available through -capture.
diego
parents:
32419
diff
changeset
|
1160 |
faefba58f413
Implement a basic capture feature, available through -capture.
diego
parents:
32419
diff
changeset
|
1161 return ret; |
faefba58f413
Implement a basic capture feature, available through -capture.
diego
parents:
32419
diff
changeset
|
1162 } |
faefba58f413
Implement a basic capture feature, available through -capture.
diego
parents:
32419
diff
changeset
|
1163 |
22478 | 1164 /// Panscan (RW) |
31156 | 1165 static int mp_property_panscan(m_option_t *prop, int action, void *arg, |
1166 MPContext *mpctx) | |
22478 | 1167 { |
1168 | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
1169 if (!mpctx->video_out |
31077 | 1170 || mpctx->video_out->control(VOCTRL_GET_PANSCAN, NULL) != VO_TRUE) |
1171 return M_PROPERTY_UNAVAILABLE; | |
22478 | 1172 |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
1173 switch (action) { |
22478 | 1174 case M_PROPERTY_SET: |
31077 | 1175 if (!arg) |
1176 return M_PROPERTY_ERROR; | |
1177 M_PROPERTY_CLAMP(prop, *(float *) arg); | |
1178 vo_panscan = *(float *) arg; | |
1179 mpctx->video_out->control(VOCTRL_SET_PANSCAN, NULL); | |
1180 return M_PROPERTY_OK; | |
22478 | 1181 case M_PROPERTY_STEP_UP: |
1182 case M_PROPERTY_STEP_DOWN: | |
31077 | 1183 vo_panscan += (arg ? *(float *) arg : 0.1) * |
1184 (action == M_PROPERTY_STEP_DOWN ? -1 : 1); | |
1185 if (vo_panscan > 1) | |
1186 vo_panscan = 1; | |
1187 else if (vo_panscan < 0) | |
1188 vo_panscan = 0; | |
1189 mpctx->video_out->control(VOCTRL_SET_PANSCAN, NULL); | |
1190 return M_PROPERTY_OK; | |
22478 | 1191 default: |
31077 | 1192 return m_property_float_range(prop, action, arg, &vo_panscan); |
22478 | 1193 } |
1194 } | |
1195 | |
1196 /// Helper to set vo flags. | |
1197 /** \ingroup PropertyImplHelper | |
1198 */ | |
31156 | 1199 static int mp_property_vo_flag(m_option_t *prop, int action, void *arg, |
1200 int vo_ctrl, int *vo_var, MPContext *mpctx) | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
1201 { |
22478 | 1202 |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
1203 if (!mpctx->video_out) |
31077 | 1204 return M_PROPERTY_UNAVAILABLE; |
22478 | 1205 |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
1206 switch (action) { |
22478 | 1207 case M_PROPERTY_SET: |
31077 | 1208 if (!arg) |
1209 return M_PROPERTY_ERROR; | |
1210 M_PROPERTY_CLAMP(prop, *(int *) arg); | |
1211 if (*vo_var == !!*(int *) arg) | |
1212 return M_PROPERTY_OK; | |
22478 | 1213 case M_PROPERTY_STEP_UP: |
1214 case M_PROPERTY_STEP_DOWN: | |
31077 | 1215 if (vo_config_count) |
1216 mpctx->video_out->control(vo_ctrl, 0); | |
1217 return M_PROPERTY_OK; | |
22478 | 1218 default: |
31077 | 1219 return m_property_flag(prop, action, arg, vo_var); |
22478 | 1220 } |
1221 } | |
1222 | |
1223 /// Window always on top (RW) | |
31156 | 1224 static int mp_property_ontop(m_option_t *prop, int action, void *arg, |
1225 MPContext *mpctx) | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
1226 { |
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
1227 return mp_property_vo_flag(prop, action, arg, VOCTRL_ONTOP, &vo_ontop, |
31077 | 1228 mpctx); |
22478 | 1229 } |
1230 | |
1231 /// Display in the root window (RW) | |
31156 | 1232 static int mp_property_rootwin(m_option_t *prop, int action, void *arg, |
1233 MPContext *mpctx) | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
1234 { |
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
1235 return mp_property_vo_flag(prop, action, arg, VOCTRL_ROOTWIN, |
31077 | 1236 &vo_rootwin, mpctx); |
22478 | 1237 } |
1238 | |
1239 /// Show window borders (RW) | |
31156 | 1240 static int mp_property_border(m_option_t *prop, int action, void *arg, |
1241 MPContext *mpctx) | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
1242 { |
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
1243 return mp_property_vo_flag(prop, action, arg, VOCTRL_BORDER, |
31077 | 1244 &vo_border, mpctx); |
22478 | 1245 } |
1246 | |
1247 /// Framedropping state (RW) | |
31156 | 1248 static int mp_property_framedropping(m_option_t *prop, int action, |
1249 void *arg, MPContext *mpctx) | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
1250 { |
22478 | 1251 |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
1252 if (!mpctx->sh_video) |
31077 | 1253 return M_PROPERTY_UNAVAILABLE; |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
1254 |
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
1255 switch (action) { |
22478 | 1256 case M_PROPERTY_PRINT: |
31077 | 1257 if (!arg) |
1258 return M_PROPERTY_ERROR; | |
1259 *(char **) arg = strdup(frame_dropping == 1 ? MSGTR_Enabled : | |
1260 (frame_dropping == 2 ? MSGTR_HardFrameDrop : | |
1261 MSGTR_Disabled)); | |
1262 return M_PROPERTY_OK; | |
22478 | 1263 default: |
31077 | 1264 return m_property_choice(prop, action, arg, &frame_dropping); |
22478 | 1265 } |
1266 } | |
1267 | |
1268 /// Color settings, try to use vf/vo then fall back on TV. (RW) | |
31156 | 1269 static int mp_property_gamma(m_option_t *prop, int action, void *arg, |
1270 MPContext *mpctx) | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
1271 { |
25465
6b9447dc7590
Check availability before check argument for getting gamma properties.
ulion
parents:
25464
diff
changeset
|
1272 int *gamma = prop->priv, r, val; |
22478 | 1273 |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
1274 if (!mpctx->sh_video) |
31077 | 1275 return M_PROPERTY_UNAVAILABLE; |
22478 | 1276 |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
1277 if (gamma[0] == 1000) { |
31077 | 1278 gamma[0] = 0; |
1279 get_video_colors(mpctx->sh_video, prop->name, gamma); | |
22478 | 1280 } |
1281 | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
1282 switch (action) { |
22478 | 1283 case M_PROPERTY_SET: |
31077 | 1284 if (!arg) |
1285 return M_PROPERTY_ERROR; | |
1286 M_PROPERTY_CLAMP(prop, *(int *) arg); | |
1287 *gamma = *(int *) arg; | |
1288 r = set_video_colors(mpctx->sh_video, prop->name, *gamma); | |
1289 if (r <= 0) | |
1290 break; | |
1291 return r; | |
22478 | 1292 case M_PROPERTY_GET: |
31077 | 1293 if (get_video_colors(mpctx->sh_video, prop->name, &val) > 0) { |
1294 if (!arg) | |
1295 return M_PROPERTY_ERROR; | |
1296 *(int *)arg = val; | |
1297 return M_PROPERTY_OK; | |
1298 } | |
1299 break; | |
22478 | 1300 case M_PROPERTY_STEP_UP: |
1301 case M_PROPERTY_STEP_DOWN: | |
31077 | 1302 *gamma += (arg ? *(int *) arg : 1) * |
1303 (action == M_PROPERTY_STEP_DOWN ? -1 : 1); | |
1304 M_PROPERTY_CLAMP(prop, *gamma); | |
1305 r = set_video_colors(mpctx->sh_video, prop->name, *gamma); | |
1306 if (r <= 0) | |
1307 break; | |
1308 return r; | |
22478 | 1309 default: |
31077 | 1310 return M_PROPERTY_NOT_IMPLEMENTED; |
22478 | 1311 } |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
1312 |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27069
diff
changeset
|
1313 #ifdef CONFIG_TV |
22478 | 1314 if (mpctx->demuxer->type == DEMUXER_TYPE_TV) { |
31077 | 1315 int l = strlen(prop->name); |
1316 char tv_prop[3 + l + 1]; | |
1317 sprintf(tv_prop, "tv_%s", prop->name); | |
1318 return mp_property_do(tv_prop, action, arg, mpctx); | |
22478 | 1319 } |
1320 #endif | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
1321 |
22478 | 1322 return M_PROPERTY_UNAVAILABLE; |
1323 } | |
1324 | |
1325 /// VSync (RW) | |
31156 | 1326 static int mp_property_vsync(m_option_t *prop, int action, void *arg, |
1327 MPContext *mpctx) | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
1328 { |
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
1329 return m_property_flag(prop, action, arg, &vo_vsync); |
22478 | 1330 } |
1331 | |
1332 /// Video codec tag (RO) | |
31156 | 1333 static int mp_property_video_format(m_option_t *prop, int action, |
1334 void *arg, MPContext *mpctx) | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
1335 { |
23394
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
1336 char* meta; |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
1337 if (!mpctx->sh_video) |
31077 | 1338 return M_PROPERTY_UNAVAILABLE; |
23394
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
1339 switch(action) { |
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
1340 case M_PROPERTY_PRINT: |
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
1341 if (!arg) |
31077 | 1342 return M_PROPERTY_ERROR; |
23394
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
1343 switch(mpctx->sh_video->format) { |
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
1344 case 0x10000001: |
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
1345 meta = strdup ("mpeg1"); break; |
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
1346 case 0x10000002: |
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
1347 meta = strdup ("mpeg2"); break; |
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
1348 case 0x10000004: |
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
1349 meta = strdup ("mpeg4"); break; |
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
1350 case 0x10000005: |
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
1351 meta = strdup ("h264"); break; |
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
1352 default: |
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
1353 if(mpctx->sh_video->format >= 0x20202020) { |
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
1354 meta = malloc(5); |
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
1355 sprintf (meta, "%.4s", (char *) &mpctx->sh_video->format); |
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
1356 } else { |
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
1357 meta = malloc(20); |
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
1358 sprintf (meta, "0x%08X", mpctx->sh_video->format); |
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
1359 } |
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
1360 } |
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
1361 *(char**)arg = meta; |
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
1362 return M_PROPERTY_OK; |
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
1363 } |
22478 | 1364 return m_property_int_ro(prop, action, arg, mpctx->sh_video->format); |
1365 } | |
1366 | |
23394
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
1367 /// Video codec name (RO) |
31156 | 1368 static int mp_property_video_codec(m_option_t *prop, int action, |
1369 void *arg, MPContext *mpctx) | |
23394
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
1370 { |
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
1371 if (!mpctx->sh_video || !mpctx->sh_video->codec) |
31077 | 1372 return M_PROPERTY_UNAVAILABLE; |
23394
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
1373 return m_property_string_ro(prop, action, arg, mpctx->sh_video->codec->name); |
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
1374 } |
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
1375 |
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
1376 |
22478 | 1377 /// Video bitrate (RO) |
31156 | 1378 static int mp_property_video_bitrate(m_option_t *prop, int action, |
1379 void *arg, MPContext *mpctx) | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
1380 { |
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
1381 if (!mpctx->sh_video) |
31077 | 1382 return M_PROPERTY_UNAVAILABLE; |
23394
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
1383 return m_property_bitrate(prop, action, arg, mpctx->sh_video->i_bps); |
22478 | 1384 } |
1385 | |
1386 /// Video display width (RO) | |
31156 | 1387 static int mp_property_width(m_option_t *prop, int action, void *arg, |
1388 MPContext *mpctx) | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
1389 { |
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
1390 if (!mpctx->sh_video) |
31077 | 1391 return M_PROPERTY_UNAVAILABLE; |
22478 | 1392 return m_property_int_ro(prop, action, arg, mpctx->sh_video->disp_w); |
1393 } | |
1394 | |
1395 /// Video display height (RO) | |
31156 | 1396 static int mp_property_height(m_option_t *prop, int action, void *arg, |
1397 MPContext *mpctx) | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
1398 { |
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
1399 if (!mpctx->sh_video) |
31077 | 1400 return M_PROPERTY_UNAVAILABLE; |
22478 | 1401 return m_property_int_ro(prop, action, arg, mpctx->sh_video->disp_h); |
1402 } | |
1403 | |
1404 /// Video fps (RO) | |
31156 | 1405 static int mp_property_fps(m_option_t *prop, int action, void *arg, |
1406 MPContext *mpctx) | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
1407 { |
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
1408 if (!mpctx->sh_video) |
31077 | 1409 return M_PROPERTY_UNAVAILABLE; |
22478 | 1410 return m_property_float_ro(prop, action, arg, mpctx->sh_video->fps); |
1411 } | |
1412 | |
1413 /// Video aspect (RO) | |
31156 | 1414 static int mp_property_aspect(m_option_t *prop, int action, void *arg, |
1415 MPContext *mpctx) | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
1416 { |
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
1417 if (!mpctx->sh_video) |
31077 | 1418 return M_PROPERTY_UNAVAILABLE; |
22478 | 1419 return m_property_float_ro(prop, action, arg, mpctx->sh_video->aspect); |
1420 } | |
1421 | |
1422 ///@} | |
1423 | |
1424 /// \defgroup SubProprties Subtitles properties | |
1425 /// \ingroup Properties | |
1426 ///@{ | |
1427 | |
1428 /// Text subtitle position (RW) | |
31156 | 1429 static int mp_property_sub_pos(m_option_t *prop, int action, void *arg, |
1430 MPContext *mpctx) | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
1431 { |
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
1432 switch (action) { |
22478 | 1433 case M_PROPERTY_SET: |
31077 | 1434 if (!arg) |
1435 return M_PROPERTY_ERROR; | |
22478 | 1436 case M_PROPERTY_STEP_UP: |
1437 case M_PROPERTY_STEP_DOWN: | |
31077 | 1438 vo_osd_changed(OSDTYPE_SUBTITLE); |
22478 | 1439 default: |
31077 | 1440 return m_property_int_range(prop, action, arg, &sub_pos); |
22478 | 1441 } |
1442 } | |
1443 | |
1444 /// Selected subtitles (RW) | |
31156 | 1445 static int mp_property_sub(m_option_t *prop, int action, void *arg, |
1446 MPContext *mpctx) | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
1447 { |
22478 | 1448 demux_stream_t *const d_sub = mpctx->d_sub; |
31612
7fc1f051a19f
Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents:
31312
diff
changeset
|
1449 int global_sub_size; |
22478 | 1450 int source = -1, reset_spu = 0; |
31612
7fc1f051a19f
Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents:
31312
diff
changeset
|
1451 int source_pos = -1; |
29668
ecc719c6d7a9
Make update_subtitles work without sh_video for text subtitles.
reimar
parents:
29617
diff
changeset
|
1452 double pts = 0; |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
1453 char *sub_name; |
22478 | 1454 |
31612
7fc1f051a19f
Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents:
31312
diff
changeset
|
1455 update_global_sub_size(mpctx); |
7fc1f051a19f
Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents:
31312
diff
changeset
|
1456 global_sub_size = mpctx->global_sub_size; |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
1457 if (global_sub_size <= 0) |
31077 | 1458 return M_PROPERTY_UNAVAILABLE; |
22478 | 1459 |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
1460 switch (action) { |
22478 | 1461 case M_PROPERTY_GET: |
31077 | 1462 if (!arg) |
1463 return M_PROPERTY_ERROR; | |
1464 *(int *) arg = mpctx->global_sub_pos; | |
1465 return M_PROPERTY_OK; | |
22478 | 1466 case M_PROPERTY_PRINT: |
31077 | 1467 if (!arg) |
1468 return M_PROPERTY_ERROR; | |
1469 *(char **) arg = malloc(64); | |
1470 (*(char **) arg)[63] = 0; | |
1471 sub_name = 0; | |
1472 if (subdata) | |
1473 sub_name = subdata->filename; | |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27069
diff
changeset
|
1474 #ifdef CONFIG_ASS |
31077 | 1475 if (ass_track && ass_track->name) |
1476 sub_name = ass_track->name; | |
22478 | 1477 #endif |
31077 | 1478 if (sub_name) { |
32588 | 1479 const char *tmp = mp_basename(sub_name); |
22478 | 1480 |
31077 | 1481 snprintf(*(char **) arg, 63, "(%d) %s%s", |
1482 mpctx->set_of_sub_pos + 1, | |
1483 strlen(tmp) < 20 ? "" : "...", | |
1484 strlen(tmp) < 20 ? tmp : tmp + strlen(tmp) - 19); | |
1485 return M_PROPERTY_OK; | |
1486 } | |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27069
diff
changeset
|
1487 #ifdef CONFIG_DVDNAV |
31077 | 1488 if (mpctx->stream->type == STREAMTYPE_DVDNAV) { |
1489 if (vo_spudec && dvdsub_id >= 0) { | |
1490 unsigned char lang[3]; | |
1491 if (mp_dvdnav_lang_from_sid(mpctx->stream, dvdsub_id, lang)) { | |
1492 snprintf(*(char **) arg, 63, "(%d) %s", dvdsub_id, lang); | |
1493 return M_PROPERTY_OK; | |
1494 } | |
1495 } | |
1496 } | |
22478 | 1497 #endif |
1498 | |
31877
e30fe0cb79cd
Add incomplete clipinf reading support to display audio
reimar
parents:
31805
diff
changeset
|
1499 if (mpctx->stream->type == STREAMTYPE_BD |
e30fe0cb79cd
Add incomplete clipinf reading support to display audio
reimar
parents:
31805
diff
changeset
|
1500 && d_sub && d_sub->sh && dvdsub_id >= 0) { |
e30fe0cb79cd
Add incomplete clipinf reading support to display audio
reimar
parents:
31805
diff
changeset
|
1501 const char *lang = bd_lang_from_id(mpctx->stream, ((sh_sub_t*)d_sub->sh)->sid); |
e30fe0cb79cd
Add incomplete clipinf reading support to display audio
reimar
parents:
31805
diff
changeset
|
1502 if (!lang) lang = MSGTR_Unknown; |
e30fe0cb79cd
Add incomplete clipinf reading support to display audio
reimar
parents:
31805
diff
changeset
|
1503 snprintf(*(char **) arg, 63, "(%d) %s", dvdsub_id, lang); |
e30fe0cb79cd
Add incomplete clipinf reading support to display audio
reimar
parents:
31805
diff
changeset
|
1504 return M_PROPERTY_OK; |
e30fe0cb79cd
Add incomplete clipinf reading support to display audio
reimar
parents:
31805
diff
changeset
|
1505 } |
e30fe0cb79cd
Add incomplete clipinf reading support to display audio
reimar
parents:
31805
diff
changeset
|
1506 |
31077 | 1507 if ((mpctx->demuxer->type == DEMUXER_TYPE_MATROSKA |
26084
ec5749eb6f5f
Fill sh_sub_t.lang in lavf, mkv and ogg demuxers. Use it for printing subtitle
eugeni
parents:
26083
diff
changeset
|
1508 || mpctx->demuxer->type == DEMUXER_TYPE_LAVF |
27457
16a2329e8776
handle the lavfpref demuxer in the same way as the lavf one
aurel
parents:
27393
diff
changeset
|
1509 || mpctx->demuxer->type == DEMUXER_TYPE_LAVF_PREFERRED |
26084
ec5749eb6f5f
Fill sh_sub_t.lang in lavf, mkv and ogg demuxers. Use it for printing subtitle
eugeni
parents:
26083
diff
changeset
|
1510 || mpctx->demuxer->type == DEMUXER_TYPE_OGG) |
ec5749eb6f5f
Fill sh_sub_t.lang in lavf, mkv and ogg demuxers. Use it for printing subtitle
eugeni
parents:
26083
diff
changeset
|
1511 && d_sub && d_sub->sh && dvdsub_id >= 0) { |
ec5749eb6f5f
Fill sh_sub_t.lang in lavf, mkv and ogg demuxers. Use it for printing subtitle
eugeni
parents:
26083
diff
changeset
|
1512 const char* lang = ((sh_sub_t*)d_sub->sh)->lang; |
ec5749eb6f5f
Fill sh_sub_t.lang in lavf, mkv and ogg demuxers. Use it for printing subtitle
eugeni
parents:
26083
diff
changeset
|
1513 if (!lang) lang = MSGTR_Unknown; |
31077 | 1514 snprintf(*(char **) arg, 63, "(%d) %s", dvdsub_id, lang); |
1515 return M_PROPERTY_OK; | |
1516 } | |
26084
ec5749eb6f5f
Fill sh_sub_t.lang in lavf, mkv and ogg demuxers. Use it for printing subtitle
eugeni
parents:
26083
diff
changeset
|
1517 |
31077 | 1518 if (vo_vobsub && vobsub_id >= 0) { |
1519 const char *language = MSGTR_Unknown; | |
1520 language = vobsub_get_id(vo_vobsub, (unsigned int) vobsub_id); | |
1521 snprintf(*(char **) arg, 63, "(%d) %s", | |
1522 vobsub_id, language ? language : MSGTR_Unknown); | |
1523 return M_PROPERTY_OK; | |
1524 } | |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27069
diff
changeset
|
1525 #ifdef CONFIG_DVDREAD |
31077 | 1526 if (vo_spudec && mpctx->stream->type == STREAMTYPE_DVD |
1527 && dvdsub_id >= 0) { | |
1528 char lang[3]; | |
1529 int code = dvd_lang_from_sid(mpctx->stream, dvdsub_id); | |
1530 lang[0] = code >> 8; | |
1531 lang[1] = code; | |
1532 lang[2] = 0; | |
1533 snprintf(*(char **) arg, 63, "(%d) %s", dvdsub_id, lang); | |
1534 return M_PROPERTY_OK; | |
1535 } | |
22478 | 1536 #endif |
31077 | 1537 if (dvdsub_id >= 0) { |
1538 snprintf(*(char **) arg, 63, "(%d) %s", dvdsub_id, MSGTR_Unknown); | |
1539 return M_PROPERTY_OK; | |
1540 } | |
1541 snprintf(*(char **) arg, 63, MSGTR_Disabled); | |
1542 return M_PROPERTY_OK; | |
22478 | 1543 |
1544 case M_PROPERTY_SET: | |
31077 | 1545 if (!arg) |
1546 return M_PROPERTY_ERROR; | |
1547 if (*(int *) arg < -1) | |
1548 *(int *) arg = -1; | |
1549 else if (*(int *) arg >= global_sub_size) | |
1550 *(int *) arg = global_sub_size - 1; | |
1551 mpctx->global_sub_pos = *(int *) arg; | |
1552 break; | |
22478 | 1553 case M_PROPERTY_STEP_UP: |
31077 | 1554 mpctx->global_sub_pos += 2; |
1555 mpctx->global_sub_pos = | |
1556 (mpctx->global_sub_pos % (global_sub_size + 1)) - 1; | |
1557 break; | |
22478 | 1558 case M_PROPERTY_STEP_DOWN: |
31077 | 1559 mpctx->global_sub_pos += global_sub_size + 1; |
1560 mpctx->global_sub_pos = | |
1561 (mpctx->global_sub_pos % (global_sub_size + 1)) - 1; | |
1562 break; | |
22478 | 1563 default: |
31077 | 1564 return M_PROPERTY_NOT_IMPLEMENTED; |
22478 | 1565 } |
1566 | |
31612
7fc1f051a19f
Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents:
31312
diff
changeset
|
1567 if (mpctx->global_sub_pos >= 0) { |
31077 | 1568 source = sub_source(mpctx); |
31612
7fc1f051a19f
Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents:
31312
diff
changeset
|
1569 source_pos = sub_source_pos(mpctx); |
7fc1f051a19f
Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents:
31312
diff
changeset
|
1570 } |
22478 | 1571 |
1572 mp_msg(MSGT_CPLAYER, MSGL_DBG3, | |
31077 | 1573 "subtitles: %d subs, (v@%d s@%d d@%d), @%d, source @%d\n", |
1574 global_sub_size, | |
31612
7fc1f051a19f
Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents:
31312
diff
changeset
|
1575 mpctx->sub_counts[SUB_SOURCE_VOBSUB], |
7fc1f051a19f
Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents:
31312
diff
changeset
|
1576 mpctx->sub_counts[SUB_SOURCE_SUBS], |
7fc1f051a19f
Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents:
31312
diff
changeset
|
1577 mpctx->sub_counts[SUB_SOURCE_DEMUX], |
31077 | 1578 mpctx->global_sub_pos, source); |
22478 | 1579 |
1580 mpctx->set_of_sub_pos = -1; | |
1581 subdata = NULL; | |
1582 | |
1583 vobsub_id = -1; | |
1584 dvdsub_id = -1; | |
1585 if (d_sub) { | |
31077 | 1586 if (d_sub->id > -2) |
1587 reset_spu = 1; | |
1588 d_sub->id = -2; | |
22478 | 1589 } |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27069
diff
changeset
|
1590 #ifdef CONFIG_ASS |
22478 | 1591 ass_track = 0; |
1592 #endif | |
1593 | |
1594 if (source == SUB_SOURCE_VOBSUB) { | |
31904
f8af1068e397
100l, re-add vobsub_get_id_by_index call accidentally removed in
reimar
parents:
31877
diff
changeset
|
1595 vobsub_id = vobsub_get_id_by_index(vo_vobsub, source_pos); |
22478 | 1596 } else if (source == SUB_SOURCE_SUBS) { |
31612
7fc1f051a19f
Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents:
31312
diff
changeset
|
1597 mpctx->set_of_sub_pos = source_pos; |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27069
diff
changeset
|
1598 #ifdef CONFIG_ASS |
31077 | 1599 if (ass_enabled && mpctx->set_of_ass_tracks[mpctx->set_of_sub_pos]) |
1600 ass_track = mpctx->set_of_ass_tracks[mpctx->set_of_sub_pos]; | |
1601 else | |
22478 | 1602 #endif |
31077 | 1603 { |
1604 subdata = mpctx->set_of_subtitles[mpctx->set_of_sub_pos]; | |
1605 vo_osd_changed(OSDTYPE_SUBTITLE); | |
1606 } | |
22478 | 1607 } else if (source == SUB_SOURCE_DEMUX) { |
31612
7fc1f051a19f
Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents:
31312
diff
changeset
|
1608 dvdsub_id = source_pos; |
31077 | 1609 if (d_sub && dvdsub_id < MAX_S_STREAMS) { |
1610 int i = 0; | |
1611 // default: assume 1:1 mapping of sid and stream id | |
1612 d_sub->id = dvdsub_id; | |
1613 d_sub->sh = mpctx->demuxer->s_streams[d_sub->id]; | |
1614 ds_free_packs(d_sub); | |
1615 for (i = 0; i < MAX_S_STREAMS; i++) { | |
1616 sh_sub_t *sh = mpctx->demuxer->s_streams[i]; | |
1617 if (sh && sh->sid == dvdsub_id) { | |
1618 d_sub->id = i; | |
1619 d_sub->sh = sh; | |
1620 break; | |
1621 } | |
1622 } | |
1623 if (d_sub->sh && d_sub->id >= 0) { | |
1624 sh_sub_t *sh = d_sub->sh; | |
1625 if (sh->type == 'v') | |
1626 init_vo_spudec(); | |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27069
diff
changeset
|
1627 #ifdef CONFIG_ASS |
31077 | 1628 else if (ass_enabled) |
1629 ass_track = sh->ass_track; | |
22478 | 1630 #endif |
23766
f0c2f9de85ba
Make sure that sub->id is -2 and sub->sh is NULL if subtitle doesn't
reimar
parents:
23758
diff
changeset
|
1631 } else { |
f0c2f9de85ba
Make sure that sub->id is -2 and sub->sh is NULL if subtitle doesn't
reimar
parents:
23758
diff
changeset
|
1632 d_sub->id = -2; |
f0c2f9de85ba
Make sure that sub->id is -2 and sub->sh is NULL if subtitle doesn't
reimar
parents:
23758
diff
changeset
|
1633 d_sub->sh = NULL; |
31077 | 1634 } |
1635 } | |
22478 | 1636 } |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27069
diff
changeset
|
1637 #ifdef CONFIG_DVDREAD |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
1638 if (vo_spudec |
31077 | 1639 && (mpctx->stream->type == STREAMTYPE_DVD |
1640 || mpctx->stream->type == STREAMTYPE_DVDNAV) | |
1641 && dvdsub_id < 0 && reset_spu) { | |
1642 d_sub->id = -2; | |
1643 d_sub->sh = NULL; | |
22478 | 1644 } |
1645 #endif | |
29668
ecc719c6d7a9
Make update_subtitles work without sh_video for text subtitles.
reimar
parents:
29617
diff
changeset
|
1646 if (mpctx->sh_audio) |
ecc719c6d7a9
Make update_subtitles work without sh_video for text subtitles.
reimar
parents:
29617
diff
changeset
|
1647 pts = mpctx->sh_audio->pts; |
ecc719c6d7a9
Make update_subtitles work without sh_video for text subtitles.
reimar
parents:
29617
diff
changeset
|
1648 if (mpctx->sh_video) |
ecc719c6d7a9
Make update_subtitles work without sh_video for text subtitles.
reimar
parents:
29617
diff
changeset
|
1649 pts = mpctx->sh_video->pts; |
ecc719c6d7a9
Make update_subtitles work without sh_video for text subtitles.
reimar
parents:
29617
diff
changeset
|
1650 update_subtitles(mpctx->sh_video, pts, d_sub, 1); |
22478 | 1651 |
1652 return M_PROPERTY_OK; | |
1653 } | |
1654 | |
25129
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1655 /// Selected sub source (RW) |
31156 | 1656 static int mp_property_sub_source(m_option_t *prop, int action, void *arg, |
1657 MPContext *mpctx) | |
25129
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1658 { |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1659 int source; |
31612
7fc1f051a19f
Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents:
31312
diff
changeset
|
1660 update_global_sub_size(mpctx); |
25129
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1661 if (!mpctx->sh_video || mpctx->global_sub_size <= 0) |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1662 return M_PROPERTY_UNAVAILABLE; |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1663 |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1664 switch (action) { |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1665 case M_PROPERTY_GET: |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1666 if (!arg) |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1667 return M_PROPERTY_ERROR; |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1668 *(int *) arg = sub_source(mpctx); |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1669 return M_PROPERTY_OK; |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1670 case M_PROPERTY_PRINT: |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1671 if (!arg) |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1672 return M_PROPERTY_ERROR; |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1673 *(char **) arg = malloc(64); |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1674 (*(char **) arg)[63] = 0; |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1675 switch (sub_source(mpctx)) |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1676 { |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1677 case SUB_SOURCE_SUBS: |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1678 snprintf(*(char **) arg, 63, MSGTR_SubSourceFile); |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1679 break; |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1680 case SUB_SOURCE_VOBSUB: |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1681 snprintf(*(char **) arg, 63, MSGTR_SubSourceVobsub); |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1682 break; |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1683 case SUB_SOURCE_DEMUX: |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1684 snprintf(*(char **) arg, 63, MSGTR_SubSourceDemux); |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1685 break; |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1686 default: |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1687 snprintf(*(char **) arg, 63, MSGTR_Disabled); |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1688 } |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1689 return M_PROPERTY_OK; |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1690 case M_PROPERTY_SET: |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1691 if (!arg) |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1692 return M_PROPERTY_ERROR; |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1693 M_PROPERTY_CLAMP(prop, *(int*)arg); |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1694 if (*(int *) arg < 0) |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1695 mpctx->global_sub_pos = -1; |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1696 else if (*(int *) arg != sub_source(mpctx)) { |
31612
7fc1f051a19f
Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents:
31312
diff
changeset
|
1697 int new_pos = sub_pos_by_source(mpctx, *(int *)arg); |
7fc1f051a19f
Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents:
31312
diff
changeset
|
1698 if (new_pos == -1) |
25129
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1699 return M_PROPERTY_UNAVAILABLE; |
31612
7fc1f051a19f
Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents:
31312
diff
changeset
|
1700 mpctx->global_sub_pos = new_pos; |
25129
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1701 } |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1702 break; |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1703 case M_PROPERTY_STEP_UP: |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1704 case M_PROPERTY_STEP_DOWN: { |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1705 int step_all = (arg && *(int*)arg != 0 ? *(int*)arg : 1) |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1706 * (action == M_PROPERTY_STEP_UP ? 1 : -1); |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1707 int step = (step_all > 0) ? 1 : -1; |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1708 int cur_source = sub_source(mpctx); |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1709 source = cur_source; |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1710 while (step_all) { |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1711 source += step; |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1712 if (source >= SUB_SOURCES) |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1713 source = -1; |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1714 else if (source < -1) |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1715 source = SUB_SOURCES - 1; |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1716 if (source == cur_source || source == -1 || |
31612
7fc1f051a19f
Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents:
31312
diff
changeset
|
1717 mpctx->sub_counts[source]) |
25129
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1718 step_all -= step; |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1719 } |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1720 if (source == cur_source) |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1721 return M_PROPERTY_OK; |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1722 if (source == -1) |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1723 mpctx->global_sub_pos = -1; |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1724 else |
31612
7fc1f051a19f
Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents:
31312
diff
changeset
|
1725 mpctx->global_sub_pos = sub_pos_by_source(mpctx, source); |
25129
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1726 break; |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1727 } |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1728 default: |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1729 return M_PROPERTY_NOT_IMPLEMENTED; |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1730 } |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1731 --mpctx->global_sub_pos; |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1732 return mp_property_sub(prop, M_PROPERTY_STEP_UP, NULL, mpctx); |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1733 } |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1734 |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1735 /// Selected subtitles from specific source (RW) |
31156 | 1736 static int mp_property_sub_by_type(m_option_t *prop, int action, void *arg, |
1737 MPContext *mpctx) | |
25129
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1738 { |
31805
05ca6dd36faf
Fix subtitle selection: make selecting -sid 0 work again by replacing the
reimar
parents:
31792
diff
changeset
|
1739 int source, is_cur_source, offset, new_pos; |
31612
7fc1f051a19f
Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents:
31312
diff
changeset
|
1740 update_global_sub_size(mpctx); |
25129
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1741 if (!mpctx->sh_video || mpctx->global_sub_size <= 0) |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1742 return M_PROPERTY_UNAVAILABLE; |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1743 |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1744 if (!strcmp(prop->name, "sub_file")) |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1745 source = SUB_SOURCE_SUBS; |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1746 else if (!strcmp(prop->name, "sub_vob")) |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1747 source = SUB_SOURCE_VOBSUB; |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1748 else if (!strcmp(prop->name, "sub_demux")) |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1749 source = SUB_SOURCE_DEMUX; |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1750 else |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1751 return M_PROPERTY_ERROR; |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1752 |
31612
7fc1f051a19f
Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents:
31312
diff
changeset
|
1753 offset = sub_pos_by_source(mpctx, source); |
7fc1f051a19f
Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents:
31312
diff
changeset
|
1754 if (offset < 0) |
25129
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1755 return M_PROPERTY_UNAVAILABLE; |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1756 |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1757 is_cur_source = sub_source(mpctx) == source; |
31805
05ca6dd36faf
Fix subtitle selection: make selecting -sid 0 work again by replacing the
reimar
parents:
31792
diff
changeset
|
1758 new_pos = mpctx->global_sub_pos; |
25129
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1759 switch (action) { |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1760 case M_PROPERTY_GET: |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1761 if (!arg) |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1762 return M_PROPERTY_ERROR; |
25251
80804f0631f4
Skip empty vobsub streams when selecting subtitles.
ulion
parents:
25215
diff
changeset
|
1763 if (is_cur_source) { |
31612
7fc1f051a19f
Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents:
31312
diff
changeset
|
1764 *(int *) arg = sub_source_pos(mpctx); |
25251
80804f0631f4
Skip empty vobsub streams when selecting subtitles.
ulion
parents:
25215
diff
changeset
|
1765 if (source == SUB_SOURCE_VOBSUB) |
80804f0631f4
Skip empty vobsub streams when selecting subtitles.
ulion
parents:
25215
diff
changeset
|
1766 *(int *) arg = vobsub_get_id_by_index(vo_vobsub, *(int *) arg); |
80804f0631f4
Skip empty vobsub streams when selecting subtitles.
ulion
parents:
25215
diff
changeset
|
1767 } |
80804f0631f4
Skip empty vobsub streams when selecting subtitles.
ulion
parents:
25215
diff
changeset
|
1768 else |
80804f0631f4
Skip empty vobsub streams when selecting subtitles.
ulion
parents:
25215
diff
changeset
|
1769 *(int *) arg = -1; |
25129
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1770 return M_PROPERTY_OK; |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1771 case M_PROPERTY_PRINT: |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1772 if (!arg) |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1773 return M_PROPERTY_ERROR; |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1774 if (is_cur_source) |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1775 return mp_property_sub(prop, M_PROPERTY_PRINT, arg, mpctx); |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1776 *(char **) arg = malloc(64); |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1777 (*(char **) arg)[63] = 0; |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1778 snprintf(*(char **) arg, 63, MSGTR_Disabled); |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1779 return M_PROPERTY_OK; |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1780 case M_PROPERTY_SET: |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1781 if (!arg) |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1782 return M_PROPERTY_ERROR; |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1783 if (*(int *) arg >= 0) { |
25251
80804f0631f4
Skip empty vobsub streams when selecting subtitles.
ulion
parents:
25215
diff
changeset
|
1784 int index = *(int *)arg; |
80804f0631f4
Skip empty vobsub streams when selecting subtitles.
ulion
parents:
25215
diff
changeset
|
1785 if (source == SUB_SOURCE_VOBSUB) |
80804f0631f4
Skip empty vobsub streams when selecting subtitles.
ulion
parents:
25215
diff
changeset
|
1786 index = vobsub_get_index_by_id(vo_vobsub, index); |
31805
05ca6dd36faf
Fix subtitle selection: make selecting -sid 0 work again by replacing the
reimar
parents:
31792
diff
changeset
|
1787 new_pos = offset + index; |
31612
7fc1f051a19f
Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents:
31312
diff
changeset
|
1788 if (index < 0 || index > mpctx->sub_counts[source]) { |
31805
05ca6dd36faf
Fix subtitle selection: make selecting -sid 0 work again by replacing the
reimar
parents:
31792
diff
changeset
|
1789 new_pos = -1; |
25129
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1790 *(int *) arg = -1; |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1791 } |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1792 } |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1793 else |
31805
05ca6dd36faf
Fix subtitle selection: make selecting -sid 0 work again by replacing the
reimar
parents:
31792
diff
changeset
|
1794 new_pos = -1; |
25129
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1795 break; |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1796 case M_PROPERTY_STEP_UP: |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1797 case M_PROPERTY_STEP_DOWN: { |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1798 int step_all = (arg && *(int*)arg != 0 ? *(int*)arg : 1) |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1799 * (action == M_PROPERTY_STEP_UP ? 1 : -1); |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1800 int step = (step_all > 0) ? 1 : -1; |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1801 int max_sub_pos_for_source = -1; |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1802 if (!is_cur_source) |
31805
05ca6dd36faf
Fix subtitle selection: make selecting -sid 0 work again by replacing the
reimar
parents:
31792
diff
changeset
|
1803 new_pos = -1; |
25129
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1804 while (step_all) { |
31805
05ca6dd36faf
Fix subtitle selection: make selecting -sid 0 work again by replacing the
reimar
parents:
31792
diff
changeset
|
1805 if (new_pos == -1) { |
25129
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1806 if (step > 0) |
31805
05ca6dd36faf
Fix subtitle selection: make selecting -sid 0 work again by replacing the
reimar
parents:
31792
diff
changeset
|
1807 new_pos = offset; |
25129
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1808 else if (max_sub_pos_for_source == -1) { |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1809 // Find max pos for specific source |
31805
05ca6dd36faf
Fix subtitle selection: make selecting -sid 0 work again by replacing the
reimar
parents:
31792
diff
changeset
|
1810 new_pos = mpctx->global_sub_size - 1; |
05ca6dd36faf
Fix subtitle selection: make selecting -sid 0 work again by replacing the
reimar
parents:
31792
diff
changeset
|
1811 while (new_pos >= 0 |
25129
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1812 && sub_source(mpctx) != source) |
31805
05ca6dd36faf
Fix subtitle selection: make selecting -sid 0 work again by replacing the
reimar
parents:
31792
diff
changeset
|
1813 new_pos--; |
25129
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1814 } |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1815 else |
31805
05ca6dd36faf
Fix subtitle selection: make selecting -sid 0 work again by replacing the
reimar
parents:
31792
diff
changeset
|
1816 new_pos = max_sub_pos_for_source; |
25129
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1817 } |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1818 else { |
31805
05ca6dd36faf
Fix subtitle selection: make selecting -sid 0 work again by replacing the
reimar
parents:
31792
diff
changeset
|
1819 new_pos += step; |
05ca6dd36faf
Fix subtitle selection: make selecting -sid 0 work again by replacing the
reimar
parents:
31792
diff
changeset
|
1820 if (new_pos < offset || |
05ca6dd36faf
Fix subtitle selection: make selecting -sid 0 work again by replacing the
reimar
parents:
31792
diff
changeset
|
1821 new_pos >= mpctx->global_sub_size || |
25129
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1822 sub_source(mpctx) != source) |
31805
05ca6dd36faf
Fix subtitle selection: make selecting -sid 0 work again by replacing the
reimar
parents:
31792
diff
changeset
|
1823 new_pos = -1; |
25129
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1824 } |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1825 step_all -= step; |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1826 } |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1827 break; |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1828 } |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1829 default: |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1830 return M_PROPERTY_NOT_IMPLEMENTED; |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1831 } |
31805
05ca6dd36faf
Fix subtitle selection: make selecting -sid 0 work again by replacing the
reimar
parents:
31792
diff
changeset
|
1832 return mp_property_sub(prop, M_PROPERTY_SET, &new_pos, mpctx); |
25129
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1833 } |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
1834 |
22478 | 1835 /// Subtitle delay (RW) |
31156 | 1836 static int mp_property_sub_delay(m_option_t *prop, int action, void *arg, |
1837 MPContext *mpctx) | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
1838 { |
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
1839 if (!mpctx->sh_video) |
31077 | 1840 return M_PROPERTY_UNAVAILABLE; |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
1841 return m_property_delay(prop, action, arg, &sub_delay); |
22478 | 1842 } |
1843 | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
1844 /// Alignment of text subtitles (RW) |
31156 | 1845 static int mp_property_sub_alignment(m_option_t *prop, int action, |
1846 void *arg, MPContext *mpctx) | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
1847 { |
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
1848 char *name[] = { MSGTR_Top, MSGTR_Center, MSGTR_Bottom }; |
22478 | 1849 |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
1850 if (!mpctx->sh_video || mpctx->global_sub_pos < 0 |
31077 | 1851 || sub_source(mpctx) != SUB_SOURCE_SUBS) |
1852 return M_PROPERTY_UNAVAILABLE; | |
22478 | 1853 |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
1854 switch (action) { |
22478 | 1855 case M_PROPERTY_PRINT: |
31077 | 1856 if (!arg) |
1857 return M_PROPERTY_ERROR; | |
1858 M_PROPERTY_CLAMP(prop, sub_alignment); | |
1859 *(char **) arg = strdup(name[sub_alignment]); | |
1860 return M_PROPERTY_OK; | |
22478 | 1861 case M_PROPERTY_SET: |
31077 | 1862 if (!arg) |
1863 return M_PROPERTY_ERROR; | |
22478 | 1864 case M_PROPERTY_STEP_UP: |
1865 case M_PROPERTY_STEP_DOWN: | |
31077 | 1866 vo_osd_changed(OSDTYPE_SUBTITLE); |
22478 | 1867 default: |
31077 | 1868 return m_property_choice(prop, action, arg, &sub_alignment); |
22478 | 1869 } |
1870 } | |
1871 | |
1872 /// Subtitle visibility (RW) | |
31156 | 1873 static int mp_property_sub_visibility(m_option_t *prop, int action, |
1874 void *arg, MPContext *mpctx) | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
1875 { |
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
1876 if (!mpctx->sh_video) |
31077 | 1877 return M_PROPERTY_UNAVAILABLE; |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
1878 |
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
1879 switch (action) { |
22478 | 1880 case M_PROPERTY_SET: |
31077 | 1881 if (!arg) |
1882 return M_PROPERTY_ERROR; | |
22478 | 1883 case M_PROPERTY_STEP_UP: |
1884 case M_PROPERTY_STEP_DOWN: | |
31077 | 1885 vo_osd_changed(OSDTYPE_SUBTITLE); |
1886 if (vo_spudec) | |
1887 vo_osd_changed(OSDTYPE_SPU); | |
22478 | 1888 default: |
31077 | 1889 return m_property_flag(prop, action, arg, &sub_visibility); |
22478 | 1890 } |
1891 } | |
1892 | |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27069
diff
changeset
|
1893 #ifdef CONFIG_ASS |
25814
4ba9b9bdf123
Add ass_use_margins command and property to shift subtitles to margins and back
eugeni
parents:
25717
diff
changeset
|
1894 /// Use margins for libass subtitles (RW) |
31156 | 1895 static int mp_property_ass_use_margins(m_option_t *prop, int action, |
1896 void *arg, MPContext *mpctx) | |
25814
4ba9b9bdf123
Add ass_use_margins command and property to shift subtitles to margins and back
eugeni
parents:
25717
diff
changeset
|
1897 { |
4ba9b9bdf123
Add ass_use_margins command and property to shift subtitles to margins and back
eugeni
parents:
25717
diff
changeset
|
1898 if (!mpctx->sh_video) |
31077 | 1899 return M_PROPERTY_UNAVAILABLE; |
25814
4ba9b9bdf123
Add ass_use_margins command and property to shift subtitles to margins and back
eugeni
parents:
25717
diff
changeset
|
1900 |
4ba9b9bdf123
Add ass_use_margins command and property to shift subtitles to margins and back
eugeni
parents:
25717
diff
changeset
|
1901 switch (action) { |
4ba9b9bdf123
Add ass_use_margins command and property to shift subtitles to margins and back
eugeni
parents:
25717
diff
changeset
|
1902 case M_PROPERTY_SET: |
31077 | 1903 if (!arg) |
1904 return M_PROPERTY_ERROR; | |
25814
4ba9b9bdf123
Add ass_use_margins command and property to shift subtitles to margins and back
eugeni
parents:
25717
diff
changeset
|
1905 case M_PROPERTY_STEP_UP: |
4ba9b9bdf123
Add ass_use_margins command and property to shift subtitles to margins and back
eugeni
parents:
25717
diff
changeset
|
1906 case M_PROPERTY_STEP_DOWN: |
31077 | 1907 ass_force_reload = 1; |
25814
4ba9b9bdf123
Add ass_use_margins command and property to shift subtitles to margins and back
eugeni
parents:
25717
diff
changeset
|
1908 default: |
31077 | 1909 return m_property_flag(prop, action, arg, &ass_use_margins); |
25814
4ba9b9bdf123
Add ass_use_margins command and property to shift subtitles to margins and back
eugeni
parents:
25717
diff
changeset
|
1910 } |
4ba9b9bdf123
Add ass_use_margins command and property to shift subtitles to margins and back
eugeni
parents:
25717
diff
changeset
|
1911 } |
4ba9b9bdf123
Add ass_use_margins command and property to shift subtitles to margins and back
eugeni
parents:
25717
diff
changeset
|
1912 #endif |
4ba9b9bdf123
Add ass_use_margins command and property to shift subtitles to margins and back
eugeni
parents:
25717
diff
changeset
|
1913 |
22478 | 1914 /// Show only forced subtitles (RW) |
31156 | 1915 static int mp_property_sub_forced_only(m_option_t *prop, int action, |
1916 void *arg, MPContext *mpctx) | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
1917 { |
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
1918 if (!vo_spudec) |
31077 | 1919 return M_PROPERTY_UNAVAILABLE; |
22478 | 1920 |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
1921 switch (action) { |
22478 | 1922 case M_PROPERTY_SET: |
31077 | 1923 if (!arg) |
1924 return M_PROPERTY_ERROR; | |
22478 | 1925 case M_PROPERTY_STEP_UP: |
1926 case M_PROPERTY_STEP_DOWN: | |
31077 | 1927 m_property_flag(prop, action, arg, &forced_subs_only); |
1928 spudec_set_forced_subs_only(vo_spudec, forced_subs_only); | |
1929 return M_PROPERTY_OK; | |
22478 | 1930 default: |
31077 | 1931 return m_property_flag(prop, action, arg, &forced_subs_only); |
22478 | 1932 } |
1933 | |
1934 } | |
1935 | |
27393 | 1936 #ifdef CONFIG_FREETYPE |
23725 | 1937 /// Subtitle scale (RW) |
31156 | 1938 static int mp_property_sub_scale(m_option_t *prop, int action, void *arg, |
1939 MPContext *mpctx) | |
23725 | 1940 { |
1941 | |
1942 switch (action) { | |
1943 case M_PROPERTY_SET: | |
1944 if (!arg) | |
1945 return M_PROPERTY_ERROR; | |
1946 M_PROPERTY_CLAMP(prop, *(float *) arg); | |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27069
diff
changeset
|
1947 #ifdef CONFIG_ASS |
25815
8920f8a26c05
sub_scale command now works with ass subtitles renderer
ben
parents:
25814
diff
changeset
|
1948 if (ass_enabled) { |
8920f8a26c05
sub_scale command now works with ass subtitles renderer
ben
parents:
25814
diff
changeset
|
1949 ass_font_scale = *(float *) arg; |
8920f8a26c05
sub_scale command now works with ass subtitles renderer
ben
parents:
25814
diff
changeset
|
1950 ass_force_reload = 1; |
8920f8a26c05
sub_scale command now works with ass subtitles renderer
ben
parents:
25814
diff
changeset
|
1951 } |
8920f8a26c05
sub_scale command now works with ass subtitles renderer
ben
parents:
25814
diff
changeset
|
1952 #endif |
25854 | 1953 text_font_scale_factor = *(float *) arg; |
1954 force_load_font = 1; | |
32738
abcf963fbd2c
Force subtitles to be redrawn on sub_scale change.
reimar
parents:
32664
diff
changeset
|
1955 vo_osd_changed(OSDTYPE_SUBTITLE); |
23725 | 1956 return M_PROPERTY_OK; |
1957 case M_PROPERTY_STEP_UP: | |
1958 case M_PROPERTY_STEP_DOWN: | |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27069
diff
changeset
|
1959 #ifdef CONFIG_ASS |
25815
8920f8a26c05
sub_scale command now works with ass subtitles renderer
ben
parents:
25814
diff
changeset
|
1960 if (ass_enabled) { |
8920f8a26c05
sub_scale command now works with ass subtitles renderer
ben
parents:
25814
diff
changeset
|
1961 ass_font_scale += (arg ? *(float *) arg : 0.1)* |
8920f8a26c05
sub_scale command now works with ass subtitles renderer
ben
parents:
25814
diff
changeset
|
1962 (action == M_PROPERTY_STEP_UP ? 1.0 : -1.0); |
8920f8a26c05
sub_scale command now works with ass subtitles renderer
ben
parents:
25814
diff
changeset
|
1963 M_PROPERTY_CLAMP(prop, ass_font_scale); |
8920f8a26c05
sub_scale command now works with ass subtitles renderer
ben
parents:
25814
diff
changeset
|
1964 ass_force_reload = 1; |
8920f8a26c05
sub_scale command now works with ass subtitles renderer
ben
parents:
25814
diff
changeset
|
1965 } |
8920f8a26c05
sub_scale command now works with ass subtitles renderer
ben
parents:
25814
diff
changeset
|
1966 #endif |
25854 | 1967 text_font_scale_factor += (arg ? *(float *) arg : 0.1)* |
1968 (action == M_PROPERTY_STEP_UP ? 1.0 : -1.0); | |
1969 M_PROPERTY_CLAMP(prop, text_font_scale_factor); | |
1970 force_load_font = 1; | |
32738
abcf963fbd2c
Force subtitles to be redrawn on sub_scale change.
reimar
parents:
32664
diff
changeset
|
1971 vo_osd_changed(OSDTYPE_SUBTITLE); |
23725 | 1972 return M_PROPERTY_OK; |
1973 default: | |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27069
diff
changeset
|
1974 #ifdef CONFIG_ASS |
25815
8920f8a26c05
sub_scale command now works with ass subtitles renderer
ben
parents:
25814
diff
changeset
|
1975 if (ass_enabled) |
8920f8a26c05
sub_scale command now works with ass subtitles renderer
ben
parents:
25814
diff
changeset
|
1976 return m_property_float_ro(prop, action, arg, ass_font_scale); |
8920f8a26c05
sub_scale command now works with ass subtitles renderer
ben
parents:
25814
diff
changeset
|
1977 else |
8920f8a26c05
sub_scale command now works with ass subtitles renderer
ben
parents:
25814
diff
changeset
|
1978 #endif |
25816 | 1979 return m_property_float_ro(prop, action, arg, text_font_scale_factor); |
23725 | 1980 } |
1981 } | |
23740 | 1982 #endif |
23725 | 1983 |
22478 | 1984 ///@} |
1985 | |
1986 /// \defgroup TVProperties TV properties | |
1987 /// \ingroup Properties | |
1988 ///@{ | |
1989 | |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27069
diff
changeset
|
1990 #ifdef CONFIG_TV |
22478 | 1991 |
1992 /// TV color settings (RW) | |
31156 | 1993 static int mp_property_tv_color(m_option_t *prop, int action, void *arg, |
1994 MPContext *mpctx) | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
1995 { |
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
1996 int r, val; |
22478 | 1997 tvi_handle_t *tvh = mpctx->demuxer->priv; |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
1998 if (mpctx->demuxer->type != DEMUXER_TYPE_TV || !tvh) |
31077 | 1999 return M_PROPERTY_UNAVAILABLE; |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2000 |
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2001 switch (action) { |
22478 | 2002 case M_PROPERTY_SET: |
31077 | 2003 if (!arg) |
2004 return M_PROPERTY_ERROR; | |
2005 M_PROPERTY_CLAMP(prop, *(int *) arg); | |
32405
ad86352b7c6b
Use intptr_t for integers stored in opaque pointers.
cigaes
parents:
32392
diff
changeset
|
2006 return tv_set_color_options(tvh, (intptr_t) prop->priv, *(int *) arg); |
22478 | 2007 case M_PROPERTY_GET: |
32405
ad86352b7c6b
Use intptr_t for integers stored in opaque pointers.
cigaes
parents:
32392
diff
changeset
|
2008 return tv_get_color_options(tvh, (intptr_t) prop->priv, arg); |
22478 | 2009 case M_PROPERTY_STEP_UP: |
2010 case M_PROPERTY_STEP_DOWN: | |
32405
ad86352b7c6b
Use intptr_t for integers stored in opaque pointers.
cigaes
parents:
32392
diff
changeset
|
2011 if ((r = tv_get_color_options(tvh, (intptr_t) prop->priv, &val)) >= 0) { |
31077 | 2012 if (!r) |
2013 return M_PROPERTY_ERROR; | |
2014 val += (arg ? *(int *) arg : 1) * | |
2015 (action == M_PROPERTY_STEP_DOWN ? -1 : 1); | |
2016 M_PROPERTY_CLAMP(prop, val); | |
32405
ad86352b7c6b
Use intptr_t for integers stored in opaque pointers.
cigaes
parents:
32392
diff
changeset
|
2017 return tv_set_color_options(tvh, (intptr_t) prop->priv, val); |
31077 | 2018 } |
2019 return M_PROPERTY_ERROR; | |
22478 | 2020 } |
2021 return M_PROPERTY_NOT_IMPLEMENTED; | |
2022 } | |
2023 | |
2024 #endif | |
2025 | |
31156 | 2026 static int mp_property_teletext_common(m_option_t *prop, int action, void *arg, |
2027 MPContext *mpctx) | |
23900 | 2028 { |
2029 int val,result; | |
32405
ad86352b7c6b
Use intptr_t for integers stored in opaque pointers.
cigaes
parents:
32392
diff
changeset
|
2030 int base_ioctl=(intptr_t)prop->priv; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28368
diff
changeset
|
2031 /* |
23900 | 2032 for teletext's GET,SET,STEP ioctls this is not 0 |
2033 SET is GET+1 | |
2034 STEP is GET+2 | |
2035 */ | |
29820
b33846197f5c
Make sure the teletext property stuff does not crash if no demuxer is available.
reimar
parents:
29809
diff
changeset
|
2036 if (!mpctx->demuxer || !mpctx->demuxer->teletext) |
23900 | 2037 return M_PROPERTY_UNAVAILABLE; |
2038 if(!base_ioctl) | |
2039 return M_PROPERTY_ERROR; | |
2040 | |
2041 switch (action) { | |
2042 case M_PROPERTY_GET: | |
2043 if (!arg) | |
2044 return M_PROPERTY_ERROR; | |
29806 | 2045 result=teletext_control(mpctx->demuxer->teletext, base_ioctl, arg); |
23900 | 2046 break; |
2047 case M_PROPERTY_SET: | |
2048 if (!arg) | |
2049 return M_PROPERTY_ERROR; | |
2050 M_PROPERTY_CLAMP(prop, *(int *) arg); | |
29806 | 2051 result=teletext_control(mpctx->demuxer->teletext, base_ioctl+1, arg); |
23900 | 2052 break; |
2053 case M_PROPERTY_STEP_UP: | |
2054 case M_PROPERTY_STEP_DOWN: | |
29806 | 2055 result=teletext_control(mpctx->demuxer->teletext, base_ioctl, &val); |
23900 | 2056 val += (arg ? *(int *) arg : 1) * (action == M_PROPERTY_STEP_DOWN ? -1 : 1); |
29806 | 2057 result=teletext_control(mpctx->demuxer->teletext, base_ioctl+1, &val); |
23900 | 2058 break; |
2059 default: | |
2060 return M_PROPERTY_NOT_IMPLEMENTED; | |
2061 } | |
2062 | |
29806 | 2063 return result == VBI_CONTROL_TRUE ? M_PROPERTY_OK : M_PROPERTY_ERROR; |
23900 | 2064 } |
2065 | |
31156 | 2066 static int mp_property_teletext_mode(m_option_t *prop, int action, void *arg, |
2067 MPContext *mpctx) | |
23900 | 2068 { |
2069 int result; | |
2070 int val; | |
2071 | |
2072 //with tvh==NULL will fail too | |
2073 result=mp_property_teletext_common(prop,action,arg,mpctx); | |
2074 if(result!=M_PROPERTY_OK) | |
2075 return result; | |
2076 | |
29806 | 2077 if(teletext_control(mpctx->demuxer->teletext, |
32405
ad86352b7c6b
Use intptr_t for integers stored in opaque pointers.
cigaes
parents:
32392
diff
changeset
|
2078 (intptr_t)prop->priv, &val)==VBI_CONTROL_TRUE && val) |
23900 | 2079 mp_input_set_section("teletext"); |
2080 else | |
2081 mp_input_set_section("tv"); | |
2082 return M_PROPERTY_OK; | |
2083 } | |
2084 | |
31156 | 2085 static int mp_property_teletext_page(m_option_t *prop, int action, void *arg, |
2086 MPContext *mpctx) | |
23900 | 2087 { |
2088 int result; | |
2089 int val; | |
29806 | 2090 if (!mpctx->demuxer->teletext) |
27806
26c27a80b8af
Disallow the modification of teletext properties when the tv demuxer is
faust3
parents:
27650
diff
changeset
|
2091 return M_PROPERTY_UNAVAILABLE; |
23900 | 2092 switch(action){ |
2093 case M_PROPERTY_STEP_UP: | |
2094 case M_PROPERTY_STEP_DOWN: | |
2095 //This should be handled separately | |
2096 val = (arg ? *(int *) arg : 1) * (action == M_PROPERTY_STEP_DOWN ? -1 : 1); | |
29806 | 2097 result=teletext_control(mpctx->demuxer->teletext, |
2098 TV_VBI_CONTROL_STEP_PAGE, &val); | |
23900 | 2099 break; |
2100 default: | |
2101 result=mp_property_teletext_common(prop,action,arg,mpctx); | |
2102 } | |
2103 return result; | |
2104 } | |
2105 | |
22478 | 2106 ///@} |
2107 | |
2108 /// All properties available in MPlayer. | |
2109 /** \ingroup Properties | |
2110 */ | |
25717 | 2111 static const m_option_t mp_properties[] = { |
22478 | 2112 // General |
2113 { "osdlevel", mp_property_osdlevel, CONF_TYPE_INT, | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2114 M_OPT_RANGE, 0, 3, NULL }, |
23727 | 2115 { "loop", mp_property_loop, CONF_TYPE_INT, |
2116 M_OPT_MIN, -1, 0, NULL }, | |
22478 | 2117 { "speed", mp_property_playback_speed, CONF_TYPE_FLOAT, |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2118 M_OPT_RANGE, 0.01, 100.0, NULL }, |
22478 | 2119 { "filename", mp_property_filename, CONF_TYPE_STRING, |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2120 0, 0, 0, NULL }, |
22478 | 2121 { "path", mp_property_path, CONF_TYPE_STRING, |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2122 0, 0, 0, NULL }, |
22478 | 2123 { "demuxer", mp_property_demuxer, CONF_TYPE_STRING, |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2124 0, 0, 0, NULL }, |
22478 | 2125 { "stream_pos", mp_property_stream_pos, CONF_TYPE_POSITION, |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2126 M_OPT_MIN, 0, 0, NULL }, |
22478 | 2127 { "stream_start", mp_property_stream_start, CONF_TYPE_POSITION, |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2128 M_OPT_MIN, 0, 0, NULL }, |
22478 | 2129 { "stream_end", mp_property_stream_end, CONF_TYPE_POSITION, |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2130 M_OPT_MIN, 0, 0, NULL }, |
22478 | 2131 { "stream_length", mp_property_stream_length, CONF_TYPE_POSITION, |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2132 M_OPT_MIN, 0, 0, NULL }, |
31728 | 2133 { "stream_time_pos", mp_property_stream_time_pos, CONF_TYPE_TIME, |
2134 M_OPT_MIN, 0, 0, NULL }, | |
23417 | 2135 { "length", mp_property_length, CONF_TYPE_TIME, |
2136 M_OPT_MIN, 0, 0, NULL }, | |
23418 | 2137 { "percent_pos", mp_property_percent_pos, CONF_TYPE_INT, |
2138 M_OPT_RANGE, 0, 100, NULL }, | |
2139 { "time_pos", mp_property_time_pos, CONF_TYPE_TIME, | |
2140 M_OPT_MIN, 0, 0, NULL }, | |
25363 | 2141 { "chapter", mp_property_chapter, CONF_TYPE_INT, |
29365
794a26e68c2c
Make set_property chapter 0-based like all other chapter-related
reimar
parents:
29333
diff
changeset
|
2142 M_OPT_MIN, 0, 0, NULL }, |
27635
22bdd7ba8892
slave command to get the number of chapters; patch by Kevin DeKorte - kdekorte gmail com
nicodvb
parents:
27457
diff
changeset
|
2143 { "chapters", mp_property_chapters, CONF_TYPE_INT, |
22bdd7ba8892
slave command to get the number of chapters; patch by Kevin DeKorte - kdekorte gmail com
nicodvb
parents:
27457
diff
changeset
|
2144 0, 0, 0, NULL }, |
25577
f1ea96323643
properties to get and set angle; patch by oattila chello hu
nicodvb
parents:
25567
diff
changeset
|
2145 { "angle", mp_property_angle, CONF_TYPE_INT, |
f1ea96323643
properties to get and set angle; patch by oattila chello hu
nicodvb
parents:
25567
diff
changeset
|
2146 CONF_RANGE, -2, 10, NULL }, |
23394
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
2147 { "metadata", mp_property_metadata, CONF_TYPE_STRING_LIST, |
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
2148 0, 0, 0, NULL }, |
27648
427fec163870
Add a "pause" property to allow checking if MPlayer is paused.
reimar
parents:
27635
diff
changeset
|
2149 { "pause", mp_property_pause, CONF_TYPE_FLAG, |
427fec163870
Add a "pause" property to allow checking if MPlayer is paused.
reimar
parents:
27635
diff
changeset
|
2150 M_OPT_RANGE, 0, 1, NULL }, |
32438
faefba58f413
Implement a basic capture feature, available through -capture.
diego
parents:
32419
diff
changeset
|
2151 { "capturing", mp_property_capture, CONF_TYPE_FLAG, |
faefba58f413
Implement a basic capture feature, available through -capture.
diego
parents:
32419
diff
changeset
|
2152 M_OPT_RANGE, 0, 1, NULL }, |
22478 | 2153 |
2154 // Audio | |
2155 { "volume", mp_property_volume, CONF_TYPE_FLOAT, | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2156 M_OPT_RANGE, 0, 100, NULL }, |
22478 | 2157 { "mute", mp_property_mute, CONF_TYPE_FLAG, |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2158 M_OPT_RANGE, 0, 1, NULL }, |
22478 | 2159 { "audio_delay", mp_property_audio_delay, CONF_TYPE_FLOAT, |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2160 M_OPT_RANGE, -100, 100, NULL }, |
22478 | 2161 { "audio_format", mp_property_audio_format, CONF_TYPE_INT, |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2162 0, 0, 0, NULL }, |
23394
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
2163 { "audio_codec", mp_property_audio_codec, CONF_TYPE_STRING, |
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
2164 0, 0, 0, NULL }, |
22478 | 2165 { "audio_bitrate", mp_property_audio_bitrate, CONF_TYPE_INT, |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2166 0, 0, 0, NULL }, |
22478 | 2167 { "samplerate", mp_property_samplerate, CONF_TYPE_INT, |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2168 0, 0, 0, NULL }, |
22478 | 2169 { "channels", mp_property_channels, CONF_TYPE_INT, |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2170 0, 0, 0, NULL }, |
22478 | 2171 { "switch_audio", mp_property_audio, CONF_TYPE_INT, |
29333
09938ba82991
Do not use MAX_A/V_STREAMS as upper limit for switch_audio/switch_video
reimar
parents:
29263
diff
changeset
|
2172 CONF_RANGE, -2, 65535, NULL }, |
23568 | 2173 { "balance", mp_property_balance, CONF_TYPE_FLOAT, |
2174 M_OPT_RANGE, -1, 1, NULL }, | |
22478 | 2175 |
2176 // Video | |
2177 { "fullscreen", mp_property_fullscreen, CONF_TYPE_FLAG, | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2178 M_OPT_RANGE, 0, 1, NULL }, |
22478 | 2179 { "deinterlace", mp_property_deinterlace, CONF_TYPE_FLAG, |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2180 M_OPT_RANGE, 0, 1, NULL }, |
22478 | 2181 { "ontop", mp_property_ontop, CONF_TYPE_FLAG, |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2182 M_OPT_RANGE, 0, 1, NULL }, |
22478 | 2183 { "rootwin", mp_property_rootwin, CONF_TYPE_FLAG, |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2184 M_OPT_RANGE, 0, 1, NULL }, |
22478 | 2185 { "border", mp_property_border, CONF_TYPE_FLAG, |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2186 M_OPT_RANGE, 0, 1, NULL }, |
22478 | 2187 { "framedropping", mp_property_framedropping, CONF_TYPE_INT, |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2188 M_OPT_RANGE, 0, 2, NULL }, |
22478 | 2189 { "gamma", mp_property_gamma, CONF_TYPE_INT, |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2190 M_OPT_RANGE, -100, 100, &vo_gamma_gamma }, |
22478 | 2191 { "brightness", mp_property_gamma, CONF_TYPE_INT, |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2192 M_OPT_RANGE, -100, 100, &vo_gamma_brightness }, |
22478 | 2193 { "contrast", mp_property_gamma, CONF_TYPE_INT, |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2194 M_OPT_RANGE, -100, 100, &vo_gamma_contrast }, |
22478 | 2195 { "saturation", mp_property_gamma, CONF_TYPE_INT, |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2196 M_OPT_RANGE, -100, 100, &vo_gamma_saturation }, |
22478 | 2197 { "hue", mp_property_gamma, CONF_TYPE_INT, |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2198 M_OPT_RANGE, -100, 100, &vo_gamma_hue }, |
22478 | 2199 { "panscan", mp_property_panscan, CONF_TYPE_FLOAT, |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2200 M_OPT_RANGE, 0, 1, NULL }, |
22478 | 2201 { "vsync", mp_property_vsync, CONF_TYPE_FLAG, |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2202 M_OPT_RANGE, 0, 1, NULL }, |
22478 | 2203 { "video_format", mp_property_video_format, CONF_TYPE_INT, |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2204 0, 0, 0, NULL }, |
23394
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
2205 { "video_codec", mp_property_video_codec, CONF_TYPE_STRING, |
d4e8613ddc95
Make all the info available via the metadata API available via properties.
albeu
parents:
23393
diff
changeset
|
2206 0, 0, 0, NULL }, |
22478 | 2207 { "video_bitrate", mp_property_video_bitrate, CONF_TYPE_INT, |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2208 0, 0, 0, NULL }, |
22478 | 2209 { "width", mp_property_width, CONF_TYPE_INT, |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2210 0, 0, 0, NULL }, |
22478 | 2211 { "height", mp_property_height, CONF_TYPE_INT, |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2212 0, 0, 0, NULL }, |
22478 | 2213 { "fps", mp_property_fps, CONF_TYPE_FLOAT, |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2214 0, 0, 0, NULL }, |
22478 | 2215 { "aspect", mp_property_aspect, CONF_TYPE_FLOAT, |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2216 0, 0, 0, NULL }, |
22478 | 2217 { "switch_video", mp_property_video, CONF_TYPE_INT, |
29333
09938ba82991
Do not use MAX_A/V_STREAMS as upper limit for switch_audio/switch_video
reimar
parents:
29263
diff
changeset
|
2218 CONF_RANGE, -2, 65535, NULL }, |
22478 | 2219 { "switch_program", mp_property_program, CONF_TYPE_INT, |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2220 CONF_RANGE, -1, 65535, NULL }, |
22478 | 2221 |
2222 // Subs | |
2223 { "sub", mp_property_sub, CONF_TYPE_INT, | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2224 M_OPT_MIN, -1, 0, NULL }, |
25129
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
2225 { "sub_source", mp_property_sub_source, CONF_TYPE_INT, |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
2226 M_OPT_RANGE, -1, SUB_SOURCES - 1, NULL }, |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
2227 { "sub_vob", mp_property_sub_by_type, CONF_TYPE_INT, |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
2228 M_OPT_MIN, -1, 0, NULL }, |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
2229 { "sub_demux", mp_property_sub_by_type, CONF_TYPE_INT, |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
2230 M_OPT_MIN, -1, 0, NULL }, |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
2231 { "sub_file", mp_property_sub_by_type, CONF_TYPE_INT, |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
2232 M_OPT_MIN, -1, 0, NULL }, |
22478 | 2233 { "sub_delay", mp_property_sub_delay, CONF_TYPE_FLOAT, |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2234 0, 0, 0, NULL }, |
22478 | 2235 { "sub_pos", mp_property_sub_pos, CONF_TYPE_INT, |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2236 M_OPT_RANGE, 0, 100, NULL }, |
22478 | 2237 { "sub_alignment", mp_property_sub_alignment, CONF_TYPE_INT, |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2238 M_OPT_RANGE, 0, 2, NULL }, |
22478 | 2239 { "sub_visibility", mp_property_sub_visibility, CONF_TYPE_FLAG, |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2240 M_OPT_RANGE, 0, 1, NULL }, |
22478 | 2241 { "sub_forced_only", mp_property_sub_forced_only, CONF_TYPE_FLAG, |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2242 M_OPT_RANGE, 0, 1, NULL }, |
27393 | 2243 #ifdef CONFIG_FREETYPE |
23725 | 2244 { "sub_scale", mp_property_sub_scale, CONF_TYPE_FLOAT, |
2245 M_OPT_RANGE, 0, 100, NULL }, | |
23740 | 2246 #endif |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27069
diff
changeset
|
2247 #ifdef CONFIG_ASS |
25814
4ba9b9bdf123
Add ass_use_margins command and property to shift subtitles to margins and back
eugeni
parents:
25717
diff
changeset
|
2248 { "ass_use_margins", mp_property_ass_use_margins, CONF_TYPE_FLAG, |
4ba9b9bdf123
Add ass_use_margins command and property to shift subtitles to margins and back
eugeni
parents:
25717
diff
changeset
|
2249 M_OPT_RANGE, 0, 1, NULL }, |
4ba9b9bdf123
Add ass_use_margins command and property to shift subtitles to margins and back
eugeni
parents:
25717
diff
changeset
|
2250 #endif |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2251 |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27069
diff
changeset
|
2252 #ifdef CONFIG_TV |
22478 | 2253 { "tv_brightness", mp_property_tv_color, CONF_TYPE_INT, |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2254 M_OPT_RANGE, -100, 100, (void *) TV_COLOR_BRIGHTNESS }, |
22478 | 2255 { "tv_contrast", mp_property_tv_color, CONF_TYPE_INT, |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2256 M_OPT_RANGE, -100, 100, (void *) TV_COLOR_CONTRAST }, |
22478 | 2257 { "tv_saturation", mp_property_tv_color, CONF_TYPE_INT, |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2258 M_OPT_RANGE, -100, 100, (void *) TV_COLOR_SATURATION }, |
22478 | 2259 { "tv_hue", mp_property_tv_color, CONF_TYPE_INT, |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2260 M_OPT_RANGE, -100, 100, (void *) TV_COLOR_HUE }, |
22478 | 2261 #endif |
23900 | 2262 { "teletext_page", mp_property_teletext_page, CONF_TYPE_INT, |
2263 M_OPT_RANGE, 100, 899, (void*)TV_VBI_CONTROL_GET_PAGE }, | |
2264 { "teletext_subpage", mp_property_teletext_common, CONF_TYPE_INT, | |
2265 M_OPT_RANGE, 0, 64, (void*)TV_VBI_CONTROL_GET_SUBPAGE }, | |
2266 { "teletext_mode", mp_property_teletext_mode, CONF_TYPE_FLAG, | |
2267 M_OPT_RANGE, 0, 1, (void*)TV_VBI_CONTROL_GET_MODE }, | |
2268 { "teletext_format", mp_property_teletext_common, CONF_TYPE_INT, | |
2269 M_OPT_RANGE, 0, 3, (void*)TV_VBI_CONTROL_GET_FORMAT }, | |
2270 { "teletext_half_page", mp_property_teletext_common, CONF_TYPE_INT, | |
2271 M_OPT_RANGE, 0, 2, (void*)TV_VBI_CONTROL_GET_HALF_PAGE }, | |
22478 | 2272 { NULL, NULL, NULL, 0, 0, 0, NULL } |
2273 }; | |
2274 | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2275 |
23393
a5e55cb59bbc
Rework the property API to allow sub properties such as
albeu
parents:
23259
diff
changeset
|
2276 int mp_property_do(const char *name, int action, void *val, void *ctx) |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2277 { |
23393
a5e55cb59bbc
Rework the property API to allow sub properties such as
albeu
parents:
23259
diff
changeset
|
2278 return m_property_do(mp_properties, name, action, val, ctx); |
22478 | 2279 } |
2280 | |
23393
a5e55cb59bbc
Rework the property API to allow sub properties such as
albeu
parents:
23259
diff
changeset
|
2281 char* mp_property_print(const char *name, void* ctx) |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2282 { |
23393
a5e55cb59bbc
Rework the property API to allow sub properties such as
albeu
parents:
23259
diff
changeset
|
2283 char* ret = NULL; |
a5e55cb59bbc
Rework the property API to allow sub properties such as
albeu
parents:
23259
diff
changeset
|
2284 if(mp_property_do(name,M_PROPERTY_PRINT,&ret,ctx) <= 0) |
a5e55cb59bbc
Rework the property API to allow sub properties such as
albeu
parents:
23259
diff
changeset
|
2285 return NULL; |
a5e55cb59bbc
Rework the property API to allow sub properties such as
albeu
parents:
23259
diff
changeset
|
2286 return ret; |
22478 | 2287 } |
2288 | |
31156 | 2289 char *property_expand_string(MPContext *mpctx, char *str) |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2290 { |
22478 | 2291 return m_properties_expand_string(mp_properties, str, mpctx); |
2292 } | |
2293 | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2294 void property_print_help(void) |
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2295 { |
22478 | 2296 m_properties_print_help_list(mp_properties); |
2297 } | |
2298 | |
2299 | |
2300 ///@} | |
2301 // Properties group | |
2302 | |
2303 | |
2304 /** | |
2305 * \defgroup Command2Property Command to property bridge | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2306 * |
22478 | 2307 * It is used to handle most commands that just set a property |
2308 * and optionally display something on the OSD. | |
2309 * Two kinds of commands are handled: adjust or toggle. | |
2310 * | |
2311 * Adjust commands take 1 or 2 parameters: <value> <abs> | |
2312 * If <abs> is non-zero the property is set to the given value | |
2313 * otherwise it is adjusted. | |
2314 * | |
2315 * Toggle commands take 0 or 1 parameters. With no parameter | |
2316 * or a value less than the property minimum it just steps the | |
32593 | 2317 * property to its next or previous value respectively. |
2318 * Otherwise it sets it to the given value. | |
22478 | 2319 * |
2320 *@{ | |
2321 */ | |
2322 | |
2323 /// List of the commands that can be handled by setting a property. | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2324 static struct { |
22478 | 2325 /// property name |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2326 const char *name; |
22478 | 2327 /// cmd id |
2328 int cmd; | |
2329 /// set/adjust or toggle command | |
2330 int toggle; | |
2331 /// progressbar type | |
2332 int osd_progbar; | |
2333 /// osd msg id if it must be shared | |
2334 int osd_id; | |
2335 /// osd msg template | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2336 const char *osd_msg; |
22478 | 2337 } set_prop_cmd[] = { |
23727 | 2338 // general |
2339 { "loop", MP_CMD_LOOP, 0, 0, -1, MSGTR_LoopStatus }, | |
25363 | 2340 { "chapter", MP_CMD_SEEK_CHAPTER, 0, 0, -1, NULL }, |
25577
f1ea96323643
properties to get and set angle; patch by oattila chello hu
nicodvb
parents:
25567
diff
changeset
|
2341 { "angle", MP_CMD_SWITCH_ANGLE, 0, 0, -1, NULL }, |
32438
faefba58f413
Implement a basic capture feature, available through -capture.
diego
parents:
32419
diff
changeset
|
2342 { "capturing", MP_CMD_CAPTURING, 1, 0, -1, NULL }, |
22478 | 2343 // audio |
2344 { "volume", MP_CMD_VOLUME, 0, OSD_VOLUME, -1, MSGTR_Volume }, | |
2345 { "mute", MP_CMD_MUTE, 1, 0, -1, MSGTR_MuteStatus }, | |
2346 { "audio_delay", MP_CMD_AUDIO_DELAY, 0, 0, -1, MSGTR_AVDelayStatus }, | |
2347 { "switch_audio", MP_CMD_SWITCH_AUDIO, 1, 0, -1, MSGTR_OSDAudio }, | |
23568 | 2348 { "balance", MP_CMD_BALANCE, 0, OSD_BALANCE, -1, MSGTR_Balance }, |
22478 | 2349 // video |
2350 { "fullscreen", MP_CMD_VO_FULLSCREEN, 1, 0, -1, NULL }, | |
2351 { "panscan", MP_CMD_PANSCAN, 0, OSD_PANSCAN, -1, MSGTR_Panscan }, | |
2352 { "ontop", MP_CMD_VO_ONTOP, 1, 0, -1, MSGTR_OnTopStatus }, | |
2353 { "rootwin", MP_CMD_VO_ROOTWIN, 1, 0, -1, MSGTR_RootwinStatus }, | |
2354 { "border", MP_CMD_VO_BORDER, 1, 0, -1, MSGTR_BorderStatus }, | |
2355 { "framedropping", MP_CMD_FRAMEDROPPING, 1, 0, -1, MSGTR_FramedroppingStatus }, | |
2356 { "gamma", MP_CMD_GAMMA, 0, OSD_BRIGHTNESS, -1, MSGTR_Gamma }, | |
2357 { "brightness", MP_CMD_BRIGHTNESS, 0, OSD_BRIGHTNESS, -1, MSGTR_Brightness }, | |
2358 { "contrast", MP_CMD_CONTRAST, 0, OSD_CONTRAST, -1, MSGTR_Contrast }, | |
2359 { "saturation", MP_CMD_SATURATION, 0, OSD_SATURATION, -1, MSGTR_Saturation }, | |
2360 { "hue", MP_CMD_HUE, 0, OSD_HUE, -1, MSGTR_Hue }, | |
2361 { "vsync", MP_CMD_SWITCH_VSYNC, 1, 0, -1, MSGTR_VSyncStatus }, | |
31077 | 2362 // subs |
22478 | 2363 { "sub", MP_CMD_SUB_SELECT, 1, 0, -1, MSGTR_SubSelectStatus }, |
25129
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
2364 { "sub_source", MP_CMD_SUB_SOURCE, 1, 0, -1, MSGTR_SubSourceStatus }, |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
2365 { "sub_vob", MP_CMD_SUB_VOB, 1, 0, -1, MSGTR_SubSelectStatus }, |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
2366 { "sub_demux", MP_CMD_SUB_DEMUX, 1, 0, -1, MSGTR_SubSelectStatus }, |
c04b64054255
Support select subtitle by source, add 4 properties:
ulion
parents:
25032
diff
changeset
|
2367 { "sub_file", MP_CMD_SUB_FILE, 1, 0, -1, MSGTR_SubSelectStatus }, |
22478 | 2368 { "sub_pos", MP_CMD_SUB_POS, 0, 0, -1, MSGTR_SubPosStatus }, |
2369 { "sub_alignment", MP_CMD_SUB_ALIGNMENT, 1, 0, -1, MSGTR_SubAlignStatus }, | |
2370 { "sub_delay", MP_CMD_SUB_DELAY, 0, 0, OSD_MSG_SUB_DELAY, MSGTR_SubDelayStatus }, | |
2371 { "sub_visibility", MP_CMD_SUB_VISIBILITY, 1, 0, -1, MSGTR_SubVisibleStatus }, | |
2372 { "sub_forced_only", MP_CMD_SUB_FORCED_ONLY, 1, 0, -1, MSGTR_SubForcedOnlyStatus }, | |
27393 | 2373 #ifdef CONFIG_FREETYPE |
23725 | 2374 { "sub_scale", MP_CMD_SUB_SCALE, 0, 0, -1, MSGTR_SubScale}, |
23740 | 2375 #endif |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27069
diff
changeset
|
2376 #ifdef CONFIG_ASS |
25814
4ba9b9bdf123
Add ass_use_margins command and property to shift subtitles to margins and back
eugeni
parents:
25717
diff
changeset
|
2377 { "ass_use_margins", MP_CMD_ASS_USE_MARGINS, 1, 0, -1, NULL }, |
4ba9b9bdf123
Add ass_use_margins command and property to shift subtitles to margins and back
eugeni
parents:
25717
diff
changeset
|
2378 #endif |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27069
diff
changeset
|
2379 #ifdef CONFIG_TV |
22478 | 2380 { "tv_brightness", MP_CMD_TV_SET_BRIGHTNESS, 0, OSD_BRIGHTNESS, -1, MSGTR_Brightness }, |
2381 { "tv_hue", MP_CMD_TV_SET_HUE, 0, OSD_HUE, -1, MSGTR_Hue }, | |
2382 { "tv_saturation", MP_CMD_TV_SET_SATURATION, 0, OSD_SATURATION, -1, MSGTR_Saturation }, | |
2383 { "tv_contrast", MP_CMD_TV_SET_CONTRAST, 0, OSD_CONTRAST, -1, MSGTR_Contrast }, | |
2384 #endif | |
2385 { NULL, 0, 0, 0, -1, NULL } | |
2386 }; | |
2387 | |
2388 | |
2389 /// Handle commands that set a property. | |
31156 | 2390 static int set_property_command(MPContext *mpctx, mp_cmd_t *cmd) |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2391 { |
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2392 int i, r; |
31156 | 2393 m_option_t *prop; |
23393
a5e55cb59bbc
Rework the property API to allow sub properties such as
albeu
parents:
23259
diff
changeset
|
2394 const char *pname; |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2395 |
22478 | 2396 // look for the command |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2397 for (i = 0; set_prop_cmd[i].name; i++) |
31077 | 2398 if (set_prop_cmd[i].cmd == cmd->id) |
2399 break; | |
23393
a5e55cb59bbc
Rework the property API to allow sub properties such as
albeu
parents:
23259
diff
changeset
|
2400 if (!(pname = set_prop_cmd[i].name)) |
31077 | 2401 return 0; |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2402 |
23393
a5e55cb59bbc
Rework the property API to allow sub properties such as
albeu
parents:
23259
diff
changeset
|
2403 if (mp_property_do(pname,M_PROPERTY_GET_TYPE,&prop,mpctx) <= 0 || !prop) |
a5e55cb59bbc
Rework the property API to allow sub properties such as
albeu
parents:
23259
diff
changeset
|
2404 return 0; |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2405 |
22478 | 2406 // toggle command |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2407 if (set_prop_cmd[i].toggle) { |
31077 | 2408 // set to value |
2409 if (cmd->nargs > 0 && cmd->args[0].v.i >= prop->min) | |
2410 r = mp_property_do(pname, M_PROPERTY_SET, &cmd->args[0].v.i, mpctx); | |
32593 | 2411 else if (cmd->nargs > 0) |
2412 r = mp_property_do(pname, M_PROPERTY_STEP_DOWN, NULL, mpctx); | |
31077 | 2413 else |
2414 r = mp_property_do(pname, M_PROPERTY_STEP_UP, NULL, mpctx); | |
2415 } else if (cmd->args[1].v.i) //set | |
2416 r = mp_property_do(pname, M_PROPERTY_SET, &cmd->args[0].v, mpctx); | |
2417 else // adjust | |
2418 r = mp_property_do(pname, M_PROPERTY_STEP_UP, &cmd->args[0].v, mpctx); | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2419 |
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2420 if (r <= 0) |
31077 | 2421 return 1; |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2422 |
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2423 if (set_prop_cmd[i].osd_progbar) { |
31077 | 2424 if (prop->type == CONF_TYPE_INT) { |
2425 if (mp_property_do(pname, M_PROPERTY_GET, &r, mpctx) > 0) | |
2426 set_osd_bar(set_prop_cmd[i].osd_progbar, | |
2427 set_prop_cmd[i].osd_msg, prop->min, prop->max, r); | |
2428 } else if (prop->type == CONF_TYPE_FLOAT) { | |
2429 float f; | |
2430 if (mp_property_do(pname, M_PROPERTY_GET, &f, mpctx) > 0) | |
2431 set_osd_bar(set_prop_cmd[i].osd_progbar, | |
2432 set_prop_cmd[i].osd_msg, prop->min, prop->max, f); | |
2433 } else | |
2434 mp_msg(MSGT_CPLAYER, MSGL_ERR, | |
2435 "Property use an unsupported type.\n"); | |
2436 return 1; | |
22478 | 2437 } |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2438 |
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2439 if (set_prop_cmd[i].osd_msg) { |
31077 | 2440 char *val = mp_property_print(pname, mpctx); |
2441 if (val) { | |
2442 set_osd_msg(set_prop_cmd[i].osd_id >= | |
2443 0 ? set_prop_cmd[i].osd_id : OSD_MSG_PROPERTY + i, | |
2444 1, osd_duration, set_prop_cmd[i].osd_msg, val); | |
2445 free(val); | |
2446 } | |
22478 | 2447 } |
2448 return 1; | |
2449 } | |
2450 | |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27069
diff
changeset
|
2451 #ifdef CONFIG_DVDNAV |
27068 | 2452 static const struct { |
2453 const char *name; | |
2454 const mp_command_type cmd; | |
2455 } mp_dvdnav_bindings[] = { | |
2456 { "up", MP_CMD_DVDNAV_UP }, | |
2457 { "down", MP_CMD_DVDNAV_DOWN }, | |
2458 { "left", MP_CMD_DVDNAV_LEFT }, | |
2459 { "right", MP_CMD_DVDNAV_RIGHT }, | |
2460 { "menu", MP_CMD_DVDNAV_MENU }, | |
2461 { "select", MP_CMD_DVDNAV_SELECT }, | |
2462 { "prev", MP_CMD_DVDNAV_PREVMENU }, | |
2463 { "mouse", MP_CMD_DVDNAV_MOUSECLICK }, | |
27069
1a6930933140
Keep old dvdnav sub-command options for a while in order
ben
parents:
27068
diff
changeset
|
2464 |
1a6930933140
Keep old dvdnav sub-command options for a while in order
ben
parents:
27068
diff
changeset
|
2465 /* |
1a6930933140
Keep old dvdnav sub-command options for a while in order
ben
parents:
27068
diff
changeset
|
2466 * keep old dvdnav sub-command options for a while in order not to |
1a6930933140
Keep old dvdnav sub-command options for a while in order
ben
parents:
27068
diff
changeset
|
2467 * break slave-mode API too suddenly. |
1a6930933140
Keep old dvdnav sub-command options for a while in order
ben
parents:
27068
diff
changeset
|
2468 */ |
1a6930933140
Keep old dvdnav sub-command options for a while in order
ben
parents:
27068
diff
changeset
|
2469 { "1", MP_CMD_DVDNAV_UP }, |
1a6930933140
Keep old dvdnav sub-command options for a while in order
ben
parents:
27068
diff
changeset
|
2470 { "2", MP_CMD_DVDNAV_DOWN }, |
1a6930933140
Keep old dvdnav sub-command options for a while in order
ben
parents:
27068
diff
changeset
|
2471 { "3", MP_CMD_DVDNAV_LEFT }, |
1a6930933140
Keep old dvdnav sub-command options for a while in order
ben
parents:
27068
diff
changeset
|
2472 { "4", MP_CMD_DVDNAV_RIGHT }, |
1a6930933140
Keep old dvdnav sub-command options for a while in order
ben
parents:
27068
diff
changeset
|
2473 { "5", MP_CMD_DVDNAV_MENU }, |
1a6930933140
Keep old dvdnav sub-command options for a while in order
ben
parents:
27068
diff
changeset
|
2474 { "6", MP_CMD_DVDNAV_SELECT }, |
1a6930933140
Keep old dvdnav sub-command options for a while in order
ben
parents:
27068
diff
changeset
|
2475 { "7", MP_CMD_DVDNAV_PREVMENU }, |
1a6930933140
Keep old dvdnav sub-command options for a while in order
ben
parents:
27068
diff
changeset
|
2476 { "8", MP_CMD_DVDNAV_MOUSECLICK }, |
27068 | 2477 { NULL, 0 } |
2478 }; | |
2479 #endif | |
22478 | 2480 |
30077
72e4567e7a0a
Print a ANS_ERROR reply if one of the *_property slave command fails.
reimar
parents:
30025
diff
changeset
|
2481 static const char *property_error_string(int error_value) |
72e4567e7a0a
Print a ANS_ERROR reply if one of the *_property slave command fails.
reimar
parents:
30025
diff
changeset
|
2482 { |
72e4567e7a0a
Print a ANS_ERROR reply if one of the *_property slave command fails.
reimar
parents:
30025
diff
changeset
|
2483 switch (error_value) { |
72e4567e7a0a
Print a ANS_ERROR reply if one of the *_property slave command fails.
reimar
parents:
30025
diff
changeset
|
2484 case M_PROPERTY_ERROR: |
72e4567e7a0a
Print a ANS_ERROR reply if one of the *_property slave command fails.
reimar
parents:
30025
diff
changeset
|
2485 return "ERROR"; |
72e4567e7a0a
Print a ANS_ERROR reply if one of the *_property slave command fails.
reimar
parents:
30025
diff
changeset
|
2486 case M_PROPERTY_UNAVAILABLE: |
72e4567e7a0a
Print a ANS_ERROR reply if one of the *_property slave command fails.
reimar
parents:
30025
diff
changeset
|
2487 return "PROPERTY_UNAVAILABLE"; |
72e4567e7a0a
Print a ANS_ERROR reply if one of the *_property slave command fails.
reimar
parents:
30025
diff
changeset
|
2488 case M_PROPERTY_NOT_IMPLEMENTED: |
72e4567e7a0a
Print a ANS_ERROR reply if one of the *_property slave command fails.
reimar
parents:
30025
diff
changeset
|
2489 return "NOT_IMPLEMENTED"; |
72e4567e7a0a
Print a ANS_ERROR reply if one of the *_property slave command fails.
reimar
parents:
30025
diff
changeset
|
2490 case M_PROPERTY_UNKNOWN: |
72e4567e7a0a
Print a ANS_ERROR reply if one of the *_property slave command fails.
reimar
parents:
30025
diff
changeset
|
2491 return "PROPERTY_UNKNOWN"; |
72e4567e7a0a
Print a ANS_ERROR reply if one of the *_property slave command fails.
reimar
parents:
30025
diff
changeset
|
2492 case M_PROPERTY_DISABLED: |
72e4567e7a0a
Print a ANS_ERROR reply if one of the *_property slave command fails.
reimar
parents:
30025
diff
changeset
|
2493 return "DISABLED"; |
72e4567e7a0a
Print a ANS_ERROR reply if one of the *_property slave command fails.
reimar
parents:
30025
diff
changeset
|
2494 } |
72e4567e7a0a
Print a ANS_ERROR reply if one of the *_property slave command fails.
reimar
parents:
30025
diff
changeset
|
2495 return "UNKNOWN"; |
72e4567e7a0a
Print a ANS_ERROR reply if one of the *_property slave command fails.
reimar
parents:
30025
diff
changeset
|
2496 } |
72e4567e7a0a
Print a ANS_ERROR reply if one of the *_property slave command fails.
reimar
parents:
30025
diff
changeset
|
2497 |
30344
4752e3cbe7be
Avoid duplicating code to remove subtitles (sub_remove slave command).
reimar
parents:
30082
diff
changeset
|
2498 static void remove_subtitle_range(MPContext *mpctx, int start, int count) |
4752e3cbe7be
Avoid duplicating code to remove subtitles (sub_remove slave command).
reimar
parents:
30082
diff
changeset
|
2499 { |
4752e3cbe7be
Avoid duplicating code to remove subtitles (sub_remove slave command).
reimar
parents:
30082
diff
changeset
|
2500 int idx; |
4752e3cbe7be
Avoid duplicating code to remove subtitles (sub_remove slave command).
reimar
parents:
30082
diff
changeset
|
2501 int end = start + count; |
4752e3cbe7be
Avoid duplicating code to remove subtitles (sub_remove slave command).
reimar
parents:
30082
diff
changeset
|
2502 int after = mpctx->set_of_sub_size - end; |
4752e3cbe7be
Avoid duplicating code to remove subtitles (sub_remove slave command).
reimar
parents:
30082
diff
changeset
|
2503 sub_data **subs = mpctx->set_of_subtitles; |
30345
ea015e0ab0c6
Also handle ASS subtitles when removing subtitles via sub_remove slave command.
reimar
parents:
30344
diff
changeset
|
2504 #ifdef CONFIG_ASS |
31792
55dacfca4a43
Rename libass types to match upstream libass >= 0.9.7
greg
parents:
31788
diff
changeset
|
2505 ASS_Track **ass_tracks = mpctx->set_of_ass_tracks; |
30345
ea015e0ab0c6
Also handle ASS subtitles when removing subtitles via sub_remove slave command.
reimar
parents:
30344
diff
changeset
|
2506 #endif |
30344
4752e3cbe7be
Avoid duplicating code to remove subtitles (sub_remove slave command).
reimar
parents:
30082
diff
changeset
|
2507 if (count < 0 || count > mpctx->set_of_sub_size || |
4752e3cbe7be
Avoid duplicating code to remove subtitles (sub_remove slave command).
reimar
parents:
30082
diff
changeset
|
2508 start < 0 || start > mpctx->set_of_sub_size - count) { |
4752e3cbe7be
Avoid duplicating code to remove subtitles (sub_remove slave command).
reimar
parents:
30082
diff
changeset
|
2509 mp_msg(MSGT_CPLAYER, MSGL_ERR, |
4752e3cbe7be
Avoid duplicating code to remove subtitles (sub_remove slave command).
reimar
parents:
30082
diff
changeset
|
2510 "Cannot remove invalid subtitle range %i +%i\n", start, count); |
4752e3cbe7be
Avoid duplicating code to remove subtitles (sub_remove slave command).
reimar
parents:
30082
diff
changeset
|
2511 return; |
4752e3cbe7be
Avoid duplicating code to remove subtitles (sub_remove slave command).
reimar
parents:
30082
diff
changeset
|
2512 } |
4752e3cbe7be
Avoid duplicating code to remove subtitles (sub_remove slave command).
reimar
parents:
30082
diff
changeset
|
2513 for (idx = start; idx < end; idx++) { |
4752e3cbe7be
Avoid duplicating code to remove subtitles (sub_remove slave command).
reimar
parents:
30082
diff
changeset
|
2514 sub_data *subd = subs[idx]; |
4752e3cbe7be
Avoid duplicating code to remove subtitles (sub_remove slave command).
reimar
parents:
30082
diff
changeset
|
2515 mp_msg(MSGT_CPLAYER, MSGL_STATUS, |
4752e3cbe7be
Avoid duplicating code to remove subtitles (sub_remove slave command).
reimar
parents:
30082
diff
changeset
|
2516 MSGTR_RemovedSubtitleFile, idx + 1, |
4752e3cbe7be
Avoid duplicating code to remove subtitles (sub_remove slave command).
reimar
parents:
30082
diff
changeset
|
2517 filename_recode(subd->filename)); |
4752e3cbe7be
Avoid duplicating code to remove subtitles (sub_remove slave command).
reimar
parents:
30082
diff
changeset
|
2518 sub_free(subd); |
4752e3cbe7be
Avoid duplicating code to remove subtitles (sub_remove slave command).
reimar
parents:
30082
diff
changeset
|
2519 subs[idx] = NULL; |
30345
ea015e0ab0c6
Also handle ASS subtitles when removing subtitles via sub_remove slave command.
reimar
parents:
30344
diff
changeset
|
2520 #ifdef CONFIG_ASS |
ea015e0ab0c6
Also handle ASS subtitles when removing subtitles via sub_remove slave command.
reimar
parents:
30344
diff
changeset
|
2521 if (ass_tracks[idx]) |
ea015e0ab0c6
Also handle ASS subtitles when removing subtitles via sub_remove slave command.
reimar
parents:
30344
diff
changeset
|
2522 ass_free_track(ass_tracks[idx]); |
ea015e0ab0c6
Also handle ASS subtitles when removing subtitles via sub_remove slave command.
reimar
parents:
30344
diff
changeset
|
2523 ass_tracks[idx] = NULL; |
ea015e0ab0c6
Also handle ASS subtitles when removing subtitles via sub_remove slave command.
reimar
parents:
30344
diff
changeset
|
2524 #endif |
30344
4752e3cbe7be
Avoid duplicating code to remove subtitles (sub_remove slave command).
reimar
parents:
30082
diff
changeset
|
2525 } |
4752e3cbe7be
Avoid duplicating code to remove subtitles (sub_remove slave command).
reimar
parents:
30082
diff
changeset
|
2526 |
4752e3cbe7be
Avoid duplicating code to remove subtitles (sub_remove slave command).
reimar
parents:
30082
diff
changeset
|
2527 mpctx->global_sub_size -= count; |
4752e3cbe7be
Avoid duplicating code to remove subtitles (sub_remove slave command).
reimar
parents:
30082
diff
changeset
|
2528 mpctx->set_of_sub_size -= count; |
4752e3cbe7be
Avoid duplicating code to remove subtitles (sub_remove slave command).
reimar
parents:
30082
diff
changeset
|
2529 if (mpctx->set_of_sub_size <= 0) |
31612
7fc1f051a19f
Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents:
31312
diff
changeset
|
2530 mpctx->sub_counts[SUB_SOURCE_SUBS] = 0; |
30344
4752e3cbe7be
Avoid duplicating code to remove subtitles (sub_remove slave command).
reimar
parents:
30082
diff
changeset
|
2531 |
4752e3cbe7be
Avoid duplicating code to remove subtitles (sub_remove slave command).
reimar
parents:
30082
diff
changeset
|
2532 memmove(subs + start, subs + end, after * sizeof(*subs)); |
4752e3cbe7be
Avoid duplicating code to remove subtitles (sub_remove slave command).
reimar
parents:
30082
diff
changeset
|
2533 memset(subs + start + after, 0, count * sizeof(*subs)); |
30345
ea015e0ab0c6
Also handle ASS subtitles when removing subtitles via sub_remove slave command.
reimar
parents:
30344
diff
changeset
|
2534 #ifdef CONFIG_ASS |
ea015e0ab0c6
Also handle ASS subtitles when removing subtitles via sub_remove slave command.
reimar
parents:
30344
diff
changeset
|
2535 memmove(ass_tracks + start, ass_tracks + end, after * sizeof(*ass_tracks)); |
ea015e0ab0c6
Also handle ASS subtitles when removing subtitles via sub_remove slave command.
reimar
parents:
30344
diff
changeset
|
2536 memset(ass_tracks + start + after, 0, count * sizeof(*ass_tracks)); |
ea015e0ab0c6
Also handle ASS subtitles when removing subtitles via sub_remove slave command.
reimar
parents:
30344
diff
changeset
|
2537 #endif |
30344
4752e3cbe7be
Avoid duplicating code to remove subtitles (sub_remove slave command).
reimar
parents:
30082
diff
changeset
|
2538 |
4752e3cbe7be
Avoid duplicating code to remove subtitles (sub_remove slave command).
reimar
parents:
30082
diff
changeset
|
2539 if (mpctx->set_of_sub_pos >= start && mpctx->set_of_sub_pos < end) { |
4752e3cbe7be
Avoid duplicating code to remove subtitles (sub_remove slave command).
reimar
parents:
30082
diff
changeset
|
2540 mpctx->global_sub_pos = -2; |
4752e3cbe7be
Avoid duplicating code to remove subtitles (sub_remove slave command).
reimar
parents:
30082
diff
changeset
|
2541 subdata = NULL; |
30345
ea015e0ab0c6
Also handle ASS subtitles when removing subtitles via sub_remove slave command.
reimar
parents:
30344
diff
changeset
|
2542 #ifdef CONFIG_ASS |
ea015e0ab0c6
Also handle ASS subtitles when removing subtitles via sub_remove slave command.
reimar
parents:
30344
diff
changeset
|
2543 ass_track = NULL; |
ea015e0ab0c6
Also handle ASS subtitles when removing subtitles via sub_remove slave command.
reimar
parents:
30344
diff
changeset
|
2544 #endif |
30344
4752e3cbe7be
Avoid duplicating code to remove subtitles (sub_remove slave command).
reimar
parents:
30082
diff
changeset
|
2545 mp_input_queue_cmd(mp_input_parse_cmd("sub_select")); |
4752e3cbe7be
Avoid duplicating code to remove subtitles (sub_remove slave command).
reimar
parents:
30082
diff
changeset
|
2546 } else if (mpctx->set_of_sub_pos >= end) { |
4752e3cbe7be
Avoid duplicating code to remove subtitles (sub_remove slave command).
reimar
parents:
30082
diff
changeset
|
2547 mpctx->set_of_sub_pos -= count; |
4752e3cbe7be
Avoid duplicating code to remove subtitles (sub_remove slave command).
reimar
parents:
30082
diff
changeset
|
2548 mpctx->global_sub_pos -= count; |
4752e3cbe7be
Avoid duplicating code to remove subtitles (sub_remove slave command).
reimar
parents:
30082
diff
changeset
|
2549 } |
4752e3cbe7be
Avoid duplicating code to remove subtitles (sub_remove slave command).
reimar
parents:
30082
diff
changeset
|
2550 } |
4752e3cbe7be
Avoid duplicating code to remove subtitles (sub_remove slave command).
reimar
parents:
30082
diff
changeset
|
2551 |
32392 | 2552 static int overlay_source_registered = 0; |
2553 static struct mp_eosd_source overlay_source = { | |
2554 .z_index = 5, | |
2555 }; | |
2556 | |
2557 static void overlay_add(char *file, int id, int x, int y, unsigned col) | |
2558 { | |
2559 FILE *f; | |
32442
bf593e3827d9
EOSD: overlay_add: use read_pnm instead of the internal reimplementation.
cigaes
parents:
32438
diff
changeset
|
2560 unsigned w, h, bpp, maxval; |
bf593e3827d9
EOSD: overlay_add: use read_pnm instead of the internal reimplementation.
cigaes
parents:
32438
diff
changeset
|
2561 uint8_t *data; |
32392 | 2562 struct mp_eosd_image *img; |
2563 | |
32442
bf593e3827d9
EOSD: overlay_add: use read_pnm instead of the internal reimplementation.
cigaes
parents:
32438
diff
changeset
|
2564 f = fopen(file, "rb"); |
bf593e3827d9
EOSD: overlay_add: use read_pnm instead of the internal reimplementation.
cigaes
parents:
32438
diff
changeset
|
2565 if (!f) { |
32392 | 2566 mp_msg(MSGT_CPLAYER, MSGL_ERR, "overlay_add: unable to open file.\n"); |
2567 return; | |
2568 } | |
32442
bf593e3827d9
EOSD: overlay_add: use read_pnm instead of the internal reimplementation.
cigaes
parents:
32438
diff
changeset
|
2569 data = read_pnm(f, &w, &h, &bpp, &maxval); |
bf593e3827d9
EOSD: overlay_add: use read_pnm instead of the internal reimplementation.
cigaes
parents:
32438
diff
changeset
|
2570 fclose(f); |
bf593e3827d9
EOSD: overlay_add: use read_pnm instead of the internal reimplementation.
cigaes
parents:
32438
diff
changeset
|
2571 if (!data) { |
bf593e3827d9
EOSD: overlay_add: use read_pnm instead of the internal reimplementation.
cigaes
parents:
32438
diff
changeset
|
2572 mp_msg(MSGT_CPLAYER, MSGL_ERR, "overlay_add: unable to load file.\n"); |
32392 | 2573 return; |
2574 } | |
32442
bf593e3827d9
EOSD: overlay_add: use read_pnm instead of the internal reimplementation.
cigaes
parents:
32438
diff
changeset
|
2575 if (bpp != 1 || maxval != 255) { |
bf593e3827d9
EOSD: overlay_add: use read_pnm instead of the internal reimplementation.
cigaes
parents:
32438
diff
changeset
|
2576 mp_msg(MSGT_CPLAYER, MSGL_ERR, |
bf593e3827d9
EOSD: overlay_add: use read_pnm instead of the internal reimplementation.
cigaes
parents:
32438
diff
changeset
|
2577 "overlay_add: file format not supported.\n"); |
32392 | 2578 return; |
2579 } | |
2580 if (!overlay_source_registered) { | |
2581 eosd_register(&overlay_source); | |
2582 eosd_image_remove_all(&overlay_source); | |
2583 overlay_source_registered = 1; | |
2584 } | |
2585 img = eosd_image_alloc(); | |
2586 img->w = w; | |
2587 img->h = h; | |
2588 img->stride = w; | |
2589 img->bitmap = data; | |
2590 img->color = col ^ 0xFF; /* col is RGBA, img->color is RGBT */ | |
2591 img->dst_x = x; | |
2592 img->dst_y = y; | |
32405
ad86352b7c6b
Use intptr_t for integers stored in opaque pointers.
cigaes
parents:
32392
diff
changeset
|
2593 img->opaque = (void *)(intptr_t)id; |
32392 | 2594 eosd_image_append(&overlay_source, img); |
2595 overlay_source.changed = EOSD_CHANGED_BITMAP; | |
2596 } | |
2597 | |
2598 static void overlay_remove(int id) | |
2599 { | |
2600 struct mp_eosd_image *img, **prev, *next; | |
2601 prev = &overlay_source.images; | |
2602 img = overlay_source.images; | |
2603 while (img) { | |
2604 next = img->next; | |
32405
ad86352b7c6b
Use intptr_t for integers stored in opaque pointers.
cigaes
parents:
32392
diff
changeset
|
2605 if ((intptr_t)img->opaque == id) { |
32392 | 2606 free(img->bitmap); |
2607 eosd_image_remove(&overlay_source, img, prev); | |
2608 overlay_source.changed = EOSD_CHANGED_BITMAP; | |
2609 } else { | |
2610 prev = &img->next; | |
2611 } | |
2612 img = next; | |
2613 } | |
2614 } | |
2615 | |
31156 | 2616 int run_command(MPContext *mpctx, mp_cmd_t *cmd) |
22478 | 2617 { |
2618 sh_audio_t * const sh_audio = mpctx->sh_audio; | |
2619 sh_video_t * const sh_video = mpctx->sh_video; | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2620 int brk_cmd = 0; |
22478 | 2621 if (!set_property_command(mpctx, cmd)) |
31077 | 2622 switch (cmd->id) { |
2623 case MP_CMD_SEEK:{ | |
2624 float v; | |
2625 int abs; | |
2626 if (sh_video) | |
2627 mpctx->osd_show_percentage = sh_video->fps; | |
2628 v = cmd->args[0].v.f; | |
2629 abs = (cmd->nargs > 1) ? cmd->args[1].v.i : 0; | |
2630 if (abs == 2) { /* Absolute seek to a specific timestamp in seconds */ | |
2631 abs_seek_pos = SEEK_ABSOLUTE; | |
2632 if (sh_video) | |
2633 mpctx->osd_function = | |
2634 (v > sh_video->pts) ? OSD_FFW : OSD_REW; | |
2635 rel_seek_secs = v; | |
2636 } else if (abs) { /* Absolute seek by percentage */ | |
2637 abs_seek_pos = SEEK_ABSOLUTE | SEEK_FACTOR; | |
2638 if (sh_video) | |
2639 mpctx->osd_function = OSD_FFW; // Direction isn't set correctly | |
2640 rel_seek_secs = v / 100.0; | |
2641 } else { | |
2642 rel_seek_secs += v; | |
2643 mpctx->osd_function = (v > 0) ? OSD_FFW : OSD_REW; | |
2644 } | |
2645 brk_cmd = 1; | |
2646 } | |
2647 break; | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2648 |
31077 | 2649 case MP_CMD_SET_PROPERTY:{ |
2650 int r = mp_property_do(cmd->args[0].v.s, M_PROPERTY_PARSE, | |
2651 cmd->args[1].v.s, mpctx); | |
2652 if (r == M_PROPERTY_UNKNOWN) | |
2653 mp_msg(MSGT_CPLAYER, MSGL_WARN, | |
2654 "Unknown property: '%s'\n", cmd->args[0].v.s); | |
2655 else if (r <= 0) | |
2656 mp_msg(MSGT_CPLAYER, MSGL_WARN, | |
2657 "Failed to set property '%s' to '%s'.\n", | |
2658 cmd->args[0].v.s, cmd->args[1].v.s); | |
2659 if (r <= 0) | |
2660 mp_msg(MSGT_GLOBAL, MSGL_INFO, "ANS_ERROR=%s\n", property_error_string(r)); | |
2661 } | |
2662 break; | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2663 |
31077 | 2664 case MP_CMD_STEP_PROPERTY:{ |
2665 void* arg = NULL; | |
2666 int r,i; | |
2667 double d; | |
2668 off_t o; | |
2669 if (cmd->args[1].v.f) { | |
31156 | 2670 m_option_t *prop; |
31077 | 2671 if((r = mp_property_do(cmd->args[0].v.s, |
2672 M_PROPERTY_GET_TYPE, | |
2673 &prop, mpctx)) <= 0) | |
2674 goto step_prop_err; | |
2675 if(prop->type == CONF_TYPE_INT || | |
2676 prop->type == CONF_TYPE_FLAG) | |
2677 i = cmd->args[1].v.f, arg = &i; | |
2678 else if(prop->type == CONF_TYPE_FLOAT) | |
2679 arg = &cmd->args[1].v.f; | |
2680 else if(prop->type == CONF_TYPE_DOUBLE || | |
2681 prop->type == CONF_TYPE_TIME) | |
2682 d = cmd->args[1].v.f, arg = &d; | |
2683 else if(prop->type == CONF_TYPE_POSITION) | |
2684 o = cmd->args[1].v.f, arg = &o; | |
2685 else | |
2686 mp_msg(MSGT_CPLAYER, MSGL_WARN, | |
2687 "Ignoring step size stepping property '%s'.\n", | |
2688 cmd->args[0].v.s); | |
2689 } | |
2690 r = mp_property_do(cmd->args[0].v.s, | |
2691 cmd->args[2].v.i < 0 ? | |
2692 M_PROPERTY_STEP_DOWN : M_PROPERTY_STEP_UP, | |
2693 arg, mpctx); | |
2694 step_prop_err: | |
2695 if (r == M_PROPERTY_UNKNOWN) | |
2696 mp_msg(MSGT_CPLAYER, MSGL_WARN, | |
2697 "Unknown property: '%s'\n", cmd->args[0].v.s); | |
2698 else if (r <= 0) | |
2699 mp_msg(MSGT_CPLAYER, MSGL_WARN, | |
2700 "Failed to increment property '%s' by %f.\n", | |
2701 cmd->args[0].v.s, cmd->args[1].v.f); | |
2702 if (r <= 0) | |
2703 mp_msg(MSGT_GLOBAL, MSGL_INFO, "ANS_ERROR=%s\n", property_error_string(r)); | |
2704 } | |
2705 break; | |
22478 | 2706 |
31077 | 2707 case MP_CMD_GET_PROPERTY:{ |
2708 char *tmp; | |
2709 int r = mp_property_do(cmd->args[0].v.s, M_PROPERTY_TO_STRING, | |
2710 &tmp, mpctx); | |
2711 if (r <= 0) { | |
2712 mp_msg(MSGT_CPLAYER, MSGL_WARN, | |
2713 "Failed to get value of property '%s'.\n", | |
2714 cmd->args[0].v.s); | |
2715 mp_msg(MSGT_GLOBAL, MSGL_INFO, "ANS_ERROR=%s\n", property_error_string(r)); | |
2716 break; | |
2717 } | |
2718 mp_msg(MSGT_GLOBAL, MSGL_INFO, "ANS_%s=%s\n", | |
2719 cmd->args[0].v.s, tmp); | |
2720 free(tmp); | |
2721 } | |
2722 break; | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2723 |
31077 | 2724 case MP_CMD_EDL_MARK: |
2725 if (edl_fd) { | |
2726 float v = sh_video ? sh_video->pts : | |
2727 playing_audio_pts(sh_audio, mpctx->d_audio, | |
2728 mpctx->audio_out); | |
22478 | 2729 |
31077 | 2730 if (mpctx->begin_skip == MP_NOPTS_VALUE) { |
2731 mpctx->begin_skip = v; | |
2732 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_EdloutStartSkip); | |
2733 } else { | |
2734 if (mpctx->begin_skip > v) | |
2735 mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_EdloutBadStop); | |
2736 else { | |
31957
49848f9a8f30
Add -edl-start-pts option to Adjust positions in EDL records according
reynaldo
parents:
31904
diff
changeset
|
2737 double pts = edl_start_pts ? start_pts : 0; |
49848f9a8f30
Add -edl-start-pts option to Adjust positions in EDL records according
reynaldo
parents:
31904
diff
changeset
|
2738 fprintf(edl_fd, "%f %f %d\n", mpctx->begin_skip - pts, v - pts, 0); |
31077 | 2739 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_EdloutEndSkip); |
2740 } | |
2741 mpctx->begin_skip = MP_NOPTS_VALUE; | |
2742 } | |
2743 } | |
2744 break; | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2745 |
31077 | 2746 case MP_CMD_SWITCH_RATIO: |
28368
c616bf5d520b
command.c: Fix some commands crashing during audio-only playback
uau
parents:
28032
diff
changeset
|
2747 if (!sh_video) |
c616bf5d520b
command.c: Fix some commands crashing during audio-only playback
uau
parents:
28032
diff
changeset
|
2748 break; |
31077 | 2749 if (cmd->nargs == 0 || cmd->args[0].v.f == -1) |
2750 movie_aspect = (float) sh_video->disp_w / sh_video->disp_h; | |
2751 else | |
2752 movie_aspect = cmd->args[0].v.f; | |
2753 mpcodecs_config_vo(sh_video, sh_video->disp_w, sh_video->disp_h, 0); | |
2754 break; | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2755 |
31077 | 2756 case MP_CMD_SPEED_INCR:{ |
2757 float v = cmd->args[0].v.f; | |
2758 playback_speed += v; | |
32561
17bb5a38ae2e
build_afilter_chain is not safe to use directly, thus make it
reimar
parents:
32511
diff
changeset
|
2759 reinit_audio_chain(); |
31077 | 2760 set_osd_msg(OSD_MSG_SPEED, 1, osd_duration, MSGTR_OSDSpeed, |
2761 playback_speed); | |
2762 } break; | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2763 |
31077 | 2764 case MP_CMD_SPEED_MULT:{ |
2765 float v = cmd->args[0].v.f; | |
2766 playback_speed *= v; | |
32561
17bb5a38ae2e
build_afilter_chain is not safe to use directly, thus make it
reimar
parents:
32511
diff
changeset
|
2767 reinit_audio_chain(); |
31077 | 2768 set_osd_msg(OSD_MSG_SPEED, 1, osd_duration, MSGTR_OSDSpeed, |
2769 playback_speed); | |
2770 } break; | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2771 |
31077 | 2772 case MP_CMD_SPEED_SET:{ |
2773 float v = cmd->args[0].v.f; | |
2774 playback_speed = v; | |
32561
17bb5a38ae2e
build_afilter_chain is not safe to use directly, thus make it
reimar
parents:
32511
diff
changeset
|
2775 reinit_audio_chain(); |
31077 | 2776 set_osd_msg(OSD_MSG_SPEED, 1, osd_duration, MSGTR_OSDSpeed, |
2777 playback_speed); | |
2778 } break; | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2779 |
31077 | 2780 case MP_CMD_FRAME_STEP: |
2781 case MP_CMD_PAUSE: | |
2782 cmd->pausing = 1; | |
2783 brk_cmd = 1; | |
2784 break; | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2785 |
31077 | 2786 case MP_CMD_FILE_FILTER: |
2787 file_filter = cmd->args[0].v.i; | |
2788 break; | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2789 |
31077 | 2790 case MP_CMD_QUIT: |
2791 exit_player_with_rc(EXIT_QUIT, | |
2792 (cmd->nargs > 0) ? cmd->args[0].v.i : 0); | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2793 |
31077 | 2794 case MP_CMD_PLAY_TREE_STEP:{ |
2795 int n = cmd->args[0].v.i == 0 ? 1 : cmd->args[0].v.i; | |
2796 int force = cmd->args[1].v.i; | |
22478 | 2797 |
27343 | 2798 #ifdef CONFIG_GUI |
31077 | 2799 if (use_gui) { |
2800 int i = 0; | |
2801 if (n > 0) | |
2802 for (i = 0; i < n; i++) | |
2803 mplNext(); | |
2804 else | |
2805 for (i = 0; i < -1 * n; i++) | |
2806 mplPrev(); | |
2807 } else | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2808 #endif |
31077 | 2809 { |
2810 if (!force && mpctx->playtree_iter) { | |
2811 play_tree_iter_t *i = | |
2812 play_tree_iter_new_copy(mpctx->playtree_iter); | |
2813 if (play_tree_iter_step(i, n, 0) == | |
2814 PLAY_TREE_ITER_ENTRY) | |
2815 mpctx->eof = | |
2816 (n > 0) ? PT_NEXT_ENTRY : PT_PREV_ENTRY; | |
2817 play_tree_iter_free(i); | |
2818 } else | |
2819 mpctx->eof = (n > 0) ? PT_NEXT_ENTRY : PT_PREV_ENTRY; | |
2820 if (mpctx->eof) | |
2821 mpctx->play_tree_step = n; | |
2822 brk_cmd = 1; | |
2823 } | |
2824 } | |
2825 break; | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2826 |
31077 | 2827 case MP_CMD_PLAY_TREE_UP_STEP:{ |
2828 int n = cmd->args[0].v.i > 0 ? 1 : -1; | |
2829 int force = cmd->args[1].v.i; | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2830 |
31077 | 2831 if (!force && mpctx->playtree_iter) { |
2832 play_tree_iter_t *i = | |
2833 play_tree_iter_new_copy(mpctx->playtree_iter); | |
2834 if (play_tree_iter_up_step(i, n, 0) == PLAY_TREE_ITER_ENTRY) | |
2835 mpctx->eof = (n > 0) ? PT_UP_NEXT : PT_UP_PREV; | |
2836 play_tree_iter_free(i); | |
2837 } else | |
2838 mpctx->eof = (n > 0) ? PT_UP_NEXT : PT_UP_PREV; | |
2839 brk_cmd = 1; | |
2840 } | |
2841 break; | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2842 |
31077 | 2843 case MP_CMD_PLAY_ALT_SRC_STEP: |
2844 if (mpctx->playtree_iter && mpctx->playtree_iter->num_files > 1) { | |
2845 int v = cmd->args[0].v.i; | |
2846 if (v > 0 | |
2847 && mpctx->playtree_iter->file < | |
2848 mpctx->playtree_iter->num_files) | |
2849 mpctx->eof = PT_NEXT_SRC; | |
2850 else if (v < 0 && mpctx->playtree_iter->file > 1) | |
2851 mpctx->eof = PT_PREV_SRC; | |
2852 } | |
2853 brk_cmd = 1; | |
2854 break; | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2855 |
31077 | 2856 case MP_CMD_SUB_STEP: |
2857 if (sh_video) { | |
2858 int movement = cmd->args[0].v.i; | |
2859 step_sub(subdata, sh_video->pts, movement); | |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27069
diff
changeset
|
2860 #ifdef CONFIG_ASS |
31077 | 2861 if (ass_track) |
2862 sub_delay += | |
2863 ass_step_sub(ass_track, | |
2864 (sh_video->pts + | |
2865 sub_delay) * 1000 + .5, movement) / 1000.; | |
22478 | 2866 #endif |
31077 | 2867 set_osd_msg(OSD_MSG_SUB_DELAY, 1, osd_duration, |
2868 MSGTR_OSDSubDelay, ROUND(sub_delay * 1000)); | |
2869 } | |
2870 break; | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2871 |
31077 | 2872 case MP_CMD_SUB_LOG: |
2873 log_sub(); | |
2874 break; | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2875 |
31077 | 2876 case MP_CMD_OSD:{ |
2877 int v = cmd->args[0].v.i; | |
2878 int max = (term_osd | |
2879 && !sh_video) ? MAX_TERM_OSD_LEVEL : MAX_OSD_LEVEL; | |
2880 if (osd_level > max) | |
2881 osd_level = max; | |
2882 if (v < 0) | |
2883 osd_level = (osd_level + 1) % (max + 1); | |
2884 else | |
2885 osd_level = v > max ? max : v; | |
2886 /* Show OSD state when disabled, but not when an explicit | |
2887 argument is given to the OSD command, i.e. in slave mode. */ | |
2888 if (v == -1 && osd_level <= 1) | |
2889 set_osd_msg(OSD_MSG_OSD_STATUS, 0, osd_duration, | |
2890 MSGTR_OSDosd, | |
2891 osd_level ? MSGTR_OSDenabled : | |
2892 MSGTR_OSDdisabled); | |
2893 else | |
2894 rm_osd_msg(OSD_MSG_OSD_STATUS); | |
2895 } | |
2896 break; | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2897 |
31077 | 2898 case MP_CMD_OSD_SHOW_TEXT: |
2899 set_osd_msg(OSD_MSG_TEXT, cmd->args[2].v.i, | |
2900 (cmd->args[1].v.i < | |
2901 0 ? osd_duration : cmd->args[1].v.i), | |
2902 "%-.63s", cmd->args[0].v.s); | |
2903 break; | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2904 |
31077 | 2905 case MP_CMD_OSD_SHOW_PROPERTY_TEXT:{ |
2906 char *txt = m_properties_expand_string(mp_properties, | |
2907 cmd->args[0].v.s, | |
2908 mpctx); | |
2909 /* if no argument supplied take default osd_duration, else <arg> ms. */ | |
2910 if (txt) { | |
2911 set_osd_msg(OSD_MSG_TEXT, cmd->args[2].v.i, | |
2912 (cmd->args[1].v.i < | |
2913 0 ? osd_duration : cmd->args[1].v.i), | |
2914 "%-.63s", txt); | |
2915 free(txt); | |
2916 } | |
2917 } | |
2918 break; | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2919 |
31077 | 2920 case MP_CMD_LOADFILE:{ |
2921 play_tree_t *e = play_tree_new(); | |
2922 play_tree_add_file(e, cmd->args[0].v.s); | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2923 |
31077 | 2924 if (cmd->args[1].v.i) // append |
2925 play_tree_append_entry(mpctx->playtree->child, e); | |
2926 else { | |
2927 // Go back to the starting point. | |
2928 while (play_tree_iter_up_step | |
2929 (mpctx->playtree_iter, 0, 1) != PLAY_TREE_ITER_END) | |
2930 /* NOP */ ; | |
2931 play_tree_free_list(mpctx->playtree->child, 1); | |
2932 play_tree_set_child(mpctx->playtree, e); | |
2933 pt_iter_goto_head(mpctx->playtree_iter); | |
2934 mpctx->eof = PT_NEXT_SRC; | |
2935 } | |
2936 brk_cmd = 1; | |
2937 } | |
2938 break; | |
22478 | 2939 |
31077 | 2940 case MP_CMD_LOADLIST:{ |
2941 play_tree_t *e = parse_playlist_file(cmd->args[0].v.s); | |
2942 if (!e) | |
2943 mp_msg(MSGT_CPLAYER, MSGL_ERR, | |
2944 MSGTR_PlaylistLoadUnable, cmd->args[0].v.s); | |
2945 else { | |
2946 if (cmd->args[1].v.i) // append | |
2947 play_tree_append_entry(mpctx->playtree->child, e); | |
2948 else { | |
2949 // Go back to the starting point. | |
2950 while (play_tree_iter_up_step | |
2951 (mpctx->playtree_iter, 0, 1) | |
2952 != PLAY_TREE_ITER_END) | |
2953 /* NOP */ ; | |
2954 play_tree_free_list(mpctx->playtree->child, 1); | |
2955 play_tree_set_child(mpctx->playtree, e); | |
2956 pt_iter_goto_head(mpctx->playtree_iter); | |
2957 mpctx->eof = PT_NEXT_SRC; | |
2958 } | |
2959 } | |
2960 brk_cmd = 1; | |
2961 } | |
2962 break; | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
2963 |
31077 | 2964 case MP_CMD_STOP: |
2965 // Go back to the starting point. | |
2966 while (play_tree_iter_up_step | |
2967 (mpctx->playtree_iter, 0, 1) != PLAY_TREE_ITER_END) | |
2968 /* NOP */ ; | |
2969 mpctx->eof = PT_STOP; | |
2970 brk_cmd = 1; | |
2971 break; | |
26877 | 2972 |
31077 | 2973 case MP_CMD_OSD_SHOW_PROGRESSION:{ |
2974 int len = demuxer_get_time_length(mpctx->demuxer); | |
2975 int pts = demuxer_get_current_time(mpctx->demuxer); | |
2976 set_osd_bar(0, "Position", 0, 100, demuxer_get_percent_pos(mpctx->demuxer)); | |
2977 set_osd_msg(OSD_MSG_TEXT, 1, osd_duration, | |
2978 "%c %02d:%02d:%02d / %02d:%02d:%02d", | |
2979 mpctx->osd_function, pts/3600, (pts/60)%60, pts%60, | |
2980 len/3600, (len/60)%60, len%60); | |
2981 } | |
2982 break; | |
30986
2186c040f9e0
Add osd_show_progression: Show progress bar and elapsed/total time.
cehoyos
parents:
30901
diff
changeset
|
2983 |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27069
diff
changeset
|
2984 #ifdef CONFIG_RADIO |
31077 | 2985 case MP_CMD_RADIO_STEP_CHANNEL: |
2986 if (mpctx->demuxer->stream->type == STREAMTYPE_RADIO) { | |
2987 int v = cmd->args[0].v.i; | |
2988 if (v > 0) | |
2989 radio_step_channel(mpctx->demuxer->stream, | |
2990 RADIO_CHANNEL_HIGHER); | |
2991 else | |
2992 radio_step_channel(mpctx->demuxer->stream, | |
2993 RADIO_CHANNEL_LOWER); | |
2994 if (radio_get_channel_name(mpctx->demuxer->stream)) { | |
2995 set_osd_msg(OSD_MSG_RADIO_CHANNEL, 1, osd_duration, | |
2996 MSGTR_OSDChannel, | |
2997 radio_get_channel_name(mpctx->demuxer->stream)); | |
2998 } | |
2999 } | |
3000 break; | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
3001 |
31077 | 3002 case MP_CMD_RADIO_SET_CHANNEL: |
3003 if (mpctx->demuxer->stream->type == STREAMTYPE_RADIO) { | |
3004 radio_set_channel(mpctx->demuxer->stream, cmd->args[0].v.s); | |
3005 if (radio_get_channel_name(mpctx->demuxer->stream)) { | |
3006 set_osd_msg(OSD_MSG_RADIO_CHANNEL, 1, osd_duration, | |
3007 MSGTR_OSDChannel, | |
3008 radio_get_channel_name(mpctx->demuxer->stream)); | |
3009 } | |
3010 } | |
3011 break; | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
3012 |
31077 | 3013 case MP_CMD_RADIO_SET_FREQ: |
3014 if (mpctx->demuxer->stream->type == STREAMTYPE_RADIO) | |
3015 radio_set_freq(mpctx->demuxer->stream, cmd->args[0].v.f); | |
3016 break; | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
3017 |
31077 | 3018 case MP_CMD_RADIO_STEP_FREQ: |
3019 if (mpctx->demuxer->stream->type == STREAMTYPE_RADIO) | |
3020 radio_step_freq(mpctx->demuxer->stream, cmd->args[0].v.f); | |
3021 break; | |
22478 | 3022 #endif |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
3023 |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27069
diff
changeset
|
3024 #ifdef CONFIG_TV |
31077 | 3025 case MP_CMD_TV_START_SCAN: |
3026 if (mpctx->file_format == DEMUXER_TYPE_TV) | |
3027 tv_start_scan((tvi_handle_t *) (mpctx->demuxer->priv),1); | |
3028 break; | |
3029 case MP_CMD_TV_SET_FREQ: | |
3030 if (mpctx->file_format == DEMUXER_TYPE_TV) | |
3031 tv_set_freq((tvi_handle_t *) (mpctx->demuxer->priv), | |
3032 cmd->args[0].v.f * 16.0); | |
27370
14c5017f40d2
Change a bunch of video/audio-output-specific preprocessor directives from
diego
parents:
27345
diff
changeset
|
3033 #ifdef CONFIG_PVR |
23258
1d86fb12e4ae
cosmetic: use K&R coding style, as in reste of the file
ben
parents:
23244
diff
changeset
|
3034 else if (mpctx->stream && mpctx->stream->type == STREAMTYPE_PVR) { |
23244
e5e8ac0bd7fc
support for PVR channel navigation (patch by Sven Gothel <sgothel at jausoft dot com>)
ben
parents:
23077
diff
changeset
|
3035 pvr_set_freq (mpctx->stream, ROUND (cmd->args[0].v.f)); |
e5e8ac0bd7fc
support for PVR channel navigation (patch by Sven Gothel <sgothel at jausoft dot com>)
ben
parents:
23077
diff
changeset
|
3036 set_osd_msg (OSD_MSG_TV_CHANNEL, 1, osd_duration, "%s: %s", |
e5e8ac0bd7fc
support for PVR channel navigation (patch by Sven Gothel <sgothel at jausoft dot com>)
ben
parents:
23077
diff
changeset
|
3037 pvr_get_current_channelname (mpctx->stream), |
e5e8ac0bd7fc
support for PVR channel navigation (patch by Sven Gothel <sgothel at jausoft dot com>)
ben
parents:
23077
diff
changeset
|
3038 pvr_get_current_stationname (mpctx->stream)); |
23259 | 3039 } |
27370
14c5017f40d2
Change a bunch of video/audio-output-specific preprocessor directives from
diego
parents:
27345
diff
changeset
|
3040 #endif /* CONFIG_PVR */ |
31077 | 3041 break; |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
3042 |
31077 | 3043 case MP_CMD_TV_STEP_FREQ: |
3044 if (mpctx->file_format == DEMUXER_TYPE_TV) | |
3045 tv_step_freq((tvi_handle_t *) (mpctx->demuxer->priv), | |
3046 cmd->args[0].v.f * 16.0); | |
27370
14c5017f40d2
Change a bunch of video/audio-output-specific preprocessor directives from
diego
parents:
27345
diff
changeset
|
3047 #ifdef CONFIG_PVR |
23258
1d86fb12e4ae
cosmetic: use K&R coding style, as in reste of the file
ben
parents:
23244
diff
changeset
|
3048 else if (mpctx->stream && mpctx->stream->type == STREAMTYPE_PVR) { |
23244
e5e8ac0bd7fc
support for PVR channel navigation (patch by Sven Gothel <sgothel at jausoft dot com>)
ben
parents:
23077
diff
changeset
|
3049 pvr_force_freq_step (mpctx->stream, ROUND (cmd->args[0].v.f)); |
e5e8ac0bd7fc
support for PVR channel navigation (patch by Sven Gothel <sgothel at jausoft dot com>)
ben
parents:
23077
diff
changeset
|
3050 set_osd_msg (OSD_MSG_TV_CHANNEL, 1, osd_duration, "%s: f %d", |
e5e8ac0bd7fc
support for PVR channel navigation (patch by Sven Gothel <sgothel at jausoft dot com>)
ben
parents:
23077
diff
changeset
|
3051 pvr_get_current_channelname (mpctx->stream), |
e5e8ac0bd7fc
support for PVR channel navigation (patch by Sven Gothel <sgothel at jausoft dot com>)
ben
parents:
23077
diff
changeset
|
3052 pvr_get_current_frequency (mpctx->stream)); |
e5e8ac0bd7fc
support for PVR channel navigation (patch by Sven Gothel <sgothel at jausoft dot com>)
ben
parents:
23077
diff
changeset
|
3053 } |
27370
14c5017f40d2
Change a bunch of video/audio-output-specific preprocessor directives from
diego
parents:
27345
diff
changeset
|
3054 #endif /* CONFIG_PVR */ |
31077 | 3055 break; |
22667 | 3056 |
31077 | 3057 case MP_CMD_TV_SET_NORM: |
3058 if (mpctx->file_format == DEMUXER_TYPE_TV) | |
3059 tv_set_norm((tvi_handle_t *) (mpctx->demuxer->priv), | |
3060 cmd->args[0].v.s); | |
3061 break; | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
3062 |
31077 | 3063 case MP_CMD_TV_STEP_CHANNEL:{ |
3064 if (mpctx->file_format == DEMUXER_TYPE_TV) { | |
3065 int v = cmd->args[0].v.i; | |
3066 if (v > 0) { | |
3067 tv_step_channel((tvi_handle_t *) (mpctx-> | |
3068 demuxer->priv), | |
3069 TV_CHANNEL_HIGHER); | |
3070 } else { | |
3071 tv_step_channel((tvi_handle_t *) (mpctx-> | |
3072 demuxer->priv), | |
3073 TV_CHANNEL_LOWER); | |
3074 } | |
3075 if (tv_channel_list) { | |
3076 set_osd_msg(OSD_MSG_TV_CHANNEL, 1, osd_duration, | |
3077 MSGTR_OSDChannel, tv_channel_current->name); | |
3078 //vo_osd_changed(OSDTYPE_SUBTITLE); | |
3079 } | |
3080 } | |
27370
14c5017f40d2
Change a bunch of video/audio-output-specific preprocessor directives from
diego
parents:
27345
diff
changeset
|
3081 #ifdef CONFIG_PVR |
23244
e5e8ac0bd7fc
support for PVR channel navigation (patch by Sven Gothel <sgothel at jausoft dot com>)
ben
parents:
23077
diff
changeset
|
3082 else if (mpctx->stream && |
23258
1d86fb12e4ae
cosmetic: use K&R coding style, as in reste of the file
ben
parents:
23244
diff
changeset
|
3083 mpctx->stream->type == STREAMTYPE_PVR) { |
23244
e5e8ac0bd7fc
support for PVR channel navigation (patch by Sven Gothel <sgothel at jausoft dot com>)
ben
parents:
23077
diff
changeset
|
3084 pvr_set_channel_step (mpctx->stream, cmd->args[0].v.i); |
e5e8ac0bd7fc
support for PVR channel navigation (patch by Sven Gothel <sgothel at jausoft dot com>)
ben
parents:
23077
diff
changeset
|
3085 set_osd_msg (OSD_MSG_TV_CHANNEL, 1, osd_duration, "%s: %s", |
e5e8ac0bd7fc
support for PVR channel navigation (patch by Sven Gothel <sgothel at jausoft dot com>)
ben
parents:
23077
diff
changeset
|
3086 pvr_get_current_channelname (mpctx->stream), |
e5e8ac0bd7fc
support for PVR channel navigation (patch by Sven Gothel <sgothel at jausoft dot com>)
ben
parents:
23077
diff
changeset
|
3087 pvr_get_current_stationname (mpctx->stream)); |
e5e8ac0bd7fc
support for PVR channel navigation (patch by Sven Gothel <sgothel at jausoft dot com>)
ben
parents:
23077
diff
changeset
|
3088 } |
27370
14c5017f40d2
Change a bunch of video/audio-output-specific preprocessor directives from
diego
parents:
27345
diff
changeset
|
3089 #endif /* CONFIG_PVR */ |
31077 | 3090 } |
27370
14c5017f40d2
Change a bunch of video/audio-output-specific preprocessor directives from
diego
parents:
27345
diff
changeset
|
3091 #ifdef CONFIG_DVBIN |
31077 | 3092 if (mpctx->stream->type == STREAMTYPE_DVB) { |
3093 int dir; | |
3094 int v = cmd->args[0].v.i; | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
3095 |
31077 | 3096 mpctx->last_dvb_step = v; |
3097 if (v > 0) | |
3098 dir = DVB_CHANNEL_HIGHER; | |
3099 else | |
3100 dir = DVB_CHANNEL_LOWER; | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
3101 |
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
3102 |
31077 | 3103 if (dvb_step_channel(mpctx->stream, dir)) |
3104 mpctx->eof = mpctx->dvbin_reopen = 1; | |
3105 } | |
27370
14c5017f40d2
Change a bunch of video/audio-output-specific preprocessor directives from
diego
parents:
27345
diff
changeset
|
3106 #endif /* CONFIG_DVBIN */ |
31077 | 3107 break; |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
3108 |
31077 | 3109 case MP_CMD_TV_SET_CHANNEL: |
3110 if (mpctx->file_format == DEMUXER_TYPE_TV) { | |
3111 tv_set_channel((tvi_handle_t *) (mpctx->demuxer->priv), | |
3112 cmd->args[0].v.s); | |
3113 if (tv_channel_list) { | |
3114 set_osd_msg(OSD_MSG_TV_CHANNEL, 1, osd_duration, | |
3115 MSGTR_OSDChannel, tv_channel_current->name); | |
3116 //vo_osd_changed(OSDTYPE_SUBTITLE); | |
3117 } | |
3118 } | |
27370
14c5017f40d2
Change a bunch of video/audio-output-specific preprocessor directives from
diego
parents:
27345
diff
changeset
|
3119 #ifdef CONFIG_PVR |
23258
1d86fb12e4ae
cosmetic: use K&R coding style, as in reste of the file
ben
parents:
23244
diff
changeset
|
3120 else if (mpctx->stream && mpctx->stream->type == STREAMTYPE_PVR) { |
23244
e5e8ac0bd7fc
support for PVR channel navigation (patch by Sven Gothel <sgothel at jausoft dot com>)
ben
parents:
23077
diff
changeset
|
3121 pvr_set_channel (mpctx->stream, cmd->args[0].v.s); |
e5e8ac0bd7fc
support for PVR channel navigation (patch by Sven Gothel <sgothel at jausoft dot com>)
ben
parents:
23077
diff
changeset
|
3122 set_osd_msg (OSD_MSG_TV_CHANNEL, 1, osd_duration, "%s: %s", |
e5e8ac0bd7fc
support for PVR channel navigation (patch by Sven Gothel <sgothel at jausoft dot com>)
ben
parents:
23077
diff
changeset
|
3123 pvr_get_current_channelname (mpctx->stream), |
e5e8ac0bd7fc
support for PVR channel navigation (patch by Sven Gothel <sgothel at jausoft dot com>)
ben
parents:
23077
diff
changeset
|
3124 pvr_get_current_stationname (mpctx->stream)); |
e5e8ac0bd7fc
support for PVR channel navigation (patch by Sven Gothel <sgothel at jausoft dot com>)
ben
parents:
23077
diff
changeset
|
3125 } |
27370
14c5017f40d2
Change a bunch of video/audio-output-specific preprocessor directives from
diego
parents:
27345
diff
changeset
|
3126 #endif /* CONFIG_PVR */ |
31077 | 3127 break; |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
3128 |
27370
14c5017f40d2
Change a bunch of video/audio-output-specific preprocessor directives from
diego
parents:
27345
diff
changeset
|
3129 #ifdef CONFIG_DVBIN |
31077 | 3130 case MP_CMD_DVB_SET_CHANNEL: |
3131 if (mpctx->stream->type == STREAMTYPE_DVB) { | |
3132 mpctx->last_dvb_step = 1; | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
3133 |
31077 | 3134 if (dvb_set_channel |
3135 (mpctx->stream, cmd->args[1].v.i, cmd->args[0].v.i)) | |
3136 mpctx->eof = mpctx->dvbin_reopen = 1; | |
3137 } | |
3138 break; | |
27370
14c5017f40d2
Change a bunch of video/audio-output-specific preprocessor directives from
diego
parents:
27345
diff
changeset
|
3139 #endif /* CONFIG_DVBIN */ |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
3140 |
31077 | 3141 case MP_CMD_TV_LAST_CHANNEL: |
3142 if (mpctx->file_format == DEMUXER_TYPE_TV) { | |
3143 tv_last_channel((tvi_handle_t *) (mpctx->demuxer->priv)); | |
3144 if (tv_channel_list) { | |
3145 set_osd_msg(OSD_MSG_TV_CHANNEL, 1, osd_duration, | |
3146 MSGTR_OSDChannel, tv_channel_current->name); | |
3147 //vo_osd_changed(OSDTYPE_SUBTITLE); | |
3148 } | |
3149 } | |
27370
14c5017f40d2
Change a bunch of video/audio-output-specific preprocessor directives from
diego
parents:
27345
diff
changeset
|
3150 #ifdef CONFIG_PVR |
23258
1d86fb12e4ae
cosmetic: use K&R coding style, as in reste of the file
ben
parents:
23244
diff
changeset
|
3151 else if (mpctx->stream && mpctx->stream->type == STREAMTYPE_PVR) { |
23244
e5e8ac0bd7fc
support for PVR channel navigation (patch by Sven Gothel <sgothel at jausoft dot com>)
ben
parents:
23077
diff
changeset
|
3152 pvr_set_lastchannel (mpctx->stream); |
e5e8ac0bd7fc
support for PVR channel navigation (patch by Sven Gothel <sgothel at jausoft dot com>)
ben
parents:
23077
diff
changeset
|
3153 set_osd_msg (OSD_MSG_TV_CHANNEL, 1, osd_duration, "%s: %s", |
e5e8ac0bd7fc
support for PVR channel navigation (patch by Sven Gothel <sgothel at jausoft dot com>)
ben
parents:
23077
diff
changeset
|
3154 pvr_get_current_channelname (mpctx->stream), |
e5e8ac0bd7fc
support for PVR channel navigation (patch by Sven Gothel <sgothel at jausoft dot com>)
ben
parents:
23077
diff
changeset
|
3155 pvr_get_current_stationname (mpctx->stream)); |
e5e8ac0bd7fc
support for PVR channel navigation (patch by Sven Gothel <sgothel at jausoft dot com>)
ben
parents:
23077
diff
changeset
|
3156 } |
27370
14c5017f40d2
Change a bunch of video/audio-output-specific preprocessor directives from
diego
parents:
27345
diff
changeset
|
3157 #endif /* CONFIG_PVR */ |
31077 | 3158 break; |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
3159 |
31077 | 3160 case MP_CMD_TV_STEP_NORM: |
3161 if (mpctx->file_format == DEMUXER_TYPE_TV) | |
3162 tv_step_norm((tvi_handle_t *) (mpctx->demuxer->priv)); | |
3163 break; | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
3164 |
31077 | 3165 case MP_CMD_TV_STEP_CHANNEL_LIST: |
3166 if (mpctx->file_format == DEMUXER_TYPE_TV) | |
3167 tv_step_chanlist((tvi_handle_t *) (mpctx->demuxer->priv)); | |
3168 break; | |
29806 | 3169 #endif /* CONFIG_TV */ |
31077 | 3170 case MP_CMD_TV_TELETEXT_ADD_DEC: |
3171 if (mpctx->demuxer->teletext) | |
3172 teletext_control(mpctx->demuxer->teletext,TV_VBI_CONTROL_ADD_DEC, | |
3173 &(cmd->args[0].v.s)); | |
3174 break; | |
3175 case MP_CMD_TV_TELETEXT_GO_LINK: | |
3176 if (mpctx->demuxer->teletext) | |
3177 teletext_control(mpctx->demuxer->teletext,TV_VBI_CONTROL_GO_LINK, | |
3178 &(cmd->args[0].v.i)); | |
3179 break; | |
32406 | 3180 |
32392 | 3181 case MP_CMD_OVERLAY_ADD: |
3182 overlay_add(cmd->args[0].v.s, cmd->args[1].v.i, | |
3183 cmd->args[2].v.i, cmd->args[3].v.i, cmd->args[4].v.i); | |
3184 break; | |
3185 case MP_CMD_OVERLAY_REMOVE: | |
3186 overlay_remove(cmd->args[0].v.i); | |
3187 break; | |
22478 | 3188 |
31077 | 3189 case MP_CMD_SUB_LOAD: |
3190 if (sh_video) { | |
3191 int n = mpctx->set_of_sub_size; | |
3192 add_subtitles(cmd->args[0].v.s, sh_video->fps, 0); | |
3193 if (n != mpctx->set_of_sub_size) { | |
31612
7fc1f051a19f
Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents:
31312
diff
changeset
|
3194 mpctx->sub_counts[SUB_SOURCE_SUBS]++; |
31077 | 3195 ++mpctx->global_sub_size; |
3196 } | |
3197 } | |
3198 break; | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
3199 |
31077 | 3200 case MP_CMD_SUB_REMOVE: |
3201 if (sh_video) { | |
3202 int v = cmd->args[0].v.i; | |
3203 if (v < 0) { | |
3204 remove_subtitle_range(mpctx, 0, mpctx->set_of_sub_size); | |
3205 } else if (v < mpctx->set_of_sub_size) { | |
3206 remove_subtitle_range(mpctx, v, 1); | |
3207 } | |
3208 } | |
3209 break; | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
3210 |
31077 | 3211 case MP_CMD_GET_SUB_VISIBILITY: |
3212 if (sh_video) { | |
3213 mp_msg(MSGT_GLOBAL, MSGL_INFO, | |
3214 "ANS_SUB_VISIBILITY=%d\n", sub_visibility); | |
3215 } | |
3216 break; | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
3217 |
31077 | 3218 case MP_CMD_SCREENSHOT: |
3219 if (vo_config_count) { | |
3220 mp_msg(MSGT_CPLAYER, MSGL_INFO, "sending VFCTRL_SCREENSHOT!\n"); | |
3221 if (CONTROL_OK != | |
3222 ((vf_instance_t *) sh_video->vfilter)-> | |
3223 control(sh_video->vfilter, VFCTRL_SCREENSHOT, | |
3224 &cmd->args[0].v.i)) | |
3225 mp_msg(MSGT_CPLAYER, MSGL_INFO, "failed (forgot -vf screenshot?)\n"); | |
3226 } | |
3227 break; | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
3228 |
31077 | 3229 case MP_CMD_VF_CHANGE_RECTANGLE: |
28368
c616bf5d520b
command.c: Fix some commands crashing during audio-only playback
uau
parents:
28032
diff
changeset
|
3230 if (!sh_video) |
c616bf5d520b
command.c: Fix some commands crashing during audio-only playback
uau
parents:
28032
diff
changeset
|
3231 break; |
31077 | 3232 set_rectangle(sh_video, cmd->args[0].v.i, cmd->args[1].v.i); |
3233 break; | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
3234 |
31077 | 3235 case MP_CMD_GET_TIME_LENGTH:{ |
32352
76f94c00a69f
1000l, %lf is not valid format string for printf (only for scanf) and actually
reimar
parents:
32209
diff
changeset
|
3236 mp_msg(MSGT_GLOBAL, MSGL_INFO, "ANS_LENGTH=%.2f\n", |
31077 | 3237 demuxer_get_time_length(mpctx->demuxer)); |
3238 } | |
3239 break; | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
3240 |
31077 | 3241 case MP_CMD_GET_FILENAME:{ |
3242 mp_msg(MSGT_GLOBAL, MSGL_INFO, "ANS_FILENAME='%s'\n", | |
3243 get_metadata(META_NAME)); | |
3244 } | |
3245 break; | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
3246 |
31077 | 3247 case MP_CMD_GET_VIDEO_CODEC:{ |
3248 char *inf = get_metadata(META_VIDEO_CODEC); | |
3249 if (!inf) | |
3250 inf = strdup(""); | |
3251 mp_msg(MSGT_GLOBAL, MSGL_INFO, "ANS_VIDEO_CODEC='%s'\n", inf); | |
3252 free(inf); | |
3253 } | |
3254 break; | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
3255 |
31077 | 3256 case MP_CMD_GET_VIDEO_BITRATE:{ |
3257 char *inf = get_metadata(META_VIDEO_BITRATE); | |
3258 if (!inf) | |
3259 inf = strdup(""); | |
3260 mp_msg(MSGT_GLOBAL, MSGL_INFO, "ANS_VIDEO_BITRATE='%s'\n", inf); | |
3261 free(inf); | |
3262 } | |
3263 break; | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
3264 |
31077 | 3265 case MP_CMD_GET_VIDEO_RESOLUTION:{ |
3266 char *inf = get_metadata(META_VIDEO_RESOLUTION); | |
3267 if (!inf) | |
3268 inf = strdup(""); | |
3269 mp_msg(MSGT_GLOBAL, MSGL_INFO, | |
3270 "ANS_VIDEO_RESOLUTION='%s'\n", inf); | |
3271 free(inf); | |
3272 } | |
3273 break; | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
3274 |
31077 | 3275 case MP_CMD_GET_AUDIO_CODEC:{ |
3276 char *inf = get_metadata(META_AUDIO_CODEC); | |
3277 if (!inf) | |
3278 inf = strdup(""); | |
3279 mp_msg(MSGT_GLOBAL, MSGL_INFO, "ANS_AUDIO_CODEC='%s'\n", inf); | |
3280 free(inf); | |
3281 } | |
3282 break; | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
3283 |
31077 | 3284 case MP_CMD_GET_AUDIO_BITRATE:{ |
3285 char *inf = get_metadata(META_AUDIO_BITRATE); | |
3286 if (!inf) | |
3287 inf = strdup(""); | |
3288 mp_msg(MSGT_GLOBAL, MSGL_INFO, "ANS_AUDIO_BITRATE='%s'\n", inf); | |
3289 free(inf); | |
3290 } | |
3291 break; | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
3292 |
31077 | 3293 case MP_CMD_GET_AUDIO_SAMPLES:{ |
3294 char *inf = get_metadata(META_AUDIO_SAMPLES); | |
3295 if (!inf) | |
3296 inf = strdup(""); | |
3297 mp_msg(MSGT_GLOBAL, MSGL_INFO, "ANS_AUDIO_SAMPLES='%s'\n", inf); | |
3298 free(inf); | |
3299 } | |
3300 break; | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
3301 |
31077 | 3302 case MP_CMD_GET_META_TITLE:{ |
3303 char *inf = get_metadata(META_INFO_TITLE); | |
3304 if (!inf) | |
3305 inf = strdup(""); | |
3306 mp_msg(MSGT_GLOBAL, MSGL_INFO, "ANS_META_TITLE='%s'\n", inf); | |
3307 free(inf); | |
3308 } | |
3309 break; | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
3310 |
31077 | 3311 case MP_CMD_GET_META_ARTIST:{ |
3312 char *inf = get_metadata(META_INFO_ARTIST); | |
3313 if (!inf) | |
3314 inf = strdup(""); | |
3315 mp_msg(MSGT_GLOBAL, MSGL_INFO, "ANS_META_ARTIST='%s'\n", inf); | |
3316 free(inf); | |
3317 } | |
3318 break; | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
3319 |
31077 | 3320 case MP_CMD_GET_META_ALBUM:{ |
3321 char *inf = get_metadata(META_INFO_ALBUM); | |
3322 if (!inf) | |
3323 inf = strdup(""); | |
3324 mp_msg(MSGT_GLOBAL, MSGL_INFO, "ANS_META_ALBUM='%s'\n", inf); | |
3325 free(inf); | |
3326 } | |
3327 break; | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
3328 |
31077 | 3329 case MP_CMD_GET_META_YEAR:{ |
3330 char *inf = get_metadata(META_INFO_YEAR); | |
3331 if (!inf) | |
3332 inf = strdup(""); | |
3333 mp_msg(MSGT_GLOBAL, MSGL_INFO, "ANS_META_YEAR='%s'\n", inf); | |
3334 free(inf); | |
3335 } | |
3336 break; | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
3337 |
31077 | 3338 case MP_CMD_GET_META_COMMENT:{ |
3339 char *inf = get_metadata(META_INFO_COMMENT); | |
3340 if (!inf) | |
3341 inf = strdup(""); | |
3342 mp_msg(MSGT_GLOBAL, MSGL_INFO, "ANS_META_COMMENT='%s'\n", inf); | |
3343 free(inf); | |
3344 } | |
3345 break; | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
3346 |
31077 | 3347 case MP_CMD_GET_META_TRACK:{ |
3348 char *inf = get_metadata(META_INFO_TRACK); | |
3349 if (!inf) | |
3350 inf = strdup(""); | |
3351 mp_msg(MSGT_GLOBAL, MSGL_INFO, "ANS_META_TRACK='%s'\n", inf); | |
3352 free(inf); | |
3353 } | |
3354 break; | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
3355 |
31077 | 3356 case MP_CMD_GET_META_GENRE:{ |
3357 char *inf = get_metadata(META_INFO_GENRE); | |
3358 if (!inf) | |
3359 inf = strdup(""); | |
3360 mp_msg(MSGT_GLOBAL, MSGL_INFO, "ANS_META_GENRE='%s'\n", inf); | |
3361 free(inf); | |
3362 } | |
3363 break; | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
3364 |
31077 | 3365 case MP_CMD_GET_VO_FULLSCREEN: |
3366 if (mpctx->video_out && vo_config_count) | |
3367 mp_msg(MSGT_GLOBAL, MSGL_INFO, "ANS_VO_FULLSCREEN=%d\n", vo_fs); | |
3368 break; | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
3369 |
31077 | 3370 case MP_CMD_GET_PERCENT_POS: |
3371 mp_msg(MSGT_GLOBAL, MSGL_INFO, "ANS_PERCENT_POSITION=%d\n", | |
3372 demuxer_get_percent_pos(mpctx->demuxer)); | |
3373 break; | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
3374 |
31077 | 3375 case MP_CMD_GET_TIME_POS:{ |
3376 float pos = 0; | |
3377 if (sh_video) | |
3378 pos = sh_video->pts; | |
3379 else if (sh_audio && mpctx->audio_out) | |
3380 pos = | |
3381 playing_audio_pts(sh_audio, mpctx->d_audio, | |
3382 mpctx->audio_out); | |
3383 mp_msg(MSGT_GLOBAL, MSGL_INFO, "ANS_TIME_POSITION=%.1f\n", pos); | |
3384 } | |
3385 break; | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
3386 |
31077 | 3387 case MP_CMD_RUN: |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
3388 #ifndef __MINGW32__ |
31077 | 3389 if (!fork()) { |
3390 execl("/bin/sh", "sh", "-c", cmd->args[0].v.s, NULL); | |
3391 exit(0); | |
3392 } | |
22478 | 3393 #endif |
31077 | 3394 break; |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
3395 |
31077 | 3396 case MP_CMD_KEYDOWN_EVENTS: |
3397 mplayer_put_key(cmd->args[0].v.i); | |
3398 break; | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
3399 |
31077 | 3400 case MP_CMD_SET_MOUSE_POS:{ |
3401 int pointer_x, pointer_y; | |
3402 double dx, dy; | |
3403 pointer_x = cmd->args[0].v.i; | |
3404 pointer_y = cmd->args[1].v.i; | |
3405 rescale_input_coordinates(pointer_x, pointer_y, &dx, &dy); | |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27069
diff
changeset
|
3406 #ifdef CONFIG_DVDNAV |
31077 | 3407 if (mpctx->stream->type == STREAMTYPE_DVDNAV |
3408 && dx > 0.0 && dy > 0.0) { | |
3409 int button = -1; | |
3410 pointer_x = (int) (dx * (double) sh_video->disp_w); | |
3411 pointer_y = (int) (dy * (double) sh_video->disp_h); | |
3412 mp_dvdnav_update_mouse_pos(mpctx->stream, | |
3413 pointer_x, pointer_y, &button); | |
3414 if (osd_level > 1 && button > 0) | |
3415 set_osd_msg(OSD_MSG_TEXT, 1, osd_duration, | |
3416 "Selected button number %d", button); | |
3417 } | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
3418 #endif |
27345
b597fd2924b4
Rename preprocessor directive HAVE_MENU --> CONFIG_MENU.
diego
parents:
27343
diff
changeset
|
3419 #ifdef CONFIG_MENU |
31077 | 3420 if (use_menu && dx >= 0.0 && dy >= 0.0) |
3421 menu_update_mouse_pos(dx, dy); | |
25461 | 3422 #endif |
31077 | 3423 } |
3424 break; | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
3425 |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27069
diff
changeset
|
3426 #ifdef CONFIG_DVDNAV |
31077 | 3427 case MP_CMD_DVDNAV:{ |
3428 int button = -1; | |
3429 int i; | |
3430 mp_command_type command = 0; | |
3431 if (mpctx->stream->type != STREAMTYPE_DVDNAV) | |
3432 break; | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
3433 |
31077 | 3434 for (i = 0; mp_dvdnav_bindings[i].name; i++) |
3435 if (cmd->args[0].v.s && | |
3436 !strcasecmp (cmd->args[0].v.s, | |
3437 mp_dvdnav_bindings[i].name)) | |
3438 command = mp_dvdnav_bindings[i].cmd; | |
27068 | 3439 |
31077 | 3440 mp_dvdnav_handle_input(mpctx->stream,command,&button); |
3441 if (osd_level > 1 && button > 0) | |
3442 set_osd_msg(OSD_MSG_TEXT, 1, osd_duration, | |
3443 "Selected button number %d", button); | |
3444 } | |
3445 break; | |
25817 | 3446 |
31077 | 3447 case MP_CMD_SWITCH_TITLE: |
3448 if (mpctx->stream->type == STREAMTYPE_DVDNAV) | |
3449 mp_dvdnav_switch_title(mpctx->stream, cmd->args[0].v.i); | |
3450 break; | |
25817 | 3451 |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
3452 #endif |
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
3453 |
30988
8d840754a921
Add slave commands for loading and unloading audio filters at runtime.
cehoyos
parents:
30986
diff
changeset
|
3454 case MP_CMD_AF_SWITCH: |
8d840754a921
Add slave commands for loading and unloading audio filters at runtime.
cehoyos
parents:
30986
diff
changeset
|
3455 if (sh_audio) |
8d840754a921
Add slave commands for loading and unloading audio filters at runtime.
cehoyos
parents:
30986
diff
changeset
|
3456 { |
8d840754a921
Add slave commands for loading and unloading audio filters at runtime.
cehoyos
parents:
30986
diff
changeset
|
3457 af_uninit(mpctx->mixer.afilter); |
8d840754a921
Add slave commands for loading and unloading audio filters at runtime.
cehoyos
parents:
30986
diff
changeset
|
3458 af_init(mpctx->mixer.afilter); |
8d840754a921
Add slave commands for loading and unloading audio filters at runtime.
cehoyos
parents:
30986
diff
changeset
|
3459 } |
8d840754a921
Add slave commands for loading and unloading audio filters at runtime.
cehoyos
parents:
30986
diff
changeset
|
3460 case MP_CMD_AF_ADD: |
8d840754a921
Add slave commands for loading and unloading audio filters at runtime.
cehoyos
parents:
30986
diff
changeset
|
3461 case MP_CMD_AF_DEL: |
8d840754a921
Add slave commands for loading and unloading audio filters at runtime.
cehoyos
parents:
30986
diff
changeset
|
3462 if (!sh_audio) |
8d840754a921
Add slave commands for loading and unloading audio filters at runtime.
cehoyos
parents:
30986
diff
changeset
|
3463 break; |
8d840754a921
Add slave commands for loading and unloading audio filters at runtime.
cehoyos
parents:
30986
diff
changeset
|
3464 { |
8d840754a921
Add slave commands for loading and unloading audio filters at runtime.
cehoyos
parents:
30986
diff
changeset
|
3465 char* af_args = strdup(cmd->args[0].v.s); |
8d840754a921
Add slave commands for loading and unloading audio filters at runtime.
cehoyos
parents:
30986
diff
changeset
|
3466 char* af_commands = af_args; |
8d840754a921
Add slave commands for loading and unloading audio filters at runtime.
cehoyos
parents:
30986
diff
changeset
|
3467 char* af_command; |
8d840754a921
Add slave commands for loading and unloading audio filters at runtime.
cehoyos
parents:
30986
diff
changeset
|
3468 af_instance_t* af; |
8d840754a921
Add slave commands for loading and unloading audio filters at runtime.
cehoyos
parents:
30986
diff
changeset
|
3469 while ((af_command = strsep(&af_commands, ",")) != NULL) |
8d840754a921
Add slave commands for loading and unloading audio filters at runtime.
cehoyos
parents:
30986
diff
changeset
|
3470 { |
8d840754a921
Add slave commands for loading and unloading audio filters at runtime.
cehoyos
parents:
30986
diff
changeset
|
3471 if (cmd->id == MP_CMD_AF_DEL) |
8d840754a921
Add slave commands for loading and unloading audio filters at runtime.
cehoyos
parents:
30986
diff
changeset
|
3472 { |
8d840754a921
Add slave commands for loading and unloading audio filters at runtime.
cehoyos
parents:
30986
diff
changeset
|
3473 af = af_get(mpctx->mixer.afilter, af_command); |
8d840754a921
Add slave commands for loading and unloading audio filters at runtime.
cehoyos
parents:
30986
diff
changeset
|
3474 if (af != NULL) |
8d840754a921
Add slave commands for loading and unloading audio filters at runtime.
cehoyos
parents:
30986
diff
changeset
|
3475 af_remove(mpctx->mixer.afilter, af); |
8d840754a921
Add slave commands for loading and unloading audio filters at runtime.
cehoyos
parents:
30986
diff
changeset
|
3476 } |
8d840754a921
Add slave commands for loading and unloading audio filters at runtime.
cehoyos
parents:
30986
diff
changeset
|
3477 else |
8d840754a921
Add slave commands for loading and unloading audio filters at runtime.
cehoyos
parents:
30986
diff
changeset
|
3478 af_add(mpctx->mixer.afilter, af_command); |
8d840754a921
Add slave commands for loading and unloading audio filters at runtime.
cehoyos
parents:
30986
diff
changeset
|
3479 } |
32561
17bb5a38ae2e
build_afilter_chain is not safe to use directly, thus make it
reimar
parents:
32511
diff
changeset
|
3480 reinit_audio_chain(); |
30988
8d840754a921
Add slave commands for loading and unloading audio filters at runtime.
cehoyos
parents:
30986
diff
changeset
|
3481 free(af_args); |
8d840754a921
Add slave commands for loading and unloading audio filters at runtime.
cehoyos
parents:
30986
diff
changeset
|
3482 } |
8d840754a921
Add slave commands for loading and unloading audio filters at runtime.
cehoyos
parents:
30986
diff
changeset
|
3483 break; |
8d840754a921
Add slave commands for loading and unloading audio filters at runtime.
cehoyos
parents:
30986
diff
changeset
|
3484 case MP_CMD_AF_CLR: |
8d840754a921
Add slave commands for loading and unloading audio filters at runtime.
cehoyos
parents:
30986
diff
changeset
|
3485 if (!sh_audio) |
8d840754a921
Add slave commands for loading and unloading audio filters at runtime.
cehoyos
parents:
30986
diff
changeset
|
3486 break; |
8d840754a921
Add slave commands for loading and unloading audio filters at runtime.
cehoyos
parents:
30986
diff
changeset
|
3487 af_uninit(mpctx->mixer.afilter); |
8d840754a921
Add slave commands for loading and unloading audio filters at runtime.
cehoyos
parents:
30986
diff
changeset
|
3488 af_init(mpctx->mixer.afilter); |
32561
17bb5a38ae2e
build_afilter_chain is not safe to use directly, thus make it
reimar
parents:
32511
diff
changeset
|
3489 reinit_audio_chain(); |
30988
8d840754a921
Add slave commands for loading and unloading audio filters at runtime.
cehoyos
parents:
30986
diff
changeset
|
3490 break; |
32419
8f35fc25523f
Add experimental af_cmdline slave command to allow changing filter options at runtime.
reimar
parents:
32406
diff
changeset
|
3491 case MP_CMD_AF_CMDLINE: |
8f35fc25523f
Add experimental af_cmdline slave command to allow changing filter options at runtime.
reimar
parents:
32406
diff
changeset
|
3492 if (sh_audio) { |
8f35fc25523f
Add experimental af_cmdline slave command to allow changing filter options at runtime.
reimar
parents:
32406
diff
changeset
|
3493 af_instance_t *af = af_get(sh_audio->afilter, cmd->args[0].v.s); |
8f35fc25523f
Add experimental af_cmdline slave command to allow changing filter options at runtime.
reimar
parents:
32406
diff
changeset
|
3494 if (!af) { |
8f35fc25523f
Add experimental af_cmdline slave command to allow changing filter options at runtime.
reimar
parents:
32406
diff
changeset
|
3495 mp_msg(MSGT_CPLAYER, MSGL_WARN, |
8f35fc25523f
Add experimental af_cmdline slave command to allow changing filter options at runtime.
reimar
parents:
32406
diff
changeset
|
3496 "Filter '%s' not found in chain.\n", cmd->args[0].v.s); |
8f35fc25523f
Add experimental af_cmdline slave command to allow changing filter options at runtime.
reimar
parents:
32406
diff
changeset
|
3497 break; |
8f35fc25523f
Add experimental af_cmdline slave command to allow changing filter options at runtime.
reimar
parents:
32406
diff
changeset
|
3498 } |
8f35fc25523f
Add experimental af_cmdline slave command to allow changing filter options at runtime.
reimar
parents:
32406
diff
changeset
|
3499 af->control(af, AF_CONTROL_COMMAND_LINE, cmd->args[1].v.s); |
8f35fc25523f
Add experimental af_cmdline slave command to allow changing filter options at runtime.
reimar
parents:
32406
diff
changeset
|
3500 af_reinit(sh_audio->afilter, af); |
8f35fc25523f
Add experimental af_cmdline slave command to allow changing filter options at runtime.
reimar
parents:
32406
diff
changeset
|
3501 } |
8f35fc25523f
Add experimental af_cmdline slave command to allow changing filter options at runtime.
reimar
parents:
32406
diff
changeset
|
3502 break; |
8f35fc25523f
Add experimental af_cmdline slave command to allow changing filter options at runtime.
reimar
parents:
32406
diff
changeset
|
3503 |
31077 | 3504 default: |
3505 mp_msg(MSGT_CPLAYER, MSGL_V, | |
3506 "Received unknown cmd %s\n", cmd->name); | |
3507 } | |
22479
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
3508 |
a99ddf2ece25
Change to match current command.c (same functionality).
uau
parents:
22478
diff
changeset
|
3509 switch (cmd->pausing) { |
31077 | 3510 case 1: // "pausing" |
3511 mpctx->osd_function = OSD_PAUSE; | |
3512 break; | |
3513 case 3: // "pausing_toggle" | |
3514 mpctx->was_paused = !mpctx->was_paused; | |
3515 if (mpctx->was_paused) | |
3516 mpctx->osd_function = OSD_PAUSE; | |
3517 else if (mpctx->osd_function == OSD_PAUSE) | |
3518 mpctx->osd_function = OSD_PLAY; | |
3519 break; | |
3520 case 2: // "pausing_keep" | |
3521 if (mpctx->was_paused) | |
3522 mpctx->osd_function = OSD_PAUSE; | |
22478 | 3523 } |
3524 return brk_cmd; | |
3525 } |