annotate command.c @ 29695:7eaa16c03a87

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