annotate command.c @ 32419:8f35fc25523f

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