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