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