annotate mplayer.c @ 36323:335349ca2137

Do not increment frame drop count when at EOF.
author reimar
date Mon, 12 Aug 2013 19:37:33 +0000
parents a73127c786e8
children 95ea180551c0
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
30429
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 30378
diff changeset
1 /*
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 30378
diff changeset
2 * This file is part of MPlayer.
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 30378
diff changeset
3 *
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 30378
diff changeset
4 * MPlayer is free software; you can redistribute it and/or modify
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 30378
diff changeset
5 * it under the terms of the GNU General Public License as published by
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 30378
diff changeset
6 * the Free Software Foundation; either version 2 of the License, or
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 30378
diff changeset
7 * (at your option) any later version.
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 30378
diff changeset
8 *
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 30378
diff changeset
9 * MPlayer is distributed in the hope that it will be useful,
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 30378
diff changeset
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 30378
diff changeset
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 30378
diff changeset
12 * GNU General Public License for more details.
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 30378
diff changeset
13 *
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 30378
diff changeset
14 * You should have received a copy of the GNU General Public License along
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 30378
diff changeset
15 * with MPlayer; if not, write to the Free Software Foundation, Inc.,
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 30378
diff changeset
16 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 30378
diff changeset
17 */
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 30378
diff changeset
18
31515
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
19 #include "config.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
20
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
21 #include <errno.h>
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
22 #include <fcntl.h>
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
23 #include <limits.h>
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
24 #include <signal.h>
1430
1728d249c783 missing unistd.h (requires for off_t under freebsd)
arpi
parents: 1429
diff changeset
25 #include <stdio.h>
1728d249c783 missing unistd.h (requires for off_t under freebsd)
arpi
parents: 1429
diff changeset
26 #include <stdlib.h>
31515
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
27 #include <string.h>
35903
389d43c448b3 Add missing strings.h #includes for strcasecmp().
diego
parents: 35868
diff changeset
28 #include <strings.h>
31515
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
29 #include <time.h>
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
30 #include <unistd.h>
32724
732cd2afae10 Replace hacky vobsub loading with a new clean one.
cboesch
parents: 32705
diff changeset
31 #include <assert.h>
31515
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
32 #include <sys/stat.h>
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
33 #include <sys/time.h>
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
34 #include <sys/types.h>
12360
85f18227756f 10l on cygwin WIN32 gets defined in config.h
faust3
parents: 12358
diff changeset
35
27727
48c1ae64255b Replace preprocessor check for WIN32 with checks for __MINGW32__ and __CYGWIN__.
diego
parents: 27635
diff changeset
36 #if defined(__MINGW32__) || defined(__CYGWIN__)
12358
133e0ebde74d Make it compile on mingw again. Now it is finally possible to include windows.h in mplayer.c
faust3
parents: 12332
diff changeset
37 #define _UWIN 1 /*disable Non-underscored versions of non-ANSI functions as otherwise int eof would conflict with eof()*/
133e0ebde74d Make it compile on mingw again. Now it is finally possible to include windows.h in mplayer.c
faust3
parents: 12332
diff changeset
38 #include <windows.h>
133e0ebde74d Make it compile on mingw again. Now it is finally possible to include windows.h in mplayer.c
faust3
parents: 12332
diff changeset
39 #endif
31515
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
40
9831
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
41 #ifndef __MINGW32__
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
42 #include <sys/ioctl.h>
1428
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1422
diff changeset
43 #include <sys/wait.h>
9831
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
44 #else
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
45 #define SIGHUP 1 /* hangup */
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
46 #define SIGQUIT 3 /* quit */
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
47 #define SIGKILL 9 /* kill (cannot be caught or ignored) */
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
48 #define SIGBUS 10 /* bus error */
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
49 #define SIGPIPE 13 /* broken pipe */
9831
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
50 #endif
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
51
3015
8bf21c807656 RTC is autodetected
arpi
parents: 2941
diff changeset
52 #ifdef HAVE_RTC
14381
dc7b86065e3c RTC support on FreeBSD, inspired by a patch from Michael Johnson
diego
parents: 14296
diff changeset
53 #ifdef __linux__
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
54 #include <linux/rtc.h>
14381
dc7b86065e3c RTC support on FreeBSD, inspired by a patch from Michael Johnson
diego
parents: 14296
diff changeset
55 #else
dc7b86065e3c RTC support on FreeBSD, inspired by a patch from Michael Johnson
diego
parents: 14296
diff changeset
56 #include <rtc.h>
dc7b86065e3c RTC support on FreeBSD, inspired by a patch from Michael Johnson
diego
parents: 14296
diff changeset
57 #define RTC_IRQP_SET RTCIO_IRQP_SET
dc7b86065e3c RTC support on FreeBSD, inspired by a patch from Michael Johnson
diego
parents: 14296
diff changeset
58 #define RTC_PIE_ON RTCIO_PIE_ON
16490
f17b3c152fd6 Add comments to a few #endif statements in order to make clear which
diego
parents: 16489
diff changeset
59 #endif /* __linux__ */
f17b3c152fd6 Add comments to a few #endif statements in order to make clear which
diego
parents: 16489
diff changeset
60 #endif /* HAVE_RTC */
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
61
31515
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
62 /*
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
63 * In Mac OS X the SDL-lib is built upon Cocoa. The easiest way to
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
64 * make it all work is to use the builtin SDL-bootstrap code, which
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
65 * will be done automatically by replacing our main() if we include SDL.h.
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
66 */
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
67 #if defined(__APPLE__) && defined(CONFIG_SDL)
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
68 #ifdef CONFIG_SDL_SDL_H
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
69 #include <SDL/SDL.h>
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
70 #else
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
71 #include <SDL.h>
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
72 #endif
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
73 #endif
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
74
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
75 #include "gui/interface.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
76 #include "input/input.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
77 #include "libao2/audio_out.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
78 #include "libavutil/avstring.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
79 #include "libavutil/intreadwrite.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
80 #include "libmenu/menu.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
81 #include "libmpcodecs/dec_audio.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
82 #include "libmpcodecs/dec_video.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
83 #include "libmpcodecs/mp_image.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
84 #include "libmpcodecs/vd.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
85 #include "libmpcodecs/vf.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
86 #include "libmpdemux/demuxer.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
87 #include "libmpdemux/stheader.h"
32466
9e627a1793b1 Move font_load.[ch], font_load_ft.c and osd_font.h from libvo to sub.
cigaes
parents: 32461
diff changeset
88 #include "sub/font_load.h"
32467
fbe5c829c69b Move libvo/sub.[ch] from libvo to sub.
cigaes
parents: 32466
diff changeset
89 #include "sub/sub.h"
31515
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
90 #include "libvo/video_out.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
91 #include "stream/cache2.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
92 #include "stream/stream.h"
31877
e30fe0cb79cd Add incomplete clipinf reading support to display audio
reimar
parents: 31839
diff changeset
93 #include "stream/stream_bd.h"
31515
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
94 #include "stream/stream_dvdnav.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
95 #include "stream/stream_radio.h"
19271
64d82a45a05d introduce new 'stream' directory for all stream layer related components and split them from libmpdemux
ben
parents: 19227
diff changeset
96 #include "stream/tv.h"
31515
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
97 #include "access_mpcontext.h"
32461
bc43cf7638e6 Move ass_mp.[ch] to the sub directory.
cigaes
parents: 32460
diff changeset
98 #include "sub/ass_mp.h"
31515
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
99 #include "cfg-mplayer-def.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
100 #include "codec-cfg.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
101 #include "command.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
102 #include "edl.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
103 #include "help_mp.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
104 #include "m_config.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
105 #include "m_option.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
106 #include "m_property.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
107 #include "m_struct.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
108 #include "metadata.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
109 #include "mixer.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
110 #include "mp_core.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
111 #include "mp_fifo.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
112 #include "mp_msg.h"
32889
db45f9bd690d 10l: forgot mp_strings.h header include with mp_asprintf prototype.
cboesch
parents: 32886
diff changeset
113 #include "mp_strings.h"
31515
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
114 #include "mpcommon.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
115 #include "mplayer.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
116 #include "osdep/getch2.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
117 #include "osdep/timer.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
118 #include "parser-cfg.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
119 #include "parser-mpcmd.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
120 #include "path.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
121 #include "playtree.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
122 #include "playtreeparser.h"
32456
728bd5c2aea7 Move spudec.[ch] to the sub directory.
cigaes
parents: 32454
diff changeset
123 #include "sub/spudec.h"
32454
69d3be4d52a2 Create a new directory, "sub", for subtitles and OSD related code.
cigaes
parents: 32438
diff changeset
124 #include "sub/subreader.h"
32459
1a605463f62b Move vobsub.[ch] and unrar_exec.[ch] to the sub directory.
cigaes
parents: 32456
diff changeset
125 #include "sub/vobsub.h"
32460
d80bbc5868de Move eosd.[ch] to the sub directory.
cigaes
parents: 32459
diff changeset
126 #include "sub/eosd.h"
31982
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents: 31977
diff changeset
127 #include "osdep/getch2.h"
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents: 31977
diff changeset
128 #include "osdep/timer.h"
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents: 31977
diff changeset
129
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents: 31977
diff changeset
130 #include "udp_sync.h"
31515
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
131
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
132 #ifdef CONFIG_X11
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
133 #include "libvo/x11_common.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
134 #endif
29432
47808d1fca5a Only #include stream/dvbin.h when DVB is enabled.
diego
parents: 29429
diff changeset
135 #ifdef CONFIG_DVBIN
19271
64d82a45a05d introduce new 'stream' directory for all stream layer related components and split them from libmpdemux
ben
parents: 19227
diff changeset
136 #include "stream/dvbin.h"
29432
47808d1fca5a Only #include stream/dvbin.h when DVB is enabled.
diego
parents: 29429
diff changeset
137 #endif
31515
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
138 #ifdef CONFIG_DVDREAD
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
139 #include "stream/stream_dvd.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
140 #endif
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
141
33257
40b298f9dc77 Remove some useless static and global zero initializations.
cboesch
parents: 33256
diff changeset
142 int slave_mode;
40b298f9dc77 Remove some useless static and global zero initializations.
cboesch
parents: 33256
diff changeset
143 int player_idle_mode;
40b298f9dc77 Remove some useless static and global zero initializations.
cboesch
parents: 33256
diff changeset
144 int quiet;
40b298f9dc77 Remove some useless static and global zero initializations.
cboesch
parents: 33256
diff changeset
145 int enable_mouse_movements;
31515
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
146 float start_volume = -1;
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
147 double start_pts = MP_NOPTS_VALUE;
31515
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
148 char *heartbeat_cmd;
36005
3be3990375da Add -heartbeat-interval option.
reimar
parents: 35903
diff changeset
149 float heartbeat_interval = 30.0;
33257
40b298f9dc77 Remove some useless static and global zero initializations.
cboesch
parents: 33256
diff changeset
150 static int max_framesize;
40b298f9dc77 Remove some useless static and global zero initializations.
cboesch
parents: 33256
diff changeset
151
40b298f9dc77 Remove some useless static and global zero initializations.
cboesch
parents: 33256
diff changeset
152 int noconsolecontrols;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
153 //**************************************************************************//
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
154
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
155 // Not all functions in mplayer.c take the context as an argument yet
22993
5e6fa9cabacc big surprise.. uau broke gcc 2.95 as usual
rfelker
parents: 22835
diff changeset
156 static MPContext mpctx_s = {
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
157 .osd_function = OSD_PLAY,
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
158 .begin_skip = MP_NOPTS_VALUE,
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
159 .play_tree_step = 1,
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
160 .global_sub_pos = -1,
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
161 .set_of_sub_pos = -1,
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
162 .file_format = DEMUXER_TYPE_UNKNOWN,
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
163 .loop_times = -1,
27370
14c5017f40d2 Change a bunch of video/audio-output-specific preprocessor directives from
diego
parents: 27359
diff changeset
164 #ifdef CONFIG_DVBIN
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
165 .last_dvb_step = 1,
22281
f00e6b43e79f Add missing #ifdef
uau
parents: 22280
diff changeset
166 #endif
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
167 };
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
168
22993
5e6fa9cabacc big surprise.. uau broke gcc 2.95 as usual
rfelker
parents: 22835
diff changeset
169 static MPContext *mpctx = &mpctx_s;
5e6fa9cabacc big surprise.. uau broke gcc 2.95 as usual
rfelker
parents: 22835
diff changeset
170
33257
40b298f9dc77 Remove some useless static and global zero initializations.
cboesch
parents: 33256
diff changeset
171 int fixed_vo;
7677
33562a65e9e8 _EXPERIMENTAL_ option: -fixed-vo for libvo spec compliance testing
arpi
parents: 7628
diff changeset
172
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
173 // benchmark:
33257
40b298f9dc77 Remove some useless static and global zero initializations.
cboesch
parents: 33256
diff changeset
174 double video_time_usage;
40b298f9dc77 Remove some useless static and global zero initializations.
cboesch
parents: 33256
diff changeset
175 double vout_time_usage;
40b298f9dc77 Remove some useless static and global zero initializations.
cboesch
parents: 33256
diff changeset
176 static double audio_time_usage;
40b298f9dc77 Remove some useless static and global zero initializations.
cboesch
parents: 33256
diff changeset
177 static int total_time_usage_start;
40b298f9dc77 Remove some useless static and global zero initializations.
cboesch
parents: 33256
diff changeset
178 static int total_frame_cnt;
40b298f9dc77 Remove some useless static and global zero initializations.
cboesch
parents: 33256
diff changeset
179 static int drop_frame_cnt; // total number of dropped frames
40b298f9dc77 Remove some useless static and global zero initializations.
cboesch
parents: 33256
diff changeset
180 int benchmark;
1124
0e95f30ffd4c -frames and -benchmark options to make chl & gabucino happy
arpi_esp
parents: 1059
diff changeset
181
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
182 // options:
30176
6fb92182aff3 At startup and while seeking avoid to introduce pointless sleeps and possibly
reimar
parents: 30175
diff changeset
183 #define DEFAULT_STARTUP_DECODE_RETRY 8
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
184 int auto_quality;
33257
40b298f9dc77 Remove some useless static and global zero initializations.
cboesch
parents: 33256
diff changeset
185 static int output_quality;
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
186
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
187 float playback_speed = 1.0;
7605
c3bbe602aff3 new option -speed, to set playback speed rate (examples: -speed 1:3 or -speed 5)
arpi
parents: 7604
diff changeset
188
33257
40b298f9dc77 Remove some useless static and global zero initializations.
cboesch
parents: 33256
diff changeset
189 int use_gui;
9291
64b8c5a07c2c - It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents: 9217
diff changeset
190
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
191 #ifdef CONFIG_GUI
33257
40b298f9dc77 Remove some useless static and global zero initializations.
cboesch
parents: 33256
diff changeset
192 int enqueue;
9291
64b8c5a07c2c - It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents: 9217
diff changeset
193 #endif
64b8c5a07c2c - It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents: 9217
diff changeset
194
33257
40b298f9dc77 Remove some useless static and global zero initializations.
cboesch
parents: 33256
diff changeset
195 static int list_properties;
17914
f9cb6fc1608a Add an option to list the properties: -list-properties
albeu
parents: 17911
diff changeset
196
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
197 int osd_level = 1;
18287
292337d09af2 Remove updating of vo_mouse_timer_const from the main loop and also
uau
parents: 18286
diff changeset
198 // if nonzero, hide current OSD contents when GetTimerMS() reaches this
292337d09af2 Remove updating of vo_mouse_timer_const from the main loop and also
uau
parents: 18286
diff changeset
199 unsigned int osd_visible;
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
200 int osd_duration = 1000;
33257
40b298f9dc77 Remove some useless static and global zero initializations.
cboesch
parents: 33256
diff changeset
201 int osd_fractions; // determines how fractions of seconds are displayed
40b298f9dc77 Remove some useless static and global zero initializations.
cboesch
parents: 33256
diff changeset
202 // on OSD
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
203
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
204 int term_osd = 1;
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
205 static char *term_osd_esc = "\x1b[A\r\x1b[K";
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
206 static char *playing_msg;
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
207 // seek:
35591
912ea01174c1 Allow -ss 0 to seek to pts 0 instead of disabling seeking.
reimar
parents: 35510
diff changeset
208 static double seek_to_sec = MP_NOPTS_VALUE;
33257
40b298f9dc77 Remove some useless static and global zero initializations.
cboesch
parents: 33256
diff changeset
209 static off_t seek_to_byte;
40b298f9dc77 Remove some useless static and global zero initializations.
cboesch
parents: 33256
diff changeset
210 static off_t step_sec;
40b298f9dc77 Remove some useless static and global zero initializations.
cboesch
parents: 33256
diff changeset
211 static int loop_seek;
7559
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
212
19973
02a18c52a42a after a long time, finally i could add -endpos option to mplayer executable.
ptt
parents: 19946
diff changeset
213 static m_time_size_t end_at = { .type = END_AT_NONE, .pos = 0 };
02a18c52a42a after a long time, finally i could add -endpos option to mplayer executable.
ptt
parents: 19946
diff changeset
214
7576
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
215 // A/V sync:
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
216 int autosync; // 30 might be a good default value.
7576
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
217
7559
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
218 // may be changed by GUI: (FIXME!)
33257
40b298f9dc77 Remove some useless static and global zero initializations.
cboesch
parents: 33256
diff changeset
219 float rel_seek_secs;
40b298f9dc77 Remove some useless static and global zero initializations.
cboesch
parents: 33256
diff changeset
220 int abs_seek_pos;
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
221
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
222 // codecs:
33257
40b298f9dc77 Remove some useless static and global zero initializations.
cboesch
parents: 33256
diff changeset
223 char **audio_codec_list; // override audio codec
40b298f9dc77 Remove some useless static and global zero initializations.
cboesch
parents: 33256
diff changeset
224 char **video_codec_list; // override video codec
40b298f9dc77 Remove some useless static and global zero initializations.
cboesch
parents: 33256
diff changeset
225 char **audio_fm_list; // override audio codec family
40b298f9dc77 Remove some useless static and global zero initializations.
cboesch
parents: 33256
diff changeset
226 char **video_fm_list; // override video codec family
1285
202d9e2dc202 -vcodec option (maybe some other name would be better though) to select between driver types without editing codecs.conf. mplayer will default to normal codec search loop if it does not find codec for the specified driver type. config range checking for the parameter (an integer) should be cleaned, IMHO
lgb
parents: 1255
diff changeset
227
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
228 // streaming:
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
229 int audio_id = -1;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
230 int video_id = -1;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
231 int dvdsub_id = -1;
29855
5e279f7d7e5d Remember which subtitle was auto-selected for dvdnav due to -slang
reimar
parents: 29854
diff changeset
232 // this dvdsub_id was selected via slang
5e279f7d7e5d Remember which subtitle was auto-selected for dvdnav due to -slang
reimar
parents: 29854
diff changeset
233 // use this to allow dvdnav to follow -slang across stream resets,
5e279f7d7e5d Remember which subtitle was auto-selected for dvdnav due to -slang
reimar
parents: 29854
diff changeset
234 // in particular the subtitle ID for a language changes
5e279f7d7e5d Remember which subtitle was auto-selected for dvdnav due to -slang
reimar
parents: 29854
diff changeset
235 int dvdsub_lang_id;
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
236 int vobsub_id = -1;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
237 char *audio_lang;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
238 char *dvdsub_lang;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
239 char *filename;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
240 int file_filter = 1;
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
241
2353
a3daec6c49e4 cache full status added
arpi
parents: 2342
diff changeset
242 // cache2:
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
243 int stream_cache_size = -1;
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
244 #ifdef CONFIG_STREAM_CACHE
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
245 float stream_cache_min_percent = 20.0;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
246 float stream_cache_seek_min_percent = 50.0;
2353
a3daec6c49e4 cache full status added
arpi
parents: 2342
diff changeset
247 #endif
a3daec6c49e4 cache full status added
arpi
parents: 2342
diff changeset
248
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
249 // dump:
32438
faefba58f413 Implement a basic capture feature, available through -capture.
diego
parents: 32415
diff changeset
250 char *stream_dump_name = "stream.dump";
33257
40b298f9dc77 Remove some useless static and global zero initializations.
cboesch
parents: 33256
diff changeset
251 int stream_dump_type;
33390
f33d61bf5da0 stream dump: print progress information.
cigaes
parents: 33363
diff changeset
252 uint64_t stream_dump_count;
f33d61bf5da0 stream dump: print progress information.
cigaes
parents: 33363
diff changeset
253 unsigned stream_dump_start_time;
f33d61bf5da0 stream dump: print progress information.
cigaes
parents: 33363
diff changeset
254 unsigned stream_dump_last_print_time;
33257
40b298f9dc77 Remove some useless static and global zero initializations.
cboesch
parents: 33256
diff changeset
255 int capture_dump;
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
256
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
257 // A-V sync:
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
258 static float default_max_pts_correction = -1;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
259 static float max_pts_correction; //default_max_pts_correction;
33257
40b298f9dc77 Remove some useless static and global zero initializations.
cboesch
parents: 33256
diff changeset
260 static float c_total;
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
261 float audio_delay;
33257
40b298f9dc77 Remove some useless static and global zero initializations.
cboesch
parents: 33256
diff changeset
262 static int ignore_start;
40b298f9dc77 Remove some useless static and global zero initializations.
cboesch
parents: 33256
diff changeset
263
40b298f9dc77 Remove some useless static and global zero initializations.
cboesch
parents: 33256
diff changeset
264 static int softsleep;
40b298f9dc77 Remove some useless static and global zero initializations.
cboesch
parents: 33256
diff changeset
265
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
266 double force_fps;
33257
40b298f9dc77 Remove some useless static and global zero initializations.
cboesch
parents: 33256
diff changeset
267 static int force_srate;
33503
d54614382edc Actually use the AF_FORMAT_UNKNOWN define instead of having it in a comment.
reimar
parents: 33495
diff changeset
268 static int audio_output_format = AF_FORMAT_UNKNOWN;
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
269 int frame_dropping; // option 0=no drop 1= drop vo 2= drop decode
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
270 static int play_n_frames = -1;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
271 static int play_n_frames_mf = -1;
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
272
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
273 // screen info:
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
274 char **video_driver_list;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
275 char **audio_driver_list;
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5072
diff changeset
276
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
277 // sub:
33257
40b298f9dc77 Remove some useless static and global zero initializations.
cboesch
parents: 33256
diff changeset
278 char *font_name;
40b298f9dc77 Remove some useless static and global zero initializations.
cboesch
parents: 33256
diff changeset
279 char *sub_font_name;
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
280 float font_factor = 0.75;
33257
40b298f9dc77 Remove some useless static and global zero initializations.
cboesch
parents: 33256
diff changeset
281 char **sub_name;
40b298f9dc77 Remove some useless static and global zero initializations.
cboesch
parents: 33256
diff changeset
282 char **sub_paths;
40b298f9dc77 Remove some useless static and global zero initializations.
cboesch
parents: 33256
diff changeset
283 float sub_delay;
40b298f9dc77 Remove some useless static and global zero initializations.
cboesch
parents: 33256
diff changeset
284 float sub_fps;
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
285 int sub_auto = 1;
33257
40b298f9dc77 Remove some useless static and global zero initializations.
cboesch
parents: 33256
diff changeset
286 char *vobsub_name;
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
287 int subcc_enabled;
8361
2202c00001e3 overlapping subtitles support is now optional, can be disabled (-nooverlapsub)
arpi
parents: 8360
diff changeset
288 int suboverlap_enabled = 1;
21140
b42f1c1ef651 Make compilation depending on USE_SUB unconditional.
uau
parents: 21120
diff changeset
289
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
290 char *current_module; // for debugging
6781
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
291
27345
b597fd2924b4 Rename preprocessor directive HAVE_MENU --> CONFIG_MENU.
diego
parents: 27343
diff changeset
292 #ifdef CONFIG_MENU
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
293 static const vf_info_t *const libmenu_vfs[] = {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
294 &vf_info_menu,
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
295 NULL
8198
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
296 };
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
297 static vf_instance_t *vf_menu;
33257
40b298f9dc77 Remove some useless static and global zero initializations.
cboesch
parents: 33256
diff changeset
298 int use_menu;
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
299 static char *menu_cfg;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
300 static char *menu_root = "main";
8198
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
301 #endif
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
302
5055
534167719e91 nortc patch by Attila Kinali
atmos4
parents: 5046
diff changeset
303 #ifdef HAVE_RTC
19756
f5584340d2e6 Disable rtc timing by default.
uau
parents: 19568
diff changeset
304 static int nortc = 1;
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
305 static char *rtc_device;
5055
534167719e91 nortc patch by Attila Kinali
atmos4
parents: 5046
diff changeset
306 #endif
534167719e91 nortc patch by Attila Kinali
atmos4
parents: 5046
diff changeset
307
33491
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
308 edl_record_ptr edl_records; ///< EDL entries memory area
33257
40b298f9dc77 Remove some useless static and global zero initializations.
cboesch
parents: 33256
diff changeset
309 edl_record_ptr next_edl_record; ///< only for traversing edl_records
33491
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
310 short edl_decision; ///< 1 when an EDL operation has been made.
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
311 short edl_needs_reset; ///< 1 if we need to reset EDL next pointer
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
312 short edl_backward; ///< 1 if we need to skip to the beginning of the next EDL record
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
313 FILE *edl_fd; ///< fd to write to when in -edlout mode.
31459
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
314 // Number of seconds to add to the seek when jumping out
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
315 // of EDL scene in backward direction. This is needed to
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
316 // have some time after the seek to decide what to do next
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
317 // (next seek, pause,...), otherwise after the seek it will
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
318 // enter the same scene again and skip forward immediately
31580
b6c2b541e1a6 Implement edl-backward-delay to avoid jumping right over an
reynaldo
parents: 31515
diff changeset
319 float edl_backward_delay = 2;
33491
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
320 int edl_start_pts; ///< Automatically add/sub this from EDL start/stop pos
20251
2971196cd8c6 Disable loading of file-specific configuration file from the same
rtogni
parents: 20207
diff changeset
321 int use_filedir_conf;
29862
fbb1f57a313e Added -name, -title and -use-filename-title options and implementation in X11 vos
ptt
parents: 29857
diff changeset
322 int use_filename_title;
8531
1aa2c9b460af Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents: 8494
diff changeset
323
33257
40b298f9dc77 Remove some useless static and global zero initializations.
cboesch
parents: 33256
diff changeset
324 static unsigned int initialized_flags;
31514
c6195b5575cc cosmetics: Move volstep global var to the top where all other global vars live.
diego
parents: 31513
diff changeset
325
33287
3105428bb2ae Doxygen cleanups in the main file.
cboesch
parents: 33279
diff changeset
326 int volstep = 3; ///< step size of mixer changes
31514
c6195b5575cc cosmetics: Move volstep global var to the top where all other global vars live.
diego
parents: 31513
diff changeset
327
31801
8187612b1af8 Fix compilation with --enable-crash-debug
reimar
parents: 31792
diff changeset
328 #ifdef CONFIG_CRASH_DEBUG
8187612b1af8 Fix compilation with --enable-crash-debug
reimar
parents: 31792
diff changeset
329 static char *prog_path;
33257
40b298f9dc77 Remove some useless static and global zero initializations.
cboesch
parents: 33256
diff changeset
330 static int crash_debug;
31801
8187612b1af8 Fix compilation with --enable-crash-debug
reimar
parents: 31792
diff changeset
331 #endif
8187612b1af8 Fix compilation with --enable-crash-debug
reimar
parents: 31792
diff changeset
332
36146
5950fc0d4b53 Allow parsing arbitrary files as playlist only
reimar
parents: 36054
diff changeset
333 static int allow_playlist_parsing;
5950fc0d4b53 Allow parsing arbitrary files as playlist only
reimar
parents: 36054
diff changeset
334
31515
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
335 /* This header requires all the global variable declarations. */
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
336 #include "cfg-mplayer.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
337
25765
304fc0bbefe1 audio_out / video_out structs should be treated as const
reimar
parents: 25658
diff changeset
338 const void *mpctx_get_video_out(MPContext *mpctx)
22284
83366c8e1928 Fix menu to work with mpctx
uau
parents: 22281
diff changeset
339 {
83366c8e1928 Fix menu to work with mpctx
uau
parents: 22281
diff changeset
340 return mpctx->video_out;
83366c8e1928 Fix menu to work with mpctx
uau
parents: 22281
diff changeset
341 }
83366c8e1928 Fix menu to work with mpctx
uau
parents: 22281
diff changeset
342
28259
f313c0ff6882 Add missing const qualifier to mpctx_get_audio_out function declaration.
diego
parents: 28185
diff changeset
343 const void *mpctx_get_audio_out(MPContext *mpctx)
22286
a7e5b99ac083 Fix GUI compilation
uau
parents: 22285
diff changeset
344 {
22411
cf4c052b6d60 Fix copy-paste bug (must have broken something in the GUI)
uau
parents: 22365
diff changeset
345 return mpctx->audio_out;
22286
a7e5b99ac083 Fix GUI compilation
uau
parents: 22285
diff changeset
346 }
a7e5b99ac083 Fix GUI compilation
uau
parents: 22285
diff changeset
347
25364
fec8936c8079 Support chapter in OSD menu.
ulion
parents: 25351
diff changeset
348 void *mpctx_get_demuxer(MPContext *mpctx)
fec8936c8079 Support chapter in OSD menu.
ulion
parents: 25351
diff changeset
349 {
fec8936c8079 Support chapter in OSD menu.
ulion
parents: 25351
diff changeset
350 return mpctx->demuxer;
fec8936c8079 Support chapter in OSD menu.
ulion
parents: 25351
diff changeset
351 }
fec8936c8079 Support chapter in OSD menu.
ulion
parents: 25351
diff changeset
352
22284
83366c8e1928 Fix menu to work with mpctx
uau
parents: 22281
diff changeset
353 void *mpctx_get_playtree_iter(MPContext *mpctx)
83366c8e1928 Fix menu to work with mpctx
uau
parents: 22281
diff changeset
354 {
83366c8e1928 Fix menu to work with mpctx
uau
parents: 22281
diff changeset
355 return mpctx->playtree_iter;
83366c8e1928 Fix menu to work with mpctx
uau
parents: 22281
diff changeset
356 }
83366c8e1928 Fix menu to work with mpctx
uau
parents: 22281
diff changeset
357
22286
a7e5b99ac083 Fix GUI compilation
uau
parents: 22285
diff changeset
358 void *mpctx_get_mixer(MPContext *mpctx)
a7e5b99ac083 Fix GUI compilation
uau
parents: 22285
diff changeset
359 {
a7e5b99ac083 Fix GUI compilation
uau
parents: 22285
diff changeset
360 return &mpctx->mixer;
a7e5b99ac083 Fix GUI compilation
uau
parents: 22285
diff changeset
361 }
a7e5b99ac083 Fix GUI compilation
uau
parents: 22285
diff changeset
362
22290
24abe3182dfe Fix nonsense function type
uau
parents: 22288
diff changeset
363 int mpctx_get_global_sub_size(MPContext *mpctx)
22286
a7e5b99ac083 Fix GUI compilation
uau
parents: 22285
diff changeset
364 {
a7e5b99ac083 Fix GUI compilation
uau
parents: 22285
diff changeset
365 return mpctx->global_sub_size;
a7e5b99ac083 Fix GUI compilation
uau
parents: 22285
diff changeset
366 }
a7e5b99ac083 Fix GUI compilation
uau
parents: 22285
diff changeset
367
25026
afead6ecb8ba Remove the pause filter and the cmd queue hack, to know the mplayer going to
ulion
parents: 24982
diff changeset
368 int mpctx_get_osd_function(MPContext *mpctx)
afead6ecb8ba Remove the pause filter and the cmd queue hack, to know the mplayer going to
ulion
parents: 24982
diff changeset
369 {
afead6ecb8ba Remove the pause filter and the cmd queue hack, to know the mplayer going to
ulion
parents: 24982
diff changeset
370 return mpctx->osd_function;
afead6ecb8ba Remove the pause filter and the cmd queue hack, to know the mplayer going to
ulion
parents: 24982
diff changeset
371 }
afead6ecb8ba Remove the pause filter and the cmd queue hack, to know the mplayer going to
ulion
parents: 24982
diff changeset
372
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
373 static int is_valid_metadata_type(metadata_t type)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
374 {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
375 switch (type) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
376 /* check for valid video stream */
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
377 case META_VIDEO_CODEC:
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
378 case META_VIDEO_BITRATE:
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
379 case META_VIDEO_RESOLUTION:
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
380 if (!mpctx->sh_video)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
381 return 0;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
382 break;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
383
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
384 /* check for valid audio stream */
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
385 case META_AUDIO_CODEC:
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
386 case META_AUDIO_BITRATE:
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
387 case META_AUDIO_SAMPLES:
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
388 if (!mpctx->sh_audio)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
389 return 0;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
390 break;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
391
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
392 /* check for valid demuxer */
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
393 case META_INFO_TITLE:
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
394 case META_INFO_ARTIST:
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
395 case META_INFO_ALBUM:
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
396 case META_INFO_YEAR:
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
397 case META_INFO_COMMENT:
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
398 case META_INFO_TRACK:
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
399 case META_INFO_GENRE:
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
400 if (!mpctx->demuxer)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
401 return 0;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
402 break;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
403
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
404 default:
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
405 break;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
406 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
407
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
408 return 1;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
409 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
410
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
411 static char *get_demuxer_info(char *tag)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
412 {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
413 char **info = mpctx->demuxer->info;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
414 int n;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
415
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
416 if (!info || !tag)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
417 return NULL;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
418
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
419 for (n = 0; info[2 * n] != NULL; n++)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
420 if (!strcasecmp(info[2 * n], tag))
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
421 break;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
422
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
423 return info[2 * n + 1] ? strdup(info[2 * n + 1]) : NULL;
19532
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
424 }
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
425
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
426 char *get_metadata(metadata_t type)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
427 {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
428 sh_audio_t *const sh_audio = mpctx->sh_audio;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
429 sh_video_t *const sh_video = mpctx->sh_video;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
430
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
431 if (!is_valid_metadata_type(type))
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
432 return NULL;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
433
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
434 switch (type) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
435 case META_NAME:
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
436 return strdup(mp_basename(filename));
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
437
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
438 case META_VIDEO_CODEC:
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
439 if (sh_video->format == 0x10000001)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
440 return strdup("mpeg1");
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
441 else if (sh_video->format == 0x10000002)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
442 return strdup("mpeg2");
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
443 else if (sh_video->format == 0x10000004)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
444 return strdup("mpeg4");
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
445 else if (sh_video->format == 0x10000005)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
446 return strdup("h264");
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
447 else if (sh_video->format >= 0x20202020)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
448 return mp_asprintf("%.4s", (char *)&sh_video->format);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
449 return mp_asprintf("0x%08X", sh_video->format);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
450
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
451 case META_VIDEO_BITRATE:
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
452 return mp_asprintf("%d kbps", (int)(sh_video->i_bps * 8 / 1024));
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
453
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
454 case META_VIDEO_RESOLUTION:
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
455 return mp_asprintf("%d x %d", sh_video->disp_w, sh_video->disp_h);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
456
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
457 case META_AUDIO_CODEC:
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
458 if (sh_audio->codec && sh_audio->codec->name)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
459 return strdup(sh_audio->codec->name);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
460 break;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
461
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
462 case META_AUDIO_BITRATE:
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
463 return mp_asprintf("%d kbps", (int)(sh_audio->i_bps * 8 / 1000));
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
464
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
465 case META_AUDIO_SAMPLES:
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
466 return mp_asprintf("%d Hz, %d ch.", sh_audio->samplerate, sh_audio->channels);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
467
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
468 /* check for valid demuxer */
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
469 case META_INFO_TITLE:
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
470 return get_demuxer_info("Title");
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
471
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
472 case META_INFO_ARTIST:
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
473 return get_demuxer_info("Artist");
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
474
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
475 case META_INFO_ALBUM:
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
476 return get_demuxer_info("Album");
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
477
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
478 case META_INFO_YEAR:
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
479 return get_demuxer_info("Year");
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
480
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
481 case META_INFO_COMMENT:
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
482 return get_demuxer_info("Comment");
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
483
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
484 case META_INFO_TRACK:
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
485 return get_demuxer_info("Track");
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
486
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
487 case META_INFO_GENRE:
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
488 return get_demuxer_info("Genre");
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
489
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
490 default:
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
491 break;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
492 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
493
19532
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
494 return NULL;
19529
9a59c33bee29 new option for libmenu that allow display of properties and metadata of currently played stream
ben
parents: 19521
diff changeset
495 }
9a59c33bee29 new option for libmenu that allow display of properties and metadata of currently played stream
ben
parents: 19521
diff changeset
496
31277
5d5bda998a2f Move code printing -identify output for a file to a separate function.
reimar
parents: 31262
diff changeset
497 static void print_file_properties(const MPContext *mpctx, const char *filename)
5d5bda998a2f Move code printing -identify output for a file to a separate function.
reimar
parents: 31262
diff changeset
498 {
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
499 double video_start_pts = MP_NOPTS_VALUE;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
500 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_FILENAME=%s\n",
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
501 filename_recode(filename));
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
502 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_DEMUXER=%s\n", mpctx->demuxer->desc->name);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
503 if (mpctx->sh_video) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
504 /* Assume FOURCC if all bytes >= 0x20 (' ') */
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
505 if (mpctx->sh_video->format >= 0x20202020)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
506 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_FORMAT=%.4s\n", (char *)&mpctx->sh_video->format);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
507 else
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
508 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_FORMAT=0x%08X\n", mpctx->sh_video->format);
33491
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
509 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_BITRATE=%d\n", mpctx->sh_video->i_bps * 8);
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
510 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_WIDTH=%d\n", mpctx->sh_video->disp_w);
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
511 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_HEIGHT=%d\n", mpctx->sh_video->disp_h);
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
512 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_FPS=%5.3f\n", mpctx->sh_video->fps);
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
513 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_ASPECT=%1.4f\n", mpctx->sh_video->aspect);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
514 video_start_pts = ds_get_next_pts(mpctx->d_video);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
515 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
516 if (mpctx->sh_audio) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
517 /* Assume FOURCC if all bytes >= 0x20 (' ') */
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
518 if (mpctx->sh_audio->format >= 0x20202020)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
519 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AUDIO_FORMAT=%.4s\n", (char *)&mpctx->sh_audio->format);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
520 else
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
521 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AUDIO_FORMAT=%d\n", mpctx->sh_audio->format);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
522 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AUDIO_BITRATE=%d\n", mpctx->sh_audio->i_bps * 8);
33491
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
523 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AUDIO_RATE=%d\n", mpctx->sh_audio->samplerate);
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
524 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AUDIO_NCH=%d\n", mpctx->sh_audio->channels);
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
525 start_pts = ds_get_next_pts(mpctx->d_audio);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
526 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
527 if (video_start_pts != MP_NOPTS_VALUE) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
528 if (start_pts == MP_NOPTS_VALUE || !mpctx->sh_audio ||
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
529 (mpctx->sh_video && video_start_pts < start_pts))
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
530 start_pts = video_start_pts;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
531 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
532 if (start_pts != MP_NOPTS_VALUE)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
533 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_START_TIME=%.2f\n", start_pts);
31277
5d5bda998a2f Move code printing -identify output for a file to a separate function.
reimar
parents: 31262
diff changeset
534 else
34607
084c21922624 Revert one change of r34694.
ib
parents: 34606
diff changeset
535 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_START_TIME=unknown\n");
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
536 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_LENGTH=%.2f\n", demuxer_get_time_length(mpctx->demuxer));
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
537 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_SEEKABLE=%d\n",
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
538 mpctx->stream->seek && (!mpctx->demuxer || mpctx->demuxer->seekable));
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
539 if (mpctx->demuxer) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
540 if (mpctx->demuxer->num_chapters == 0)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
541 stream_control(mpctx->demuxer->stream, STREAM_CTRL_GET_NUM_CHAPTERS, &mpctx->demuxer->num_chapters);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
542 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_CHAPTERS=%d\n", mpctx->demuxer->num_chapters);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
543 }
31277
5d5bda998a2f Move code printing -identify output for a file to a separate function.
reimar
parents: 31262
diff changeset
544 }
5d5bda998a2f Move code printing -identify output for a file to a separate function.
reimar
parents: 31262
diff changeset
545
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
546 #ifdef CONFIG_DVDNAV
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
547 static void mp_dvdnav_context_free(MPContext *ctx)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
548 {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
549 if (ctx->nav_smpi)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
550 free_mp_image(ctx->nav_smpi);
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
551 ctx->nav_smpi = NULL;
32511
b39155e98ac3 Remove some useless NULL pointer checks before invoking free() on the pointer.
diego
parents: 32467
diff changeset
552 free(ctx->nav_buffer);
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
553 ctx->nav_buffer = NULL;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
554 ctx->nav_start = NULL;
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
555 ctx->nav_in_size = 0;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
556 }
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
557
8198
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
558 #endif
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
559
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
560 void uninit_player(unsigned int mask)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
561 {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
562 mask &= initialized_flags;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
563
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
564 mp_msg(MSGT_CPLAYER, MSGL_DBG2, "\n*** uninit(0x%X)\n", mask);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
565
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
566 if (mask & INITIALIZED_ACODEC) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
567 initialized_flags &= ~INITIALIZED_ACODEC;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
568 current_module = "uninit_acodec";
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
569 if (mpctx->sh_audio)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
570 uninit_audio(mpctx->sh_audio);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
571 #ifdef CONFIG_GUI
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
572 if (use_gui)
33731
81f71d910333 Cosmetic: Change prefix for symbolic constants from GMP to GUI.
ib
parents: 33725
diff changeset
573 gui(GUI_SET_AFILTER, NULL);
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
574 #endif
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
575 mpctx->sh_audio = NULL;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
576 mpctx->mixer.afilter = NULL;
8023
3738cc2269a3 get stream back from the demuxer
arpi
parents: 7923
diff changeset
577 }
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
578
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
579 if (mask & INITIALIZED_VCODEC) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
580 initialized_flags &= ~INITIALIZED_VCODEC;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
581 current_module = "uninit_vcodec";
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
582 if (mpctx->sh_video)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
583 uninit_video(mpctx->sh_video);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
584 mpctx->sh_video = NULL;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
585 #ifdef CONFIG_MENU
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
586 vf_menu = NULL;
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
587 #endif
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
588 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
589
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
590 if (mask & INITIALIZED_DEMUXER) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
591 initialized_flags &= ~INITIALIZED_DEMUXER;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
592 current_module = "free_demuxer";
34815
049b24e18a65 Do not override mpctx->stream during free_demuxer.
reimar
parents: 34782
diff changeset
593 if (mpctx->demuxer)
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
594 free_demuxer(mpctx->demuxer);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
595 mpctx->demuxer = NULL;
31839
5edb6679ccad 100l, do not free vo_spudec if e.g. just the audio is reinitialized.
reimar
parents: 31837
diff changeset
596 }
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
597
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
598 // kill the cache process:
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
599 if (mask & INITIALIZED_STREAM) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
600 initialized_flags &= ~INITIALIZED_STREAM;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
601 current_module = "uninit_stream";
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
602 if (mpctx->stream)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
603 free_stream(mpctx->stream);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
604 mpctx->stream = NULL;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
605 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
606
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
607 if (mask & INITIALIZED_VO) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
608 initialized_flags &= ~INITIALIZED_VO;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
609 current_module = "uninit_vo";
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
610 mpctx->video_out->uninit();
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
611 mpctx->video_out = NULL;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
612 #ifdef CONFIG_DVDNAV
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
613 mp_dvdnav_context_free(mpctx);
33276
e7f4c0ae303d Move freeing of subtitle data to uninit_player so it not only happens
reimar
parents: 33257
diff changeset
614 #endif
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
615 if (vo_spudec) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
616 current_module = "uninit_spudec";
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
617 spudec_free(vo_spudec);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
618 vo_spudec = NULL;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
619 }
33276
e7f4c0ae303d Move freeing of subtitle data to uninit_player so it not only happens
reimar
parents: 33257
diff changeset
620 }
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
621
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
622 // Must be after libvo uninit, as few vo drivers (svgalib) have tty code.
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
623 if (mask & INITIALIZED_GETCH2) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
624 initialized_flags &= ~INITIALIZED_GETCH2;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
625 current_module = "uninit_getch2";
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
626 mp_msg(MSGT_CPLAYER, MSGL_DBG2, "\n[[[uninit getch2]]]\n");
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
627 // restore terminal:
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
628 getch2_disable();
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
629 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
630
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
631 if (mask & INITIALIZED_SUBS) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
632 initialized_flags &= ~INITIALIZED_SUBS;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
633 if (mpctx->set_of_sub_size > 0) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
634 int i;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
635 current_module = "sub_free";
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
636 for (i = 0; i < mpctx->set_of_sub_size; ++i) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
637 sub_free(mpctx->set_of_subtitles[i]);
33276
e7f4c0ae303d Move freeing of subtitle data to uninit_player so it not only happens
reimar
parents: 33257
diff changeset
638 #ifdef CONFIG_ASS
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
639 if (mpctx->set_of_ass_tracks[i])
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
640 ass_free_track(mpctx->set_of_ass_tracks[i]);
33276
e7f4c0ae303d Move freeing of subtitle data to uninit_player so it not only happens
reimar
parents: 33257
diff changeset
641 #endif
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
642 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
643 mpctx->set_of_sub_size = 0;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
644 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
645 vo_sub_last = vo_sub = NULL;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
646 subdata = NULL;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
647 #ifdef CONFIG_ASS
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
648 ass_track = NULL;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
649 if (ass_library)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
650 ass_clear_fonts(ass_library);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
651 #endif
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
652 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
653
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
654 if (mask & INITIALIZED_VOBSUB) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
655 initialized_flags &= ~INITIALIZED_VOBSUB;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
656 current_module = "uninit_vobsub";
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
657 if (vo_vobsub)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
658 vobsub_close(vo_vobsub);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
659 vo_vobsub = NULL;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
660 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
661
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
662 if (mask & INITIALIZED_AO) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
663 initialized_flags &= ~INITIALIZED_AO;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
664 current_module = "uninit_ao";
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
665 if (mpctx->edl_muted)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
666 mixer_mute(&mpctx->mixer);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
667 if (mpctx->audio_out)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
668 mpctx->audio_out->uninit(mpctx->eof ? 0 : 1);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
669 mpctx->audio_out = NULL;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
670 }
1856
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
671
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
672 #ifdef CONFIG_GUI
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
673 if (mask & INITIALIZED_GUI) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
674 initialized_flags &= ~INITIALIZED_GUI;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
675 current_module = "uninit_gui";
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
676 guiDone();
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
677 }
1856
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
678 #endif
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
679
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
680 if (mask & INITIALIZED_INPUT) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
681 initialized_flags &= ~INITIALIZED_INPUT;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
682 current_module = "uninit_input";
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
683 mp_input_uninit();
27345
b597fd2924b4 Rename preprocessor directive HAVE_MENU --> CONFIG_MENU.
diego
parents: 27343
diff changeset
684 #ifdef CONFIG_MENU
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
685 if (use_menu)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
686 menu_uninit();
25433
55e3b1a32c65 Make libmenu init and uninit in proper place.
ulion
parents: 25416
diff changeset
687 #endif
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
688 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
689
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
690 current_module = NULL;
1856
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
691 }
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
692
30518
654cad7ea876 Rename exit_reason_t enum to exit_reason and do not typedef it.
diego
parents: 30506
diff changeset
693 void exit_player_with_rc(enum exit_reason how, int rc)
654cad7ea876 Rename exit_reason_t enum to exit_reason and do not typedef it.
diego
parents: 30506
diff changeset
694 {
31982
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents: 31977
diff changeset
695 #ifdef CONFIG_NETWORKING
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
696 if (udp_master)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
697 send_udp(udp_ip, udp_port, "bye");
31982
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents: 31977
diff changeset
698 #endif /* CONFIG_NETWORKING */
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents: 31977
diff changeset
699
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
700 if (mpctx->user_muted && !mpctx->edl_muted)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
701 mixer_mute(&mpctx->mixer);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
702 uninit_player(INITIALIZED_ALL);
27727
48c1ae64255b Replace preprocessor check for WIN32 with checks for __MINGW32__ and __CYGWIN__.
diego
parents: 27635
diff changeset
703 #if defined(__MINGW32__) || defined(__CYGWIN__)
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
704 timeEndPeriod(1);
26689
4cf30c0ca561 Request a timer resolution of 1 ms on Windows, the default of
reimar
parents: 26479
diff changeset
705 #endif
27377
d58d06eafe83 Change a bunch of X11-specific preprocessor directives.
diego
parents: 27370
diff changeset
706 #ifdef CONFIG_X11
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
707 #ifdef CONFIG_GUI
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
708 if (!use_gui)
6016
be9cd7d845c2 -zoom, -fs with x[11|mga|v] fix -- round two
pontscho
parents: 6015
diff changeset
709 #endif
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
710 vo_uninit(); // Close the X11 connection (if any is open).
6015
04fe086ae486 vo_uninit fixed
arpi
parents: 6013
diff changeset
711 #endif
1723
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1709
diff changeset
712
27393
4876c89bafdd Rename font-related preprocessor directives.
diego
parents: 27391
diff changeset
713 #ifdef CONFIG_FREETYPE
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
714 current_module = "uninit_font";
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
715 if (sub_font && sub_font != vo_font)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
716 free_font_desc(sub_font);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
717 sub_font = NULL;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
718 if (vo_font)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
719 free_font_desc(vo_font);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
720 vo_font = NULL;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
721 done_freetype();
13956
5d8f11a627ae free freetype descriptor and library and mconfig data right before exit
iive
parents: 13946
diff changeset
722 #endif
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
723 free_osd_list();
13956
5d8f11a627ae free freetype descriptor and library and mconfig data right before exit
iive
parents: 13946
diff changeset
724
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
725 #ifdef CONFIG_ASS
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
726 ass_library_done(ass_library);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
727 ass_library = NULL;
20477
de4a66d99f41 Libass interface reworked:
eugeni
parents: 20341
diff changeset
728 #endif
de4a66d99f41 Libass interface reworked:
eugeni
parents: 20341
diff changeset
729
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
730 current_module = "exit_player";
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
731
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
732 if (mpctx->playtree_iter)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
733 play_tree_iter_free(mpctx->playtree_iter);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
734 mpctx->playtree_iter = NULL;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
735 if (mpctx->playtree)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
736 play_tree_free(mpctx->playtree, 1);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
737 mpctx->playtree = NULL;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
738
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
739 free(edl_records); // free mem allocated for EDL
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
740 edl_records = NULL;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
741 switch (how) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
742 case EXIT_QUIT:
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
743 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_ExitingHow, MSGTR_Exit_quit);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
744 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_EXIT=QUIT\n");
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
745 break;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
746 case EXIT_EOF:
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
747 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_ExitingHow, MSGTR_Exit_eof);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
748 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_EXIT=EOF\n");
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
749 break;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
750 case EXIT_ERROR:
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
751 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_ExitingHow, MSGTR_Exit_error);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
752 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_EXIT=ERROR\n");
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
753 break;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
754 default:
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
755 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_EXIT=NONE\n");
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
756 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
757 mp_msg(MSGT_CPLAYER, MSGL_DBG2, "max framesize was %d bytes\n", max_framesize);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
758
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
759 // must be last since e.g. mp_msg uses option values
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
760 // that will be freed by this.
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
761 if (mconfig)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
762 m_config_free(mconfig);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
763 mconfig = NULL;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
764
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
765 exit(rc);
8644
0bfd73828e33 This patch fixes so that the exit code (or return code if you like) is set
arpi
parents: 8635
diff changeset
766 }
0bfd73828e33 This patch fixes so that the exit code (or return code if you like) is set
arpi
parents: 8635
diff changeset
767
30518
654cad7ea876 Rename exit_reason_t enum to exit_reason and do not typedef it.
diego
parents: 30506
diff changeset
768 void exit_player(enum exit_reason how)
654cad7ea876 Rename exit_reason_t enum to exit_reason and do not typedef it.
diego
parents: 30506
diff changeset
769 {
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
770 exit_player_with_rc(how, 1);
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
771 }
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
772
13391
b6c3752d9544 handle sigchld in mplayer.c
faust3
parents: 13358
diff changeset
773 #ifndef __MINGW32__
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
774 static void child_sighandler(int x)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
775 {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
776 pid_t pid;
33490
b180edfecf1b Clarify child_sighandler loop.
cboesch
parents: 33486
diff changeset
777 do {
b180edfecf1b Clarify child_sighandler loop.
cboesch
parents: 33486
diff changeset
778 pid = waitpid(-1, NULL, WNOHANG);
b180edfecf1b Clarify child_sighandler loop.
cboesch
parents: 33486
diff changeset
779 } while (pid > 0);
13391
b6c3752d9544 handle sigchld in mplayer.c
faust3
parents: 13358
diff changeset
780 }
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
781
13794
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
782 #endif
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
783
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
784 static void exit_sighandler(int x)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
785 {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
786 static int sig_count;
27397
d47744b95b78 Give a CONFIG_ prefix to preprocessor directives that lacked one and
diego
parents: 27393
diff changeset
787 #ifdef CONFIG_CRASH_DEBUG
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
788 if (!crash_debug || x != SIGTRAP)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
789 #endif
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
790 ++sig_count;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
791 if (initialized_flags == 0 && sig_count > 1)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
792 exit(1);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
793 if (sig_count == 5) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
794 /* We're crashing bad and can't uninit cleanly :(
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
795 * by popular request, we make one last (dirty)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
796 * effort to restore the user's
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
797 * terminal. */
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
798 getch2_disable();
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
799 exit(1);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
800 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
801 if (sig_count == 6)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
802 exit(1);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
803 if (sig_count > 6) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
804 // can't stop :(
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
805 #ifndef __MINGW32__
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
806 kill(getpid(), SIGKILL);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
807 #endif
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
808 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
809 mp_msg(MSGT_CPLAYER, MSGL_FATAL, "\n" MSGTR_IntBySignal, x,
34606
ed612f6f4778 Make mplayer.c messages translatable.
ib
parents: 34605
diff changeset
810 current_module ? current_module : MSGTR_Unknown
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
811 );
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
812 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_SIGNAL=%d\n", x);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
813 if (sig_count <= 1)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
814 switch (x) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
815 case SIGINT:
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
816 case SIGPIPE:
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
817 case SIGQUIT:
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
818 case SIGTERM:
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
819 case SIGKILL:
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
820 async_quit_request = 1;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
821 return; // killed from keyboard (^C) or killed [-9]
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
822 case SIGILL:
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
823 #if CONFIG_RUNTIME_CPUDETECT
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
824 mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_Exit_SIGILL_RTCpuSel);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
825 #else
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
826 mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_Exit_SIGILL);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
827 #endif
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
828 case SIGFPE:
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
829 case SIGSEGV:
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
830 mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_Exit_SIGSEGV_SIGFPE);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
831 default:
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
832 mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_Exit_SIGCRASH);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
833 #ifdef CONFIG_CRASH_DEBUG
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
834 if (crash_debug) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
835 int gdb_pid;
34606
ed612f6f4778 Make mplayer.c messages translatable.
ib
parents: 34605
diff changeset
836 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_Forking);
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
837 gdb_pid = fork();
34606
ed612f6f4778 Make mplayer.c messages translatable.
ib
parents: 34605
diff changeset
838 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_Forked);
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
839 if (gdb_pid == 0) { // We are the child
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
840 char spid[20];
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
841 snprintf(spid, sizeof(spid), "%i", getppid());
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
842 getch2_disable(); // allow terminal to work properly with gdb
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
843 if (execlp("gdb", "gdb", prog_path, spid, "-ex", "bt", NULL) == -1)
34606
ed612f6f4778 Make mplayer.c messages translatable.
ib
parents: 34605
diff changeset
844 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_CouldntStartGdb);
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
845 } else if (gdb_pid < 0)
34606
ed612f6f4778 Make mplayer.c messages translatable.
ib
parents: 34605
diff changeset
846 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_CouldntFork);
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
847 else {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
848 waitpid(gdb_pid, NULL, 0);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
849 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
850 if (x == SIGTRAP)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
851 return;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
852 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
853 #endif
13794
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
854 }
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
855 getch2_disable();
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
856 exit(1);
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
857 }
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
858
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
859 static void parse_cfgfiles(m_config_t *conf)
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
860 {
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
861 char *conffile;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
862 int conffile_fd;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
863 if (!disable_system_conf &&
34172
5761a9a31bcb Sanitize include option behaviour.
reimar
parents: 34119
diff changeset
864 m_config_parse_config_file(conf, MPLAYER_CONFDIR "/mplayer.conf", 1) < 0)
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
865 exit_player(EXIT_NONE);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
866 if ((conffile = get_path("")) == NULL) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
867 mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_NoHomeDir);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
868 } else {
9831
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
869 #ifdef __MINGW32__
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
870 mkdir(conffile);
9831
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
871 #else
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
872 mkdir(conffile, 0777);
9831
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
873 #endif
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
874 free(conffile);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
875 if ((conffile = get_path("config")) == NULL) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
876 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_GetpathProblem);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
877 } else {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
878 if ((conffile_fd = open(conffile, O_CREAT | O_EXCL | O_WRONLY, 0666)) != -1) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
879 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_CreatingCfgFile, conffile);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
880 write(conffile_fd, default_config, strlen(default_config));
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
881 close(conffile_fd);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
882 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
883 if (!disable_user_conf &&
34172
5761a9a31bcb Sanitize include option behaviour.
reimar
parents: 34119
diff changeset
884 m_config_parse_config_file(conf, conffile, 1) < 0)
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
885 exit_player(EXIT_NONE);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
886 free(conffile);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
887 }
178
55206b791586 get_path()
szabii
parents: 175
diff changeset
888 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
889 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
890
25635
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
891 #define PROFILE_CFG_PROTOCOL "protocol."
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
892
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
893 static void load_per_protocol_config(m_config_t *conf, const char *const file)
25635
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
894 {
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
895 char *str;
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
896 char protocol[strlen(PROFILE_CFG_PROTOCOL) + strlen(file) + 1];
25635
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
897 m_profile_t *p;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
898
25635
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
899 /* does filename actually uses a protocol ? */
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
900 str = strstr(file, "://");
25635
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
901 if (!str)
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
902 return;
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
903
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
904 sprintf(protocol, "%s%s", PROFILE_CFG_PROTOCOL, file);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
905 protocol[strlen(PROFILE_CFG_PROTOCOL) + strlen(file) - strlen(str)] = '\0';
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
906 p = m_config_get_profile(conf, protocol);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
907 if (p) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
908 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_LoadingProtocolProfile, protocol);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
909 m_config_set_profile(conf, p);
25635
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
910 }
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
911 }
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
912
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
913 #define PROFILE_CFG_EXTENSION "extension."
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
914
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
915 static void load_per_extension_config(m_config_t *conf, const char *const file)
25635
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
916 {
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
917 char *str;
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
918 char extension[strlen(PROFILE_CFG_EXTENSION) + 8];
25635
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
919 m_profile_t *p;
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
920
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
921 /* does filename actually have an extension ? */
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
922 str = strrchr(filename, '.');
25635
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
923 if (!str)
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
924 return;
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
925
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
926 sprintf(extension, PROFILE_CFG_EXTENSION);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
927 strncat(extension, ++str, 7);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
928 p = m_config_get_profile(conf, extension);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
929 if (p) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
930 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_LoadingExtensionProfile, extension);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
931 m_config_set_profile(conf, p);
25635
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
932 }
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
933 }
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
934
25641
58fd8ebcd6e3 allow profile loading per audio/video output
ben
parents: 25636
diff changeset
935 #define PROFILE_CFG_VO "vo."
58fd8ebcd6e3 allow profile loading per audio/video output
ben
parents: 25636
diff changeset
936 #define PROFILE_CFG_AO "ao."
58fd8ebcd6e3 allow profile loading per audio/video output
ben
parents: 25636
diff changeset
937
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
938 static void load_per_output_config(m_config_t *conf, char *cfg, char *out)
25641
58fd8ebcd6e3 allow profile loading per audio/video output
ben
parents: 25636
diff changeset
939 {
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
940 char profile[strlen(cfg) + strlen(out) + 1];
25641
58fd8ebcd6e3 allow profile loading per audio/video output
ben
parents: 25636
diff changeset
941 m_profile_t *p;
58fd8ebcd6e3 allow profile loading per audio/video output
ben
parents: 25636
diff changeset
942
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
943 sprintf(profile, "%s%s", cfg, out);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
944 p = m_config_get_profile(conf, profile);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
945 if (p) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
946 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_LoadingExtensionProfile, profile);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
947 m_config_set_profile(conf, p);
25641
58fd8ebcd6e3 allow profile loading per audio/video output
ben
parents: 25636
diff changeset
948 }
58fd8ebcd6e3 allow profile loading per audio/video output
ben
parents: 25636
diff changeset
949 }
58fd8ebcd6e3 allow profile loading per audio/video output
ben
parents: 25636
diff changeset
950
29561
82ff5f35918a Factor out code to try and load a config file only if it exists.
reimar
parents: 29432
diff changeset
951 /**
33287
3105428bb2ae Doxygen cleanups in the main file.
cboesch
parents: 33279
diff changeset
952 * @brief Tries to load a config file.
29561
82ff5f35918a Factor out code to try and load a config file only if it exists.
reimar
parents: 29432
diff changeset
953 * @return 0 if file was not found, 1 otherwise
82ff5f35918a Factor out code to try and load a config file only if it exists.
reimar
parents: 29432
diff changeset
954 */
82ff5f35918a Factor out code to try and load a config file only if it exists.
reimar
parents: 29432
diff changeset
955 static int try_load_config(m_config_t *conf, const char *file)
82ff5f35918a Factor out code to try and load a config file only if it exists.
reimar
parents: 29432
diff changeset
956 {
82ff5f35918a Factor out code to try and load a config file only if it exists.
reimar
parents: 29432
diff changeset
957 struct stat st;
82ff5f35918a Factor out code to try and load a config file only if it exists.
reimar
parents: 29432
diff changeset
958 if (stat(file, &st))
82ff5f35918a Factor out code to try and load a config file only if it exists.
reimar
parents: 29432
diff changeset
959 return 0;
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
960 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_LoadingConfig, file);
34172
5761a9a31bcb Sanitize include option behaviour.
reimar
parents: 34119
diff changeset
961 m_config_parse_config_file(conf, file, 0);
29561
82ff5f35918a Factor out code to try and load a config file only if it exists.
reimar
parents: 29432
diff changeset
962 return 1;
82ff5f35918a Factor out code to try and load a config file only if it exists.
reimar
parents: 29432
diff changeset
963 }
82ff5f35918a Factor out code to try and load a config file only if it exists.
reimar
parents: 29432
diff changeset
964
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
965 static void load_per_file_config(m_config_t *conf, const char *const file)
8614
49e36bf2f342 The patch adds support for a per-file config, which is loaded before
arpi
parents: 8612
diff changeset
966 {
49e36bf2f342 The patch adds support for a per-file config, which is loaded before
arpi
parents: 8612
diff changeset
967 char *confpath;
29594
331320b4557b Limit amount of data allocated on stack, strlen(filename) is not a good idea for
reimar
parents: 29592
diff changeset
968 char cfg[PATH_MAX];
32588
aa82dfc7bd49 Make use of mp_basename in a few places.
cboesch
parents: 32561
diff changeset
969 const char *name;
8614
49e36bf2f342 The patch adds support for a per-file config, which is loaded before
arpi
parents: 8612
diff changeset
970
29594
331320b4557b Limit amount of data allocated on stack, strlen(filename) is not a good idea for
reimar
parents: 29592
diff changeset
971 if (strlen(file) > PATH_MAX - 14) {
34606
ed612f6f4778 Make mplayer.c messages translatable.
ib
parents: 34605
diff changeset
972 mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_FilenameTooLong);
29594
331320b4557b Limit amount of data allocated on stack, strlen(filename) is not a good idea for
reimar
parents: 29592
diff changeset
973 return;
331320b4557b Limit amount of data allocated on stack, strlen(filename) is not a good idea for
reimar
parents: 29592
diff changeset
974 }
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
975 sprintf(cfg, "%s.conf", file);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
976
32588
aa82dfc7bd49 Make use of mp_basename in a few places.
cboesch
parents: 32561
diff changeset
977 name = mp_basename(cfg);
29592
ccdfb20713eb Add support for directory-specific mplayer.conf configuration file.
reimar
parents: 29571
diff changeset
978 if (use_filedir_conf) {
29594
331320b4557b Limit amount of data allocated on stack, strlen(filename) is not a good idea for
reimar
parents: 29592
diff changeset
979 char dircfg[PATH_MAX];
29592
ccdfb20713eb Add support for directory-specific mplayer.conf configuration file.
reimar
parents: 29571
diff changeset
980 strcpy(dircfg, cfg);
ccdfb20713eb Add support for directory-specific mplayer.conf configuration file.
reimar
parents: 29571
diff changeset
981 strcpy(dircfg + (name - cfg), "mplayer.conf");
ccdfb20713eb Add support for directory-specific mplayer.conf configuration file.
reimar
parents: 29571
diff changeset
982 try_load_config(conf, dircfg);
ccdfb20713eb Add support for directory-specific mplayer.conf configuration file.
reimar
parents: 29571
diff changeset
983
ccdfb20713eb Add support for directory-specific mplayer.conf configuration file.
reimar
parents: 29571
diff changeset
984 if (try_load_config(conf, cfg))
ccdfb20713eb Add support for directory-specific mplayer.conf configuration file.
reimar
parents: 29571
diff changeset
985 return;
ccdfb20713eb Add support for directory-specific mplayer.conf configuration file.
reimar
parents: 29571
diff changeset
986 }
ccdfb20713eb Add support for directory-specific mplayer.conf configuration file.
reimar
parents: 29571
diff changeset
987
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
988 if ((confpath = get_path(name)) != NULL) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
989 try_load_config(conf, confpath);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
990
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
991 free(confpath);
8614
49e36bf2f342 The patch adds support for a per-file config, which is loaded before
arpi
parents: 8612
diff changeset
992 }
49e36bf2f342 The patch adds support for a per-file config, which is loaded before
arpi
parents: 8612
diff changeset
993 }
49e36bf2f342 The patch adds support for a per-file config, which is loaded before
arpi
parents: 8612
diff changeset
994
34114
113156bc1137 Ensure that filename related config will always be loaded.
ib
parents: 34113
diff changeset
995 static int load_profile_config(m_config_t *conf, const char *const file)
113156bc1137 Ensure that filename related config will always be loaded.
ib
parents: 34113
diff changeset
996 {
113156bc1137 Ensure that filename related config will always be loaded.
ib
parents: 34113
diff changeset
997 if (file) {
113156bc1137 Ensure that filename related config will always be loaded.
ib
parents: 34113
diff changeset
998 load_per_protocol_config(conf, file);
113156bc1137 Ensure that filename related config will always be loaded.
ib
parents: 34113
diff changeset
999 load_per_extension_config(conf, file);
113156bc1137 Ensure that filename related config will always be loaded.
ib
parents: 34113
diff changeset
1000 load_per_file_config(conf, file);
113156bc1137 Ensure that filename related config will always be loaded.
ib
parents: 34113
diff changeset
1001 }
113156bc1137 Ensure that filename related config will always be loaded.
ib
parents: 34113
diff changeset
1002
113156bc1137 Ensure that filename related config will always be loaded.
ib
parents: 34113
diff changeset
1003 return file != NULL;
113156bc1137 Ensure that filename related config will always be loaded.
ib
parents: 34113
diff changeset
1004 }
113156bc1137 Ensure that filename related config will always be loaded.
ib
parents: 34113
diff changeset
1005
18316
b3be7df634b0 spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents: 18315
diff changeset
1006 /* When libmpdemux performs a blocking operation (network connection or
b3be7df634b0 spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents: 18315
diff changeset
1007 * cache filling) if the operation fails we use this function to check
b3be7df634b0 spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents: 18315
diff changeset
1008 * if it was interrupted by the user.
b3be7df634b0 spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents: 18315
diff changeset
1009 * The function returns a new value for eof. */
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1010 static int libmpdemux_was_interrupted(int eof)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1011 {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1012 mp_cmd_t *cmd;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1013 if ((cmd = mp_input_get_cmd(0, 0, 0)) != NULL) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1014 switch (cmd->id) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1015 case MP_CMD_QUIT:
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1016 run_command(mpctx, cmd);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1017 case MP_CMD_PLAY_TREE_STEP:
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1018 eof = (cmd->args[0].v.i > 0) ? PT_NEXT_ENTRY : PT_PREV_ENTRY;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1019 mpctx->play_tree_step = (cmd->args[0].v.i == 0) ? 1 : cmd->args[0].v.i;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1020 break;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1021 case MP_CMD_PLAY_TREE_UP_STEP:
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1022 eof = (cmd->args[0].v.i > 0) ? PT_UP_NEXT : PT_UP_PREV;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1023 break;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1024 case MP_CMD_PLAY_ALT_SRC_STEP:
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1025 eof = (cmd->args[0].v.i > 0) ? PT_NEXT_SRC : PT_PREV_SRC;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1026 break;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1027 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1028 mp_cmd_free(cmd);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1029 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1030 return eof;
4825
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
1031 }
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
1032
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1033 static int playtree_add_playlist(play_tree_t *entry)
8925
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8913
diff changeset
1034 {
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1035 play_tree_add_bpf(entry, filename);
9301
7841308ad250 this patch fixes latest bug, discovered by .so ... (relative filenames &
arpi
parents: 9291
diff changeset
1036
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
1037 #ifdef CONFIG_GUI
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1038 if (use_gui) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1039 if (entry) {
35510
06aa6dc71613 Combine guiPlaylistInitialize() and guiPlaylistAdd().
ib
parents: 35388
diff changeset
1040 guiPlaylist(GUI_PLAYLIST_ADD, entry, mconfig, 0);
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1041 play_tree_free_list(entry, 1);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1042 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1043 } else
9291
64b8c5a07c2c - It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents: 9217
diff changeset
1044 #endif
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1045 {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1046 if (!entry) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1047 entry = mpctx->playtree_iter->tree;
33491
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
1048 if (play_tree_iter_step(mpctx->playtree_iter, 1, 0) != PLAY_TREE_ITER_ENTRY)
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1049 return PT_NEXT_ENTRY;
33491
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
1050 // Loop with a single file
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
1051 if (mpctx->playtree_iter->tree == entry &&
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
1052 play_tree_iter_up_step(mpctx->playtree_iter, 1, 0) != PLAY_TREE_ITER_ENTRY)
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
1053 return PT_NEXT_ENTRY;
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1054 play_tree_remove(entry, 1, 1);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1055 return PT_NEXT_SRC;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1056 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1057 play_tree_insert_entry(mpctx->playtree_iter->tree, entry);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1058 play_tree_set_params_from(entry, mpctx->playtree_iter->tree);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1059 entry = mpctx->playtree_iter->tree;
33491
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
1060 if (play_tree_iter_step(mpctx->playtree_iter, 1, 0) != PLAY_TREE_ITER_ENTRY)
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1061 return PT_NEXT_ENTRY;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1062 play_tree_remove(entry, 1, 1);
8925
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8913
diff changeset
1063 }
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8913
diff changeset
1064 return PT_NEXT_SRC;
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8913
diff changeset
1065 }
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8913
diff changeset
1066
25264
42aa06653705 When auto loading subs, log warning instead of error for load failure.
ulion
parents: 25251
diff changeset
1067 void add_subtitles(char *filename, float fps, int noerr)
9870
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
1068 {
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
1069 sub_data *subd;
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
1070 #ifdef CONFIG_ASS
31792
55dacfca4a43 Rename libass types to match upstream libass >= 0.9.7
greg
parents: 31762
diff changeset
1071 ASS_Track *asst = 0;
18937
9e95ac641e77 Initial libass release (without mencoder support).
eugeni
parents: 18934
diff changeset
1072 #endif
9e95ac641e77 Initial libass release (without mencoder support).
eugeni
parents: 18934
diff changeset
1073
33491
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
1074 if (filename == NULL || mpctx->set_of_sub_size >= MAX_SUBTITLE_FILES)
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1075 return;
9870
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
1076
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
1077 subd = sub_read_file(filename, fps);
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
1078 #ifdef CONFIG_ASS
18937
9e95ac641e77 Initial libass release (without mencoder support).
eugeni
parents: 18934
diff changeset
1079 if (ass_enabled)
27393
4876c89bafdd Rename font-related preprocessor directives.
diego
parents: 27391
diff changeset
1080 #ifdef CONFIG_ICONV
30473
7446f58b6899 Add support for loading ASS subtitles through the stream layer and thus e.g.
reimar
parents: 30429
diff changeset
1081 asst = ass_read_stream(ass_library, filename, sub_cp);
20477
de4a66d99f41 Libass interface reworked:
eugeni
parents: 20341
diff changeset
1082 #else
30473
7446f58b6899 Add support for loading ASS subtitles through the stream layer and thus e.g.
reimar
parents: 30429
diff changeset
1083 asst = ass_read_stream(ass_library, filename, 0);
20477
de4a66d99f41 Libass interface reworked:
eugeni
parents: 20341
diff changeset
1084 #endif
19468
ecd8f562e19b fix null pointer check in add_subtitles,
gpoirier
parents: 19436
diff changeset
1085 if (ass_enabled && subd && !asst)
20477
de4a66d99f41 Libass interface reworked:
eugeni
parents: 20341
diff changeset
1086 asst = ass_read_subdata(ass_library, subd, fps);
19401
c0c3a2f8bb32 Add subdata to ass_track conversion for external subtitles.
eugeni
parents: 19380
diff changeset
1087
25264
42aa06653705 When auto loading subs, log warning instead of error for load failure.
ulion
parents: 25251
diff changeset
1088 if (!asst && !subd)
18937
9e95ac641e77 Initial libass release (without mencoder support).
eugeni
parents: 18934
diff changeset
1089 #else
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1090 if (!subd)
18937
9e95ac641e77 Initial libass release (without mencoder support).
eugeni
parents: 18934
diff changeset
1091 #endif
25264
42aa06653705 When auto loading subs, log warning instead of error for load failure.
ulion
parents: 25251
diff changeset
1092 mp_msg(MSGT_CPLAYER, noerr ? MSGL_WARN : MSGL_ERR, MSGTR_CantLoadSub,
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1093 filename_recode(filename));
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1094
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
1095 #ifdef CONFIG_ASS
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1096 if (!asst && !subd)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1097 return;
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1098 mpctx->set_of_ass_tracks[mpctx->set_of_sub_size] = asst;
18937
9e95ac641e77 Initial libass release (without mencoder support).
eugeni
parents: 18934
diff changeset
1099 #else
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1100 if (!subd)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1101 return;
18937
9e95ac641e77 Initial libass release (without mencoder support).
eugeni
parents: 18934
diff changeset
1102 #endif
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1103 mpctx->set_of_subtitles[mpctx->set_of_sub_size] = subd;
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1104 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_FILE_SUB_ID=%d\n", mpctx->set_of_sub_size);
22002
ebd2d5efb11b filename double-conversion, especially usefull for CJK users :-)
gpoirier
parents: 21930
diff changeset
1105 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_FILE_SUB_FILENAME=%s\n",
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1106 filename_recode(filename));
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1107 ++mpctx->set_of_sub_size;
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1108 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_AddedSubtitleFile, mpctx->set_of_sub_size,
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1109 filename_recode(filename));
9870
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
1110 }
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
1111
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1112 static int add_vob_subtitle(const char *vobname, const char *const ifo, int force, void *spu)
32724
732cd2afae10 Replace hacky vobsub loading with a new clean one.
cboesch
parents: 32705
diff changeset
1113 {
732cd2afae10 Replace hacky vobsub loading with a new clean one.
cboesch
parents: 32705
diff changeset
1114 if (!vobname)
732cd2afae10 Replace hacky vobsub loading with a new clean one.
cboesch
parents: 32705
diff changeset
1115 return 0;
732cd2afae10 Replace hacky vobsub loading with a new clean one.
cboesch
parents: 32705
diff changeset
1116
732cd2afae10 Replace hacky vobsub loading with a new clean one.
cboesch
parents: 32705
diff changeset
1117 assert(!vo_vobsub);
732cd2afae10 Replace hacky vobsub loading with a new clean one.
cboesch
parents: 32705
diff changeset
1118
732cd2afae10 Replace hacky vobsub loading with a new clean one.
cboesch
parents: 32705
diff changeset
1119 vo_vobsub = vobsub_open(vobname, ifo, force, spu);
732cd2afae10 Replace hacky vobsub loading with a new clean one.
cboesch
parents: 32705
diff changeset
1120
732cd2afae10 Replace hacky vobsub loading with a new clean one.
cboesch
parents: 32705
diff changeset
1121 if (!vo_vobsub && force)
732cd2afae10 Replace hacky vobsub loading with a new clean one.
cboesch
parents: 32705
diff changeset
1122 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_CantLoadSub,
732cd2afae10 Replace hacky vobsub loading with a new clean one.
cboesch
parents: 32705
diff changeset
1123 filename_recode(vobname));
732cd2afae10 Replace hacky vobsub loading with a new clean one.
cboesch
parents: 32705
diff changeset
1124
732cd2afae10 Replace hacky vobsub loading with a new clean one.
cboesch
parents: 32705
diff changeset
1125 return !!vo_vobsub;
732cd2afae10 Replace hacky vobsub loading with a new clean one.
cboesch
parents: 32705
diff changeset
1126 }
732cd2afae10 Replace hacky vobsub loading with a new clean one.
cboesch
parents: 32705
diff changeset
1127
13501
a5004eb92a79 fix sub_select fiasco with global sub numbering. now multiple sub sources can be managed in essentially one list.
joey
parents: 13500
diff changeset
1128 // FIXME: if/when the GUI calls this, global sub numbering gets (potentially) broken.
17566
f580a7755ac5 Patch by Stefan Huehner / stefan % huehner ! org \
rathann
parents: 17553
diff changeset
1129 void update_set_of_subtitles(void)
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1130 {
9870
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
1131 // subdata was changed, set_of_sub... have to be updated.
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1132 sub_data **const set_of_subtitles = mpctx->set_of_subtitles;
9870
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
1133 int i;
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1134 if (mpctx->set_of_sub_size > 0 && subdata == NULL) { // *subdata was deleted
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1135 for (i = mpctx->set_of_sub_pos + 1; i < mpctx->set_of_sub_size; ++i)
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1136 set_of_subtitles[i - 1] = set_of_subtitles[i];
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1137 set_of_subtitles[mpctx->set_of_sub_size - 1] = NULL;
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1138 --mpctx->set_of_sub_size;
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1139 if (mpctx->set_of_sub_size > 0)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1140 subdata = set_of_subtitles[mpctx->set_of_sub_pos = 0];
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1141 } else if (mpctx->set_of_sub_size > 0 && subdata != NULL) { // *subdata was changed
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1142 set_of_subtitles[mpctx->set_of_sub_pos] = subdata;
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1143 } else if (mpctx->set_of_sub_size <= 0 && subdata != NULL) { // *subdata was added
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1144 set_of_subtitles[mpctx->set_of_sub_pos = mpctx->set_of_sub_size] = subdata;
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1145 ++mpctx->set_of_sub_size;
9870
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
1146 }
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
1147 }
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
1148
13710
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
1149 /**
33287
3105428bb2ae Doxygen cleanups in the main file.
cboesch
parents: 33279
diff changeset
1150 * @brief Append a formatted string.
3105428bb2ae Doxygen cleanups in the main file.
cboesch
parents: 33279
diff changeset
1151 * @param buf buffer to print into
3105428bb2ae Doxygen cleanups in the main file.
cboesch
parents: 33279
diff changeset
1152 * @param pos position of terminating 0 in buf
3105428bb2ae Doxygen cleanups in the main file.
cboesch
parents: 33279
diff changeset
1153 * @param len maximum number of characters in buf, not including terminating 0
3105428bb2ae Doxygen cleanups in the main file.
cboesch
parents: 33279
diff changeset
1154 * @param format printf format string
13857
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1155 */
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1156 static void saddf(char *buf, unsigned *pos, int len, const char *format, ...)
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1157 {
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1158 va_list va;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1159 va_start(va, format);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1160 *pos += vsnprintf(&buf[*pos], len - *pos, format, va);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1161 va_end(va);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1162 if (*pos >= len) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1163 buf[len] = 0;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1164 *pos = len;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1165 }
13857
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1166 }
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1167
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1168 /**
33287
3105428bb2ae Doxygen cleanups in the main file.
cboesch
parents: 33279
diff changeset
1169 * @brief Append time in the hh:mm:ss.f format.
3105428bb2ae Doxygen cleanups in the main file.
cboesch
parents: 33279
diff changeset
1170 * @param buf buffer to print into
3105428bb2ae Doxygen cleanups in the main file.
cboesch
parents: 33279
diff changeset
1171 * @param pos position of terminating 0 in buf
3105428bb2ae Doxygen cleanups in the main file.
cboesch
parents: 33279
diff changeset
1172 * @param len maximum number of characters in buf, not including terminating 0
3105428bb2ae Doxygen cleanups in the main file.
cboesch
parents: 33279
diff changeset
1173 * @param time time value to convert/append
16654
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
1174 */
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1175 static void sadd_hhmmssf(char *buf, unsigned *pos, int len, float time)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1176 {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1177 int64_t tenths = 10 * time;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1178 int f1 = tenths % 10;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1179 int ss = (tenths / 10) % 60;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1180 int mm = (tenths / 600) % 60;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1181 int hh = tenths / 36000;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1182 if (time <= 0) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1183 saddf(buf, pos, len, "unknown");
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1184 return;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1185 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1186 if (hh > 0)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1187 saddf(buf, pos, len, "%2d:", hh);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1188 if (hh > 0 || mm > 0)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1189 saddf(buf, pos, len, "%02d:", mm);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1190 saddf(buf, pos, len, "%02d.%1d", ss, f1);
16654
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
1191 }
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
1192
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
1193 /**
33287
3105428bb2ae Doxygen cleanups in the main file.
cboesch
parents: 33279
diff changeset
1194 * @brief Print the status line.
3105428bb2ae Doxygen cleanups in the main file.
cboesch
parents: 33279
diff changeset
1195 * @param a_pos audio position
3105428bb2ae Doxygen cleanups in the main file.
cboesch
parents: 33279
diff changeset
1196 * @param a_v A-V desynchronization
3105428bb2ae Doxygen cleanups in the main file.
cboesch
parents: 33279
diff changeset
1197 * @param corr amount out A-V synchronization
13857
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1198 */
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1199 static void print_status(float a_pos, float a_v, float corr)
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1200 {
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1201 sh_video_t *const sh_video = mpctx->sh_video;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1202 int width;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1203 char *line;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1204 unsigned pos = 0;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1205 get_screen_size();
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1206 if (screen_width > 0)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1207 width = screen_width;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1208 else
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1209 width = 80;
27727
48c1ae64255b Replace preprocessor check for WIN32 with checks for __MINGW32__ and __CYGWIN__.
diego
parents: 27635
diff changeset
1210 #if defined(__MINGW32__) || defined(__CYGWIN__) || defined(__OS2__)
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1211 /* Windows command line is broken (MinGW's rxvt works, but we
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1212 * should not depend on that). */
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1213 width--;
13928
6a0b5d320378 fix scrolling status line in windows
reimar
parents: 13906
diff changeset
1214 #endif
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1215 line = malloc(width + 1); // one additional char for the terminating null
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1216
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1217 // Audio time
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1218 if (mpctx->sh_audio) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1219 saddf(line, &pos, width, "A:%6.1f ", a_pos);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1220 if (!sh_video) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1221 float len = demuxer_get_time_length(mpctx->demuxer);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1222 saddf(line, &pos, width, "(");
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1223 sadd_hhmmssf(line, &pos, width, a_pos);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1224 saddf(line, &pos, width, ") of %.1f (", len);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1225 sadd_hhmmssf(line, &pos, width, len);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1226 saddf(line, &pos, width, ") ");
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1227 }
13857
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1228 }
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1229
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1230 // Video time
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1231 if (sh_video)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1232 saddf(line, &pos, width, "V:%6.1f ", sh_video->pts);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1233
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1234 // A-V sync
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1235 if (mpctx->sh_audio && sh_video)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1236 saddf(line, &pos, width, "A-V:%7.3f ct:%7.3f ", a_v, corr);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1237
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1238 // Video stats
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1239 if (sh_video)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1240 saddf(line, &pos, width, "%3d/%3d ",
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1241 (int)sh_video->num_frames,
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1242 (int)sh_video->num_frames_decoded);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1243
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1244 // CPU usage
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1245 if (sh_video) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1246 if (sh_video->timer > 0.5)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1247 saddf(line, &pos, width, "%2d%% %2d%% %4.1f%% ",
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1248 (int)(100.0 * video_time_usage * playback_speed / (double)sh_video->timer),
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1249 (int)(100.0 * vout_time_usage * playback_speed / (double)sh_video->timer),
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1250 (100.0 * audio_time_usage * playback_speed / (double)sh_video->timer));
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1251 else
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1252 saddf(line, &pos, width, "??%% ??%% ??,?%% ");
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1253 } else if (mpctx->sh_audio) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1254 if (mpctx->delay > 0.5)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1255 saddf(line, &pos, width, "%4.1f%% ",
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1256 100.0 * audio_time_usage / (double)mpctx->delay);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1257 else
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1258 saddf(line, &pos, width, "??,?%% ");
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1259 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1260
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1261 // VO stats
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1262 if (sh_video)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1263 saddf(line, &pos, width, "%d %d ", drop_frame_cnt, output_quality);
13857
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1264
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
1265 #ifdef CONFIG_STREAM_CACHE
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1266 // cache stats
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1267 if (stream_cache_size > 0)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1268 saddf(line, &pos, width, "%d%% ", cache_fill_status(mpctx->stream));
13857
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1269 #endif
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1270
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1271 // other
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1272 if (playback_speed != 1)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1273 saddf(line, &pos, width, "%4.2fx ", playback_speed);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1274
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1275 // end
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1276 if (erase_to_end_of_line) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1277 line[pos] = 0;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1278 mp_msg(MSGT_STATUSLINE, MSGL_STATUS, "%s%s\r", line, erase_to_end_of_line);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1279 } else {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1280 memset(&line[pos], ' ', width - pos);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1281 line[width] = 0;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1282 mp_msg(MSGT_STATUSLINE, MSGL_STATUS, "%s\r", line);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1283 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1284 free(line);
13857
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1285 }
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1286
33390
f33d61bf5da0 stream dump: print progress information.
cigaes
parents: 33363
diff changeset
1287 static void stream_dump_progress_start(void)
f33d61bf5da0 stream dump: print progress information.
cigaes
parents: 33363
diff changeset
1288 {
f33d61bf5da0 stream dump: print progress information.
cigaes
parents: 33363
diff changeset
1289 stream_dump_start_time = stream_dump_last_print_time = GetTimerMS();
f33d61bf5da0 stream dump: print progress information.
cigaes
parents: 33363
diff changeset
1290 }
f33d61bf5da0 stream dump: print progress information.
cigaes
parents: 33363
diff changeset
1291
f33d61bf5da0 stream dump: print progress information.
cigaes
parents: 33363
diff changeset
1292 static void stream_dump_progress(uint64_t len, stream_t *stream)
f33d61bf5da0 stream dump: print progress information.
cigaes
parents: 33363
diff changeset
1293 {
f33d61bf5da0 stream dump: print progress information.
cigaes
parents: 33363
diff changeset
1294 unsigned t = GetTimerMS();
f33d61bf5da0 stream dump: print progress information.
cigaes
parents: 33363
diff changeset
1295 uint64_t start = stream->start_pos;
f33d61bf5da0 stream dump: print progress information.
cigaes
parents: 33363
diff changeset
1296 uint64_t end = stream->end_pos;
f33d61bf5da0 stream dump: print progress information.
cigaes
parents: 33363
diff changeset
1297 uint64_t pos = stream->pos;
f33d61bf5da0 stream dump: print progress information.
cigaes
parents: 33363
diff changeset
1298
f33d61bf5da0 stream dump: print progress information.
cigaes
parents: 33363
diff changeset
1299 stream_dump_count += len;
f33d61bf5da0 stream dump: print progress information.
cigaes
parents: 33363
diff changeset
1300 if (t - stream_dump_last_print_time - 1000 > UINT_MAX / 2)
f33d61bf5da0 stream dump: print progress information.
cigaes
parents: 33363
diff changeset
1301 return;
f33d61bf5da0 stream dump: print progress information.
cigaes
parents: 33363
diff changeset
1302 stream_dump_last_print_time = t;
f33d61bf5da0 stream dump: print progress information.
cigaes
parents: 33363
diff changeset
1303 /* TODO: pretty print sizes; ETA */
f33d61bf5da0 stream dump: print progress information.
cigaes
parents: 33363
diff changeset
1304 if (end > start && pos >= start && pos <= end) {
f33d61bf5da0 stream dump: print progress information.
cigaes
parents: 33363
diff changeset
1305 mp_msg(MSGT_STATUSLINE, MSGL_STATUS, MSGTR_DumpBytesWrittenPercent,
f33d61bf5da0 stream dump: print progress information.
cigaes
parents: 33363
diff changeset
1306 stream_dump_count, 100.0 * (pos - start) / (end - start));
f33d61bf5da0 stream dump: print progress information.
cigaes
parents: 33363
diff changeset
1307 } else {
f33d61bf5da0 stream dump: print progress information.
cigaes
parents: 33363
diff changeset
1308 mp_msg(MSGT_STATUSLINE, MSGL_STATUS, MSGTR_DumpBytesWritten,
f33d61bf5da0 stream dump: print progress information.
cigaes
parents: 33363
diff changeset
1309 stream_dump_count);
f33d61bf5da0 stream dump: print progress information.
cigaes
parents: 33363
diff changeset
1310 }
f33d61bf5da0 stream dump: print progress information.
cigaes
parents: 33363
diff changeset
1311 }
f33d61bf5da0 stream dump: print progress information.
cigaes
parents: 33363
diff changeset
1312
f33d61bf5da0 stream dump: print progress information.
cigaes
parents: 33363
diff changeset
1313 static void stream_dump_progress_end(void)
f33d61bf5da0 stream dump: print progress information.
cigaes
parents: 33363
diff changeset
1314 {
f33d61bf5da0 stream dump: print progress information.
cigaes
parents: 33363
diff changeset
1315 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_DumpBytesWrittenTo,
f33d61bf5da0 stream dump: print progress information.
cigaes
parents: 33363
diff changeset
1316 stream_dump_count, stream_dump_name);
f33d61bf5da0 stream dump: print progress information.
cigaes
parents: 33363
diff changeset
1317 }
f33d61bf5da0 stream dump: print progress information.
cigaes
parents: 33363
diff changeset
1318
13857
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1319 /**
33287
3105428bb2ae Doxygen cleanups in the main file.
cboesch
parents: 33279
diff changeset
1320 * @brief Build a chain of audio filters that converts the input format.
13710
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
1321 * to the ao's format, taking into account the current playback_speed.
33287
3105428bb2ae Doxygen cleanups in the main file.
cboesch
parents: 33279
diff changeset
1322 * @param sh_audio describes the requested input format of the chain.
3105428bb2ae Doxygen cleanups in the main file.
cboesch
parents: 33279
diff changeset
1323 * @param ao_data describes the requested output format of the chain.
13710
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
1324 */
32561
17bb5a38ae2e build_afilter_chain is not safe to use directly, thus make it
reimar
parents: 32543
diff changeset
1325 static int build_afilter_chain(sh_audio_t *sh_audio, ao_data_t *ao_data)
13710
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
1326 {
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1327 int new_srate;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1328 int result;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1329 if (!sh_audio) {
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
1330 #ifdef CONFIG_GUI
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1331 if (use_gui)
33731
81f71d910333 Cosmetic: Change prefix for symbolic constants from GMP to GUI.
ib
parents: 33725
diff changeset
1332 gui(GUI_SET_AFILTER, NULL);
14254
21e72b6d8d11 Do not use audio plugins anymore
reimar
parents: 14245
diff changeset
1333 #endif
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1334 mpctx->mixer.afilter = NULL;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1335 return 0;
24896
8133163bd1dd Add audio filter scaletempo
uau
parents: 24895
diff changeset
1336 }
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1337 if (af_control_any_rev(sh_audio->afilter,
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1338 AF_CONTROL_PLAYBACK_SPEED | AF_CONTROL_SET,
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1339 &playback_speed)) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1340 new_srate = sh_audio->samplerate;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1341 } else {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1342 new_srate = sh_audio->samplerate * playback_speed;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1343 if (new_srate != ao_data->samplerate) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1344 // limits are taken from libaf/af_resample.c
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1345 if (new_srate < 8000)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1346 new_srate = 8000;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1347 if (new_srate > 192000)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1348 new_srate = 192000;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1349 playback_speed = (float)new_srate / (float)sh_audio->samplerate;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1350 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1351 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1352 result = init_audio_filters(sh_audio, new_srate,
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1353 &ao_data->samplerate, &ao_data->channels, &ao_data->format);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1354 mpctx->mixer.afilter = sh_audio->afilter;
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
1355 #ifdef CONFIG_GUI
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1356 if (use_gui)
33731
81f71d910333 Cosmetic: Change prefix for symbolic constants from GMP to GUI.
ib
parents: 33725
diff changeset
1357 gui(GUI_SET_AFILTER, sh_audio->afilter);
14254
21e72b6d8d11 Do not use audio plugins anymore
reimar
parents: 14245
diff changeset
1358 #endif
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1359 return result;
13710
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
1360 }
8800
2485bc98772d fixed some possible overflow places
alex
parents: 8784
diff changeset
1361
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1362 typedef struct mp_osd_msg mp_osd_msg_t;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1363 struct mp_osd_msg {
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1364 mp_osd_msg_t *prev; ///< Previous message on the stack
33287
3105428bb2ae Doxygen cleanups in the main file.
cboesch
parents: 33279
diff changeset
1365 char msg[128]; ///< Message text
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1366 int id, level, started;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1367 unsigned time; ///< Display duration in ms
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1368 };
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1369
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1370 static mp_osd_msg_t *osd_msg_stack; ///< OSD message stack
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1371
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1372 /**
33287
3105428bb2ae Doxygen cleanups in the main file.
cboesch
parents: 33279
diff changeset
1373 * @brief Add a message on the OSD message stack.
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1374 *
33287
3105428bb2ae Doxygen cleanups in the main file.
cboesch
parents: 33279
diff changeset
1375 * If a message with the same id is already present in the stack
3105428bb2ae Doxygen cleanups in the main file.
cboesch
parents: 33279
diff changeset
1376 * it is pulled on top of the stack, otherwise a new message is created.
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1377 */
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1378 void set_osd_msg(int id, int level, int time, const char *fmt, ...)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1379 {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1380 mp_osd_msg_t *msg, *last = NULL;
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1381 va_list va;
17929
6fe95ee39422 Fix osd_show_msg alignment and make sure msg strings
albeu
parents: 17928
diff changeset
1382 int r;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1383
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1384 // look if the id is already in the stack
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1385 for (msg = osd_msg_stack; msg && msg->id != id;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1386 last = msg, msg = msg->prev) ;
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1387 // not found: alloc it
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1388 if (!msg) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1389 msg = calloc(1, sizeof(mp_osd_msg_t));
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1390 msg->prev = osd_msg_stack;
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1391 osd_msg_stack = msg;
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1392 } else if (last) { // found, but it's not on top of the stack
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1393 last->prev = msg->prev;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1394 msg->prev = osd_msg_stack;
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1395 osd_msg_stack = msg;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1396 }
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1397 // write the msg
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1398 va_start(va, fmt);
28378
45ddc04c30a1 increase max OSD message size limit
compn
parents: 28325
diff changeset
1399 r = vsnprintf(msg->msg, 128, fmt, va);
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1400 va_end(va);
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1401 if (r >= 128)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1402 msg->msg[127] = 0;
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1403 // set id and time
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1404 msg->id = id;
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1405 msg->level = level;
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1406 msg->time = time;
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1407 }
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1408
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1409 /**
33287
3105428bb2ae Doxygen cleanups in the main file.
cboesch
parents: 33279
diff changeset
1410 * @brief Remove a message from the OSD stack.
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1411 *
33287
3105428bb2ae Doxygen cleanups in the main file.
cboesch
parents: 33279
diff changeset
1412 * This function can be used to get rid of a message right away.
17057
d301c1833d12 Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents: 17021
diff changeset
1413 */
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1414 void rm_osd_msg(int id)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1415 {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1416 mp_osd_msg_t *msg, *last = NULL;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1417
17057
d301c1833d12 Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents: 17021
diff changeset
1418 // Search for the msg
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1419 for (msg = osd_msg_stack; msg && msg->id != id;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1420 last = msg, msg = msg->prev) ;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1421 if (!msg)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1422 return;
17057
d301c1833d12 Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents: 17021
diff changeset
1423
d301c1833d12 Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents: 17021
diff changeset
1424 // Detach it from the stack and free it
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1425 if (last)
17057
d301c1833d12 Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents: 17021
diff changeset
1426 last->prev = msg->prev;
d301c1833d12 Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents: 17021
diff changeset
1427 else
d301c1833d12 Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents: 17021
diff changeset
1428 osd_msg_stack = msg->prev;
d301c1833d12 Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents: 17021
diff changeset
1429 free(msg);
d301c1833d12 Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents: 17021
diff changeset
1430 }
d301c1833d12 Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents: 17021
diff changeset
1431
d301c1833d12 Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents: 17021
diff changeset
1432 /**
33287
3105428bb2ae Doxygen cleanups in the main file.
cboesch
parents: 33279
diff changeset
1433 * @brief Remove all messages from the OSD stack.
17938
810b407ba6c4 Get rid of 2 osd related hacks.
albeu
parents: 17935
diff changeset
1434 */
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1435 static void clear_osd_msgs(void)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1436 {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1437 mp_osd_msg_t *msg = osd_msg_stack, *prev = NULL;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1438 while (msg) {
17938
810b407ba6c4 Get rid of 2 osd related hacks.
albeu
parents: 17935
diff changeset
1439 prev = msg->prev;
810b407ba6c4 Get rid of 2 osd related hacks.
albeu
parents: 17935
diff changeset
1440 free(msg);
810b407ba6c4 Get rid of 2 osd related hacks.
albeu
parents: 17935
diff changeset
1441 msg = prev;
810b407ba6c4 Get rid of 2 osd related hacks.
albeu
parents: 17935
diff changeset
1442 }
810b407ba6c4 Get rid of 2 osd related hacks.
albeu
parents: 17935
diff changeset
1443 osd_msg_stack = NULL;
810b407ba6c4 Get rid of 2 osd related hacks.
albeu
parents: 17935
diff changeset
1444 }
810b407ba6c4 Get rid of 2 osd related hacks.
albeu
parents: 17935
diff changeset
1445
810b407ba6c4 Get rid of 2 osd related hacks.
albeu
parents: 17935
diff changeset
1446 /**
33287
3105428bb2ae Doxygen cleanups in the main file.
cboesch
parents: 33279
diff changeset
1447 * @brief Get the current message from the OSD stack.
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1448 *
33287
3105428bb2ae Doxygen cleanups in the main file.
cboesch
parents: 33279
diff changeset
1449 * This function decrements the message timer and destroys the old ones.
3105428bb2ae Doxygen cleanups in the main file.
cboesch
parents: 33279
diff changeset
1450 * The message that should be displayed is returned (if any).
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1451 */
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1452 static mp_osd_msg_t *get_osd_msg(void)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1453 {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1454 mp_osd_msg_t *msg, *prev, *last = NULL;
33257
40b298f9dc77 Remove some useless static and global zero initializations.
cboesch
parents: 33256
diff changeset
1455 static unsigned last_update;
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1456 unsigned now = GetTimerMS();
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1457 unsigned diff;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1458 char hidden_dec_done = 0;
24091
e7df91814c0f Minor code cleanup
uau
parents: 24070
diff changeset
1459
e7df91814c0f Minor code cleanup
uau
parents: 24070
diff changeset
1460 if (osd_visible) {
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1461 // 36000000 means max timed visibility is 1 hour into the future, if
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1462 // the difference is greater assume it's wrapped around from below 0
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1463 if (osd_visible - now > 36000000) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1464 osd_visible = 0;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1465 vo_osd_progbar_type = -1; // disable
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1466 vo_osd_changed(OSDTYPE_PROGBAR);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1467 if (mpctx->osd_function != OSD_PAUSE)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1468 mpctx->osd_function = OSD_PLAY;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1469 }
24091
e7df91814c0f Minor code cleanup
uau
parents: 24070
diff changeset
1470 }
e7df91814c0f Minor code cleanup
uau
parents: 24070
diff changeset
1471
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1472 if (!last_update)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1473 last_update = now;
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1474 diff = now >= last_update ? now - last_update : 0;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1475
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1476 last_update = now;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1477
18316
b3be7df634b0 spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents: 18315
diff changeset
1478 // Look for the first message in the stack with high enough level.
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1479 for (msg = osd_msg_stack; msg; last = msg, msg = prev) {
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1480 prev = msg->prev;
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1481 if (msg->level > osd_level && hidden_dec_done)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1482 continue;
18316
b3be7df634b0 spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents: 18315
diff changeset
1483 // The message has a high enough level or it is the first hidden one
b3be7df634b0 spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents: 18315
diff changeset
1484 // in both cases we decrement the timer or kill it.
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1485 if (!msg->started || msg->time > diff) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1486 if (msg->started)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1487 msg->time -= diff;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1488 else
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1489 msg->started = 1;
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1490 // display it
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1491 if (msg->level <= osd_level)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1492 return msg;
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1493 hidden_dec_done = 1;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1494 continue;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1495 }
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1496 // kill the message
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1497 free(msg);
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1498 if (last) {
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1499 last->prev = prev;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1500 msg = last;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1501 } else {
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1502 osd_msg_stack = prev;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1503 msg = NULL;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1504 }
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1505 }
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1506 // Nothing found
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1507 return NULL;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1508 }
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1509
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1510 /**
33287
3105428bb2ae Doxygen cleanups in the main file.
cboesch
parents: 33279
diff changeset
1511 * @brief Display the OSD bar.
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1512 *
18316
b3be7df634b0 spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents: 18315
diff changeset
1513 * Display the OSD bar or fall back on a simple message.
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1514 */
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1515 void set_osd_bar(int type, const char *name, double min, double max, double val)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1516 {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1517 if (osd_level < 1)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1518 return;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1519
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1520 if (mpctx->sh_video) {
18287
292337d09af2 Remove updating of vo_mouse_timer_const from the main loop and also
uau
parents: 18286
diff changeset
1521 osd_visible = (GetTimerMS() + 1000) | 1;
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1522 vo_osd_progbar_type = type;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1523 vo_osd_progbar_value = 256 * (val - min) / (max - min);
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1524 vo_osd_changed(OSDTYPE_PROGBAR);
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1525 return;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1526 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1527
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1528 set_osd_msg(OSD_MSG_BAR, 1, osd_duration, "%s: %d %%",
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1529 name, ROUND(100 * (val - min) / (max - min)));
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1530 }
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1531
29670
2e3751815a21 Add support for displaying subtitles on the command-line when playing
reimar
parents: 29668
diff changeset
1532 /**
33287
3105428bb2ae Doxygen cleanups in the main file.
cboesch
parents: 33279
diff changeset
1533 * @brief Display text subtitles on the OSD.
29670
2e3751815a21 Add support for displaying subtitles on the command-line when playing
reimar
parents: 29668
diff changeset
1534 */
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1535 void set_osd_subtitle(subtitle *subs)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1536 {
29670
2e3751815a21 Add support for displaying subtitles on the command-line when playing
reimar
parents: 29668
diff changeset
1537 int i;
2e3751815a21 Add support for displaying subtitles on the command-line when playing
reimar
parents: 29668
diff changeset
1538 vo_sub = subs;
2e3751815a21 Add support for displaying subtitles on the command-line when playing
reimar
parents: 29668
diff changeset
1539 vo_osd_changed(OSDTYPE_SUBTITLE);
2e3751815a21 Add support for displaying subtitles on the command-line when playing
reimar
parents: 29668
diff changeset
1540 if (!mpctx->sh_video) {
2e3751815a21 Add support for displaying subtitles on the command-line when playing
reimar
parents: 29668
diff changeset
1541 // reverse order, since newest set_osd_msg is displayed first
2e3751815a21 Add support for displaying subtitles on the command-line when playing
reimar
parents: 29668
diff changeset
1542 for (i = SUB_MAX_TEXT - 1; i >= 0; i--) {
2e3751815a21 Add support for displaying subtitles on the command-line when playing
reimar
parents: 29668
diff changeset
1543 if (!subs || i >= subs->lines || !subs->text[i])
2e3751815a21 Add support for displaying subtitles on the command-line when playing
reimar
parents: 29668
diff changeset
1544 rm_osd_msg(OSD_MSG_SUB_BASE + i);
2e3751815a21 Add support for displaying subtitles on the command-line when playing
reimar
parents: 29668
diff changeset
1545 else {
2e3751815a21 Add support for displaying subtitles on the command-line when playing
reimar
parents: 29668
diff changeset
1546 // HACK: currently display time for each sub line except the last is set to 2 seconds.
2e3751815a21 Add support for displaying subtitles on the command-line when playing
reimar
parents: 29668
diff changeset
1547 int display_time = i == subs->lines - 1 ? 180000 : 2000;
2e3751815a21 Add support for displaying subtitles on the command-line when playing
reimar
parents: 29668
diff changeset
1548 set_osd_msg(OSD_MSG_SUB_BASE + i, 1, display_time, "%s", subs->text[i]);
2e3751815a21 Add support for displaying subtitles on the command-line when playing
reimar
parents: 29668
diff changeset
1549 }
2e3751815a21 Add support for displaying subtitles on the command-line when playing
reimar
parents: 29668
diff changeset
1550 }
2e3751815a21 Add support for displaying subtitles on the command-line when playing
reimar
parents: 29668
diff changeset
1551 }
2e3751815a21 Add support for displaying subtitles on the command-line when playing
reimar
parents: 29668
diff changeset
1552 }
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1553
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1554 /**
33287
3105428bb2ae Doxygen cleanups in the main file.
cboesch
parents: 33279
diff changeset
1555 * @brief Update the OSD message line.
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1556 *
18316
b3be7df634b0 spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents: 18315
diff changeset
1557 * This function displays the current message on the vo OSD or on the term.
b3be7df634b0 spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents: 18315
diff changeset
1558 * If the stack is empty and the OSD level is high enough the timer
b3be7df634b0 spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents: 18315
diff changeset
1559 * is displayed (only on the vo OSD).
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1560 */
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1561 static void update_osd_msg(void)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1562 {
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1563 mp_osd_msg_t *msg;
28378
45ddc04c30a1 increase max OSD message size limit
compn
parents: 28325
diff changeset
1564 static char osd_text[128] = "";
45ddc04c30a1 increase max OSD message size limit
compn
parents: 28325
diff changeset
1565 static char osd_text_timer[128];
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1566
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1567 // we need some mem for vo_osd_text
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1568 vo_osd_text = (unsigned char *)osd_text;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1569
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1570 // Look if we have a msg
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1571 if ((msg = get_osd_msg())) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1572 if (strcmp(osd_text, msg->msg)) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1573 strncpy((char *)osd_text, msg->msg, 127);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1574 if (mpctx->sh_video)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1575 vo_osd_changed(OSDTYPE_OSD);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1576 else if (term_osd)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1577 mp_msg(MSGT_CPLAYER, MSGL_STATUS, "%s%s\n", term_osd_esc, msg->msg);
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1578 }
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1579 return;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1580 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1581
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1582 if (mpctx->sh_video) {
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1583 // fallback on the timer
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1584 if (osd_level >= 2) {
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1585 int len = demuxer_get_time_length(mpctx->demuxer);
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1586 int percentage = -1;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1587 char percentage_text[10];
32793
0adeebe4e561 Fractional part of time stamp in OSD.
cigaes
parents: 32773
diff changeset
1588 char fractions_text[4];
34312
d2a41814c879 Fix OSD time and e.g. frame number displayed with osd_fractions
reimar
parents: 34262
diff changeset
1589 double pts = demuxer_get_current_time(mpctx->demuxer);
d2a41814c879 Fix OSD time and e.g. frame number displayed with osd_fractions
reimar
parents: 34262
diff changeset
1590 int pts_seconds = pts;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1591
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1592 if (mpctx->osd_show_percentage)
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1593 percentage = demuxer_get_percent_pos(mpctx->demuxer);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1594
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1595 if (percentage >= 0)
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1596 snprintf(percentage_text, 9, " (%d%%)", percentage);
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1597 else
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1598 percentage_text[0] = 0;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1599
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1600 if (osd_fractions == 1) {
33491
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
1601 // print fractions as sub-second timestamp
32793
0adeebe4e561 Fractional part of time stamp in OSD.
cigaes
parents: 32773
diff changeset
1602 snprintf(fractions_text, sizeof(fractions_text), ".%02d",
34312
d2a41814c879 Fix OSD time and e.g. frame number displayed with osd_fractions
reimar
parents: 34262
diff changeset
1603 (int)((pts - pts_seconds) * 100) % 100);
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1604 } else if (osd_fractions == 2) {
33491
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
1605 // print fractions by estimating the frame count within the
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
1606 // second
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
1607
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
1608 // rounding or cutting off numbers after the decimal point
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
1609 // causes problems because of float's precision and movies,
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
1610 // whose first frame is not exactly at timestamp 0. Therefore,
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
1611 // we add 0.2 and cut off at the decimal point, which proved
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
1612 // as good heuristic
32793
0adeebe4e561 Fractional part of time stamp in OSD.
cigaes
parents: 32773
diff changeset
1613 snprintf(fractions_text, sizeof(fractions_text), ".%02d",
34312
d2a41814c879 Fix OSD time and e.g. frame number displayed with osd_fractions
reimar
parents: 34262
diff changeset
1614 (int)((pts - pts_seconds) *
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1615 mpctx->sh_video->fps + 0.2));
32793
0adeebe4e561 Fractional part of time stamp in OSD.
cigaes
parents: 32773
diff changeset
1616 } else {
33491
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
1617 // do not print fractions
32793
0adeebe4e561 Fractional part of time stamp in OSD.
cigaes
parents: 32773
diff changeset
1618 fractions_text[0] = 0;
0adeebe4e561 Fractional part of time stamp in OSD.
cigaes
parents: 32773
diff changeset
1619 }
0adeebe4e561 Fractional part of time stamp in OSD.
cigaes
parents: 32773
diff changeset
1620
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1621 if (osd_level == 3)
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1622 snprintf(osd_text_timer, 63,
32793
0adeebe4e561 Fractional part of time stamp in OSD.
cigaes
parents: 32773
diff changeset
1623 "%c %02d:%02d:%02d%s / %02d:%02d:%02d%s",
34312
d2a41814c879 Fix OSD time and e.g. frame number displayed with osd_fractions
reimar
parents: 34262
diff changeset
1624 mpctx->osd_function, pts_seconds / 3600, (pts_seconds / 60) % 60, pts_seconds % 60,
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1625 fractions_text, len / 3600, (len / 60) % 60, len % 60,
32793
0adeebe4e561 Fractional part of time stamp in OSD.
cigaes
parents: 32773
diff changeset
1626 percentage_text);
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1627 else
32793
0adeebe4e561 Fractional part of time stamp in OSD.
cigaes
parents: 32773
diff changeset
1628 snprintf(osd_text_timer, 63, "%c %02d:%02d:%02d%s%s",
34312
d2a41814c879 Fix OSD time and e.g. frame number displayed with osd_fractions
reimar
parents: 34262
diff changeset
1629 mpctx->osd_function, pts_seconds / 3600, (pts_seconds / 60) % 60,
d2a41814c879 Fix OSD time and e.g. frame number displayed with osd_fractions
reimar
parents: 34262
diff changeset
1630 pts_seconds % 60, fractions_text, percentage_text);
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1631 } else
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1632 osd_text_timer[0] = 0;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1633
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1634 // always decrement the percentage timer
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1635 if (mpctx->osd_show_percentage)
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1636 mpctx->osd_show_percentage--;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1637
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1638 if (strcmp(osd_text, osd_text_timer)) {
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1639 strncpy(osd_text, osd_text_timer, 63);
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1640 vo_osd_changed(OSDTYPE_OSD);
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1641 }
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1642 return;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1643 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1644
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1645 // Clear the term osd line
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1646 if (term_osd && osd_text[0]) {
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1647 osd_text[0] = 0;
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1648 printf("%s\n", term_osd_esc);
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1649 }
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1650 }
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1651
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1652 void reinit_audio_chain(void)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1653 {
29801
7ac1f37f8aa5 Whitespace cosmetics: reindent reinit_audio_chain function
reimar
parents: 29800
diff changeset
1654 if (!mpctx->sh_audio)
7ac1f37f8aa5 Whitespace cosmetics: reindent reinit_audio_chain function
reimar
parents: 29800
diff changeset
1655 return;
31671
4541f1921482 Add support for parameter changes (e.g. channel count) during playback.
reimar
parents: 31670
diff changeset
1656 if (!(initialized_flags & INITIALIZED_ACODEC)) {
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1657 current_module = "init_audio_codec";
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1658 mp_msg(MSGT_CPLAYER, MSGL_INFO, "==========================================================================\n");
33491
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
1659 if (!init_best_audio_codec(mpctx->sh_audio, audio_codec_list, audio_fm_list))
31673
cb6e9b6d8811 Reindent.
reimar
parents: 31671
diff changeset
1660 goto init_error;
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1661 initialized_flags |= INITIALIZED_ACODEC;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1662 mp_msg(MSGT_CPLAYER, MSGL_INFO, "==========================================================================\n");
31671
4541f1921482 Add support for parameter changes (e.g. channel count) during playback.
reimar
parents: 31670
diff changeset
1663 }
4541f1921482 Add support for parameter changes (e.g. channel count) during playback.
reimar
parents: 31670
diff changeset
1664
4541f1921482 Add support for parameter changes (e.g. channel count) during playback.
reimar
parents: 31670
diff changeset
1665 if (!(initialized_flags & INITIALIZED_AO)) {
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1666 current_module = "af_preinit";
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1667 ao_data.samplerate = force_srate;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1668 ao_data.channels = 0;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1669 ao_data.format = audio_output_format;
31673
cb6e9b6d8811 Reindent.
reimar
parents: 31671
diff changeset
1670 // first init to detect best values
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1671 if (!init_audio_filters(mpctx->sh_audio, // preliminary init
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1672 // input:
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1673 mpctx->sh_audio->samplerate,
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1674 // output:
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1675 &ao_data.samplerate, &ao_data.channels, &ao_data.format)) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1676 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_AudioFilterChainPreinitError);
31673
cb6e9b6d8811 Reindent.
reimar
parents: 31671
diff changeset
1677 exit_player(EXIT_ERROR);
cb6e9b6d8811 Reindent.
reimar
parents: 31671
diff changeset
1678 }
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1679 current_module = "ao2_init";
31673
cb6e9b6d8811 Reindent.
reimar
parents: 31671
diff changeset
1680 mpctx->audio_out = init_best_audio_out(audio_driver_list,
cb6e9b6d8811 Reindent.
reimar
parents: 31671
diff changeset
1681 0, // plugin flag
cb6e9b6d8811 Reindent.
reimar
parents: 31671
diff changeset
1682 ao_data.samplerate,
cb6e9b6d8811 Reindent.
reimar
parents: 31671
diff changeset
1683 ao_data.channels,
cb6e9b6d8811 Reindent.
reimar
parents: 31671
diff changeset
1684 ao_data.format, 0);
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1685 if (!mpctx->audio_out) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1686 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_CannotInitAO);
31673
cb6e9b6d8811 Reindent.
reimar
parents: 31671
diff changeset
1687 goto init_error;
cb6e9b6d8811 Reindent.
reimar
parents: 31671
diff changeset
1688 }
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1689 initialized_flags |= INITIALIZED_AO;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1690 mp_msg(MSGT_CPLAYER, MSGL_INFO, "AO: [%s] %dHz %dch %s (%d bytes per sample)\n",
31673
cb6e9b6d8811 Reindent.
reimar
parents: 31671
diff changeset
1691 mpctx->audio_out->info->short_name,
cb6e9b6d8811 Reindent.
reimar
parents: 31671
diff changeset
1692 ao_data.samplerate, ao_data.channels,
cb6e9b6d8811 Reindent.
reimar
parents: 31671
diff changeset
1693 af_fmt2str_short(ao_data.format),
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1694 af_fmt2bits(ao_data.format) / 8);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1695 mp_msg(MSGT_CPLAYER, MSGL_V, "AO: Description: %s\nAO: Author: %s\n",
31673
cb6e9b6d8811 Reindent.
reimar
parents: 31671
diff changeset
1696 mpctx->audio_out->info->name, mpctx->audio_out->info->author);
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1697 if (strlen(mpctx->audio_out->info->comment) > 0)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1698 mp_msg(MSGT_CPLAYER, MSGL_V, "AO: Comment: %s\n", mpctx->audio_out->info->comment);
31671
4541f1921482 Add support for parameter changes (e.g. channel count) during playback.
reimar
parents: 31670
diff changeset
1699 }
4541f1921482 Add support for parameter changes (e.g. channel count) during playback.
reimar
parents: 31670
diff changeset
1700
18679
e52e101e9e59 moved audio codec/filters/out to a separate function that is called both at init() and to switch audio stream
nicodvb
parents: 18406
diff changeset
1701 // init audio filters:
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1702 current_module = "af_init";
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1703 if (!build_afilter_chain(mpctx->sh_audio, &ao_data)) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1704 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_NoMatchingFilter);
29801
7ac1f37f8aa5 Whitespace cosmetics: reindent reinit_audio_chain function
reimar
parents: 29800
diff changeset
1705 goto init_error;
18679
e52e101e9e59 moved audio codec/filters/out to a separate function that is called both at init() and to switch audio stream
nicodvb
parents: 18406
diff changeset
1706 }
29801
7ac1f37f8aa5 Whitespace cosmetics: reindent reinit_audio_chain function
reimar
parents: 29800
diff changeset
1707 mpctx->mixer.audio_out = mpctx->audio_out;
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1708 mpctx->mixer.volstep = volstep;
29801
7ac1f37f8aa5 Whitespace cosmetics: reindent reinit_audio_chain function
reimar
parents: 29800
diff changeset
1709 return;
29794
df1826dcdb2d Disable audio when initializing the filter chain fails (can happen e.g. when the hwmpa
reimar
parents: 29785
diff changeset
1710
df1826dcdb2d Disable audio when initializing the filter chain fails (can happen e.g. when the hwmpa
reimar
parents: 29785
diff changeset
1711 init_error:
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1712 uninit_player(INITIALIZED_ACODEC | INITIALIZED_AO); // close codec and possibly AO
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1713 mpctx->sh_audio = mpctx->d_audio->sh = NULL; // -> nosound
29794
df1826dcdb2d Disable audio when initializing the filter chain fails (can happen e.g. when the hwmpa
reimar
parents: 29785
diff changeset
1714 mpctx->d_audio->id = -2;
18679
e52e101e9e59 moved audio codec/filters/out to a separate function that is called both at init() and to switch audio stream
nicodvb
parents: 18406
diff changeset
1715 }
e52e101e9e59 moved audio codec/filters/out to a separate function that is called both at init() and to switch audio stream
nicodvb
parents: 18406
diff changeset
1716
18710
c528c6c518f1 Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents: 18682
diff changeset
1717 // Return pts value corresponding to the end point of audio written to the
c528c6c518f1 Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents: 18682
diff changeset
1718 // ao so far.
c528c6c518f1 Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents: 18682
diff changeset
1719 static double written_audio_pts(sh_audio_t *sh_audio, demux_stream_t *d_audio)
c528c6c518f1 Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents: 18682
diff changeset
1720 {
24913
38f25bdb3cbc We support gcc 2.95 (fixes r24928).
cehoyos
parents: 24900
diff changeset
1721 double buffered_output;
18710
c528c6c518f1 Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents: 18682
diff changeset
1722 // first calculate the end pts of audio that has been output by decoder
32863
674117ab7ce7 Move MPlayer's audio pts calculation code into mp_common.c and reuse it in
reimar
parents: 32814
diff changeset
1723 double a_pts = calc_a_pts(sh_audio, d_audio);
18710
c528c6c518f1 Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents: 18682
diff changeset
1724 // Now a_pts hopefully holds the pts for end of audio from decoder.
c528c6c518f1 Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents: 18682
diff changeset
1725 // Substract data in buffers between decoder and audio out.
c528c6c518f1 Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents: 18682
diff changeset
1726
c528c6c518f1 Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents: 18682
diff changeset
1727 // Decoded but not filtered
c528c6c518f1 Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents: 18682
diff changeset
1728 a_pts -= sh_audio->a_buffer_len / (double)sh_audio->o_bps;
c528c6c518f1 Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents: 18682
diff changeset
1729
24900
9079c9745ff9 A/V sync: take audio filter buffers into account
uau
parents: 24896
diff changeset
1730 // Data buffered in audio filters, measured in bytes of "missing" output
24913
38f25bdb3cbc We support gcc 2.95 (fixes r24928).
cehoyos
parents: 24900
diff changeset
1731 buffered_output = af_calc_delay(sh_audio->afilter);
24900
9079c9745ff9 A/V sync: take audio filter buffers into account
uau
parents: 24896
diff changeset
1732
18710
c528c6c518f1 Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents: 18682
diff changeset
1733 // Data that was ready for ao but was buffered because ao didn't fully
c528c6c518f1 Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents: 18682
diff changeset
1734 // accept everything to internal buffers yet
24900
9079c9745ff9 A/V sync: take audio filter buffers into account
uau
parents: 24896
diff changeset
1735 buffered_output += sh_audio->a_out_buffer_len;
9079c9745ff9 A/V sync: take audio filter buffers into account
uau
parents: 24896
diff changeset
1736
9079c9745ff9 A/V sync: take audio filter buffers into account
uau
parents: 24896
diff changeset
1737 // Filters divide audio length by playback_speed, so multiply by it
9079c9745ff9 A/V sync: take audio filter buffers into account
uau
parents: 24896
diff changeset
1738 // to get the length in original units without speedup or slowdown
9079c9745ff9 A/V sync: take audio filter buffers into account
uau
parents: 24896
diff changeset
1739 a_pts -= buffered_output * playback_speed / ao_data.bps;
18710
c528c6c518f1 Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents: 18682
diff changeset
1740
c528c6c518f1 Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents: 18682
diff changeset
1741 return a_pts;
c528c6c518f1 Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents: 18682
diff changeset
1742 }
c528c6c518f1 Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents: 18682
diff changeset
1743
c528c6c518f1 Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents: 18682
diff changeset
1744 // Return pts value corresponding to currently playing audio.
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1745 double playing_audio_pts(sh_audio_t *sh_audio, demux_stream_t *d_audio,
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1746 const ao_functions_t *audio_out)
18710
c528c6c518f1 Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents: 18682
diff changeset
1747 {
c528c6c518f1 Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents: 18682
diff changeset
1748 return written_audio_pts(sh_audio, d_audio) - playback_speed *
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1749 audio_out->get_delay();
18710
c528c6c518f1 Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents: 18682
diff changeset
1750 }
c528c6c518f1 Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents: 18682
diff changeset
1751
33495
52a393df8df8 Put code checking if at the EOS in a function.
cboesch
parents: 33493
diff changeset
1752 static int is_at_end(MPContext *mpctx, m_time_size_t *end_at, double pts)
52a393df8df8 Put code checking if at the EOS in a function.
cboesch
parents: 33493
diff changeset
1753 {
52a393df8df8 Put code checking if at the EOS in a function.
cboesch
parents: 33493
diff changeset
1754 switch (end_at->type) {
36042
134919b73b04 Add limited -endpos support when dumping.
reimar
parents: 36005
diff changeset
1755 case END_AT_TIME: return pts != MP_NOPTS_VALUE && end_at->pos <= pts;
33495
52a393df8df8 Put code checking if at the EOS in a function.
cboesch
parents: 33493
diff changeset
1756 case END_AT_SIZE: return end_at->pos <= stream_tell(mpctx->stream);
52a393df8df8 Put code checking if at the EOS in a function.
cboesch
parents: 33493
diff changeset
1757 }
52a393df8df8 Put code checking if at the EOS in a function.
cboesch
parents: 33493
diff changeset
1758 return 0;
52a393df8df8 Put code checking if at the EOS in a function.
cboesch
parents: 33493
diff changeset
1759 }
52a393df8df8 Put code checking if at the EOS in a function.
cboesch
parents: 33493
diff changeset
1760
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1761 static int check_framedrop(double frame_time)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1762 {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1763 // check for frame-drop:
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1764 current_module = "check_framedrop";
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1765 if (mpctx->sh_audio && !mpctx->d_audio->eof) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1766 static int dropped_frames;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1767 float delay = playback_speed * mpctx->audio_out->get_delay();
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1768 float d = delay - mpctx->delay;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1769 ++total_frame_cnt;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1770 // we should avoid dropping too many frames in sequence unless we
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1771 // are too late. and we allow 100ms A-V delay here:
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1772 if (d < -dropped_frames * frame_time - 0.100 &&
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1773 mpctx->osd_function != OSD_PAUSE) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1774 ++drop_frame_cnt;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1775 ++dropped_frames;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1776 return frame_dropping;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1777 } else
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1778 dropped_frames = 0;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1779 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1780 return 0;
26228
089dc00275b6 Experimental support for -framedrop with -correct-pts.
reimar
parents: 26159
diff changeset
1781 }
089dc00275b6 Experimental support for -framedrop with -correct-pts.
reimar
parents: 26159
diff changeset
1782
18917
d9a75b26da6c Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents: 18913
diff changeset
1783 static int generate_video_frame(sh_video_t *sh_video, demux_stream_t *d_video)
d9a75b26da6c Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents: 18913
diff changeset
1784 {
d9a75b26da6c Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents: 18913
diff changeset
1785 unsigned char *start;
d9a75b26da6c Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents: 18913
diff changeset
1786 int in_size;
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1787 int hit_eof = 0;
18917
d9a75b26da6c Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents: 18913
diff changeset
1788 double pts;
d9a75b26da6c Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents: 18913
diff changeset
1789
d9a75b26da6c Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents: 18913
diff changeset
1790 while (1) {
36323
335349ca2137 Do not increment frame drop count when at EOF.
reimar
parents: 36294
diff changeset
1791 int drop_frame = 0;
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1792 void *decoded_frame;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1793 current_module = "decode video";
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1794 // XXX Time used in this call is not counted in any performance
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1795 // timer now, OSD is not updated correctly for filter-added frames
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1796 if (vf_output_queued_frame(sh_video->vfilter))
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1797 break;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1798 current_module = "video_read_frame";
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1799 in_size = ds_get_packet_pts(d_video, &start, &pts);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1800 if (in_size < 0) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1801 // try to extract last frames in case of decoder lag
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1802 in_size = 0;
34772
d32f75f79517 Decode last frames for codecs with delay.
reimar
parents: 34769
diff changeset
1803 start = NULL;
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1804 pts = MP_NOPTS_VALUE;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1805 hit_eof = 1;
36323
335349ca2137 Do not increment frame drop count when at EOF.
reimar
parents: 36294
diff changeset
1806 } else
335349ca2137 Do not increment frame drop count when at EOF.
reimar
parents: 36294
diff changeset
1807 drop_frame = check_framedrop(sh_video->frametime);
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1808 if (in_size > max_framesize)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1809 max_framesize = in_size;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1810 current_module = "decode video";
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1811 decoded_frame = decode_video(sh_video, start, in_size, drop_frame, pts, NULL);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1812 if (decoded_frame) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1813 update_subtitles(sh_video, sh_video->pts, mpctx->d_sub, 0);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1814 update_teletext(sh_video, mpctx->demuxer, 0);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1815 update_osd_msg();
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1816 current_module = "filter video";
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1817 if (filter_video(sh_video, decoded_frame, sh_video->pts))
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1818 break;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1819 } else if (drop_frame)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1820 return -1;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1821 if (hit_eof)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1822 return 0;
18917
d9a75b26da6c Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents: 18913
diff changeset
1823 }
d9a75b26da6c Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents: 18913
diff changeset
1824 return 1;
d9a75b26da6c Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents: 18913
diff changeset
1825 }
d9a75b26da6c Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents: 18913
diff changeset
1826
20887
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1827 #ifdef HAVE_RTC
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1828 int rtc_fd = -1;
20887
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1829 #endif
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1830
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1831 static float timing_sleep(float time_frame)
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1832 {
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1833 #ifdef HAVE_RTC
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1834 if (rtc_fd >= 0) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1835 // -------- RTC -----------
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1836 current_module = "sleep_rtc";
20887
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1837 while (time_frame > 0.000) {
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1838 unsigned long rtc_ts;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1839 if (read(rtc_fd, &rtc_ts, sizeof(rtc_ts)) <= 0)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1840 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_LinuxRTCReadError, strerror(errno));
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1841 time_frame -= GetRelativeTime();
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1842 }
20887
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1843 } else
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1844 #endif
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1845 {
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1846 // assume kernel HZ=100 for softsleep, works with larger HZ but with
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1847 // unnecessarily high CPU usage
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1848 float margin = softsleep ? 0.011 : 0;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1849 current_module = "sleep_timer";
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1850 while (time_frame > margin) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1851 usec_sleep(1000000 * (time_frame - margin));
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1852 time_frame -= GetRelativeTime();
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1853 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1854 if (softsleep) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1855 current_module = "sleep_soft";
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1856 if (time_frame < 0)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1857 mp_msg(MSGT_AVSYNC, MSGL_WARN, MSGTR_SoftsleepUnderflow);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1858 while (time_frame > 0)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1859 time_frame -= GetRelativeTime(); // burn the CPU
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1860 }
20887
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1861 }
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1862 return time_frame;
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1863 }
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1864
31612
7fc1f051a19f Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents: 31607
diff changeset
1865 static int select_subtitle(MPContext *mpctx)
31201
203789464176 misc cosmetics: K&R style nits, #include placement, indentation
diego
parents: 31148
diff changeset
1866 {
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1867 // find the best sub to use
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1868 int id;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1869 int found = 0;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1870 mpctx->global_sub_pos = -1; // no subs by default
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1871 if (vobsub_id >= 0) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1872 // if user asks for a vobsub id, use that first.
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1873 id = vobsub_id;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1874 found = mp_property_do("sub_vob", M_PROPERTY_SET, &id, mpctx) == M_PROPERTY_OK;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1875 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1876
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1877 if (!found && dvdsub_id >= 0) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1878 // if user asks for a dvd sub id, use that next.
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1879 id = dvdsub_id;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1880 found = mp_property_do("sub_demux", M_PROPERTY_SET, &id, mpctx) == M_PROPERTY_OK;
31612
7fc1f051a19f Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents: 31607
diff changeset
1881 }
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1882
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1883 if (!found) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1884 // if there are text subs to use, use those. (autosubs come last here)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1885 id = 0;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1886 found = mp_property_do("sub_file", M_PROPERTY_SET, &id, mpctx) == M_PROPERTY_OK;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1887 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1888
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1889 if (!found && dvdsub_id == -1) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1890 // finally select subs by language and container hints
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1891 if (dvdsub_id == -1 && dvdsub_lang)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1892 dvdsub_id = demuxer_sub_track_by_lang(mpctx->demuxer, dvdsub_lang);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1893 if (dvdsub_id == -1)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1894 dvdsub_id = demuxer_default_sub_track(mpctx->demuxer);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1895 if (dvdsub_id >= 0) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1896 id = dvdsub_id;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1897 found = mp_property_do("sub_demux", M_PROPERTY_SET, &id, mpctx) == M_PROPERTY_OK;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1898 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1899 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1900 return found;
29854
00ebdb6cb87f Factor out code that decides which subtitle to play.
reimar
parents: 29804
diff changeset
1901 }
00ebdb6cb87f Factor out code that decides which subtitle to play.
reimar
parents: 29804
diff changeset
1902
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
1903 #ifdef CONFIG_DVDNAV
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1904 #ifndef FF_B_TYPE
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1905 #define FF_B_TYPE 3
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1906 #endif
33287
3105428bb2ae Doxygen cleanups in the main file.
cboesch
parents: 33279
diff changeset
1907 /**
3105428bb2ae Doxygen cleanups in the main file.
cboesch
parents: 33279
diff changeset
1908 * @brief Store decoded video image.
3105428bb2ae Doxygen cleanups in the main file.
cboesch
parents: 33279
diff changeset
1909 */
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1910 static mp_image_t *mp_dvdnav_copy_mpi(mp_image_t *to_mpi,
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1911 mp_image_t *from_mpi)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1912 {
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1913 mp_image_t *mpi;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1914
33287
3105428bb2ae Doxygen cleanups in the main file.
cboesch
parents: 33279
diff changeset
1915 // do not store B-frames
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1916 if (from_mpi->pict_type == FF_B_TYPE)
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1917 return to_mpi;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1918
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1919 if (to_mpi &&
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1920 to_mpi->w == from_mpi->w &&
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1921 to_mpi->h == from_mpi->h &&
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1922 to_mpi->imgfmt == from_mpi->imgfmt)
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1923 mpi = to_mpi;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1924 else {
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1925 if (to_mpi)
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1926 free_mp_image(to_mpi);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1927 if (from_mpi->w == 0 || from_mpi->h == 0)
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1928 return NULL;
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1929 mpi = alloc_mpi(from_mpi->w, from_mpi->h, from_mpi->imgfmt);
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1930 }
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1931
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1932 copy_mpi(mpi, from_mpi);
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1933 return mpi;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1934 }
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1935
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1936 static void mp_dvdnav_reset_stream(MPContext *ctx)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1937 {
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1938 if (ctx->sh_video) {
33287
3105428bb2ae Doxygen cleanups in the main file.
cboesch
parents: 33279
diff changeset
1939 // clear video pts
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1940 ctx->d_video->pts = 0.0f;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1941 ctx->sh_video->pts = 0.0f;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1942 ctx->sh_video->i_pts = 0.0f;
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1943 ctx->sh_video->last_pts = 0.0f;
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1944 ctx->sh_video->num_buffered_pts = 0;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1945 ctx->sh_video->num_frames = 0;
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1946 ctx->sh_video->num_frames_decoded = 0;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1947 ctx->sh_video->timer = 0.0f;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1948 ctx->sh_video->stream_delay = 0.0f;
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1949 ctx->sh_video->timer = 0;
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1950 ctx->demuxer->stream_pts = MP_NOPTS_VALUE;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1951 }
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1952
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1953 if (ctx->sh_audio) {
33287
3105428bb2ae Doxygen cleanups in the main file.
cboesch
parents: 33279
diff changeset
1954 // free audio packets and reset
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1955 ds_free_packs(ctx->d_audio);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1956 audio_delay -= ctx->sh_audio->stream_delay;
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1957 ctx->delay = -audio_delay;
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1958 ctx->audio_out->reset();
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1959 resync_audio_stream(ctx->sh_audio);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1960 }
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1961
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1962 audio_delay = 0.0f;
31612
7fc1f051a19f Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents: 31607
diff changeset
1963 mpctx->sub_counts[SUB_SOURCE_DEMUX] = mp_dvdnav_number_of_subs(mpctx->stream);
29855
5e279f7d7e5d Remember which subtitle was auto-selected for dvdnav due to -slang
reimar
parents: 29854
diff changeset
1964 if (dvdsub_lang && dvdsub_id == dvdsub_lang_id) {
5e279f7d7e5d Remember which subtitle was auto-selected for dvdnav due to -slang
reimar
parents: 29854
diff changeset
1965 dvdsub_lang_id = mp_dvdnav_sid_from_lang(ctx->stream, dvdsub_lang);
5e279f7d7e5d Remember which subtitle was auto-selected for dvdnav due to -slang
reimar
parents: 29854
diff changeset
1966 if (dvdsub_lang_id != dvdsub_id) {
5e279f7d7e5d Remember which subtitle was auto-selected for dvdnav due to -slang
reimar
parents: 29854
diff changeset
1967 dvdsub_id = dvdsub_lang_id;
5e279f7d7e5d Remember which subtitle was auto-selected for dvdnav due to -slang
reimar
parents: 29854
diff changeset
1968 select_subtitle(ctx);
5e279f7d7e5d Remember which subtitle was auto-selected for dvdnav due to -slang
reimar
parents: 29854
diff changeset
1969 }
5e279f7d7e5d Remember which subtitle was auto-selected for dvdnav due to -slang
reimar
parents: 29854
diff changeset
1970 }
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1971
33287
3105428bb2ae Doxygen cleanups in the main file.
cboesch
parents: 33279
diff changeset
1972 // clear all EOF related flags
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1973 ctx->d_video->eof = ctx->d_audio->eof = ctx->stream->eof = 0;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1974 }
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1975
33287
3105428bb2ae Doxygen cleanups in the main file.
cboesch
parents: 33279
diff changeset
1976 /**
3105428bb2ae Doxygen cleanups in the main file.
cboesch
parents: 33279
diff changeset
1977 * @brief Restore last decoded DVDNAV (still frame).
3105428bb2ae Doxygen cleanups in the main file.
cboesch
parents: 33279
diff changeset
1978 */
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1979 static mp_image_t *mp_dvdnav_restore_smpi(int *in_size,
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1980 unsigned char **start,
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1981 mp_image_t *decoded_frame)
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1982 {
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1983 if (mpctx->stream->type != STREAMTYPE_DVDNAV)
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1984 return decoded_frame;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1985
33510
36c1cffd17e5 Spelling fix.
reimar
parents: 33503
diff changeset
1986 // a change occurred in dvdnav stream
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1987 if (mp_dvdnav_cell_has_changed(mpctx->stream, 0)) {
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1988 mp_dvdnav_read_wait(mpctx->stream, 1, 1);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1989 mp_dvdnav_context_free(mpctx);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1990 mp_dvdnav_reset_stream(mpctx);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1991 mp_dvdnav_read_wait(mpctx->stream, 0, 1);
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
1992 mp_dvdnav_cell_has_changed(mpctx->stream, 1);
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1993 }
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1994
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1995 if (*in_size < 0) {
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1996 float len;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1997
33287
3105428bb2ae Doxygen cleanups in the main file.
cboesch
parents: 33279
diff changeset
1998 // display still frame, if any
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1999 if (mpctx->nav_smpi && !mpctx->nav_buffer)
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2000 decoded_frame = mpctx->nav_smpi;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2001
33287
3105428bb2ae Doxygen cleanups in the main file.
cboesch
parents: 33279
diff changeset
2002 // increment video frame: continue playing after still frame
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2003 len = demuxer_get_time_length(mpctx->demuxer);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2004 if (mpctx->sh_video->pts >= len &&
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2005 mpctx->sh_video->pts > 0.0 && len > 0.0) {
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2006 mp_dvdnav_skip_still(mpctx->stream);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2007 mp_dvdnav_skip_wait(mpctx->stream);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2008 }
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2009 mpctx->sh_video->pts += 1 / mpctx->sh_video->fps;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
2010
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2011 if (mpctx->nav_buffer) {
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2012 *start = mpctx->nav_start;
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2013 *in_size = mpctx->nav_in_size;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2014 if (mpctx->nav_start)
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2015 memcpy(*start, mpctx->nav_buffer, mpctx->nav_in_size);
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2016 }
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2017 }
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2018
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2019 return decoded_frame;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2020 }
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2021
33287
3105428bb2ae Doxygen cleanups in the main file.
cboesch
parents: 33279
diff changeset
2022 /**
3105428bb2ae Doxygen cleanups in the main file.
cboesch
parents: 33279
diff changeset
2023 * @brief Save last decoded DVDNAV (still frame).
3105428bb2ae Doxygen cleanups in the main file.
cboesch
parents: 33279
diff changeset
2024 */
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2025 static void mp_dvdnav_save_smpi(int in_size,
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2026 unsigned char *start,
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2027 mp_image_t *decoded_frame)
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2028 {
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2029 if (mpctx->stream->type != STREAMTYPE_DVDNAV)
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2030 return;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
2031
32511
b39155e98ac3 Remove some useless NULL pointer checks before invoking free() on the pointer.
diego
parents: 32467
diff changeset
2032 free(mpctx->nav_buffer);
33511
d30b183c3fdc Make mp_dvdnav_save_smpi more robust and ensure consistency of nav buffer.
reimar
parents: 33510
diff changeset
2033 mpctx->nav_buffer = NULL;
d30b183c3fdc Make mp_dvdnav_save_smpi more robust and ensure consistency of nav buffer.
reimar
parents: 33510
diff changeset
2034 mpctx->nav_start = NULL;
d30b183c3fdc Make mp_dvdnav_save_smpi more robust and ensure consistency of nav buffer.
reimar
parents: 33510
diff changeset
2035 mpctx->nav_in_size = -1;
d30b183c3fdc Make mp_dvdnav_save_smpi more robust and ensure consistency of nav buffer.
reimar
parents: 33510
diff changeset
2036
d30b183c3fdc Make mp_dvdnav_save_smpi more robust and ensure consistency of nav buffer.
reimar
parents: 33510
diff changeset
2037 if (in_size > 0)
33875
e23e8c872ae5 mplayer: small indent fix.
cboesch
parents: 33827
diff changeset
2038 mpctx->nav_buffer = malloc(in_size);
33511
d30b183c3fdc Make mp_dvdnav_save_smpi more robust and ensure consistency of nav buffer.
reimar
parents: 33510
diff changeset
2039 if (mpctx->nav_buffer) {
33875
e23e8c872ae5 mplayer: small indent fix.
cboesch
parents: 33827
diff changeset
2040 mpctx->nav_start = start;
33511
d30b183c3fdc Make mp_dvdnav_save_smpi more robust and ensure consistency of nav buffer.
reimar
parents: 33510
diff changeset
2041 mpctx->nav_in_size = in_size;
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2042 memcpy(mpctx->nav_buffer, start, in_size);
33511
d30b183c3fdc Make mp_dvdnav_save_smpi more robust and ensure consistency of nav buffer.
reimar
parents: 33510
diff changeset
2043 }
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2044
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2045 if (decoded_frame && mpctx->nav_smpi != decoded_frame)
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2046 mpctx->nav_smpi = mp_dvdnav_copy_mpi(mpctx->nav_smpi, decoded_frame);
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2047 }
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2048
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
2049 #endif /* CONFIG_DVDNAV */
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2050
20887
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2051 static void adjust_sync_and_print_status(int between_frames, float timing_error)
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2052 {
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2053 current_module = "av_sync";
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2054
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2055 if (mpctx->sh_audio) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2056 double a_pts, v_pts;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2057
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2058 if (autosync)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2059 /*
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2060 * If autosync is enabled, the value for delay must be calculated
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2061 * a bit differently. It is set only to the difference between
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2062 * the audio and video timers. Any attempt to include the real
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2063 * or corrected delay causes the pts_correction code below to
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2064 * try to correct for the changes in delay which autosync is
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2065 * trying to measure. This keeps the two from competing, but still
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2066 * allows the code to correct for PTS drift *only*. (Using a delay
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2067 * value here, even a "corrected" one, would be incompatible with
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2068 * autosync mode.)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2069 */
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2070 a_pts = written_audio_pts(mpctx->sh_audio, mpctx->d_audio) - mpctx->delay;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2071 else
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2072 a_pts = playing_audio_pts(mpctx->sh_audio, mpctx->d_audio, mpctx->audio_out);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2073
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2074 v_pts = mpctx->sh_video->pts;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2075
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2076 {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2077 static int drop_message;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2078 double AV_delay = a_pts - audio_delay - v_pts;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2079 double x;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2080 // not a good idea to do A-V correction with with bogus values
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2081 if (a_pts == MP_NOPTS_VALUE || v_pts == MP_NOPTS_VALUE)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2082 AV_delay = 0;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2083 if (AV_delay > 0.5 && drop_frame_cnt > 50 && drop_message == 0) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2084 ++drop_message;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2085 mp_msg(MSGT_AVSYNC, MSGL_WARN, MSGTR_SystemTooSlow);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2086 }
34769
8c1a27b26502 Fix hang when video pts suddenly jumps to match audio pts.
reimar
parents: 34704
diff changeset
2087 if (AV_delay > 0.5 && correct_pts && mpctx->delay < -audio_delay - 30) {
8c1a27b26502 Fix hang when video pts suddenly jumps to match audio pts.
reimar
parents: 34704
diff changeset
2088 // This case means that we are supposed to stop video for a long
8c1a27b26502 Fix hang when video pts suddenly jumps to match audio pts.
reimar
parents: 34704
diff changeset
2089 // time, even though audio is already ahead.
8c1a27b26502 Fix hang when video pts suddenly jumps to match audio pts.
reimar
parents: 34704
diff changeset
2090 // This happens e.g. when initial audio pts is 10000, video
8c1a27b26502 Fix hang when video pts suddenly jumps to match audio pts.
reimar
parents: 34704
diff changeset
2091 // starts at 0 but suddenly jumps to match audio.
8c1a27b26502 Fix hang when video pts suddenly jumps to match audio pts.
reimar
parents: 34704
diff changeset
2092 // This is common in ogg streams.
8c1a27b26502 Fix hang when video pts suddenly jumps to match audio pts.
reimar
parents: 34704
diff changeset
2093 // Only check for -correct-pts since this case does not cause
8c1a27b26502 Fix hang when video pts suddenly jumps to match audio pts.
reimar
parents: 34704
diff changeset
2094 // issues with -nocorrect-pts.
8c1a27b26502 Fix hang when video pts suddenly jumps to match audio pts.
reimar
parents: 34704
diff changeset
2095 mp_msg(MSGT_AVSYNC, MSGL_WARN, "Timing looks severely broken, resetting\n");
8c1a27b26502 Fix hang when video pts suddenly jumps to match audio pts.
reimar
parents: 34704
diff changeset
2096 AV_delay = 0;
8c1a27b26502 Fix hang when video pts suddenly jumps to match audio pts.
reimar
parents: 34704
diff changeset
2097 timing_error = 0;
8c1a27b26502 Fix hang when video pts suddenly jumps to match audio pts.
reimar
parents: 34704
diff changeset
2098 mpctx->delay = -audio_delay;
8c1a27b26502 Fix hang when video pts suddenly jumps to match audio pts.
reimar
parents: 34704
diff changeset
2099 }
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2100 if (autosync)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2101 x = AV_delay * 0.1f;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2102 else
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2103 /* Do not correct target time for the next frame if this frame
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2104 * was late not because of wrong target time but because the
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2105 * target time could not be met */
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2106 x = (AV_delay + timing_error * playback_speed) * 0.1f;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2107 if (x < -max_pts_correction)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2108 x = -max_pts_correction;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2109 else if (x > max_pts_correction)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2110 x = max_pts_correction;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2111 if (default_max_pts_correction >= 0)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2112 max_pts_correction = default_max_pts_correction;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2113 else
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2114 max_pts_correction = mpctx->sh_video->frametime * 0.10; // +-10% of time
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2115 if (!between_frames) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2116 mpctx->delay += x;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2117 c_total += x;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2118 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2119 if (!quiet)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2120 print_status(a_pts - audio_delay, AV_delay, c_total);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2121 }
20887
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2122 } else {
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2123 // No audio:
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2124
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2125 if (!quiet)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2126 print_status(0, 0, 0);
20887
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2127 }
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2128 }
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2129
20986
2422495f5e78 Mark some functions static
uau
parents: 20978
diff changeset
2130 static int fill_audio_out_buffers(void)
20889
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2131 {
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2132 unsigned int t;
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2133 double tt;
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2134 int playsize;
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2135 int playflags = 0;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2136 int audio_eof = 0;
20890
9e2d69c27ddb Try filling audio buffers more if they're very large, add some comments.
uau
parents: 20889
diff changeset
2137 int bytes_to_write;
31671
4541f1921482 Add support for parameter changes (e.g. channel count) during playback.
reimar
parents: 31670
diff changeset
2138 int format_change = 0;
34605
b85d4539ad07 Try to detect when an audio driver ends up hanging after
reimar
parents: 34494
diff changeset
2139 int timeout = 0;
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2140 sh_audio_t *const sh_audio = mpctx->sh_audio;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2141
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2142 current_module = "play_audio";
20889
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2143
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2144 while (1) {
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2145 int sleep_time;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2146 // all the current uses of ao_data.pts seem to be in aos that handle
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2147 // sync completely wrong; there should be no need to use ao_data.pts
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2148 // in get_space()
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2149 ao_data.pts = ((mpctx->sh_video ? mpctx->sh_video->timer : 0) + mpctx->delay) * 90000.0;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2150 bytes_to_write = mpctx->audio_out->get_space();
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2151 if (mpctx->sh_video || bytes_to_write >= ao_data.outburst)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2152 break;
34605
b85d4539ad07 Try to detect when an audio driver ends up hanging after
reimar
parents: 34494
diff changeset
2153 if (timeout++ > 10) {
34606
ed612f6f4778 Make mplayer.c messages translatable.
ib
parents: 34605
diff changeset
2154 mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_AudioDeviceStuck);
34605
b85d4539ad07 Try to detect when an audio driver ends up hanging after
reimar
parents: 34494
diff changeset
2155 break;
b85d4539ad07 Try to detect when an audio driver ends up hanging after
reimar
parents: 34494
diff changeset
2156 }
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2157
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2158 // handle audio-only case:
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2159 // this is where mplayer sleeps during audio-only playback
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2160 // to avoid 100% CPU use
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2161 sleep_time = (ao_data.outburst - bytes_to_write) * 1000 / ao_data.bps;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2162 if (sleep_time < 10)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2163 sleep_time = 10; // limit to 100 wakeups per second
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2164 usec_sleep(sleep_time * 1000);
20890
9e2d69c27ddb Try filling audio buffers more if they're very large, add some comments.
uau
parents: 20889
diff changeset
2165 }
9e2d69c27ddb Try filling audio buffers more if they're very large, add some comments.
uau
parents: 20889
diff changeset
2166
9e2d69c27ddb Try filling audio buffers more if they're very large, add some comments.
uau
parents: 20889
diff changeset
2167 while (bytes_to_write) {
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2168 int res;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2169 playsize = bytes_to_write;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2170 if (playsize > MAX_OUTBURST)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2171 playsize = MAX_OUTBURST;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2172 bytes_to_write -= playsize;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2173
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2174 // Fill buffer if needed:
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2175 current_module = "decode_audio";
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2176 t = GetTimer();
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2177 if (!format_change) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2178 res = mp_decode_audio(sh_audio, playsize);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2179 format_change = res == -2;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2180 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2181 if (!format_change && res < 0) // EOF or error
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2182 if (mpctx->d_audio->eof) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2183 audio_eof = 1;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2184 if (sh_audio->a_out_buffer_len == 0)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2185 return 0;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2186 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2187 t = GetTimer() - t;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2188 tt = t * 0.000001f;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2189 audio_time_usage += tt;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2190 if (playsize > sh_audio->a_out_buffer_len) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2191 playsize = sh_audio->a_out_buffer_len;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2192 if (audio_eof || format_change)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2193 playflags |= AOPLAY_FINAL_CHUNK;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2194 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2195 if (!playsize)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2196 break;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2197
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2198 // play audio:
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2199 current_module = "play_audio";
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2200
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2201 // Is this pts value actually useful for the aos that access it?
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2202 // They're obviously badly broken in the way they handle av sync;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2203 // would not having access to this make them more broken?
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2204 ao_data.pts = ((mpctx->sh_video ? mpctx->sh_video->timer : 0) + mpctx->delay) * 90000.0;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2205 playsize = mpctx->audio_out->play(sh_audio->a_out_buffer, playsize, playflags);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2206
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2207 if (playsize > 0) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2208 sh_audio->a_out_buffer_len -= playsize;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2209 memmove(sh_audio->a_out_buffer, &sh_audio->a_out_buffer[playsize],
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2210 sh_audio->a_out_buffer_len);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2211 mpctx->delay += playback_speed * playsize / (double)ao_data.bps;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2212 } else if ((format_change || audio_eof) && mpctx->audio_out->get_delay() < .04) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2213 // Sanity check to avoid hanging in case current ao doesn't output
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2214 // partial chunks and doesn't check for AOPLAY_FINAL_CHUNK
34606
ed612f6f4778 Make mplayer.c messages translatable.
ib
parents: 34605
diff changeset
2215 mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_AudioOutputTruncated);
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2216 sh_audio->a_out_buffer_len = 0;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2217 }
20889
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2218 }
31671
4541f1921482 Add support for parameter changes (e.g. channel count) during playback.
reimar
parents: 31670
diff changeset
2219 if (format_change) {
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2220 uninit_player(INITIALIZED_AO);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2221 reinit_audio_chain();
31671
4541f1921482 Add support for parameter changes (e.g. channel count) during playback.
reimar
parents: 31670
diff changeset
2222 }
20889
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2223 return 1;
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2224 }
20887
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2225
33155
16e5b7f9ddb8 Send udp master updates also when paused and let slave use normal timing
reimar
parents: 33154
diff changeset
2226 static void handle_udp_master(double time)
16e5b7f9ddb8 Send udp master updates also when paused and let slave use normal timing
reimar
parents: 33154
diff changeset
2227 {
16e5b7f9ddb8 Send udp master updates also when paused and let slave use normal timing
reimar
parents: 33154
diff changeset
2228 #ifdef CONFIG_NETWORKING
16e5b7f9ddb8 Send udp master updates also when paused and let slave use normal timing
reimar
parents: 33154
diff changeset
2229 if (udp_master) {
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2230 char current_time[256];
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2231 snprintf(current_time, sizeof(current_time), "%f", time);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2232 send_udp(udp_ip, udp_port, current_time);
33155
16e5b7f9ddb8 Send udp master updates also when paused and let slave use normal timing
reimar
parents: 33154
diff changeset
2233 }
16e5b7f9ddb8 Send udp master updates also when paused and let slave use normal timing
reimar
parents: 33154
diff changeset
2234 #endif /* CONFIG_NETWORKING */
16e5b7f9ddb8 Send udp master updates also when paused and let slave use normal timing
reimar
parents: 33154
diff changeset
2235 }
16e5b7f9ddb8 Send udp master updates also when paused and let slave use normal timing
reimar
parents: 33154
diff changeset
2236
20986
2422495f5e78 Mark some functions static
uau
parents: 20978
diff changeset
2237 static int sleep_until_update(float *time_frame, float *aq_sleep_time)
20899
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2238 {
20904
e5456123de82 Fix statement-before-declaration warnings.
reimar
parents: 20903
diff changeset
2239 int frame_time_remaining = 0;
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2240 current_module = "calc_sleep_time";
20899
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2241
31982
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents: 31977
diff changeset
2242 #ifdef CONFIG_NETWORKING
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents: 31977
diff changeset
2243 if (udp_slave) {
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents: 31977
diff changeset
2244 int udp_master_exited = udp_slave_sync(mpctx);
33486
e46989c7f47e Change -udp-slave code to temporarily fall back to normal
reimar
parents: 33481
diff changeset
2245 if (udp_master_exited > 0) {
31982
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents: 31977
diff changeset
2246 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_MasterQuit);
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents: 31977
diff changeset
2247 exit_player(EXIT_QUIT);
33486
e46989c7f47e Change -udp-slave code to temporarily fall back to normal
reimar
parents: 33481
diff changeset
2248 } else if (udp_master_exited == 0)
e46989c7f47e Change -udp-slave code to temporarily fall back to normal
reimar
parents: 33481
diff changeset
2249 return 0;
31982
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents: 31977
diff changeset
2250 }
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents: 31977
diff changeset
2251 #endif /* CONFIG_NETWORKING */
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents: 31977
diff changeset
2252
20899
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2253 *time_frame -= GetRelativeTime(); // reset timer
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2254
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
2255 if (mpctx->sh_audio && !mpctx->d_audio->eof) {
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2256 float delay = mpctx->audio_out->get_delay();
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2257 mp_dbg(MSGT_AVSYNC, MSGL_DBG2, "delay=%f\n", delay);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2258
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2259 if (autosync) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2260 /*
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2261 * Adjust this raw delay value by calculating the expected
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2262 * delay for this frame and generating a new value which is
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2263 * weighted between the two. The higher autosync is, the
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2264 * closer to the delay value gets to that which "-nosound"
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2265 * would have used, and the longer it will take for A/V
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2266 * sync to settle at the right value (but it eventually will.)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2267 * This settling time is very short for values below 100.
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2268 */
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2269 float predicted = mpctx->delay / playback_speed + *time_frame;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2270 float difference = delay - predicted;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2271 delay = predicted + difference / (float)autosync;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2272 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2273
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2274 *time_frame = delay - mpctx->delay / playback_speed;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2275
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2276 // delay = amount of audio buffered in soundcard/driver
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2277 if (delay > 0.25)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2278 delay = 0.25;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2279 else if (delay < 0.10)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2280 delay = 0.10;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2281 if (*time_frame > delay * 0.6) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2282 // sleep time too big - may cause audio drops (buffer underrun)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2283 frame_time_remaining = 1;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2284 *time_frame = delay * 0.5;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2285 }
20899
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2286 } else {
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2287 // If we're lagging more than 200 ms behind the right playback rate,
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2288 // don't try to "catch up".
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2289 // If benchmark is set always output frames as fast as possible
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2290 // without sleeping.
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2291 if (*time_frame < -0.2 || benchmark)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2292 *time_frame = 0;
20899
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2293 }
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2294
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2295 *aq_sleep_time += *time_frame;
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2296
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2297 //============================== SLEEP: ===================================
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2298
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2299 // flag 256 means: libvo driver does its timing (dvb card)
35132
5ba6eb55d311 Avoid sleeping for too long without reacting to user input.
reimar
parents: 35107
diff changeset
2300 if (!(vo_flags & 256)) {
35383
fa7a7312c47a React more smoothly to user input/window redraw requests
reimar
parents: 35132
diff changeset
2301 if (*time_frame > 0.3) {
35132
5ba6eb55d311 Avoid sleeping for too long without reacting to user input.
reimar
parents: 35107
diff changeset
2302 // Avoid sleeping too long without reacting to user input
35383
fa7a7312c47a React more smoothly to user input/window redraw requests
reimar
parents: 35132
diff changeset
2303 usec_sleep(200000);
35132
5ba6eb55d311 Avoid sleeping for too long without reacting to user input.
reimar
parents: 35107
diff changeset
2304 *time_frame -= GetRelativeTime();
5ba6eb55d311 Avoid sleeping for too long without reacting to user input.
reimar
parents: 35107
diff changeset
2305 frame_time_remaining = 1;
5ba6eb55d311 Avoid sleeping for too long without reacting to user input.
reimar
parents: 35107
diff changeset
2306 } else if (*time_frame > 0.001)
5ba6eb55d311 Avoid sleeping for too long without reacting to user input.
reimar
parents: 35107
diff changeset
2307 *time_frame = timing_sleep(*time_frame);
5ba6eb55d311 Avoid sleeping for too long without reacting to user input.
reimar
parents: 35107
diff changeset
2308 }
31982
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents: 31977
diff changeset
2309
33155
16e5b7f9ddb8 Send udp master updates also when paused and let slave use normal timing
reimar
parents: 33154
diff changeset
2310 handle_udp_master(mpctx->sh_video->pts);
31982
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents: 31977
diff changeset
2311
20899
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2312 return frame_time_remaining;
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2313 }
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2314
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2315 int reinit_video_chain(void)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2316 {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2317 sh_video_t *const sh_video = mpctx->sh_video;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2318 double ar = -1.0;
20947
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2319 //================== Init VIDEO (codec & libvo) ==========================
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2320 if (!fixed_vo || !(initialized_flags & INITIALIZED_VO)) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2321 current_module = "preinit_libvo";
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2322
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2323 //shouldn't we set dvideo->id=-2 when we fail?
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2324 vo_config_count = 0;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2325 //if((mpctx->video_out->preinit(vo_subdevice))!=0){
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2326 if (!(mpctx->video_out = init_best_video_out(video_driver_list))) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2327 mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_ErrorInitializingVODevice);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2328 goto err_out;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2329 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2330 initialized_flags |= INITIALIZED_VO;
20947
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2331 }
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2332
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2333 if (stream_control(mpctx->demuxer->stream, STREAM_CTRL_GET_ASPECT_RATIO, &ar) != STREAM_UNSUPPORTED)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2334 mpctx->sh_video->stream_aspect = ar;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2335 current_module = "init_video_filters";
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2336 {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2337 char *vf_arg[] = { "_oldargs_", (char *)mpctx->video_out, NULL };
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2338 sh_video->vfilter = vf_open_filter(NULL, "vo", vf_arg);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2339 }
27345
b597fd2924b4 Rename preprocessor directive HAVE_MENU --> CONFIG_MENU.
diego
parents: 27343
diff changeset
2340 #ifdef CONFIG_MENU
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2341 if (use_menu) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2342 char *vf_arg[] = { "_oldargs_", menu_root, NULL };
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2343 vf_menu = vf_open_plugin(libmenu_vfs, sh_video->vfilter, "menu", vf_arg);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2344 if (!vf_menu) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2345 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_CantOpenLibmenuFilterWithThisRootMenu, menu_root);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2346 use_menu = 0;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2347 }
20947
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2348 }
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2349 if (vf_menu)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2350 sh_video->vfilter = vf_menu;
20947
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2351 #endif
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2352
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
2353 #ifdef CONFIG_ASS
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2354 if (ass_enabled) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2355 int i;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2356 int insert = 1;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2357 if (vf_settings)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2358 for (i = 0; vf_settings[i].name; ++i)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2359 if (strcmp(vf_settings[i].name, "ass") == 0) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2360 insert = 0;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2361 break;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2362 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2363 if (insert) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2364 char *vf_arg[] = { "auto", "1", NULL };
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2365 vf_instance_t *vf_ass = vf_open_filter(sh_video->vfilter, "ass", vf_arg);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2366 if (vf_ass)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2367 sh_video->vfilter = vf_ass;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2368 else
34606
ed612f6f4778 Make mplayer.c messages translatable.
ib
parents: 34605
diff changeset
2369 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_ASSCannotAddVideoFilter);
20947
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2370 }
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2371 }
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2372 #endif
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2373
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2374 sh_video->vfilter = append_filters(sh_video->vfilter);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2375 eosd_init(sh_video->vfilter);
20947
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2376
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
2377 #ifdef CONFIG_ASS
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2378 if (ass_enabled)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2379 eosd_ass_init(ass_library);
20947
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2380 #endif
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2381
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2382 current_module = "init_video_codec";
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2383
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2384 mp_msg(MSGT_CPLAYER, MSGL_INFO, "==========================================================================\n");
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2385 init_best_video_codec(sh_video, video_codec_list, video_fm_list);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2386 mp_msg(MSGT_CPLAYER, MSGL_INFO, "==========================================================================\n");
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2387
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2388 if (!sh_video->initialized) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2389 if (!fixed_vo)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2390 uninit_player(INITIALIZED_VO);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2391 goto err_out;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2392 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2393
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2394 initialized_flags |= INITIALIZED_VCODEC;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2395
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2396 if (sh_video->codec)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2397 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_CODEC=%s\n", sh_video->codec->name);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2398
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2399 sh_video->last_pts = MP_NOPTS_VALUE;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2400 sh_video->num_buffered_pts = 0;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2401 sh_video->next_frame_time = 0;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2402
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2403 if (auto_quality > 0) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2404 // Auto quality option enabled
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2405 output_quality = get_video_quality_max(sh_video);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2406 if (auto_quality > output_quality)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2407 auto_quality = output_quality;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2408 else
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2409 output_quality = auto_quality;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2410 mp_msg(MSGT_CPLAYER, MSGL_V, "AutoQ: setting quality to %d.\n", output_quality);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2411 set_video_quality(sh_video, output_quality);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2412 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2413
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2414 // ========== Init display (sh_video->disp_w*sh_video->disp_h/out_fmt) ============
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2415
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2416 current_module = "init_vo";
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2417
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2418 return 1;
21031
e45bb0ee5558 Make sure sh_video == NULL when reinit_video_chain fails.
reimar
parents: 21030
diff changeset
2419
e45bb0ee5558 Make sure sh_video == NULL when reinit_video_chain fails.
reimar
parents: 21030
diff changeset
2420 err_out:
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2421 mpctx->sh_video = mpctx->d_video->sh = NULL;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2422 return 0;
20947
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2423 }
20899
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2424
21077
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2425 static double update_video(int *blit_frame)
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2426 {
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2427 sh_video_t *const sh_video = mpctx->sh_video;
21077
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2428 //-------------------- Decode a frame: -----------------------
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2429 double frame_time;
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2430 *blit_frame = 0; // Don't blit if we hit EOF
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2431 if (!correct_pts) {
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2432 unsigned char *start = NULL;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2433 void *decoded_frame = NULL;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2434 int drop_frame = 0;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2435 int in_size;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2436 int full_frame;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2437
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2438 do {
34772
d32f75f79517 Decode last frames for codecs with delay.
reimar
parents: 34769
diff changeset
2439 int flush;
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2440 current_module = "video_read_frame";
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2441 frame_time = sh_video->next_frame_time;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2442 in_size = video_read_frame(sh_video, &sh_video->next_frame_time,
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2443 &start, force_fps);
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
2444 #ifdef CONFIG_DVDNAV
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2445 // wait, still frame or EOF
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2446 if (mpctx->stream->type == STREAMTYPE_DVDNAV && in_size < 0) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2447 if (mp_dvdnav_is_eof(mpctx->stream))
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2448 return -1;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2449 if (mpctx->d_video)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2450 mpctx->d_video->eof = 0;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2451 if (mpctx->d_audio)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2452 mpctx->d_audio->eof = 0;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2453 mpctx->stream->eof = 0;
34777
9b8a830767f2 Fix dvdnav case to not leave "flush" uninitialized.
reimar
parents: 34772
diff changeset
2454 }
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2455 #endif
34772
d32f75f79517 Decode last frames for codecs with delay.
reimar
parents: 34769
diff changeset
2456 flush = in_size < 0 && mpctx->d_video->eof;
d32f75f79517 Decode last frames for codecs with delay.
reimar
parents: 34769
diff changeset
2457 if (flush) {
d32f75f79517 Decode last frames for codecs with delay.
reimar
parents: 34769
diff changeset
2458 start = NULL;
d32f75f79517 Decode last frames for codecs with delay.
reimar
parents: 34769
diff changeset
2459 in_size = 0;
d32f75f79517 Decode last frames for codecs with delay.
reimar
parents: 34769
diff changeset
2460 }
34777
9b8a830767f2 Fix dvdnav case to not leave "flush" uninitialized.
reimar
parents: 34772
diff changeset
2461 if (mpctx->stream->type != STREAMTYPE_DVDNAV && in_size < 0)
31201
203789464176 misc cosmetics: K&R style nits, #include placement, indentation
diego
parents: 31148
diff changeset
2462 return -1;
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2463 if (in_size > max_framesize)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2464 max_framesize = in_size; // stats
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2465 drop_frame = check_framedrop(frame_time);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2466 current_module = "decode_video";
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
2467 #ifdef CONFIG_DVDNAV
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2468 full_frame = 1;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2469 decoded_frame = mp_dvdnav_restore_smpi(&in_size, &start, decoded_frame);
34772
d32f75f79517 Decode last frames for codecs with delay.
reimar
parents: 34769
diff changeset
2470 #endif
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2471 // still frame has been reached, no need to decode
34772
d32f75f79517 Decode last frames for codecs with delay.
reimar
parents: 34769
diff changeset
2472 if ((in_size > 0 || flush) && !decoded_frame)
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2473 decoded_frame = decode_video(sh_video, start, in_size, drop_frame,
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2474 sh_video->pts, &full_frame);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2475
34772
d32f75f79517 Decode last frames for codecs with delay.
reimar
parents: 34769
diff changeset
2476 if (flush && !decoded_frame)
d32f75f79517 Decode last frames for codecs with delay.
reimar
parents: 34769
diff changeset
2477 return -1;
d32f75f79517 Decode last frames for codecs with delay.
reimar
parents: 34769
diff changeset
2478
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2479 if (full_frame) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2480 sh_video->timer += frame_time;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2481 if (mpctx->sh_audio)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2482 mpctx->delay -= frame_time;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2483 // video_read_frame can change fps (e.g. for ASF video)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2484 vo_fps = sh_video->fps;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2485 update_subtitles(sh_video, sh_video->pts, mpctx->d_sub, 0);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2486 update_teletext(sh_video, mpctx->demuxer, 0);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2487 update_osd_msg();
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2488 }
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
2489 #ifdef CONFIG_DVDNAV
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2490 // save back last still frame for future display
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2491 mp_dvdnav_save_smpi(in_size, start, decoded_frame);
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2492 #endif
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2493 } while (!full_frame);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2494
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2495 current_module = "filter_video";
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2496 *blit_frame = (decoded_frame && filter_video(sh_video, decoded_frame,
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2497 sh_video->pts));
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2498 } else {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2499 int res = generate_video_frame(sh_video, mpctx->d_video);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2500 if (!res)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2501 return -1;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2502 ((vf_instance_t *)sh_video->vfilter)->control(sh_video->vfilter,
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2503 VFCTRL_GET_PTS, &sh_video->pts);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2504 if (sh_video->pts == MP_NOPTS_VALUE) {
34606
ed612f6f4778 Make mplayer.c messages translatable.
ib
parents: 34605
diff changeset
2505 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_PtsAfterFiltersMissing);
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2506 sh_video->pts = sh_video->last_pts;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2507 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2508 if (sh_video->last_pts == MP_NOPTS_VALUE)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2509 sh_video->last_pts = sh_video->pts;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2510 else if (sh_video->last_pts > sh_video->pts) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2511 // make a guess whether this is some kind of discontinuity
33552
ee00679a24c1 Spelling fix.
reimar
parents: 33511
diff changeset
2512 // we should jump along with or some wrong timestamps we
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2513 // should replace instead
31245
a3adde0a5b83 If an invalid pts value is detected, try to to make up some if it seems
reimar
parents: 31243
diff changeset
2514 if (sh_video->pts < sh_video->last_pts - 20 * sh_video->frametime)
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2515 sh_video->last_pts = sh_video->pts;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2516 else
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2517 sh_video->pts = sh_video->last_pts + sh_video->frametime;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2518 mp_msg(MSGT_CPLAYER, MSGL_V, "pts value < previous\n");
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2519 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2520 frame_time = sh_video->pts - sh_video->last_pts;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2521 if (!frame_time)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2522 frame_time = sh_video->frametime;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2523 sh_video->last_pts = sh_video->pts;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2524 sh_video->timer += frame_time;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2525 if (mpctx->sh_audio)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2526 mpctx->delay -= frame_time;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2527 *blit_frame = res > 0;
21077
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2528 }
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2529 return frame_time;
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2530 }
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2531
25606
a3f9b22287ca Make some functions in mplayer.c static
reimar
parents: 25467
diff changeset
2532 static void pause_loop(void)
21082
ef6a6e777fdd Move pause loop into a separate function.
uau
parents: 21077
diff changeset
2533 {
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2534 mp_cmd_t *cmd;
32732
67e0128e2f1a Update PAUSED status line with cache fill status if it changed.
reimar
parents: 32731
diff changeset
2535 #ifdef CONFIG_STREAM_CACHE
67e0128e2f1a Update PAUSED status line with cache fill status if it changed.
reimar
parents: 32731
diff changeset
2536 int old_cache_fill = stream_cache_size > 0 ? cache_fill_status(mpctx->stream) : 0;
67e0128e2f1a Update PAUSED status line with cache fill status if it changed.
reimar
parents: 32731
diff changeset
2537 #endif
21082
ef6a6e777fdd Move pause loop into a separate function.
uau
parents: 21077
diff changeset
2538 if (!quiet) {
29857
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2539 if (term_osd && !mpctx->sh_video) {
32730
736b22f11e00 Change MSGTR_Paused definition to allow simplifying some code.
reimar
parents: 32724
diff changeset
2540 set_osd_msg(OSD_MSG_PAUSE, 1, 0, MSGTR_Paused);
29857
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2541 update_osd_msg();
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2542 } else
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2543 mp_msg(MSGT_CPLAYER, MSGL_STATUS, "\n"MSGTR_Paused "\r");
21082
ef6a6e777fdd Move pause loop into a separate function.
uau
parents: 21077
diff changeset
2544 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_PAUSED\n");
ef6a6e777fdd Move pause loop into a separate function.
uau
parents: 21077
diff changeset
2545 }
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
2546 #ifdef CONFIG_GUI
21082
ef6a6e777fdd Move pause loop into a separate function.
uau
parents: 21077
diff changeset
2547 if (use_gui)
33731
81f71d910333 Cosmetic: Change prefix for symbolic constants from GMP to GUI.
ib
parents: 33725
diff changeset
2548 gui(GUI_SET_STATE, (void *)GUI_PAUSE);
21082
ef6a6e777fdd Move pause loop into a separate function.
uau
parents: 21077
diff changeset
2549 #endif
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
2550 if (mpctx->video_out && mpctx->sh_video && vo_config_count)
29857
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2551 mpctx->video_out->control(VOCTRL_PAUSE, NULL);
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
2552
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
2553 if (mpctx->audio_out && mpctx->sh_audio)
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2554 mpctx->audio_out->pause(); // pause audio, keep data if possible
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2555
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2556 while ((cmd = mp_input_get_cmd(20, 1, 1)) == NULL || cmd->pausing == 4) {
29857
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2557 if (cmd) {
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2558 cmd = mp_input_get_cmd(0, 1, 0);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2559 run_command(mpctx, cmd);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2560 mp_cmd_free(cmd);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2561 continue;
29857
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2562 }
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2563 if (mpctx->sh_video && mpctx->video_out && vo_config_count)
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2564 mpctx->video_out->check_events();
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
2565 #ifdef CONFIG_GUI
29857
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2566 if (use_gui) {
36287
3a1b89dc7070 Place GUI_HANDLE_EVENTS calls after GUI_REDRAW calls.
ib
parents: 36286
diff changeset
2567 gui(GUI_REDRAW, 0);
33615
1f9a31d4f114 Replace all playback integer constants by their symbolic constants.
ib
parents: 33614
diff changeset
2568 if (guiInfo.Playing != GUI_PAUSE || (rel_seek_secs || abs_seek_pos))
29857
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2569 break;
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2570 }
21082
ef6a6e777fdd Move pause loop into a separate function.
uau
parents: 21077
diff changeset
2571 #endif
27345
b597fd2924b4 Rename preprocessor directive HAVE_MENU --> CONFIG_MENU.
diego
parents: 27343
diff changeset
2572 #ifdef CONFIG_MENU
29857
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2573 if (vf_menu)
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2574 vf_menu_pause_update(vf_menu);
21082
ef6a6e777fdd Move pause loop into a separate function.
uau
parents: 21077
diff changeset
2575 #endif
32732
67e0128e2f1a Update PAUSED status line with cache fill status if it changed.
reimar
parents: 32731
diff changeset
2576 #ifdef CONFIG_STREAM_CACHE
32735
c8b9c17890cb Cosmetics: move if and following { onto same line.
reimar
parents: 32732
diff changeset
2577 if (!quiet && stream_cache_size > 0) {
32732
67e0128e2f1a Update PAUSED status line with cache fill status if it changed.
reimar
parents: 32731
diff changeset
2578 int new_cache_fill = cache_fill_status(mpctx->stream);
67e0128e2f1a Update PAUSED status line with cache fill status if it changed.
reimar
parents: 32731
diff changeset
2579 if (new_cache_fill != old_cache_fill) {
67e0128e2f1a Update PAUSED status line with cache fill status if it changed.
reimar
parents: 32731
diff changeset
2580 if (term_osd && !mpctx->sh_video) {
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2581 set_osd_msg(OSD_MSG_PAUSE, 1, 0, MSGTR_Paused " %d%%",
32732
67e0128e2f1a Update PAUSED status line with cache fill status if it changed.
reimar
parents: 32731
diff changeset
2582 new_cache_fill);
67e0128e2f1a Update PAUSED status line with cache fill status if it changed.
reimar
parents: 32731
diff changeset
2583 update_osd_msg();
67e0128e2f1a Update PAUSED status line with cache fill status if it changed.
reimar
parents: 32731
diff changeset
2584 } else
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2585 mp_msg(MSGT_CPLAYER, MSGL_STATUS, MSGTR_Paused " %d%%\r",
32732
67e0128e2f1a Update PAUSED status line with cache fill status if it changed.
reimar
parents: 32731
diff changeset
2586 new_cache_fill);
67e0128e2f1a Update PAUSED status line with cache fill status if it changed.
reimar
parents: 32731
diff changeset
2587 old_cache_fill = new_cache_fill;
67e0128e2f1a Update PAUSED status line with cache fill status if it changed.
reimar
parents: 32731
diff changeset
2588 }
67e0128e2f1a Update PAUSED status line with cache fill status if it changed.
reimar
parents: 32731
diff changeset
2589 }
67e0128e2f1a Update PAUSED status line with cache fill status if it changed.
reimar
parents: 32731
diff changeset
2590 #endif
33181
ddbd34d6392d Avoid crash when pausing an audio-only file.
reimar
parents: 33155
diff changeset
2591 if (mpctx->sh_video)
ddbd34d6392d Avoid crash when pausing an audio-only file.
reimar
parents: 33155
diff changeset
2592 handle_udp_master(mpctx->sh_video->pts);
29857
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2593 usec_sleep(20000);
21082
ef6a6e777fdd Move pause loop into a separate function.
uau
parents: 21077
diff changeset
2594 }
ef6a6e777fdd Move pause loop into a separate function.
uau
parents: 21077
diff changeset
2595 if (cmd && cmd->id == MP_CMD_PAUSE) {
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2596 cmd = mp_input_get_cmd(0, 1, 0);
29857
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2597 mp_cmd_free(cmd);
21082
ef6a6e777fdd Move pause loop into a separate function.
uau
parents: 21077
diff changeset
2598 }
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2599 mpctx->osd_function = OSD_PLAY;
29937
d654021c9652 Add braces to avoid ambiguous else.
reimar
parents: 29922
diff changeset
2600 if (mpctx->audio_out && mpctx->sh_audio) {
29856
3a6ae46759de Do not call resume on unpausing if we have already reached eof while
reimar
parents: 29855
diff changeset
2601 if (mpctx->eof) // do not play remaining audio if we e.g. switch to the next file
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2602 mpctx->audio_out->reset();
29856
3a6ae46759de Do not call resume on unpausing if we have already reached eof while
reimar
parents: 29855
diff changeset
2603 else
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2604 mpctx->audio_out->resume(); // resume audio
29937
d654021c9652 Add braces to avoid ambiguous else.
reimar
parents: 29922
diff changeset
2605 }
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
2606 if (mpctx->video_out && mpctx->sh_video && vo_config_count)
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2607 mpctx->video_out->control(VOCTRL_RESUME, NULL); // resume video
29857
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2608 (void)GetRelativeTime(); // ignore time that passed during pause
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
2609 #ifdef CONFIG_GUI
21082
ef6a6e777fdd Move pause loop into a separate function.
uau
parents: 21077
diff changeset
2610 if (use_gui) {
33614
79743a5cf4f0 Rename the symbolic playback state constants.
ib
parents: 33611
diff changeset
2611 if (guiInfo.Playing == GUI_STOP)
29857
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2612 mpctx->eof = 1;
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2613 else
33731
81f71d910333 Cosmetic: Change prefix for symbolic constants from GMP to GUI.
ib
parents: 33725
diff changeset
2614 gui(GUI_SET_STATE, (void *)GUI_PLAY);
21082
ef6a6e777fdd Move pause loop into a separate function.
uau
parents: 21077
diff changeset
2615 }
ef6a6e777fdd Move pause loop into a separate function.
uau
parents: 21077
diff changeset
2616 #endif
ef6a6e777fdd Move pause loop into a separate function.
uau
parents: 21077
diff changeset
2617 }
ef6a6e777fdd Move pause loop into a separate function.
uau
parents: 21077
diff changeset
2618
31956
a6c25d94e60e Add new slave mode command for loading EDL file on demand.
reynaldo
parents: 31945
diff changeset
2619 static void edl_loadfile(void)
a6c25d94e60e Add new slave mode command for loading EDL file on demand.
reynaldo
parents: 31945
diff changeset
2620 {
a6c25d94e60e Add new slave mode command for loading EDL file on demand.
reynaldo
parents: 31945
diff changeset
2621 if (edl_filename) {
a6c25d94e60e Add new slave mode command for loading EDL file on demand.
reynaldo
parents: 31945
diff changeset
2622 if (edl_records) {
a6c25d94e60e Add new slave mode command for loading EDL file on demand.
reynaldo
parents: 31945
diff changeset
2623 free_edl(edl_records);
a6c25d94e60e Add new slave mode command for loading EDL file on demand.
reynaldo
parents: 31945
diff changeset
2624 edl_needs_reset = 1;
a6c25d94e60e Add new slave mode command for loading EDL file on demand.
reynaldo
parents: 31945
diff changeset
2625 }
a6c25d94e60e Add new slave mode command for loading EDL file on demand.
reynaldo
parents: 31945
diff changeset
2626 next_edl_record = edl_records = edl_parse_file();
a6c25d94e60e Add new slave mode command for loading EDL file on demand.
reynaldo
parents: 31945
diff changeset
2627 }
a6c25d94e60e Add new slave mode command for loading EDL file on demand.
reynaldo
parents: 31945
diff changeset
2628 }
a6c25d94e60e Add new slave mode command for loading EDL file on demand.
reynaldo
parents: 31945
diff changeset
2629
22298
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2630 // Execute EDL command for the current position if one exists
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2631 static void edl_update(MPContext *mpctx)
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2632 {
34782
5e946a81746c Use a local variable to reduce some code clutter.
reimar
parents: 34777
diff changeset
2633 double pts;
33491
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
2634 if (!edl_records)
31459
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2635 return;
22298
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2636
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2637 if (!mpctx->sh_video) {
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2638 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_EdlNOsh_video);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2639 free_edl(edl_records);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2640 next_edl_record = NULL;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2641 edl_records = NULL;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2642 return;
22298
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2643 }
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2644
34782
5e946a81746c Use a local variable to reduce some code clutter.
reimar
parents: 34777
diff changeset
2645 pts = mpctx->sh_video->pts;
31459
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2646 // This indicates that we need to reset next EDL record according
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2647 // to new PTS due to seek or other condition
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2648 if (edl_needs_reset) {
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2649 edl_needs_reset = 0;
31459
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2650 mpctx->edl_muted = 0;
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2651 next_edl_record = edl_records;
31459
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2652
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2653 // Find next record, also skip immediately if we are already
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2654 // inside any record
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2655 while (next_edl_record) {
34782
5e946a81746c Use a local variable to reduce some code clutter.
reimar
parents: 34777
diff changeset
2656 if (next_edl_record->start_sec > pts)
31459
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2657 break;
34782
5e946a81746c Use a local variable to reduce some code clutter.
reimar
parents: 34777
diff changeset
2658 if (next_edl_record->stop_sec >= pts) {
31459
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2659 if (edl_backward) {
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2660 mpctx->osd_function = OSD_REW;
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2661 edl_decision = 1;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2662 abs_seek_pos = 0;
34782
5e946a81746c Use a local variable to reduce some code clutter.
reimar
parents: 34777
diff changeset
2663 rel_seek_secs = -(pts -
31459
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2664 next_edl_record->start_sec +
31580
b6c2b541e1a6 Implement edl-backward-delay to avoid jumping right over an
reynaldo
parents: 31515
diff changeset
2665 edl_backward_delay);
31459
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2666 mp_msg(MSGT_CPLAYER, MSGL_DBG4, "EDL_SKIP: pts [%f], "
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2667 "offset [%f], start [%f], stop [%f], length [%f]\n",
34782
5e946a81746c Use a local variable to reduce some code clutter.
reimar
parents: 34777
diff changeset
2668 pts, rel_seek_secs,
31459
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2669 next_edl_record->start_sec, next_edl_record->stop_sec,
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2670 next_edl_record->length_sec);
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2671 return;
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2672 }
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2673 break;
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2674 }
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2675
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2676 if (next_edl_record->action == EDL_MUTE)
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2677 mpctx->edl_muted = !mpctx->edl_muted;
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2678
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2679 next_edl_record = next_edl_record->next;
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2680 }
31459
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2681 if ((mpctx->user_muted | mpctx->edl_muted) != mpctx->mixer.muted)
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2682 mixer_mute(&mpctx->mixer);
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2683 }
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2684
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2685 if (next_edl_record &&
34782
5e946a81746c Use a local variable to reduce some code clutter.
reimar
parents: 34777
diff changeset
2686 pts >= next_edl_record->start_sec) {
31459
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2687 if (next_edl_record->action == EDL_SKIP) {
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2688 mpctx->osd_function = OSD_FFW;
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2689 edl_decision = 1;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2690 abs_seek_pos = 0;
34782
5e946a81746c Use a local variable to reduce some code clutter.
reimar
parents: 34777
diff changeset
2691 rel_seek_secs = next_edl_record->stop_sec - pts;
31459
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2692 mp_msg(MSGT_CPLAYER, MSGL_DBG4, "EDL_SKIP: pts [%f], offset [%f], "
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2693 "start [%f], stop [%f], length [%f]\n",
34782
5e946a81746c Use a local variable to reduce some code clutter.
reimar
parents: 34777
diff changeset
2694 pts, rel_seek_secs,
31459
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2695 next_edl_record->start_sec, next_edl_record->stop_sec,
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2696 next_edl_record->length_sec);
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2697 } else if (next_edl_record->action == EDL_MUTE) {
31459
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2698 mpctx->edl_muted = !mpctx->edl_muted;
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2699 if ((mpctx->user_muted | mpctx->edl_muted) != mpctx->mixer.muted)
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2700 mixer_mute(&mpctx->mixer);
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2701 mp_msg(MSGT_CPLAYER, MSGL_DBG4, "EDL_MUTE: [%f]\n",
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2702 next_edl_record->start_sec);
31459
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2703 }
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2704 next_edl_record = next_edl_record->next;
22298
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2705 }
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2706 }
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2707
25883
baf32110d3fc Use defines to give names to the different seek flags.
reimar
parents: 25852
diff changeset
2708 // style & SEEK_ABSOLUTE == 0 means seek relative to current position, == 1 means absolute
33491
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
2709 // style & SEEK_FACTOR == 0 means amount in seconds, == 2 means fraction of file length
22300
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2710 // return -1 if seek failed (non-seekable stream?), 0 otherwise
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2711 static int seek(MPContext *mpctx, double amount, int style)
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2712 {
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2713 current_module = "seek";
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2714 if (demux_seek(mpctx->demuxer, amount, audio_delay, style) == 0)
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2715 return -1;
22300
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2716
30176
6fb92182aff3 At startup and while seeking avoid to introduce pointless sleeps and possibly
reimar
parents: 30175
diff changeset
2717 mpctx->startup_decode_retry = DEFAULT_STARTUP_DECODE_RETRY;
22300
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2718 if (mpctx->sh_video) {
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2719 current_module = "seek_video_reset";
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2720 if (vo_config_count)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2721 mpctx->video_out->control(VOCTRL_RESET, NULL);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2722 mpctx->num_buffered_frames = 0;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2723 mpctx->delay = 0;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2724 mpctx->time_frame = 0;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2725 // Not all demuxers set d_video->pts during seek, so this value
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2726 // (which is used by at least vobsub and edl code below) may
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2727 // be completely wrong (probably 0).
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2728 mpctx->sh_video->pts = mpctx->d_video->pts;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2729 update_subtitles(mpctx->sh_video, mpctx->sh_video->pts, mpctx->d_sub, 1);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2730 update_teletext(mpctx->sh_video, mpctx->demuxer, 1);
22300
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2731 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
2732
22300
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2733 if (mpctx->sh_audio) {
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2734 current_module = "seek_audio_reset";
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2735 mpctx->audio_out->reset(); // stop audio, throwing away buffered data
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2736 if (!mpctx->sh_video)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2737 update_subtitles(NULL, mpctx->sh_audio->pts, mpctx->d_sub, 1);
22300
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2738 }
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2739
25416
a79a22add62a Do not operate on vobsub when no video (Bug #312).
ulion
parents: 25397
diff changeset
2740 if (vo_vobsub && mpctx->sh_video) {
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2741 current_module = "seek_vobsub_reset";
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2742 vobsub_seek(vo_vobsub, mpctx->sh_video->pts);
22300
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2743 }
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2744
31700
121fed0ab46a libass: remove yet another version check
greg
parents: 31673
diff changeset
2745 #ifdef CONFIG_ASS
31227
ee7beb1a3a6e backport ass_flush_events() from upstream libass and make use of it
aurel
parents: 31201
diff changeset
2746 if (ass_enabled && mpctx->d_sub->sh && ((sh_sub_t *)mpctx->d_sub->sh)->ass_track)
ee7beb1a3a6e backport ass_flush_events() from upstream libass and make use of it
aurel
parents: 31201
diff changeset
2747 ass_flush_events(((sh_sub_t *)mpctx->d_sub->sh)->ass_track);
ee7beb1a3a6e backport ass_flush_events() from upstream libass and make use of it
aurel
parents: 31201
diff changeset
2748 #endif
ee7beb1a3a6e backport ass_flush_events() from upstream libass and make use of it
aurel
parents: 31201
diff changeset
2749
31459
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2750 if (edl_records) {
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2751 edl_needs_reset = 1;
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2752 edl_backward = amount < 0;
31459
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2753 }
22300
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2754
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2755 c_total = 0;
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2756 max_pts_correction = 0.1;
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2757 audio_time_usage = 0;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2758 video_time_usage = 0;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2759 vout_time_usage = 0;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2760 drop_frame_cnt = 0;
22300
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2761
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2762 current_module = NULL;
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2763 return 0;
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2764 }
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2765
26963
8825552ee585 Fix the linking of TOOLS/netstream and TOOLS/vivodump.
diego
parents: 26877
diff changeset
2766 /* This preprocessor directive is a hack to generate a mplayer-nomain.o object
8825552ee585 Fix the linking of TOOLS/netstream and TOOLS/vivodump.
diego
parents: 26877
diff changeset
2767 * file for some tools to link against. */
8825552ee585 Fix the linking of TOOLS/netstream and TOOLS/vivodump.
diego
parents: 26877
diff changeset
2768 #ifndef DISABLE_MAIN
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2769 int main(int argc, char *argv[])
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2770 {
33491
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
2771 int opt_exit = 0; // Flag indicating whether MPlayer should exit without playing anything.
34114
113156bc1137 Ensure that filename related config will always be loaded.
ib
parents: 34113
diff changeset
2772 int profile_config_loaded;
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2773 int i;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2774
35868
3edaed3c1d60 Win32: support file names with characters outside system code-page
reimar
parents: 35592
diff changeset
2775 common_preinit(&argc, &argv);
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2776
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2777 // Create the config context and register the options
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2778 mconfig = m_config_new();
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2779 m_config_register_options(mconfig, mplayer_opts);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2780 m_config_register_options(mconfig, common_opts);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2781 mp_input_register_options(mconfig);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2782
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2783 // Preparse the command line
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2784 m_config_preparse_command_line(mconfig, argc, argv);
21930
6af0d674aa53 print_version() and others get executed before the command line has been parsed so -really-quiet does not silence them even though it should according to the verbosity level set by it, this simple change/hack fixes it
michael
parents: 21888
diff changeset
2785
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
2786 #ifdef CONFIG_TV
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2787 stream_tv_defaults.immediate = 1;
7068
6c2d746b17bf 10l, fix compiling without tv. patch by Andreas Hess <jaska@gmx.net>
arpi
parents: 7058
diff changeset
2788 #endif
5572
8cd761968f35 BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents: 5520
diff changeset
2789
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2790 if (argc > 1 && argv[1] &&
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2791 (!strcmp(argv[1], "-gui") || !strcmp(argv[1], "-nogui"))) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2792 use_gui = !strcmp(argv[1], "-gui");
36054
1562f350e8d2 Cosmetic: Rename GMPlayer definition gmplayer.
ib
parents: 36042
diff changeset
2793 } else if (argv[0] && strstr(mp_basename(argv[0]), gmplayer)) {
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2794 use_gui = 1;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2795 }
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
2796
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2797 parse_cfgfiles(mconfig);
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2798
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
2799 #ifdef CONFIG_GUI
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2800 if (use_gui) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2801 initialized_flags |= INITIALIZED_GUI;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2802 cfg_read();
33307
552f1f7731c8 Set GUI initialization flag earlier.
ib
parents: 33293
diff changeset
2803 }
7019
e37a67d5e117 fix (?) cmd line handling
pontscho
parents: 7009
diff changeset
2804 #endif
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2805
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
2806 mpctx->playtree = m_config_parse_mp_command_line(mconfig, argc, argv);
33491
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
2807 if (mpctx->playtree == NULL) {
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2808 opt_exit = 1;
33491
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
2809 } else {
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2810 mpctx->playtree = play_tree_cleanup(mpctx->playtree);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2811 if (mpctx->playtree) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2812 mpctx->playtree_iter = play_tree_iter_new(mpctx->playtree, mconfig);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2813 if (mpctx->playtree_iter) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2814 if (play_tree_iter_step(mpctx->playtree_iter, 0, 0) != PLAY_TREE_ITER_ENTRY) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2815 play_tree_iter_free(mpctx->playtree_iter);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2816 mpctx->playtree_iter = NULL;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2817 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2818 filename = play_tree_iter_get_file(mpctx->playtree_iter, 1);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2819 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2820 }
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2821 }
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2822
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2823 print_version("MPlayer");
32415
d1f6c6cf8905 Move gui-specific code out of common_init, it certainly does
reimar
parents: 32383
diff changeset
2824 #if (defined(__MINGW32__) || defined(__CYGWIN__)) && defined(CONFIG_GUI)
d1f6c6cf8905 Move gui-specific code out of common_init, it certainly does
reimar
parents: 32383
diff changeset
2825 void *runningmplayer = FindWindow("MPlayer GUI for Windows", "MPlayer for Windows");
d1f6c6cf8905 Move gui-specific code out of common_init, it certainly does
reimar
parents: 32383
diff changeset
2826 if (runningmplayer && filename && use_gui) {
d1f6c6cf8905 Move gui-specific code out of common_init, it certainly does
reimar
parents: 32383
diff changeset
2827 COPYDATASTRUCT csData;
d1f6c6cf8905 Move gui-specific code out of common_init, it certainly does
reimar
parents: 32383
diff changeset
2828 char file[MAX_PATH];
d1f6c6cf8905 Move gui-specific code out of common_init, it certainly does
reimar
parents: 32383
diff changeset
2829 char *filepart = filename;
d1f6c6cf8905 Move gui-specific code out of common_init, it certainly does
reimar
parents: 32383
diff changeset
2830 if (GetFullPathName(filename, MAX_PATH, file, &filepart)) {
d1f6c6cf8905 Move gui-specific code out of common_init, it certainly does
reimar
parents: 32383
diff changeset
2831 csData.dwData = 0;
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2832 csData.cbData = strlen(file) * 2;
32415
d1f6c6cf8905 Move gui-specific code out of common_init, it certainly does
reimar
parents: 32383
diff changeset
2833 csData.lpData = file;
d1f6c6cf8905 Move gui-specific code out of common_init, it certainly does
reimar
parents: 32383
diff changeset
2834 SendMessage(runningmplayer, WM_COPYDATA, (WPARAM)runningmplayer, (LPARAM)&csData);
d1f6c6cf8905 Move gui-specific code out of common_init, it certainly does
reimar
parents: 32383
diff changeset
2835 }
d1f6c6cf8905 Move gui-specific code out of common_init, it certainly does
reimar
parents: 32383
diff changeset
2836 }
d1f6c6cf8905 Move gui-specific code out of common_init, it certainly does
reimar
parents: 32383
diff changeset
2837 #endif
32383
f6e78eef2e1b Avoid duplicating common init code between MPlayer and mencoder.
reimar
parents: 32382
diff changeset
2838 if (!common_init())
f6e78eef2e1b Avoid duplicating common init code between MPlayer and mencoder.
reimar
parents: 32382
diff changeset
2839 exit_player_with_rc(EXIT_NONE, 0);
30855
977fd535cc9d Add -codecpath option.
komh
parents: 30815
diff changeset
2840
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
2841 #ifndef CONFIG_GUI
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2842 if (use_gui) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2843 mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_NoGui);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2844 use_gui = 0;
1709
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
2845 }
1723
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1709
diff changeset
2846 #else
27727
48c1ae64255b Replace preprocessor check for WIN32 with checks for __MINGW32__ and __CYGWIN__.
diego
parents: 27635
diff changeset
2847 #if !defined(__MINGW32__) && !defined(__CYGWIN__)
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2848 if (use_gui && !vo_init()) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2849 mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_GuiNeedsX);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2850 use_gui = 0;
1723
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1709
diff changeset
2851 }
18945
337d4324c766 No point in checking for X for windows gui, in addition the hackish
reimar
parents: 18939
diff changeset
2852 #endif
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2853 if (use_gui && mpctx->playtree_iter) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2854 char cwd[PATH_MAX + 2];
34056
792c1e241416 Correct comment on playtree and playtree_iter in connection with the GUI.
ib
parents: 34052
diff changeset
2855 // Free playtree_iter as it's not used in connection with the GUI.
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2856 play_tree_iter_free(mpctx->playtree_iter);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2857 mpctx->playtree_iter = NULL;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2858
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2859 if (getcwd(cwd, PATH_MAX) != (char *)NULL) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2860 strcat(cwd, "/");
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2861 // Prefix relative paths with current working directory
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2862 play_tree_add_bpf(mpctx->playtree, cwd);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2863 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2864 // Import initital playtree into GUI.
35510
06aa6dc71613 Combine guiPlaylistInitialize() and guiPlaylistAdd().
ib
parents: 35388
diff changeset
2865 guiPlaylist(GUI_PLAYLIST_INIT, mpctx->playtree, mconfig, enqueue);
9291
64b8c5a07c2c - It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents: 9217
diff changeset
2866 }
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
2867 #endif /* CONFIG_GUI */
1709
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
2868
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2869 if (video_driver_list && strcmp(video_driver_list[0], "help") == 0) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2870 list_video_out();
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2871 opt_exit = 1;
956
a6cecd9a1bad '-ao' switch (including '-ao help'), fixing Arpi's bug (short name 'null' for both of oss and null driver ;)
lgb
parents: 955
diff changeset
2872 }
5072
a760c9f074df libvo2 #ifs removed
arpi
parents: 5055
diff changeset
2873
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2874 if (audio_driver_list && strcmp(audio_driver_list[0], "help") == 0) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2875 list_audio_out();
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2876 opt_exit = 1;
956
a6cecd9a1bad '-ao' switch (including '-ao help'), fixing Arpi's bug (short name 'null' for both of oss and null driver ;)
lgb
parents: 955
diff changeset
2877 }
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
2878
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2879 if (audio_codec_list && strcmp(audio_codec_list[0], "help") == 0) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2880 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_AvailableAudioCodecs);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2881 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AUDIO_CODECS\n");
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2882 list_codecs(1);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2883 mp_msg(MSGT_FIXME, MSGL_FIXME, "\n");
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2884 opt_exit = 1;
1983
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
2885 }
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2886 if (video_codec_list && strcmp(video_codec_list[0], "help") == 0) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2887 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_AvailableVideoCodecs);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2888 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_CODECS\n");
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2889 list_codecs(0);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2890 mp_msg(MSGT_FIXME, MSGL_FIXME, "\n");
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2891 opt_exit = 1;
1983
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
2892 }
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2893 if (video_fm_list && strcmp(video_fm_list[0], "help") == 0) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2894 vfm_help();
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2895 mp_msg(MSGT_FIXME, MSGL_FIXME, "\n");
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2896 opt_exit = 1;
7191
1eadce15446c -afm/-vfm help implemenetd, some cosmetics of ad/vd codec names/comments
arpi
parents: 7180
diff changeset
2897 }
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2898 if (audio_fm_list && strcmp(audio_fm_list[0], "help") == 0) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2899 afm_help();
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2900 mp_msg(MSGT_FIXME, MSGL_FIXME, "\n");
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2901 opt_exit = 1;
7191
1eadce15446c -afm/-vfm help implemenetd, some cosmetics of ad/vd codec names/comments
arpi
parents: 7180
diff changeset
2902 }
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2903 if (af_cfg.list && strcmp(af_cfg.list[0], "help") == 0) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2904 af_help();
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2905 printf("\n");
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2906 opt_exit = 1;
13269
aa13937da8a0 mplayer -af help now lists all available audio filters.
ivo
parents: 13228
diff changeset
2907 }
27377
d58d06eafe83 Change a bunch of X11-specific preprocessor directives.
diego
parents: 27370
diff changeset
2908 #ifdef CONFIG_X11
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2909 if (vo_fstype_list && strcmp(vo_fstype_list[0], "help") == 0) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2910 fstype_help();
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2911 mp_msg(MSGT_FIXME, MSGL_FIXME, "\n");
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2912 opt_exit = 1;
9317
c7f5df43b937 - support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents: 9315
diff changeset
2913 }
9336
4d39aa85a723 Forgot about #ifdef HAVE_X11. 10l
filon
parents: 9319
diff changeset
2914 #endif
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2915 if ((demuxer_name && strcmp(demuxer_name, "help") == 0) ||
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2916 (audio_demuxer_name && strcmp(audio_demuxer_name, "help") == 0) ||
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2917 (sub_demuxer_name && strcmp(sub_demuxer_name, "help") == 0)) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2918 demuxer_help();
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2919 mp_msg(MSGT_CPLAYER, MSGL_INFO, "\n");
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2920 opt_exit = 1;
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
2921 }
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2922 if (list_properties) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2923 property_print_help();
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2924 opt_exit = 1;
17914
f9cb6fc1608a Add an option to list the properties: -list-properties
albeu
parents: 17911
diff changeset
2925 }
1983
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
2926
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2927 if (opt_exit)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2928 exit_player(EXIT_NONE);
16345
feb16d0117c8 allow multiple help clauses on the command line, Patch by kiriuja " mplayer-patches AH en-directo POUM net "
gpoirier
parents: 16323
diff changeset
2929
33887
584b9baad6b5 Remove unneeded variable and simplify code.
ib
parents: 33877
diff changeset
2930 if (!filename && !player_idle_mode && !use_gui) {
33888
b6ec17457aae Cosmetic: Adjust indent.
ib
parents: 33887
diff changeset
2931 // no file/vcd/dvd -> show HELP:
b6ec17457aae Cosmetic: Adjust indent.
ib
parents: 33887
diff changeset
2932 mp_msg(MSGT_CPLAYER, MSGL_INFO, help_text);
b6ec17457aae Cosmetic: Adjust indent.
ib
parents: 33887
diff changeset
2933 exit_player_with_rc(EXIT_NONE, 0);
1690
09f9297d2ee6 -vo help fixed
arpi
parents: 1674
diff changeset
2934 }
09f9297d2ee6 -vo help fixed
arpi
parents: 1674
diff changeset
2935
21342
dc98645820b7 Make MPlayer/MEncoder print the compile-time configuration in verbose mode.
diego
parents: 21219
diff changeset
2936 /* Display what configure line was used */
dc98645820b7 Make MPlayer/MEncoder print the compile-time configuration in verbose mode.
diego
parents: 21219
diff changeset
2937 mp_msg(MSGT_CPLAYER, MSGL_V, "Configuration: " CONFIGURATION "\n");
dc98645820b7 Make MPlayer/MEncoder print the compile-time configuration in verbose mode.
diego
parents: 21219
diff changeset
2938
1690
09f9297d2ee6 -vo help fixed
arpi
parents: 1674
diff changeset
2939 // Many users forget to include command line in bugreports...
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2940 if (mp_msg_test(MSGT_CPLAYER, MSGL_V)) {
34606
ed612f6f4778 Make mplayer.c messages translatable.
ib
parents: 34605
diff changeset
2941 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_CommandLine);
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2942 for (i = 1; i < argc; i++)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2943 mp_msg(MSGT_CPLAYER, MSGL_INFO, " '%s'", argv[i]);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2944 mp_msg(MSGT_CPLAYER, MSGL_INFO, "\n");
1690
09f9297d2ee6 -vo help fixed
arpi
parents: 1674
diff changeset
2945 }
09f9297d2ee6 -vo help fixed
arpi
parents: 1674
diff changeset
2946
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
2947 //------ load global data first ------
955
3a3304cd9fd5 libao support
arpi_esp
parents: 940
diff changeset
2948
3015
8bf21c807656 RTC is autodetected
arpi
parents: 2941
diff changeset
2949 #ifdef HAVE_RTC
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2950 if (!nortc) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2951 // seteuid(0); /* Can't hurt to try to get root here */
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2952 if ((rtc_fd = open(rtc_device ? rtc_device : "/dev/rtc", O_RDONLY)) < 0)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2953 mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_RTCDeviceNotOpenable,
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2954 rtc_device ? rtc_device : "/dev/rtc", strerror(errno));
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2955 else {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2956 unsigned long irqp = 1024; /* 512 seemed OK. 128 is jerky. */
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2957
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2958 if (ioctl(rtc_fd, RTC_IRQP_SET, irqp) < 0) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2959 mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_LinuxRTCInitErrorIrqpSet, irqp, strerror(errno));
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2960 mp_msg(MSGT_CPLAYER, MSGL_HINT, MSGTR_IncreaseRTCMaxUserFreq, irqp);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2961 close(rtc_fd);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2962 rtc_fd = -1;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2963 } else if (ioctl(rtc_fd, RTC_PIE_ON, 0) < 0) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2964 /* variable only by the root */
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2965 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_LinuxRTCInitErrorPieOn, strerror(errno));
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2966 close(rtc_fd);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2967 rtc_fd = -1;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2968 } else
33827
277ec491a8a7 Do not translate console messages of verbosity level MSGL_V and above.
diego
parents: 33752
diff changeset
2969 mp_msg(MSGT_CPLAYER, MSGL_V, "Using Linux hardware RTC timing (%ldHz).\n", irqp);
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2970 }
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
2971 }
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
2972 #ifdef CONFIG_GUI
33491
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
2973 // breaks DGA and SVGAlib and VESA drivers: --A'rpi
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
2974 // and now ? -- Pontscho
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2975 if (use_gui)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2976 setuid(getuid()); // strongly test, please check this.
4176
116abdd0aed1 small gtk bug fix (-display bug, baze gabu, miattad fogok elkarhozni:), and remove gui dependencie in mencoder
pontscho
parents: 4160
diff changeset
2977 #endif
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2978 if (rtc_fd < 0)
16490
f17b3c152fd6 Add comments to a few #endif statements in order to make clear which
diego
parents: 16489
diff changeset
2979 #endif /* HAVE_RTC */
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2980 mp_msg(MSGT_CPLAYER, MSGL_V, "Using %s timing\n",
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2981 softsleep ? "software" : timer_name);
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
2982
27359
d788e177a35e Rename some preprocessor directives from CONFIG_* to HAVE_* where appropriate;
diego
parents: 27345
diff changeset
2983 #ifdef HAVE_TERMCAP
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2984 if (!use_gui)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2985 load_termcap(NULL); // load key-codes
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
2986 #endif
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
2987
1816
c8bc613eb4f8 fixed 'n' key bug :)
arpi
parents: 1809
diff changeset
2988 // ========== Init keyboard FIFO (connection to libvo) ============
1694
0def229bd8bc GUI support (--enable-gui)
arpi
parents: 1690
diff changeset
2989
33491
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
2990 // Init input system
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2991 current_module = "init_input";
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2992 mp_input_init();
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2993 mp_input_add_key_fd(-1, 0, mplayer_get_key, NULL);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2994 if (slave_mode)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2995 mp_input_add_cmd_fd(0, USE_SELECT, MP_INPUT_SLAVE_CMD_FUNC, NULL);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2996 else if (!noconsolecontrols)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2997 mp_input_add_event_fd(0, getch2);
33491
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
2998 // Set the libstream interrupt callback
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
2999 stream_set_interrupt_callback(mp_input_check_interrupt);
9831
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
3000
27345
b597fd2924b4 Rename preprocessor directive HAVE_MENU --> CONFIG_MENU.
diego
parents: 27343
diff changeset
3001 #ifdef CONFIG_MENU
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3002 if (use_menu) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3003 if (menu_cfg && menu_init(mpctx, menu_cfg))
33827
277ec491a8a7 Do not translate console messages of verbosity level MSGL_V and above.
diego
parents: 33752
diff changeset
3004 mp_msg(MSGT_CPLAYER, MSGL_V, "Menu initialized: %s\n", menu_cfg);
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3005 else {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3006 menu_cfg = get_path("menu.conf");
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3007 if (menu_init(mpctx, menu_cfg))
33827
277ec491a8a7 Do not translate console messages of verbosity level MSGL_V and above.
diego
parents: 33752
diff changeset
3008 mp_msg(MSGT_CPLAYER, MSGL_V, "Menu initialized: %s\n", menu_cfg);
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3009 else {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3010 if (menu_init(mpctx, MPLAYER_CONFDIR "/menu.conf"))
33827
277ec491a8a7 Do not translate console messages of verbosity level MSGL_V and above.
diego
parents: 33752
diff changeset
3011 mp_msg(MSGT_CPLAYER, MSGL_V, "Menu initialized: %s\n", MPLAYER_CONFDIR "/menu.conf");
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3012 else {
34606
ed612f6f4778 Make mplayer.c messages translatable.
ib
parents: 34605
diff changeset
3013 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_MenuInitFailed);
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3014 use_menu = 0;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3015 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3016 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3017 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3018 }
8198
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
3019 #endif
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
3020
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3021 initialized_flags |= INITIALIZED_INPUT;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3022 current_module = NULL;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3023
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3024 // Catch signals
13391
b6c3752d9544 handle sigchld in mplayer.c
faust3
parents: 13358
diff changeset
3025 #ifndef __MINGW32__
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3026 signal(SIGCHLD, child_sighandler);
13391
b6c3752d9544 handle sigchld in mplayer.c
faust3
parents: 13358
diff changeset
3027 #endif
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3028
27397
d47744b95b78 Give a CONFIG_ prefix to preprocessor directives that lacked one and
diego
parents: 27393
diff changeset
3029 #ifdef CONFIG_CRASH_DEBUG
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3030 prog_path = argv[0];
13794
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
3031 #endif
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3032 //========= Catch terminate signals: ================
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3033 // terminate requests:
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3034 signal(SIGTERM, exit_sighandler); // kill
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3035 signal(SIGHUP, exit_sighandler); // kill -HUP / xterm closed
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3036
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3037 signal(SIGINT, exit_sighandler); // Interrupt from keyboard
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3038
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3039 signal(SIGQUIT, exit_sighandler); // Quit from keyboard
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3040 signal(SIGPIPE, exit_sighandler); // Some window managers cause this
27397
d47744b95b78 Give a CONFIG_ prefix to preprocessor directives that lacked one and
diego
parents: 27393
diff changeset
3041 #ifdef CONFIG_SIGHANDLER
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3042 // fatal errors:
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3043 signal(SIGBUS, exit_sighandler); // bus error
34119
3959e81b0bcb Add comment.
ib
parents: 34115
diff changeset
3044 #ifndef __WINE__ // hack: the Wine executable will crash else
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3045 signal(SIGSEGV, exit_sighandler); // segfault
34115
3d7ee643b110 Port to Wine.
ib
parents: 34114
diff changeset
3046 #endif
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3047 signal(SIGILL, exit_sighandler); // illegal instruction
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3048 signal(SIGFPE, exit_sighandler); // floating point exc.
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3049 signal(SIGABRT, exit_sighandler); // abort()
27397
d47744b95b78 Give a CONFIG_ prefix to preprocessor directives that lacked one and
diego
parents: 27393
diff changeset
3050 #ifdef CONFIG_CRASH_DEBUG
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3051 if (crash_debug)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3052 signal(SIGTRAP, exit_sighandler);
13794
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
3053 #endif
5367
658ea5d7316a Allow to disable crasj sighandler to enable creation of coredump files.
atmos4
parents: 5326
diff changeset
3054 #endif
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
3055
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
3056 #ifdef CONFIG_GUI
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3057 if (use_gui) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3058 guiInit();
33731
81f71d910333 Cosmetic: Change prefix for symbolic constants from GMP to GUI.
ib
parents: 33725
diff changeset
3059 gui(GUI_SET_CONTEXT, mpctx);
33887
584b9baad6b5 Remove unneeded variable and simplify code.
ib
parents: 33877
diff changeset
3060 gui(GUI_SET_STATE, (void *)(filename ? GUI_PLAY : GUI_STOP));
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3061 }
4963
13262bd21965 small changes
pontscho
parents: 4950
diff changeset
3062 #endif
13262bd21965 small changes
pontscho
parents: 4950
diff changeset
3063
5983
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
3064 // ******************* Now, let's see the per-file stuff ********************
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
3065
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
3066 play_next_file:
1787
de6a0987a08d stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents: 1772
diff changeset
3067
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3068 // init global sub numbers
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3069 mpctx->global_sub_size = 0;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3070 memset(mpctx->sub_counts, 0, sizeof(mpctx->sub_counts));
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3071
34114
113156bc1137 Ensure that filename related config will always be loaded.
ib
parents: 34113
diff changeset
3072 profile_config_loaded = load_profile_config(mconfig, filename);
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3073
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3074 if (video_driver_list)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3075 load_per_output_config(mconfig, PROFILE_CFG_VO, video_driver_list[0]);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3076 if (audio_driver_list)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3077 load_per_output_config(mconfig, PROFILE_CFG_AO, audio_driver_list[0]);
25641
58fd8ebcd6e3 allow profile loading per audio/video output
ben
parents: 25636
diff changeset
3078
33491
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
3079 // We must enable getch2 here to be able to interrupt network connection
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
3080 // or cache filling
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3081 if (!noconsolecontrols && !slave_mode) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3082 if (initialized_flags & INITIALIZED_GETCH2)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3083 mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_Getch2InitializedTwice);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3084 else
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3085 getch2_enable(); // prepare stdin for hotkeys...
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3086 initialized_flags |= INITIALIZED_GETCH2;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3087 mp_msg(MSGT_CPLAYER, MSGL_DBG2, "\n[[[init getch2]]]\n");
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3088 }
4825
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
3089
5983
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
3090 // =================== GUI idle loop (STOP state) ===========================
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
3091 #ifdef CONFIG_GUI
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3092 if (use_gui) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3093 mpctx->file_format = DEMUXER_TYPE_UNKNOWN;
33615
1f9a31d4f114 Replace all playback integer constants by their symbolic constants.
ib
parents: 33614
diff changeset
3094 while (guiInfo.Playing != GUI_PLAY) {
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3095 mp_cmd_t *cmd;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3096 usec_sleep(20000);
36287
3a1b89dc7070 Place GUI_HANDLE_EVENTS calls after GUI_REDRAW calls.
ib
parents: 36286
diff changeset
3097 gui(GUI_REDRAW, 0);
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3098 if ((cmd = mp_input_get_cmd(0, 0, 0)) != NULL) {
34339
f05c75392897 Enable gui slave commands.
ib
parents: 34312
diff changeset
3099 if (cmd->id == MP_CMD_GUI)
f05c75392897 Enable gui slave commands.
ib
parents: 34312
diff changeset
3100 gui(GUI_RUN_MESSAGE, cmd->args[0].v.s);
f05c75392897 Enable gui slave commands.
ib
parents: 34312
diff changeset
3101 else
34340
ce8b1d7d54fe Cosmetic: Adjust indent.
ib
parents: 34339
diff changeset
3102 gui(GUI_RUN_COMMAND, (void *)cmd->id);
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3103 mp_cmd_free(cmd);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3104 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3105 }
33731
81f71d910333 Cosmetic: Change prefix for symbolic constants from GMP to GUI.
ib
parents: 33725
diff changeset
3106 gui(GUI_PREPARE, 0);
1787
de6a0987a08d stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents: 1772
diff changeset
3107 }
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
3108 #endif /* CONFIG_GUI */
16347
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
3109
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3110 while (player_idle_mode && !filename) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3111 play_tree_t *entry = NULL;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3112 mp_cmd_t *cmd;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3113 if (mpctx->video_out && vo_config_count)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3114 mpctx->video_out->control(VOCTRL_PAUSE, NULL);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3115 while (!(cmd = mp_input_get_cmd(0, 1, 0))) { // wait for command
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3116 if (mpctx->video_out && vo_config_count)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3117 mpctx->video_out->check_events();
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3118 usec_sleep(20000);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3119 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3120 switch (cmd->id) {
16347
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
3121 case MP_CMD_LOADFILE:
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
3122 // prepare a tree entry with the new filename
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
3123 entry = play_tree_new();
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
3124 play_tree_add_file(entry, cmd->args[0].v.s);
18316
b3be7df634b0 spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents: 18315
diff changeset
3125 // The entry is added to the main playtree after the switch().
16347
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
3126 break;
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
3127 case MP_CMD_LOADLIST:
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
3128 entry = parse_playlist_file(cmd->args[0].v.s);
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
3129 break;
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
3130 case MP_CMD_QUIT:
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3131 exit_player_with_rc(EXIT_QUIT, (cmd->nargs > 0) ? cmd->args[0].v.i : 0);
16347
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
3132 break;
31670
05a6d70df204 Allow fullscreen switching during -idle. Useful in combination
reimar
parents: 31612
diff changeset
3133 case MP_CMD_VO_FULLSCREEN:
26264
a80db7629478 Handle property commands in idle mode.
reimar
parents: 26228
diff changeset
3134 case MP_CMD_GET_PROPERTY:
a80db7629478 Handle property commands in idle mode.
reimar
parents: 26228
diff changeset
3135 case MP_CMD_SET_PROPERTY:
a80db7629478 Handle property commands in idle mode.
reimar
parents: 26228
diff changeset
3136 case MP_CMD_STEP_PROPERTY:
a80db7629478 Handle property commands in idle mode.
reimar
parents: 26228
diff changeset
3137 run_command(mpctx, cmd);
a80db7629478 Handle property commands in idle mode.
reimar
parents: 26228
diff changeset
3138 break;
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3139 }
35107
aed7a945c114 Support pausing prefix also in idle mode.
reimar
parents: 34888
diff changeset
3140 mpctx->osd_function = cmd->pausing ? OSD_PAUSE : OSD_PLAY;
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3141
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3142 mp_cmd_free(cmd);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3143
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3144 if (entry) { // user entered a command that gave a valid entry
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3145 if (mpctx->playtree) // the playtree is always a node with one child. let's clear it
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3146 play_tree_free_list(mpctx->playtree->child, 1);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3147 else
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3148 mpctx->playtree = play_tree_new(); // .. or make a brand new playtree
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3149
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3150 if (!mpctx->playtree)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3151 continue; // couldn't make playtree! wait for next command
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3152
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3153 play_tree_set_child(mpctx->playtree, entry);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3154
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3155 /* Make iterator start at the top the of tree. */
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3156 mpctx->playtree_iter = play_tree_iter_new(mpctx->playtree, mconfig);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3157 if (!mpctx->playtree_iter)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3158 continue;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3159
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3160 // find the first real item in the tree
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3161 if (play_tree_iter_step(mpctx->playtree_iter, 0, 0) != PLAY_TREE_ITER_ENTRY) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3162 // no items!
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3163 play_tree_iter_free(mpctx->playtree_iter);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3164 mpctx->playtree_iter = NULL;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3165 continue; // wait for next command
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3166 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3167 filename = play_tree_iter_get_file(mpctx->playtree_iter, 1);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3168 }
16347
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
3169 }
34114
113156bc1137 Ensure that filename related config will always be loaded.
ib
parents: 34113
diff changeset
3170
113156bc1137 Ensure that filename related config will always be loaded.
ib
parents: 34113
diff changeset
3171 if (!profile_config_loaded) load_profile_config(mconfig, filename);
5983
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
3172 //---------------------------------------------------------------------------
1787
de6a0987a08d stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents: 1772
diff changeset
3173
30618
c061152a5d84 Send VOCTRL_PAUSE/VOCTRL_RESUME events also when pausing for idle mode.
reimar
parents: 30616
diff changeset
3174 if (mpctx->video_out && vo_config_count)
c061152a5d84 Send VOCTRL_PAUSE/VOCTRL_RESUME events also when pausing for idle mode.
reimar
parents: 30616
diff changeset
3175 mpctx->video_out->control(VOCTRL_RESUME, NULL);
c061152a5d84 Send VOCTRL_PAUSE/VOCTRL_RESUME events also when pausing for idle mode.
reimar
parents: 30616
diff changeset
3176
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3177 if (filename) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3178 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_Playing,
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3179 filename_recode(filename));
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3180 if (use_filename_title && vo_wintitle == NULL)
32543
18338ee51c9d Export mp_basename in a function instead of duplicate macros in various places
cboesch
parents: 32537
diff changeset
3181 vo_wintitle = strdup(mp_basename(filename));
29862
fbb1f57a313e Added -name, -title and -use-filename-title options and implementation in X11 vos
ptt
parents: 29857
diff changeset
3182 }
1650
7502b16bce63 make automatic subfile detection working with many files
atlka
parents: 1641
diff changeset
3183
31956
a6c25d94e60e Add new slave mode command for loading EDL file on demand.
reynaldo
parents: 31945
diff changeset
3184 edl_loadfile();
31963
e9d8a677874b Cosmetics
reynaldo
parents: 31962
diff changeset
3185
e9d8a677874b Cosmetics
reynaldo
parents: 31962
diff changeset
3186 if (edl_output_filename) {
e9d8a677874b Cosmetics
reynaldo
parents: 31962
diff changeset
3187 if (edl_fd)
e9d8a677874b Cosmetics
reynaldo
parents: 31962
diff changeset
3188 fclose(edl_fd);
31970
7779efdd10a7 Cosmetics pointed out by Diego Biurrun
reynaldo
parents: 31963
diff changeset
3189 if ((edl_fd = fopen(edl_output_filename, "w")) == NULL) {
31963
e9d8a677874b Cosmetics
reynaldo
parents: 31962
diff changeset
3190 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_EdlCantOpenForWrite,
31970
7779efdd10a7 Cosmetics pointed out by Diego Biurrun
reynaldo
parents: 31963
diff changeset
3191 filename_recode(edl_output_filename));
31963
e9d8a677874b Cosmetics
reynaldo
parents: 31962
diff changeset
3192 }
17109
327be31a101d Fix EDL to be per file, allow -edlout and -edl together as there is really
ods15
parents: 17106
diff changeset
3193 }
327be31a101d Fix EDL to be per file, allow -edlout and -edl together as there is really
ods15
parents: 17106
diff changeset
3194
5983
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
3195 //==================== Open VOB-Sub ============================
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
3196
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3197 current_module = "vobsub";
32724
732cd2afae10 Replace hacky vobsub loading with a new clean one.
cboesch
parents: 32705
diff changeset
3198 load_vob_subtitle(filename, spudec_ifo, &vo_spudec, add_vob_subtitle);
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3199 if (vo_vobsub) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3200 initialized_flags |= INITIALIZED_VOBSUB;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3201 vobsub_set_from_lang(vo_vobsub, dvdsub_lang);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3202 mp_property_do("sub_forced_only", M_PROPERTY_SET, &forced_subs_only, mpctx);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3203
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3204 // setup global sub numbering
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3205 mpctx->sub_counts[SUB_SOURCE_VOBSUB] = vobsub_get_indexes_count(vo_vobsub);
7621
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
3206 }
34494
fede902a408c Fix per-file ASS options like -ass-force-style.
reimar
parents: 34340
diff changeset
3207 #ifdef CONFIG_ASS
fede902a408c Fix per-file ASS options like -ass-force-style.
reimar
parents: 34340
diff changeset
3208 // must be before demuxer open, since the settings are
fede902a408c Fix per-file ASS options like -ass-force-style.
reimar
parents: 34340
diff changeset
3209 // used in generating the ASSTrack
fede902a408c Fix per-file ASS options like -ass-force-style.
reimar
parents: 34340
diff changeset
3210 if (ass_enabled && ass_library)
fede902a408c Fix per-file ASS options like -ass-force-style.
reimar
parents: 34340
diff changeset
3211 ass_mp_reset_config(ass_library);
fede902a408c Fix per-file ASS options like -ass-force-style.
reimar
parents: 34340
diff changeset
3212 #endif
4770
59f8fd64538b autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents: 4754
diff changeset
3213
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
3214 //============ Open & Sync STREAM --- fork cache2 ====================
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
3215
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3216 mpctx->stream = NULL;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3217 mpctx->demuxer = NULL;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3218 if (mpctx->d_audio) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3219 //free_demuxer_stream(mpctx->d_audio);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3220 mpctx->d_audio = NULL;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3221 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3222 if (mpctx->d_video) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3223 //free_demuxer_stream(d_video);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3224 mpctx->d_video = NULL;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3225 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3226 mpctx->sh_audio = NULL;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3227 mpctx->sh_video = NULL;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3228
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3229 current_module = "open_stream";
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3230 mpctx->stream = open_stream(filename, 0, &mpctx->file_format);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3231 if (!mpctx->stream) { // error...
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3232 mpctx->eof = libmpdemux_was_interrupted(PT_NEXT_ENTRY);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3233 goto goto_next_file;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3234 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3235 initialized_flags |= INITIALIZED_STREAM;
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
3236
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
3237 #ifdef CONFIG_GUI
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3238 if (use_gui)
33731
81f71d910333 Cosmetic: Change prefix for symbolic constants from GMP to GUI.
ib
parents: 33725
diff changeset
3239 gui(GUI_SET_STREAM, mpctx->stream);
8423
c6a1a5b6ba25 - fix three submenu bug
pontscho
parents: 8366
diff changeset
3240 #endif
c6a1a5b6ba25 - fix three submenu bug
pontscho
parents: 8366
diff changeset
3241
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3242 if (mpctx->file_format == DEMUXER_TYPE_PLAYLIST) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3243 play_tree_t *entry;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3244 // Handle playlist
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3245 current_module = "handle_playlist";
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3246 mp_msg(MSGT_CPLAYER, MSGL_V, "Parsing playlist %s...\n",
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3247 filename_recode(filename));
36146
5950fc0d4b53 Allow parsing arbitrary files as playlist only
reimar
parents: 36054
diff changeset
3248 if (allow_playlist_parsing) {
5950fc0d4b53 Allow parsing arbitrary files as playlist only
reimar
parents: 36054
diff changeset
3249 entry = parse_playtree(mpctx->stream, use_gui);
5950fc0d4b53 Allow parsing arbitrary files as playlist only
reimar
parents: 36054
diff changeset
3250 mpctx->eof = playtree_add_playlist(entry);
5950fc0d4b53 Allow parsing arbitrary files as playlist only
reimar
parents: 36054
diff changeset
3251 } else {
5950fc0d4b53 Allow parsing arbitrary files as playlist only
reimar
parents: 36054
diff changeset
3252 mp_msg(MSGT_CPLAYER, MSGL_ERR, "Playlist parsing disabled for security reasons. Ignoring file.\n");
5950fc0d4b53 Allow parsing arbitrary files as playlist only
reimar
parents: 36054
diff changeset
3253 }
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3254 goto goto_next_file;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3255 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3256 mpctx->stream->start_pos += seek_to_byte;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3257
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3258 if (stream_dump_type == 5) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3259 unsigned char buf[4096];
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3260 int len;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3261 FILE *f;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3262 current_module = "dumpstream";
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3263 stream_reset(mpctx->stream);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3264 stream_seek(mpctx->stream, mpctx->stream->start_pos);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3265 f = fopen(stream_dump_name, "wb");
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3266 if (!f) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3267 mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_CantOpenDumpfile);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3268 exit_player(EXIT_ERROR);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3269 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3270 if (dvd_chapter > 1) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3271 int chapter = dvd_chapter - 1;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3272 stream_control(mpctx->stream, STREAM_CTRL_SEEK_TO_CHAPTER, &chapter);
10225
785c945f6796 check for -dumpstream file writes, patch by Eric Lammerts <eric@lammerts.org>
alex
parents: 10223
diff changeset
3273 }
33390
f33d61bf5da0 stream dump: print progress information.
cigaes
parents: 33363
diff changeset
3274 stream_dump_progress_start();
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3275 while (!mpctx->stream->eof && !async_quit_request) {
36042
134919b73b04 Add limited -endpos support when dumping.
reimar
parents: 36005
diff changeset
3276 double pts;
134919b73b04 Add limited -endpos support when dumping.
reimar
parents: 36005
diff changeset
3277 if (stream_control(mpctx->stream, STREAM_CTRL_GET_CURRENT_TIME, &pts) != STREAM_OK)
134919b73b04 Add limited -endpos support when dumping.
reimar
parents: 36005
diff changeset
3278 pts = MP_NOPTS_VALUE;
134919b73b04 Add limited -endpos support when dumping.
reimar
parents: 36005
diff changeset
3279 if (is_at_end(mpctx, &end_at, pts))
134919b73b04 Add limited -endpos support when dumping.
reimar
parents: 36005
diff changeset
3280 break;
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3281 len = stream_read(mpctx->stream, buf, 4096);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3282 if (len > 0) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3283 if (fwrite(buf, len, 1, f) != 1) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3284 mp_msg(MSGT_MENCODER, MSGL_FATAL, MSGTR_ErrorWritingFile, stream_dump_name);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3285 exit_player(EXIT_ERROR);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3286 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3287 }
33390
f33d61bf5da0 stream dump: print progress information.
cigaes
parents: 33363
diff changeset
3288 stream_dump_progress(len, mpctx->stream);
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3289 if (dvd_last_chapter > 0) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3290 int chapter = -1;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3291 if (stream_control(mpctx->stream, STREAM_CTRL_GET_CURRENT_CHAPTER,
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3292 &chapter) == STREAM_OK && chapter + 1 > dvd_last_chapter)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3293 break;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3294 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3295 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3296 if (fclose(f)) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3297 mp_msg(MSGT_MENCODER, MSGL_FATAL, MSGTR_ErrorWritingFile, stream_dump_name);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3298 exit_player(EXIT_ERROR);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3299 }
33390
f33d61bf5da0 stream dump: print progress information.
cigaes
parents: 33363
diff changeset
3300 stream_dump_progress_end();
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3301 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_CoreDumped);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3302 exit_player_with_rc(EXIT_EOF, 0);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3303 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3304
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3305 if (mpctx->stream->type == STREAMTYPE_BD) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3306 if (audio_lang && audio_id == -1)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3307 audio_id = bd_aid_from_lang(mpctx->stream, audio_lang);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3308 if (dvdsub_lang && dvdsub_id == -1)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3309 dvdsub_id = bd_sid_from_lang(mpctx->stream, dvdsub_lang);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3310 }
31877
e30fe0cb79cd Add incomplete clipinf reading support to display audio
reimar
parents: 31839
diff changeset
3311
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
3312 #ifdef CONFIG_DVDREAD
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3313 if (mpctx->stream->type == STREAMTYPE_DVD) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3314 current_module = "dvd lang->id";
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3315 if (audio_lang && audio_id == -1)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3316 audio_id = dvd_aid_from_lang(mpctx->stream, audio_lang);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3317 if (dvdsub_lang && dvdsub_id == -1)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3318 dvdsub_id = dvd_sid_from_lang(mpctx->stream, dvdsub_lang);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3319 // setup global sub numbering
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3320 mpctx->sub_counts[SUB_SOURCE_DEMUX] = dvd_number_of_subs(mpctx->stream);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3321 current_module = NULL;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3322 }
4274
f5759bbdd7be -alang/-slang fixed
arpi
parents: 4260
diff changeset
3323 #endif
f5759bbdd7be -alang/-slang fixed
arpi
parents: 4260
diff changeset
3324
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
3325 #ifdef CONFIG_DVDNAV
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3326 if (mpctx->stream->type == STREAMTYPE_DVDNAV) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3327 current_module = "dvdnav lang->id";
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3328 if (audio_lang && audio_id == -1)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3329 audio_id = mp_dvdnav_aid_from_lang(mpctx->stream, audio_lang);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3330 dvdsub_lang_id = -3;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3331 if (dvdsub_lang && dvdsub_id == -1)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3332 dvdsub_lang_id = dvdsub_id = mp_dvdnav_sid_from_lang(mpctx->stream, dvdsub_lang);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3333 // setup global sub numbering
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3334 mpctx->sub_counts[SUB_SOURCE_DEMUX] = mp_dvdnav_number_of_subs(mpctx->stream);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3335 current_module = NULL;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3336 }
21203
235a8e71ed6f support for -slang and subtitles in dvdnav; patch by Attila Otvos (oattila chello hu) and me. No palette yet
nicodvb
parents: 21200
diff changeset
3337 #endif
235a8e71ed6f support for -slang and subtitles in dvdnav; patch by Attila Otvos (oattila chello hu) and me. No palette yet
nicodvb
parents: 21200
diff changeset
3338
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
3339 // CACHE2: initial prefill: 20% later: 5% (should be set by -cacheopts)
11352
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 11331
diff changeset
3340 goto_enable_cache:
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3341 if (stream_cache_size > 0) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3342 int res;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3343 current_module = "enable_cache";
34704
cc658103f214 Allow using a cache size of up to 4 TB.
reimar
parents: 34607
diff changeset
3344 res = stream_enable_cache(mpctx->stream, stream_cache_size * 1024ull,
cc658103f214 Allow using a cache size of up to 4 TB.
reimar
parents: 34607
diff changeset
3345 stream_cache_size * 1024ull * (stream_cache_min_percent / 100.0),
cc658103f214 Allow using a cache size of up to 4 TB.
reimar
parents: 34607
diff changeset
3346 stream_cache_size * 1024ull * (stream_cache_seek_min_percent / 100.0));
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3347 if (res == 0)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3348 if ((mpctx->eof = libmpdemux_was_interrupted(PT_NEXT_ENTRY)))
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3349 goto goto_next_file;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3350 }
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
3351
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
3352 //============ Open DEMUXERS --- DETECT file type =======================
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3353 current_module = "demux_open";
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3354
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3355 mpctx->demuxer = demux_open(mpctx->stream, mpctx->file_format, audio_id, video_id, dvdsub_id, filename);
8937
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3356
33491
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
3357 // HACK to get MOV Reference Files working
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3358 if (mpctx->demuxer && mpctx->demuxer->type == DEMUXER_TYPE_PLAYLIST) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3359 unsigned char *playlist_entry;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3360 play_tree_t *list = NULL, *entry = NULL;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3361
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3362 current_module = "handle_demux_playlist";
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3363 while (ds_get_packet(mpctx->demuxer->video, &playlist_entry) > 0) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3364 char *temp;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3365 const char *bname;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3366
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3367 mp_msg(MSGT_CPLAYER, MSGL_V, "Adding file %s to element entry.\n",
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3368 filename_recode(playlist_entry));
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3369
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3370 bname = mp_basename(playlist_entry);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3371 if ((strlen(bname) > 10) && !strncmp(bname, "qt", 2) && !strncmp(bname + 3, "gateQT", 6))
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3372 continue;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3373
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3374 if (!strcmp(playlist_entry, filename)) // ignoring self-reference
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3375 continue;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3376
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3377 entry = play_tree_new();
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3378
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3379 if (filename && !strcmp(mp_basename(playlist_entry), playlist_entry)) { // add reference path of current file
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3380 temp = malloc((strlen(filename) - strlen(mp_basename(filename)) + strlen(playlist_entry) + 1));
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3381 if (temp) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3382 strncpy(temp, filename, strlen(filename) - strlen(mp_basename(filename)));
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3383 temp[strlen(filename) - strlen(mp_basename(filename))] = '\0';
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3384 strcat(temp, playlist_entry);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3385 if (!strcmp(temp, filename)) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3386 free(temp);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3387 continue;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3388 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3389 play_tree_add_file(entry, temp);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3390 mp_msg(MSGT_CPLAYER, MSGL_V, "Resolving reference to %s.\n", temp);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3391 free(temp);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3392 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3393 } else
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3394 play_tree_add_file(entry, playlist_entry);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3395
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3396 if (!list)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3397 list = entry;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3398 else
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3399 play_tree_append_entry(list, entry);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3400 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3401 free_demuxer(mpctx->demuxer);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3402 mpctx->demuxer = NULL;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3403
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3404 if (list) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3405 entry = play_tree_new();
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3406 play_tree_set_child(entry, list);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3407 mpctx->eof = playtree_add_playlist(entry);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3408 goto goto_next_file;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3409 }
8937
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3410 }
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3411
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3412 if (!mpctx->demuxer)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3413 goto goto_next_file;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3414 if (dvd_chapter > 1) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3415 float pts;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3416 if (demuxer_seek_chapter(mpctx->demuxer, dvd_chapter - 1, 1, &pts, NULL, NULL) >= 0 && pts > -1.0)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3417 seek(mpctx, pts, SEEK_ABSOLUTE);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3418 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3419
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3420 initialized_flags |= INITIALIZED_DEMUXER;
7058
2e5c07262861 new v4l capture patch by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>:
arpi
parents: 7055
diff changeset
3421
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
3422 #ifdef CONFIG_ASS
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3423 if (ass_enabled && ass_library) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3424 for (i = 0; i < mpctx->demuxer->num_attachments; ++i) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3425 demux_attachment_t *att = mpctx->demuxer->attachments + i;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3426 if (extract_embedded_fonts &&
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3427 att->name && att->type && att->data && att->data_size &&
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3428 (strcmp(att->type, "application/x-truetype-font") == 0 ||
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3429 strcmp(att->type, "application/x-font") == 0))
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3430 ass_add_font(ass_library, att->name, att->data, att->data_size);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3431 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3432 }
25658
0d0c48ecba90 Instead of keeping attachments in mkv demuxer, use demuxer_add_attachment().
eugeni
parents: 25641
diff changeset
3433 #endif
0d0c48ecba90 Instead of keeping attachments in mkv demuxer, use demuxer_add_attachment().
eugeni
parents: 25641
diff changeset
3434
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3435 current_module = "demux_open2";
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3436
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3437 mpctx->d_audio = mpctx->demuxer->audio;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3438 mpctx->d_video = mpctx->demuxer->video;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3439 mpctx->d_sub = mpctx->demuxer->sub;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3440
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3441 if (ts_prog) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3442 int tmp = ts_prog;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3443 mp_property_do("switch_program", M_PROPERTY_SET, &tmp, mpctx);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3444 }
33491
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
3445 // select audio stream
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3446 select_audio(mpctx->demuxer, audio_id, audio_lang);
26090
c585e2ad8ebf Select audio stream in mplayer and mencoder, overriding demuxer decision.
eugeni
parents: 26087
diff changeset
3447
33491
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
3448 // DUMP STREAMS:
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3449 if ((stream_dump_type) && (stream_dump_type < 4)) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3450 FILE *f;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3451 demux_stream_t *ds = NULL;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3452 current_module = "dump";
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3453 // select stream to dump
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3454 switch (stream_dump_type) {
33491
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
3455 case 1: ds = mpctx->d_audio; break;
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
3456 case 2: ds = mpctx->d_video; break;
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
3457 case 3: ds = mpctx->d_sub; break;
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3458 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3459 if (!ds) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3460 mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_DumpSelectedStreamMissing);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3461 exit_player(EXIT_ERROR);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3462 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3463 // disable other streams:
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3464 if (mpctx->d_audio && mpctx->d_audio != ds) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3465 ds_free_packs(mpctx->d_audio);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3466 mpctx->d_audio->id = -2;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3467 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3468 if (mpctx->d_video && mpctx->d_video != ds) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3469 ds_free_packs(mpctx->d_video);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3470 mpctx->d_video->id = -2;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3471 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3472 if (mpctx->d_sub && mpctx->d_sub != ds) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3473 ds_free_packs(mpctx->d_sub);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3474 mpctx->d_sub->id = -2;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3475 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3476 // let's dump it!
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3477 f = fopen(stream_dump_name, "wb");
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3478 if (!f) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3479 mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_CantOpenDumpfile);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3480 exit_player(EXIT_ERROR);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3481 }
33390
f33d61bf5da0 stream dump: print progress information.
cigaes
parents: 33363
diff changeset
3482 stream_dump_progress_start();
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3483 while (!ds->eof) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3484 unsigned char *start;
36042
134919b73b04 Add limited -endpos support when dumping.
reimar
parents: 36005
diff changeset
3485 double pts;
134919b73b04 Add limited -endpos support when dumping.
reimar
parents: 36005
diff changeset
3486 int in_size = ds_get_packet_pts(ds, &start, &pts);
134919b73b04 Add limited -endpos support when dumping.
reimar
parents: 36005
diff changeset
3487 if (is_at_end(mpctx, &end_at, pts))
134919b73b04 Add limited -endpos support when dumping.
reimar
parents: 36005
diff changeset
3488 break;
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3489 if ((mpctx->demuxer->file_format == DEMUXER_TYPE_AVI || mpctx->demuxer->file_format == DEMUXER_TYPE_ASF || mpctx->demuxer->file_format == DEMUXER_TYPE_MOV)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3490 && stream_dump_type == 2)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3491 fwrite(&in_size, 1, 4, f);
33390
f33d61bf5da0 stream dump: print progress information.
cigaes
parents: 33363
diff changeset
3492 if (in_size > 0) {
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3493 fwrite(start, in_size, 1, f);
33390
f33d61bf5da0 stream dump: print progress information.
cigaes
parents: 33363
diff changeset
3494 stream_dump_progress(in_size, mpctx->stream);
f33d61bf5da0 stream dump: print progress information.
cigaes
parents: 33363
diff changeset
3495 }
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3496 if (dvd_last_chapter > 0) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3497 int cur_chapter = demuxer_get_current_chapter(mpctx->demuxer);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3498 if (cur_chapter != -1 && cur_chapter + 1 > dvd_last_chapter)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3499 break;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3500 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3501 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3502 fclose(f);
33390
f33d61bf5da0 stream dump: print progress information.
cigaes
parents: 33363
diff changeset
3503 stream_dump_progress_end();
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3504 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_CoreDumped);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3505 exit_player_with_rc(EXIT_EOF, 0);
27953
e5918aa8557f Reimplement -endchapter support again for -dump*, it was broken in r25987.
reimar
parents: 27838
diff changeset
3506 }
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3507
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3508 mpctx->sh_audio = mpctx->d_audio->sh;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3509 mpctx->sh_video = mpctx->d_video->sh;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3510
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3511 if (mpctx->sh_video) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3512 current_module = "video_read_properties";
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3513 if (!video_read_properties(mpctx->sh_video)) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3514 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_CannotReadVideoProperties);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3515 mpctx->sh_video = mpctx->d_video->sh = NULL;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3516 } else {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3517 mp_msg(MSGT_CPLAYER, MSGL_V, MSGTR_FilefmtFourccSizeFpsFtime,
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3518 mpctx->demuxer->file_format, mpctx->sh_video->format, mpctx->sh_video->disp_w, mpctx->sh_video->disp_h,
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3519 mpctx->sh_video->fps, mpctx->sh_video->frametime
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3520 );
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3521
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3522 /* need to set fps here for output encoders to pick it up in their init */
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3523 if (force_fps) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3524 mpctx->sh_video->fps = force_fps;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3525 mpctx->sh_video->frametime = 1.0f / mpctx->sh_video->fps;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3526 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3527 vo_fps = mpctx->sh_video->fps;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3528
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3529 if (!mpctx->sh_video->fps && !force_fps && !correct_pts) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3530 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_FPSnotspecified);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3531 correct_pts = 1;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3532 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3533 }
4598
badb76094897 setting vo_fps, required for vo_yuv4mpeg
arpi
parents: 4593
diff changeset
3534 }
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3535
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3536 if (!mpctx->sh_video && !mpctx->sh_audio) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3537 mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_NoStreamFound);
27370
14c5017f40d2 Change a bunch of video/audio-output-specific preprocessor directives from
diego
parents: 27359
diff changeset
3538 #ifdef CONFIG_DVBIN
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3539 if (mpctx->stream->type == STREAMTYPE_DVB) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3540 int dir;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3541 int v = mpctx->last_dvb_step;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3542 if (v > 0)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3543 dir = DVB_CHANNEL_HIGHER;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3544 else
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3545 dir = DVB_CHANNEL_LOWER;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3546
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3547 if (dvb_step_channel(mpctx->stream, dir))
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3548 mpctx->eof = mpctx->dvbin_reopen = 1;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3549 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
3550 #endif
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3551 goto goto_next_file; // exit_player(MSGTR_Exit_error);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3552 }
778
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
3553
33491
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
3554 /* display clip info */
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3555 demux_info_print(mpctx->demuxer);
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
3556
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
3557 //================== Read SUBTITLES (DVD & TEXT) ==========================
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3558 if (vo_spudec == NULL &&
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3559 (mpctx->stream->type == STREAMTYPE_DVD || mpctx->stream->type == STREAMTYPE_DVDNAV)) {
33577
c111d9e9cfb0 Move init_vo_spudec to mp_common.c and reuse it in mencoder.
reimar
parents: 33574
diff changeset
3560 init_vo_spudec(mpctx->stream, mpctx->sh_video, mpctx->d_sub ? mpctx->d_sub->sh : NULL);
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3561 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3562
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3563 if (1 || mpctx->sh_video) {
33491
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
3564 // after reading video params we should load subtitles because
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
3565 // we know fps so now we can adjust subtitle time to ~6 seconds AST
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
3566 // check .sub
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3567 double fps = mpctx->sh_video ? mpctx->sh_video->fps : 25;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3568 current_module = "read_subtitles_file";
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3569 load_subtitles(filename, fps, add_subtitles);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3570 if (mpctx->set_of_sub_size > 0)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3571 mpctx->sub_counts[SUB_SOURCE_SUBS] = mpctx->set_of_sub_size;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3572 // set even if we have no subs yet, they may be added later
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3573 initialized_flags |= INITIALIZED_SUBS;
17935
d72e7330c548 Subtitles properties: move sub_select, sub_pos, sub_visibilty,
albeu
parents: 17932
diff changeset
3574 }
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3575
33491
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
3576 if (select_subtitle(mpctx) && subdata) {
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
3577 switch (stream_dump_type) {
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
3578 case 3: list_sub_file(subdata); break;
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
3579 case 4: dump_mpsub(subdata, mpctx->sh_video->fps); break;
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
3580 case 6: dump_srt(subdata, mpctx->sh_video->fps); break;
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
3581 case 7: dump_microdvd(subdata, mpctx->sh_video->fps); break;
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
3582 case 8: dump_jacosub(subdata, mpctx->sh_video->fps); break;
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
3583 case 9: dump_sami(subdata, mpctx->sh_video->fps); break;
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
3584 }
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3585 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3586
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3587 print_file_properties(mpctx, filename);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3588
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3589 // Adjust EDL positions with start_pts
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3590 if (edl_start_pts && start_pts) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3591 edl_record_ptr edl = edl_records;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3592 while (edl) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3593 edl->start_sec += start_pts;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3594 edl->stop_sec += start_pts;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3595 edl = edl->next;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3596 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3597 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3598
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3599 if (mpctx->sh_video)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3600 reinit_video_chain();
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3601
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3602 if (mpctx->sh_video) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3603 if (vo_flags & 0x08 && vo_spudec)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3604 spudec_set_hw_spu(vo_spudec, mpctx->video_out);
6110
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
3605
27393
4876c89bafdd Rename font-related preprocessor directives.
diego
parents: 27391
diff changeset
3606 #ifdef CONFIG_FREETYPE
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3607 force_load_font = 1;
7122
0dc9cb756b68 freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents: 7111
diff changeset
3608 #endif
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3609 } else if (!mpctx->sh_audio)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3610 goto goto_next_file;
7122
0dc9cb756b68 freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents: 7111
diff changeset
3611
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3612 //================== MAIN: ==========================
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3613 current_module = "main";
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3614
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3615 if (playing_msg) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3616 char *msg = property_expand_string(mpctx, playing_msg);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3617 mp_msg(MSGT_CPLAYER, MSGL_INFO, "%s", msg);
17911
52f95509cd05 Add the new property API and implement a couple properties.
albeu
parents: 17910
diff changeset
3618 free(msg);
52f95509cd05 Add the new property API and implement a couple properties.
albeu
parents: 17910
diff changeset
3619 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
3620
33491
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
3621 // Disable the term OSD in verbose mode
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3622 if (verbose)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3623 term_osd = 0;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3624
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3625 {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3626 mpctx->num_buffered_frames = 0;
5929
9e7d54e7be58 - frame_time delayed one frame, as it's really duration of current frame,
arpi
parents: 5927
diff changeset
3627
33491
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
3628 // Make sure old OSD does not stay around,
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
3629 // e.g. with -fixed-vo and same-resolution files
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3630 clear_osd_msgs();
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3631 update_osd_msg();
6028
bd016664dc18 UMRs fixed - noticed by Nilmoni Deb <ndeb@ece.cmu.edu>
arpi
parents: 6016
diff changeset
3632
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3633 //================ SETUP AUDIO ==========================
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3634
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3635 if (mpctx->sh_audio) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3636 reinit_audio_chain();
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3637 if (mpctx->sh_audio && mpctx->sh_audio->codec)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3638 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AUDIO_CODEC=%s\n", mpctx->sh_audio->codec->name);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3639 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3640
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3641 current_module = "av_init";
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3642
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3643 if (mpctx->sh_video) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3644 mpctx->sh_video->timer = 0;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3645 if (!ignore_start)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3646 audio_delay += mpctx->sh_video->stream_delay;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3647 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3648 if (mpctx->sh_audio) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3649 if (start_volume >= 0)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3650 mixer_setvolume(&mpctx->mixer, start_volume, start_volume);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3651 if (!ignore_start)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3652 audio_delay -= mpctx->sh_audio->stream_delay;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3653 mpctx->delay = -audio_delay;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3654 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3655
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3656 if (!mpctx->sh_audio) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3657 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_NoSound);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3658 mp_msg(MSGT_CPLAYER, MSGL_V, "Freeing %d unused audio chunks.\n", mpctx->d_audio->packs);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3659 ds_free_packs(mpctx->d_audio); // free buffered chunks
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3660 //mpctx->d_audio->id=-2; // do not read audio chunks
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3661 //uninit_player(INITIALIZED_AO); // close device
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3662 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3663 if (!mpctx->sh_video) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3664 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_Video_NoVideo);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3665 mp_msg(MSGT_CPLAYER, MSGL_V, "Freeing %d unused video chunks.\n", mpctx->d_video->packs);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3666 ds_free_packs(mpctx->d_video);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3667 mpctx->d_video->id = -2;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3668 //if(!fixed_vo) uninit_player(INITIALIZED_VO);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3669 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3670
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3671 if (!mpctx->sh_video && !mpctx->sh_audio)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3672 goto goto_next_file;
6185
7e769ea2acc7 jump to next file (or exit) if can't decode audio && video
alex
parents: 6183
diff changeset
3673
33491
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
3674 //if(demuxer->file_format!=DEMUXER_TYPE_AVI) pts_from_bps=0; // it must be 0 for mpeg/asf!
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3675 if (force_fps && mpctx->sh_video) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3676 vo_fps = mpctx->sh_video->fps = force_fps;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3677 mpctx->sh_video->frametime = 1.0f / mpctx->sh_video->fps;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3678 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_FPSforced, mpctx->sh_video->fps, mpctx->sh_video->frametime);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3679 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3680
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
3681 #ifdef CONFIG_GUI
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3682 if (use_gui) {
33731
81f71d910333 Cosmetic: Change prefix for symbolic constants from GMP to GUI.
ib
parents: 33725
diff changeset
3683 if (!gui(GUI_SET_VIDEO, mpctx->sh_video))
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3684 goto goto_next_file;
33731
81f71d910333 Cosmetic: Change prefix for symbolic constants from GMP to GUI.
ib
parents: 33725
diff changeset
3685 gui(GUI_SET_AUDIO, mpctx->sh_audio);
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3686 }
19946
ef94dfe93fe8 Fix the sound mute switch in the GUI menu by moving the corresponding
diego
parents: 19945
diff changeset
3687 #endif
ef94dfe93fe8 Fix the sound mute switch in the GUI menu by moving the corresponding
diego
parents: 19945
diff changeset
3688
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3689 mp_input_set_section(NULL);
33491
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
3690 //TODO: add desired (stream-based) sections here
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3691 if (mpctx->stream->type == STREAMTYPE_TV)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3692 mp_input_set_section("tv");
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3693 if (mpctx->stream->type == STREAMTYPE_DVDNAV)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3694 mp_input_set_section("dvdnav");
23477
15710094cb15 implement "bind sections"
voroshil
parents: 23460
diff changeset
3695
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
3696 //==================== START PLAYING =======================
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
3697
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3698 if (mpctx->loop_times > 1)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3699 mpctx->loop_times--;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3700 else if (mpctx->loop_times == 1)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3701 mpctx->loop_times = -1;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3702
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3703 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_StartPlaying);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3704
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3705 total_time_usage_start = GetTimer();
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3706 audio_time_usage = 0;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3707 video_time_usage = 0;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3708 vout_time_usage = 0;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3709 total_frame_cnt = 0;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3710 drop_frame_cnt = 0; // fix for multifile fps benchmark
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3711 play_n_frames = play_n_frames_mf;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3712 mpctx->startup_decode_retry = DEFAULT_STARTUP_DECODE_RETRY;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3713
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3714 if (play_n_frames == 0) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3715 mpctx->eof = PT_NEXT_ENTRY;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3716 goto goto_next_file;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3717 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3718
35591
912ea01174c1 Allow -ss 0 to seek to pts 0 instead of disabling seeking.
reimar
parents: 35510
diff changeset
3719 if (seek_to_sec != MP_NOPTS_VALUE) {
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3720 seek(mpctx, seek_to_sec, SEEK_ABSOLUTE);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3721 end_at.pos += seek_to_sec;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3722 }
22338
434cd072b0d3 Seek to -ss position without first starting audio/video from the start.
uau
parents: 22313
diff changeset
3723
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
3724 #ifdef CONFIG_DVDNAV
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3725 mp_dvdnav_context_free(mpctx);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3726 if (mpctx->stream->type == STREAMTYPE_DVDNAV) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3727 mp_dvdnav_read_wait(mpctx->stream, 0, 1);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3728 mp_dvdnav_cell_has_changed(mpctx->stream, 1);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3729 }
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
3730 #endif
22338
434cd072b0d3 Seek to -ss position without first starting audio/video from the start.
uau
parents: 22313
diff changeset
3731
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3732 while (!mpctx->eof) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3733 float aq_sleep_time = 0;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3734
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3735 if (dvd_last_chapter > 0) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3736 int cur_chapter = demuxer_get_current_chapter(mpctx->demuxer);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3737 if (cur_chapter != -1 && cur_chapter + 1 > dvd_last_chapter)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3738 goto goto_next_file;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3739 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3740
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3741 if (!mpctx->sh_audio && mpctx->d_audio->sh) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3742 mpctx->sh_audio = mpctx->d_audio->sh;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3743 mpctx->sh_audio->ds = mpctx->d_audio;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3744 reinit_audio_chain();
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3745 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3746
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3747 /*========================== PLAY AUDIO ============================*/
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
3748
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3749 if (mpctx->sh_audio)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3750 if (!fill_audio_out_buffers())
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3751 // at eof, all audio at least written to ao
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3752 if (!mpctx->sh_video)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3753 mpctx->eof = PT_NEXT_ENTRY;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3754
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3755 if (!mpctx->sh_video) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3756 // handle audio-only case:
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3757 double a_pos = 0;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3758 // sh_audio can be NULL due to video stream switching
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3759 // TODO: handle this better
33493
fd4a27bd4ed4 a_pos is also used by update_subtitles, so initialize it always.
reimar
parents: 33491
diff changeset
3760 if (mpctx->sh_audio)
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3761 a_pos = playing_audio_pts(mpctx->sh_audio, mpctx->d_audio, mpctx->audio_out);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3762
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3763 if (!quiet)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3764 print_status(a_pos, 0, 0);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3765
33495
52a393df8df8 Put code checking if at the EOS in a function.
cboesch
parents: 33493
diff changeset
3766 if (is_at_end(mpctx, &end_at, a_pos))
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3767 mpctx->eof = PT_NEXT_ENTRY;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3768 update_subtitles(NULL, a_pos, mpctx->d_sub, 0);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3769 update_osd_msg();
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3770 } else {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3771 int frame_time_remaining = 0;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3772 int blit_frame = 1;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3773 // skip timing after seek
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3774 int skip_timing = mpctx->startup_decode_retry > 0;
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
3775
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3776 /*========================== PLAY VIDEO ============================*/
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3777
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3778 vo_pts = mpctx->sh_video->timer * 90000.0;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3779 vo_fps = mpctx->sh_video->fps;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3780
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3781 if (!mpctx->num_buffered_frames) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3782 double frame_time = update_video(&blit_frame);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3783 while (!blit_frame && mpctx->startup_decode_retry > 0) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3784 double delay = mpctx->delay;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3785 // these initial decode failures are probably due to codec delay,
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3786 // ignore them and also their probably nonsense durations
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3787 update_video(&blit_frame);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3788 mpctx->delay = delay;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3789 mpctx->startup_decode_retry--;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3790 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3791 mpctx->startup_decode_retry = 0;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3792 mp_dbg(MSGT_AVSYNC, MSGL_DBG2, "*** ftime=%5.3f ***\n", frame_time);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3793 if (mpctx->sh_video->vf_initialized < 0) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3794 mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_NotInitializeVOPorVO);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3795 mpctx->eof = 1;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3796 goto goto_next_file;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3797 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3798 if (frame_time < 0) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3799 // if we have no more video, sleep some arbitrary time
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3800 frame_time = 1.0 / 20.0;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3801 // only stop playing when audio is at end as well
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3802 if (!mpctx->sh_audio || mpctx->d_audio->eof)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3803 mpctx->eof = 1;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3804 } else {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3805 // might return with !eof && !blit_frame if !correct_pts
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3806 mpctx->num_buffered_frames += blit_frame;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3807 mpctx->time_frame += frame_time / playback_speed; // for nosound
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3808 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3809 }
5929
9e7d54e7be58 - frame_time delayed one frame, as it's really duration of current frame,
arpi
parents: 5927
diff changeset
3810
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
3811 // ==========================================================================
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
3812
5643
3d9de27d9bd0 OSD handled by vf control()
arpi
parents: 5640
diff changeset
3813 // current_module="draw_osd";
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3814 // if(vo_config_count) mpctx->video_out->draw_osd();
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3815
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3816 current_module = "vo_check_events";
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3817 if (vo_config_count)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3818 mpctx->video_out->check_events();
20894
8753befb60ad move vo event check together with gui event check
uau
parents: 20892
diff changeset
3819
27377
d58d06eafe83 Change a bunch of X11-specific preprocessor directives.
diego
parents: 27370
diff changeset
3820 #ifdef CONFIG_X11
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3821 if (stop_xscreensaver) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3822 current_module = "stop_xscreensaver";
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3823 xscreensaver_heartbeat();
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3824 }
20900
b0f2e9a16bb1 Move xscreensaver_heartbeat call next to vo check_events
uau
parents: 20899
diff changeset
3825 #endif
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3826 if (heartbeat_cmd) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3827 static unsigned last_heartbeat;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3828 unsigned now = GetTimerMS();
36005
3be3990375da Add -heartbeat-interval option.
reimar
parents: 35903
diff changeset
3829 // compare as unsigned so that any mistakes (overflow etc)
3be3990375da Add -heartbeat-interval option.
reimar
parents: 35903
diff changeset
3830 // trigger a heartbeat, thus resetting the logic.
3be3990375da Add -heartbeat-interval option.
reimar
parents: 35903
diff changeset
3831 if (now - last_heartbeat > (unsigned)(heartbeat_interval * 1000)) {
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3832 last_heartbeat = now;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3833 system(heartbeat_cmd);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3834 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3835 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3836
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3837 if (!skip_timing)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3838 frame_time_remaining = sleep_until_update(&mpctx->time_frame, &aq_sleep_time);
5929
9e7d54e7be58 - frame_time delayed one frame, as it's really duration of current frame,
arpi
parents: 5927
diff changeset
3839
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
3840 //====================== FLIP PAGE (VIDEO BLT): =========================
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
3841
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3842 if (!edl_needs_reset) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3843 current_module = "flip_page";
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3844 if (!frame_time_remaining && blit_frame) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3845 unsigned int t2 = GetTimer();
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3846
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3847 if (vo_config_count)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3848 mpctx->video_out->flip_page();
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3849 mpctx->num_buffered_frames--;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3850
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3851 vout_time_usage += (GetTimer() - t2) * 0.000001;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3852 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3853 }
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
3854 //====================== A-V TIMESTAMP CORRECTION: =========================
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
3855
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3856 adjust_sync_and_print_status(frame_time_remaining, mpctx->time_frame);
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
3857
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
3858 //============================ Auto QUALITY ============================
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3859
33491
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
3860 /*Output quality adjustments:*/
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3861 if (auto_quality > 0) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3862 current_module = "autoq";
33491
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
3863 //float total=0.000001f * (GetTimer()-aq_total_time);
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
3864 //if(output_quality<auto_quality && aq_sleep_time>0.05f*total)
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3865 if (output_quality < auto_quality && aq_sleep_time > 0)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3866 ++output_quality;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3867 else
33491
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
3868 //if(output_quality>0 && aq_sleep_time<-0.05f*total)
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3869 if (output_quality > 1 && aq_sleep_time < 0)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3870 --output_quality;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3871 else if (output_quality > 0 && aq_sleep_time < -0.050f) // 50ms
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3872 output_quality = 0;
33491
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
3873 //printf("total: %8.6f sleep: %8.6f q: %d\n",(0.000001f*aq_total_time),aq_sleep_time,output_quality);
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3874 set_video_quality(mpctx->sh_video, output_quality);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3875 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3876
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3877 if (play_n_frames >= 0 && !frame_time_remaining && blit_frame) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3878 --play_n_frames;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3879 if (play_n_frames <= 0)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3880 mpctx->eof = PT_NEXT_ENTRY;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3881 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3882
33495
52a393df8df8 Put code checking if at the EOS in a function.
cboesch
parents: 33493
diff changeset
3883 if (!frame_time_remaining && is_at_end(mpctx, &end_at,
52a393df8df8 Put code checking if at the EOS in a function.
cboesch
parents: 33493
diff changeset
3884 mpctx->sh_video->pts))
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3885 mpctx->eof = PT_NEXT_ENTRY;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3886 } // end if(mpctx->sh_video)
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
3887
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
3888 #ifdef CONFIG_DVDNAV
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3889 if (mpctx->stream->type == STREAMTYPE_DVDNAV) {
34886
73842c97cac0 Another attempt at clearing DVDNAV highlights, this
reimar
parents: 34815
diff changeset
3890 // do not clobber subtitles
73842c97cac0 Another attempt at clearing DVDNAV highlights, this
reimar
parents: 34815
diff changeset
3891 if (!mp_dvdnav_number_of_subs(mpctx->stream)) {
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3892 nav_highlight_t hl;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3893 mp_dvdnav_get_highlight(mpctx->stream, &hl);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3894 if (!vo_spudec || !spudec_apply_palette_crop(vo_spudec, hl.palette, hl.sx, hl.sy, hl.ex, hl.ey)) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3895 osd_set_nav_box(hl.sx, hl.sy, hl.ex, hl.ey);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3896 vo_osd_changed(OSDTYPE_DVDNAV);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3897 } else {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3898 osd_set_nav_box(0, 0, 0, 0);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3899 vo_osd_changed(OSDTYPE_DVDNAV);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3900 vo_osd_changed(OSDTYPE_SPU);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3901 }
34886
73842c97cac0 Another attempt at clearing DVDNAV highlights, this
reimar
parents: 34815
diff changeset
3902 }
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3903
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3904 if (mp_dvdnav_stream_has_changed(mpctx->stream)) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3905 double ar = -1.0;
34886
73842c97cac0 Another attempt at clearing DVDNAV highlights, this
reimar
parents: 34815
diff changeset
3906 // clear highlight
73842c97cac0 Another attempt at clearing DVDNAV highlights, this
reimar
parents: 34815
diff changeset
3907 if (vo_spudec)
73842c97cac0 Another attempt at clearing DVDNAV highlights, this
reimar
parents: 34815
diff changeset
3908 spudec_apply_palette_crop(vo_spudec, 0, 0, 0, 0, 0);
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3909 if (mpctx->sh_video &&
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3910 stream_control(mpctx->demuxer->stream,
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3911 STREAM_CTRL_GET_ASPECT_RATIO, &ar)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3912 != STREAM_UNSUPPORTED)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3913 mpctx->sh_video->stream_aspect = ar;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3914 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3915 }
21193
a067e7e18b50 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents: 21161
diff changeset
3916 #endif
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
3917
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
3918 //============================ Handle PAUSE ===============================
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
3919
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3920 current_module = "pause";
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3921
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3922 if (mpctx->osd_function == OSD_PAUSE) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3923 mpctx->was_paused = 1;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3924 pause_loop();
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3925 }
371
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
3926
33491
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
3927 // handle -sstep
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3928 if (step_sec > 0) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3929 mpctx->osd_function = OSD_FFW;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3930 rel_seek_secs += step_sec;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3931 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3932
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3933 edl_update(mpctx);
8531
1aa2c9b460af Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents: 8494
diff changeset
3934
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3935 //================= Keyboard events, SEEKing ====================
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3936
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3937 current_module = "key_events";
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3938
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3939 {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3940 mp_cmd_t *cmd;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3941 int brk_cmd = 0;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3942 while (!brk_cmd && (cmd = mp_input_get_cmd(0, 0, 0)) != NULL) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3943 brk_cmd = run_command(mpctx, cmd);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3944 if (cmd->id == MP_CMD_EDL_LOADFILE) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3945 free(edl_filename);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3946 edl_filename = strdup(cmd->args[0].v.s);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3947 if (edl_filename)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3948 edl_loadfile();
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3949 else
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3950 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_EdlOutOfMemFile,
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3951 cmd->args[0].v.s);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3952 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3953 mp_cmd_free(cmd);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3954 if (brk_cmd == 2)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3955 goto goto_enable_cache;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3956 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3957 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3958 mpctx->was_paused = 0;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3959
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3960 /* Looping. */
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3961 if (mpctx->eof == 1 && mpctx->loop_times >= 0) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3962 mp_msg(MSGT_CPLAYER, MSGL_V, "loop_times = %d, eof = %d\n", mpctx->loop_times, mpctx->eof);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3963
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3964 if (mpctx->loop_times > 1)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3965 mpctx->loop_times--;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3966 else if (mpctx->loop_times == 1)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3967 mpctx->loop_times = -1;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3968 play_n_frames = play_n_frames_mf;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3969 mpctx->eof = 0;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3970 abs_seek_pos = SEEK_ABSOLUTE;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3971 rel_seek_secs = seek_to_sec;
35592
355bbee58b99 Attempt to fix -loop (when written after the file name) for
reimar
parents: 35591
diff changeset
3972 if (seek_to_sec == MP_NOPTS_VALUE) {
355bbee58b99 Attempt to fix -loop (when written after the file name) for
reimar
parents: 35591
diff changeset
3973 // the first pts is not necessarily 0
355bbee58b99 Attempt to fix -loop (when written after the file name) for
reimar
parents: 35591
diff changeset
3974 abs_seek_pos = SEEK_ABSOLUTE | SEEK_FACTOR;
355bbee58b99 Attempt to fix -loop (when written after the file name) for
reimar
parents: 35591
diff changeset
3975 rel_seek_secs = 0;
355bbee58b99 Attempt to fix -loop (when written after the file name) for
reimar
parents: 35591
diff changeset
3976 }
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3977 loop_seek = 1;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3978 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3979
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3980 if (rel_seek_secs || abs_seek_pos) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3981 if (seek(mpctx, rel_seek_secs, abs_seek_pos) >= 0) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3982 // Set OSD:
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3983 if (!loop_seek) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3984 if (!edl_decision)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3985 set_osd_bar(0, "Position", 0, 100, demuxer_get_percent_pos(mpctx->demuxer));
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3986 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3987 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3988
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3989 rel_seek_secs = 0;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3990 abs_seek_pos = 0;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3991 loop_seek = 0;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3992 edl_decision = 0;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3993 }
1466
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1462
diff changeset
3994
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
3995 #ifdef CONFIG_GUI
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3996 if (use_gui) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3997 if (mpctx->demuxer->file_format == DEMUXER_TYPE_AVI && mpctx->sh_video && mpctx->sh_video->video.dwLength > 2) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
3998 // get pos from frame number / total frames
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33552
diff changeset
3999 guiInfo.Position = (float)mpctx->d_video->pack_no * 100.0f / mpctx->sh_video->video.dwLength;
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4000 } else {
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33552
diff changeset
4001 guiInfo.Position = demuxer_get_percent_pos(mpctx->demuxer);
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4002 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4003 if (mpctx->sh_video)
33897
e0d211c62cf7 Cosmetic: Rename some guiInfo members.
ib
parents: 33891
diff changeset
4004 guiInfo.ElapsedTime = mpctx->sh_video->pts;
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4005 else if (mpctx->sh_audio)
33897
e0d211c62cf7 Cosmetic: Rename some guiInfo members.
ib
parents: 33891
diff changeset
4006 guiInfo.ElapsedTime = playing_audio_pts(mpctx->sh_audio, mpctx->d_audio, mpctx->audio_out);
e0d211c62cf7 Cosmetic: Rename some guiInfo members.
ib
parents: 33891
diff changeset
4007 guiInfo.RunningTime = demuxer_get_time_length(mpctx->demuxer);
33731
81f71d910333 Cosmetic: Change prefix for symbolic constants from GMP to GUI.
ib
parents: 33725
diff changeset
4008 gui(GUI_SET_MIXER, 0);
81f71d910333 Cosmetic: Change prefix for symbolic constants from GMP to GUI.
ib
parents: 33725
diff changeset
4009 gui(GUI_REDRAW, 0);
33615
1f9a31d4f114 Replace all playback integer constants by their symbolic constants.
ib
parents: 33614
diff changeset
4010 if (guiInfo.Playing == GUI_STOP)
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4011 break; // STOP
33615
1f9a31d4f114 Replace all playback integer constants by their symbolic constants.
ib
parents: 33614
diff changeset
4012 if (guiInfo.Playing == GUI_PAUSE)
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4013 mpctx->osd_function = OSD_PAUSE;
33890
c51e44dd38e2 Remove needless guiInfo member DiskChanged.
ib
parents: 33889
diff changeset
4014 if (guiInfo.NewPlay)
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4015 goto goto_next_file;
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
4016 #ifdef CONFIG_DVDREAD
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4017 if (mpctx->stream->type == STREAMTYPE_DVD) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4018 dvd_priv_t *dvdp = mpctx->stream->priv;
33876
4789b8eed97e Get rid of a bunch of needless or redundant guiInfo members.
ib
parents: 33875
diff changeset
4019 guiInfo.Chapter = dvd_chapter_from_cell(dvdp, guiInfo.Track - 1, dvdp->cur_cell) + 1;
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4020 }
3054
9507f90d8254 add half dvd support for gui
pontscho
parents: 3050
diff changeset
4021 #endif
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4022 }
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
4023 #endif /* CONFIG_GUI */
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4024 } // while(!mpctx->eof)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4025
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4026 mp_msg(MSGT_GLOBAL, MSGL_V, "EOF code: %d \n", mpctx->eof);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
4027
27370
14c5017f40d2 Change a bunch of video/audio-output-specific preprocessor directives from
diego
parents: 27359
diff changeset
4028 #ifdef CONFIG_DVBIN
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4029 if (mpctx->dvbin_reopen) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4030 mpctx->eof = 0;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4031 uninit_player(INITIALIZED_ALL - (INITIALIZED_GUI | INITIALIZED_STREAM | INITIALIZED_INPUT | INITIALIZED_GETCH2 | (fixed_vo ? INITIALIZED_VO : 0)));
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4032 cache_uninit(mpctx->stream);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4033 mpctx->dvbin_reopen = 0;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4034 goto goto_enable_cache;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4035 }
18286
e0470e00b3bd simplified management of dvb channel switching
nicodvb
parents: 18261
diff changeset
4036 #endif
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4037 }
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
4038
3618
772729dd7b40 better dvd support
pontscho
parents: 3597
diff changeset
4039 goto_next_file: // don't jump here after ao/vo/getch initialization!
1641
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
4040
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4041 mp_msg(MSGT_CPLAYER, MSGL_INFO, "\n");
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4042
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4043 if (benchmark) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4044 double tot = video_time_usage + vout_time_usage + audio_time_usage;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4045 double total_time_usage;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4046 total_time_usage_start = GetTimer() - total_time_usage_start;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4047 total_time_usage = (float)total_time_usage_start * 0.000001;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4048 mp_msg(MSGT_CPLAYER, MSGL_INFO, "\nBENCHMARKs: VC:%8.3fs VO:%8.3fs A:%8.3fs Sys:%8.3fs = %8.3fs\n",
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4049 video_time_usage, vout_time_usage, audio_time_usage,
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4050 total_time_usage - tot, total_time_usage);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4051 if (total_time_usage > 0.0)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4052 mp_msg(MSGT_CPLAYER, MSGL_INFO, "BENCHMARK%%: VC:%8.4f%% VO:%8.4f%% A:%8.4f%% Sys:%8.4f%% = %8.4f%%\n",
33491
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
4053 100.0 * video_time_usage / total_time_usage,
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
4054 100.0 * vout_time_usage / total_time_usage,
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
4055 100.0 * audio_time_usage / total_time_usage,
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4056 100.0 * (total_time_usage - tot) / total_time_usage,
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4057 100.0);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4058 if (total_frame_cnt && frame_dropping)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4059 mp_msg(MSGT_CPLAYER, MSGL_INFO, "BENCHMARKn: disp: %d (%3.2f fps) drop: %d (%d%%) total: %d (%3.2f fps)\n",
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4060 total_frame_cnt - drop_frame_cnt,
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4061 (total_time_usage > 0.5) ? ((total_frame_cnt - drop_frame_cnt) / total_time_usage) : 0,
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4062 drop_frame_cnt,
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4063 100 * drop_frame_cnt / total_frame_cnt,
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4064 total_frame_cnt,
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4065 (total_time_usage > 0.5) ? (total_frame_cnt / total_time_usage) : 0);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4066 }
4221
401149ba73fd Fixed bug with benchmark option
albeu
parents: 4203
diff changeset
4067
33491
52545582f44d Various alignment cosmetics and brackets simplifications.
cboesch
parents: 33490
diff changeset
4068 // time to uninit all, except global stuff:
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4069 uninit_player(INITIALIZED_ALL - (INITIALIZED_GUI + INITIALIZED_INPUT + (fixed_vo ? INITIALIZED_VO : 0)));
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4070
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4071 if (mpctx->eof == PT_NEXT_ENTRY || mpctx->eof == PT_PREV_ENTRY) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4072 mpctx->eof = mpctx->eof == PT_NEXT_ENTRY ? 1 : -1;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4073 if (play_tree_iter_step(mpctx->playtree_iter, mpctx->play_tree_step, 0) == PLAY_TREE_ITER_ENTRY) {
26159
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4074 mpctx->eof = 1;
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4075 } else {
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4076 play_tree_iter_free(mpctx->playtree_iter);
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4077 mpctx->playtree_iter = NULL;
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4078 }
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4079 mpctx->play_tree_step = 1;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4080 } else if (mpctx->eof == PT_UP_NEXT || mpctx->eof == PT_UP_PREV) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4081 mpctx->eof = mpctx->eof == PT_UP_NEXT ? 1 : -1;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4082 if (mpctx->playtree_iter) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4083 if (play_tree_iter_up_step(mpctx->playtree_iter, mpctx->eof, 0) == PLAY_TREE_ITER_ENTRY) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4084 mpctx->eof = 1;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4085 } else {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4086 play_tree_iter_free(mpctx->playtree_iter);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4087 mpctx->playtree_iter = NULL;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4088 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4089 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4090 } else if (mpctx->eof == PT_STOP) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4091 play_tree_iter_free(mpctx->playtree_iter);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4092 mpctx->playtree_iter = NULL;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4093 } else { // NEXT PREV SRC
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4094 mpctx->eof = mpctx->eof == PT_PREV_SRC ? -1 : 1;
26159
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4095 }
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4096
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4097 if (mpctx->eof == 0)
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4098 mpctx->eof = 1;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4099
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4100 while (mpctx->playtree_iter != NULL) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4101 filename = play_tree_iter_get_file(mpctx->playtree_iter, mpctx->eof);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4102 if (filename == NULL) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4103 if (play_tree_iter_step(mpctx->playtree_iter, mpctx->eof, 0) != PLAY_TREE_ITER_ENTRY) {
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4104 play_tree_iter_free(mpctx->playtree_iter);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4105 mpctx->playtree_iter = NULL;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4106 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4107 } else
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4108 break;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4109 }
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
4110
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
4111 #ifdef CONFIG_GUI
33891
efab1fd86316 Cosmetic: Adjust indent and remove braces.
ib
parents: 33890
diff changeset
4112 if (use_gui)
33890
c51e44dd38e2 Remove needless guiInfo member DiskChanged.
ib
parents: 33889
diff changeset
4113 if (guiInfo.NewPlay != GUI_FILE_SAME)
33891
efab1fd86316 Cosmetic: Adjust indent and remove braces.
ib
parents: 33890
diff changeset
4114 gui(GUI_END_FILE, 0);
5910
20c335d98ab3 fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents: 5908
diff changeset
4115 #endif
20c335d98ab3 fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents: 5908
diff changeset
4116
33481
de7945cbcfa0 Fix compilation without gui.
cehoyos
parents: 33476
diff changeset
4117 if (
de7945cbcfa0 Fix compilation without gui.
cehoyos
parents: 33476
diff changeset
4118 #ifdef CONFIG_GUI
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33552
diff changeset
4119 (use_gui && guiInfo.Playing) ||
33481
de7945cbcfa0 Fix compilation without gui.
cehoyos
parents: 33476
diff changeset
4120 #endif
33630
442726a401f1 Cosmetic: Adjust indent.
ib
parents: 33615
diff changeset
4121 mpctx->playtree_iter != NULL || player_idle_mode) {
34113
b3e209516ae0 Allow GUI to use filename related config.
ib
parents: 34076
diff changeset
4122 if (!mpctx->playtree_iter && !use_gui)
33363
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4123 filename = NULL;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4124 mpctx->eof = 0;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4125 goto play_next_file;
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4126 }
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4127
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4128 exit_player_with_rc(EXIT_EOF, 0);
02021152bad3 Prettify main MPlayer source file.
cboesch
parents: 33307
diff changeset
4129 return 1;
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
4130 }
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
4131
26963
8825552ee585 Fix the linking of TOOLS/netstream and TOOLS/vivodump.
diego
parents: 26877
diff changeset
4132 #endif /* DISABLE_MAIN */