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