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