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