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