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