annotate command.c @ 26083:19fa7a56ed04

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