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