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