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