annotate mplayer.c @ 32389:4fb3f810de30

Write the code in a more understandable way instead of trying to explain the mess with a comment. Also fix a potential memleak (though MPlayer will exit right after anyway).
author reimar
date Sat, 09 Oct 2010 15:55:09 +0000
parents f6e78eef2e1b
children d1f6c6cf8905
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
18261
5bf6b74e793c Doxygen attack! - Chapter 2
albeu
parents: 18243
diff changeset
19 /// \file
5bf6b74e793c Doxygen attack! - Chapter 2
albeu
parents: 18243
diff changeset
20 /// \ingroup Properties Command2Property OSDMsgStack
5bf6b74e793c Doxygen attack! - Chapter 2
albeu
parents: 18243
diff changeset
21
31515
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
22 #include "config.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
23
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
24 #include <errno.h>
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
25 #include <fcntl.h>
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
26 #include <limits.h>
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
27 #include <signal.h>
1430
1728d249c783 missing unistd.h (requires for off_t under freebsd)
arpi
parents: 1429
diff changeset
28 #include <stdio.h>
1728d249c783 missing unistd.h (requires for off_t under freebsd)
arpi
parents: 1429
diff changeset
29 #include <stdlib.h>
31515
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
30 #include <string.h>
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
31 #include <time.h>
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
32 #include <unistd.h>
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
33 #include <sys/stat.h>
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
34 #include <sys/time.h>
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
35 #include <sys/types.h>
12360
85f18227756f 10l on cygwin WIN32 gets defined in config.h
faust3
parents: 12358
diff changeset
36
27727
48c1ae64255b Replace preprocessor check for WIN32 with checks for __MINGW32__ and __CYGWIN__.
diego
parents: 27635
diff changeset
37 #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
38 #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
39 #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
40 #endif
31515
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
41
9831
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
42 #ifndef __MINGW32__
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
43 #include <sys/ioctl.h>
1428
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1422
diff changeset
44 #include <sys/wait.h>
9831
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
45 #else
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
46 #define SIGHUP 1 /* hangup */
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
47 #define SIGQUIT 3 /* quit */
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
48 #define SIGKILL 9 /* kill (cannot be caught or ignored) */
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
49 #define SIGBUS 10 /* bus error */
16049
0ccf19820216 define SIGHUP and SIGPIPE for MinGW and catch SIGPIPE also in mplayer
reimar
parents: 16036
diff changeset
50 #define SIGPIPE 13 /* broken pipe */
9831
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
51 #endif
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
52
3015
8bf21c807656 RTC is autodetected
arpi
parents: 2941
diff changeset
53 #ifdef HAVE_RTC
14381
dc7b86065e3c RTC support on FreeBSD, inspired by a patch from Michael Johnson
diego
parents: 14296
diff changeset
54 #ifdef __linux__
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
55 #include <linux/rtc.h>
14381
dc7b86065e3c RTC support on FreeBSD, inspired by a patch from Michael Johnson
diego
parents: 14296
diff changeset
56 #else
dc7b86065e3c RTC support on FreeBSD, inspired by a patch from Michael Johnson
diego
parents: 14296
diff changeset
57 #include <rtc.h>
dc7b86065e3c RTC support on FreeBSD, inspired by a patch from Michael Johnson
diego
parents: 14296
diff changeset
58 #define RTC_IRQP_SET RTCIO_IRQP_SET
dc7b86065e3c RTC support on FreeBSD, inspired by a patch from Michael Johnson
diego
parents: 14296
diff changeset
59 #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
60 #endif /* __linux__ */
f17b3c152fd6 Add comments to a few #endif statements in order to make clear which
diego
parents: 16489
diff changeset
61 #endif /* HAVE_RTC */
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
62
31515
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
63 /*
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
64 * 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
65 * 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
66 * 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
67 */
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
68 #if defined(__APPLE__) && defined(CONFIG_SDL)
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
69 #ifdef CONFIG_SDL_SDL_H
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
70 #include <SDL/SDL.h>
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
71 #else
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
72 #include <SDL.h>
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 #endif
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
75
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
76 #include "gui/interface.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
77 #include "input/input.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
78 #include "libao2/audio_out.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
79 #include "libavutil/avstring.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
80 #include "libavutil/intreadwrite.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
81 #include "libmenu/menu.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
82 #include "libmpcodecs/dec_audio.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
83 #include "libmpcodecs/dec_video.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
84 #include "libmpcodecs/mp_image.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
85 #include "libmpcodecs/vd.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
86 #include "libmpcodecs/vf.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
87 #include "libmpdemux/demuxer.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
88 #include "libmpdemux/stheader.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
89 #include "libvo/font_load.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
90 #include "libvo/sub.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
91 #include "libvo/video_out.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
92 #include "stream/cache2.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
93 #include "stream/stream.h"
31877
e30fe0cb79cd Add incomplete clipinf reading support to display audio
reimar
parents: 31839
diff changeset
94 #include "stream/stream_bd.h"
31515
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
95 #include "stream/stream_dvdnav.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
96 #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
97 #include "stream/tv.h"
31515
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
98 #include "access_mpcontext.h"
32209
ef21cbba62ee Move libass/ass_mp.[ch] ---> ass_mp.[ch].
diego
parents: 32047
diff changeset
99 #include "ass_mp.h"
31515
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
100 #include "cfg-mplayer-def.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
101 #include "codec-cfg.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
102 #include "command.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
103 #include "edl.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
104 #include "help_mp.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
105 #include "m_config.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
106 #include "m_option.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
107 #include "m_property.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
108 #include "m_struct.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
109 #include "metadata.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
110 #include "mixer.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
111 #include "mp_core.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
112 #include "mp_fifo.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
113 #include "mp_msg.h"
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"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
123 #include "spudec.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
124 #include "subreader.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
125 #include "vobsub.h"
31927
6e0b5a97e00f EOSD/ASS code factorization
cigaes
parents: 31923
diff changeset
126 #include "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
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
142
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
143 int slave_mode=0;
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
144 int player_idle_mode=0;
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
145 int quiet=0;
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
146 int enable_mouse_movements=0;
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
147 float start_volume = -1;
31957
49848f9a8f30 Add -edl-start-pts option to Adjust positions in EDL records according
reynaldo
parents: 31956
diff changeset
148 double start_pts = MP_NOPTS_VALUE;
31515
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
149 char *heartbeat_cmd;
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
150
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
151 #define ROUND(x) ((int)((x)<0 ? (x)-0.5 : (x)+0.5))
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
152
19808
5385740067a1 * remove extern definitions of functions in .c files
attila
parents: 19774
diff changeset
153
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
154 m_config_t* mconfig;
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
155
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
156 //**************************************************************************//
258
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
157 // Config file
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
158 //**************************************************************************//
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
159
10594
57bdcdb061d7 Removed the historic cfgparser and switched full to the new config parser (altought some macros still remain for compatibility). As a side effect 90% of the warning messages are gone from the core. Things should be cleaner now and less confusing for newbies.
alex
parents: 10580
diff changeset
160 static int cfg_inc_verbose(m_option_t *conf){ ++verbose; return 0;}
57bdcdb061d7 Removed the historic cfgparser and switched full to the new config parser (altought some macros still remain for compatibility). As a side effect 90% of the warning messages are gone from the core. Things should be cleaner now and less confusing for newbies.
alex
parents: 10580
diff changeset
161
57bdcdb061d7 Removed the historic cfgparser and switched full to the new config parser (altought some macros still remain for compatibility). As a side effect 90% of the warning messages are gone from the core. Things should be cleaner now and less confusing for newbies.
alex
parents: 10580
diff changeset
162 static int cfg_include(m_option_t *conf, char *filename){
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
163 return m_config_parse_config_file(mconfig, filename);
162
effc62af528c new option: -include
szabii
parents: 154
diff changeset
164 }
effc62af528c new option: -include
szabii
parents: 154
diff changeset
165
1289
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
166 static int max_framesize=0;
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
167
12816
fba780800efe -use-stdin renamed to -noconsolecontrols.
diego
parents: 12753
diff changeset
168 int noconsolecontrols=0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
169 //**************************************************************************//
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
170
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
171 // 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
172 static MPContext mpctx_s = {
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
173 .osd_function = OSD_PLAY,
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
174 .begin_skip = MP_NOPTS_VALUE,
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
175 .play_tree_step = 1,
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
176 .global_sub_pos = -1,
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
177 .set_of_sub_pos = -1,
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
178 .file_format = DEMUXER_TYPE_UNKNOWN,
23726
11abe5f3dcaa Move loop_times into mpctx.
albeu
parents: 23573
diff changeset
179 .loop_times = -1,
27370
14c5017f40d2 Change a bunch of video/audio-output-specific preprocessor directives from
diego
parents: 27359
diff changeset
180 #ifdef CONFIG_DVBIN
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
181 .last_dvb_step = 1,
22281
f00e6b43e79f Add missing #ifdef
uau
parents: 22280
diff changeset
182 #endif
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
183 };
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
184
22993
5e6fa9cabacc big surprise.. uau broke gcc 2.95 as usual
rfelker
parents: 22835
diff changeset
185 static MPContext *mpctx = &mpctx_s;
5e6fa9cabacc big surprise.. uau broke gcc 2.95 as usual
rfelker
parents: 22835
diff changeset
186
7677
33562a65e9e8 _EXPERIMENTAL_ option: -fixed-vo for libvo spec compliance testing
arpi
parents: 7628
diff changeset
187 int fixed_vo=0;
33562a65e9e8 _EXPERIMENTAL_ option: -fixed-vo for libvo spec compliance testing
arpi
parents: 7628
diff changeset
188
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
189 // benchmark:
1291
36ed1692c0b8 video codec stuff moved to dec_video.c
arpi
parents: 1289
diff changeset
190 double video_time_usage=0;
36ed1692c0b8 video codec stuff moved to dec_video.c
arpi
parents: 1289
diff changeset
191 double vout_time_usage=0;
1289
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
192 static double audio_time_usage=0;
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
193 static int total_time_usage_start=0;
5621
0426f9b887cd some more statistics: BENCHMARKn
arpi
parents: 5612
diff changeset
194 static int total_frame_cnt=0;
0426f9b887cd some more statistics: BENCHMARKn
arpi
parents: 5612
diff changeset
195 static int drop_frame_cnt=0; // total number of dropped frames
4844
76acf5bbda78 exclude benchmark stuff execution from normal playback
nick
parents: 4843
diff changeset
196 int benchmark=0;
1124
0e95f30ffd4c -frames and -benchmark options to make chl & gabucino happy
arpi_esp
parents: 1059
diff changeset
197
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
198 // options:
30176
6fb92182aff3 At startup and while seeking avoid to introduce pointless sleeps and possibly
reimar
parents: 30175
diff changeset
199 #define DEFAULT_STARTUP_DECODE_RETRY 8
6796
9c828335b2d0 add preferences to gui
pontscho
parents: 6792
diff changeset
200 int auto_quality=0;
1496
8c3e93ef116d cleanup...
arpi
parents: 1487
diff changeset
201 static int output_quality=0;
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
202
7605
c3bbe602aff3 new option -speed, to set playback speed rate (examples: -speed 1:3 or -speed 5)
arpi
parents: 7604
diff changeset
203 float playback_speed=1.0;
c3bbe602aff3 new option -speed, to set playback speed rate (examples: -speed 1:3 or -speed 5)
arpi
parents: 7604
diff changeset
204
1709
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
205 int use_gui=0;
9291
64b8c5a07c2c - It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents: 9217
diff changeset
206
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
207 #ifdef CONFIG_GUI
9291
64b8c5a07c2c - It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents: 9217
diff changeset
208 int enqueue=0;
64b8c5a07c2c - It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents: 9217
diff changeset
209 #endif
64b8c5a07c2c - It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents: 9217
diff changeset
210
17914
f9cb6fc1608a Add an option to list the properties: -list-properties
albeu
parents: 17911
diff changeset
211 static int list_properties = 0;
f9cb6fc1608a Add an option to list the properties: -list-properties
albeu
parents: 17911
diff changeset
212
6921
762c98c47f01 osdlevel=1 by default
arpi
parents: 6914
diff changeset
213 int osd_level=1;
18287
292337d09af2 Remove updating of vo_mouse_timer_const from the main loop and also
uau
parents: 18286
diff changeset
214 // 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
215 unsigned int osd_visible;
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
216 int osd_duration = 1000;
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
217
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
218 int term_osd = 1;
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
219 static char* term_osd_esc = "\x1b[A\r\x1b[K";
17911
52f95509cd05 Add the new property API and implement a couple properties.
albeu
parents: 17910
diff changeset
220 static char* playing_msg = NULL;
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
221 // seek:
22312
cca9ff25bed2 Move parsing of the -ss option to the option code.
uau
parents: 22302
diff changeset
222 static double seek_to_sec;
7559
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
223 static off_t seek_to_byte=0;
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
224 static off_t step_sec=0;
8784
6e190ea2abba don't show OSD progbar when -loop seeks back
arpi
parents: 8745
diff changeset
225 static int loop_seek=0;
7559
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
226
19973
02a18c52a42a after a long time, finally i could add -endpos option to mplayer executable.
ptt
parents: 19946
diff changeset
227 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
228
7576
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
229 // A/V sync:
8311
37ab4e646f65 add autosync && some 10l bugfix
pontscho
parents: 8306
diff changeset
230 int autosync=0; // 30 might be a good default value.
7576
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
231
7559
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
232 // may be changed by GUI: (FIXME!)
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
233 float rel_seek_secs=0;
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
234 int abs_seek_pos=0;
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
235
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
236 // codecs:
7529
c276bfb414fb removed obsolete/unused audio|video_fm|codec, has_audio|video
arpi
parents: 7526
diff changeset
237 char **audio_codec_list=NULL; // override audio codec
7506
c1cb94198e05 -vc/-vfm accepts codec/driver _list_ now. empty list element for -vc means
arpi
parents: 7502
diff changeset
238 char **video_codec_list=NULL; // override video codec
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
239 char **audio_fm_list=NULL; // override audio codec family
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
240 char **video_fm_list=NULL; // 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
241
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
242 // streaming:
3532
19998399f4d5 Made audio_id and video_id non static variable.
bertrand
parents: 3499
diff changeset
243 int audio_id=-1;
19998399f4d5 Made audio_id and video_id non static variable.
bertrand
parents: 3499
diff changeset
244 int video_id=-1;
29688
94f1bca4f4b6 Add a -nosub option that allows disabling auto-selected subtitles as e.g. the
reimar
parents: 29686
diff changeset
245 int dvdsub_id=-1;
29855
5e279f7d7e5d Remember which subtitle was auto-selected for dvdnav due to -slang
reimar
parents: 29854
diff changeset
246 // this dvdsub_id was selected via slang
5e279f7d7e5d Remember which subtitle was auto-selected for dvdnav due to -slang
reimar
parents: 29854
diff changeset
247 // 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
248 // 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
249 int dvdsub_lang_id;
4079
ae78dd1d8daf Add vobsub support.
kmkaplan
parents: 4064
diff changeset
250 int vobsub_id=-1;
10167
531b00ad6f2d Support for selecting the audio track in Matroska files via -alang.
mosu
parents: 10116
diff changeset
251 char* audio_lang=NULL;
9870
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
252 char* dvdsub_lang=NULL;
5388
3af2729c5c87 * New command line switch for mplayer & mencoder:
kmkaplan
parents: 5380
diff changeset
253 static char* spudec_ifo=NULL;
6627
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
254 char* filename=NULL; //"MI2-Trailer.avi";
10917
d45870f67728 Forced subtitles patch by Arne Driescher <driescher@mpi-magdeburg.mpg.de>
attila
parents: 10884
diff changeset
255 int forced_subs_only=0;
19491
10d8f2cae948 added new filter option to menu file browser to only display some files according to extension
ben
parents: 19485
diff changeset
256 int file_filter=1;
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
257
2353
a3daec6c49e4 cache full status added
arpi
parents: 2342
diff changeset
258 // cache2:
7881
aba9301ed3c4 allow cache to be disabled (-nocache should override cachesize autodetection
arpi
parents: 7867
diff changeset
259 int stream_cache_size=-1;
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
260 #ifdef CONFIG_STREAM_CACHE
12835
4235ae5a2d60 cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents: 12816
diff changeset
261 float stream_cache_min_percent=20.0;
16152
10a69a812eff remove unused cache-prefill and create cache-seek-min that controls when seek_long is prefered over waiting for cache to fill
iive
parents: 16079
diff changeset
262 float stream_cache_seek_min_percent=50.0;
2353
a3daec6c49e4 cache full status added
arpi
parents: 2342
diff changeset
263 #endif
a3daec6c49e4 cache full status added
arpi
parents: 2342
diff changeset
264
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
265 // dump:
3257
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
266 static char *stream_dump_name="stream.dump";
6796
9c828335b2d0 add preferences to gui
pontscho
parents: 6792
diff changeset
267 int stream_dump_type=0;
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
268
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
269 // A-V sync:
31973
c2d29ae022a4 Revert r31349 "Make -mc 1 the default".
cehoyos
parents: 31972
diff changeset
270 static float default_max_pts_correction=-1;
1498
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
271 static float max_pts_correction=0;//default_max_pts_correction;
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
272 static float c_total=0;
6796
9c828335b2d0 add preferences to gui
pontscho
parents: 6792
diff changeset
273 float audio_delay=0;
17654
16633b9c0953 New option: -ignore-start
corey
parents: 17643
diff changeset
274 static int ignore_start=0;
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
275
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
276 static int softsleep=0;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
277
25965
4cd12675cfbb Change force_fps and force_ofps to double
reimar
parents: 25962
diff changeset
278 double force_fps=0;
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
279 static int force_srate=0;
20771
1e78e35b6c7b Change value used to indicate "unknown audio format" from 0 to -1.
uau
parents: 20750
diff changeset
280 static int audio_output_format=-1; // AF_FORMAT_UNKNOWN
6796
9c828335b2d0 add preferences to gui
pontscho
parents: 6792
diff changeset
281 int frame_dropping=0; // option 0=no drop 1= drop vo 2= drop decode
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
282 static int play_n_frames=-1;
6590
bfc209bb3f48 -frames 0 fix, multifile frames support by tibcu
alex
parents: 6585
diff changeset
283 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
284
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
285 // screen info:
7562
92188b57a062 video out driver list support (like -vc, example: -vo xmga,xv,x11,)
arpi
parents: 7559
diff changeset
286 char** video_driver_list=NULL;
92188b57a062 video out driver list support (like -vc, example: -vo xmga,xv,x11,)
arpi
parents: 7559
diff changeset
287 char** audio_driver_list=NULL;
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5072
diff changeset
288
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
289 // sub:
212
7034ef1f685d new option: -font
arpi_esp
parents: 208
diff changeset
290 char *font_name=NULL;
23338
2a66d95355f0 add new -subfont option, that allows having a different font for OSD (controls and menu) and subtitles
ben
parents: 23294
diff changeset
291 char *sub_font_name=NULL;
215
09d565842a33 font alpha resampling, see -ffactor
arpi_esp
parents: 212
diff changeset
292 float font_factor=0.75;
9870
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
293 char **sub_name=NULL;
258
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
294 float sub_delay=0;
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
295 float sub_fps=0;
510
2951d138ddaf add sub autoread & remove 'c' key
pontscho
parents: 500
diff changeset
296 int sub_auto = 1;
4079
ae78dd1d8daf Add vobsub support.
kmkaplan
parents: 4064
diff changeset
297 char *vobsub_name=NULL;
6784
b38e38b6f88f DVD Closed Captioning support, patch by Matteo Giani <matgiani@ctonet.it>, small changes by me.
atmos4
parents: 6781
diff changeset
298 int subcc_enabled=0;
8361
2202c00001e3 overlapping subtitles support is now optional, can be disabled (-nooverlapsub)
arpi
parents: 8360
diff changeset
299 int suboverlap_enabled = 1;
21140
b42f1c1ef651 Make compilation depending on USE_SUB unconditional.
uau
parents: 21120
diff changeset
300
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4807
diff changeset
301 char* current_module=NULL; // for debugging
1856
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
302
6781
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
303
27345
b597fd2924b4 Rename preprocessor directive HAVE_MENU --> CONFIG_MENU.
diego
parents: 27343
diff changeset
304 #ifdef CONFIG_MENU
32026
fe0a39657851 Mark libmenu_vfs declaration as const, fixes the warning:
diego
parents: 32015
diff changeset
305 static const vf_info_t* const libmenu_vfs[] = {
8198
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
306 &vf_info_menu,
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
307 NULL
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
308 };
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
309 static vf_instance_t* vf_menu = NULL;
25461
7ef04742572c OSD menu support mouse selection.
ulion
parents: 25436
diff changeset
310 int use_menu = 0;
8198
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
311 static char* menu_cfg = NULL;
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
312 static char* menu_root = "main";
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
313 #endif
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
314
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
315
5055
534167719e91 nortc patch by Attila Kinali
atmos4
parents: 5046
diff changeset
316 #ifdef HAVE_RTC
19756
f5584340d2e6 Disable rtc timing by default.
uau
parents: 19568
diff changeset
317 static int nortc = 1;
12681
6d815f12e3e5 rtc-device cmd option by James Noble
alex
parents: 12672
diff changeset
318 static char* rtc_device;
5055
534167719e91 nortc patch by Attila Kinali
atmos4
parents: 5046
diff changeset
319 #endif
534167719e91 nortc patch by Attila Kinali
atmos4
parents: 5046
diff changeset
320
13858
4178a4eee72c fixed some doxygen comments, patch by Oded Shimon
reynaldo
parents: 13857
diff changeset
321 edl_record_ptr edl_records = NULL; ///< EDL entries memory area
4178a4eee72c fixed some doxygen comments, patch by Oded Shimon
reynaldo
parents: 13857
diff changeset
322 edl_record_ptr next_edl_record = NULL; ///< only for traversing edl_records
18316
b3be7df634b0 spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents: 18315
diff changeset
323 short edl_decision = 0; ///< 1 when an EDL operation has been made.
31459
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
324 short edl_needs_reset = 0; ///< 1 if we need to reset EDL next pointer
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
325 short edl_backward = 0; ///< 1 if we need to skip to the beginning of the next EDL record
18316
b3be7df634b0 spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents: 18315
diff changeset
326 FILE* edl_fd = NULL; ///< 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
327 // 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
328 // 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
329 // 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
330 // (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
331 // 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
332 float edl_backward_delay = 2;
31957
49848f9a8f30 Add -edl-start-pts option to Adjust positions in EDL records according
reynaldo
parents: 31956
diff changeset
333 int edl_start_pts = 0; ///< 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
334 int use_filedir_conf;
29862
fbb1f57a313e Added -name, -title and -use-filename-title options and implementation in X11 vos
ptt
parents: 29857
diff changeset
335 int use_filename_title;
8531
1aa2c9b460af Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents: 8494
diff changeset
336
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
337 static unsigned int initialized_flags=0;
31514
c6195b5575cc cosmetics: Move volstep global var to the top where all other global vars live.
diego
parents: 31513
diff changeset
338
c6195b5575cc cosmetics: Move volstep global var to the top where all other global vars live.
diego
parents: 31513
diff changeset
339 /// step size of mixer changes
c6195b5575cc cosmetics: Move volstep global var to the top where all other global vars live.
diego
parents: 31513
diff changeset
340 int volstep = 3;
c6195b5575cc cosmetics: Move volstep global var to the top where all other global vars live.
diego
parents: 31513
diff changeset
341
31801
8187612b1af8 Fix compilation with --enable-crash-debug
reimar
parents: 31792
diff changeset
342 #ifdef CONFIG_CRASH_DEBUG
8187612b1af8 Fix compilation with --enable-crash-debug
reimar
parents: 31792
diff changeset
343 static char *prog_path;
8187612b1af8 Fix compilation with --enable-crash-debug
reimar
parents: 31792
diff changeset
344 static int crash_debug = 0;
8187612b1af8 Fix compilation with --enable-crash-debug
reimar
parents: 31792
diff changeset
345 #endif
8187612b1af8 Fix compilation with --enable-crash-debug
reimar
parents: 31792
diff changeset
346
31515
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
347 /* This header requires all the global variable declarations. */
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
348 #include "cfg-mplayer.h"
823f39ab650b Clean up #include handling in mplayer.c and mencoder.c.
diego
parents: 31514
diff changeset
349
19532
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
350
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
351 #define mp_basename2(s) (strrchr(s,'/')==NULL?(char*)s:(strrchr(s,'/')+1))
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
352
25765
304fc0bbefe1 audio_out / video_out structs should be treated as const
reimar
parents: 25658
diff changeset
353 const void *mpctx_get_video_out(MPContext *mpctx)
22284
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->video_out;
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
28259
f313c0ff6882 Add missing const qualifier to mpctx_get_audio_out function declaration.
diego
parents: 28185
diff changeset
358 const void *mpctx_get_audio_out(MPContext *mpctx)
22286
a7e5b99ac083 Fix GUI compilation
uau
parents: 22285
diff changeset
359 {
22411
cf4c052b6d60 Fix copy-paste bug (must have broken something in the GUI)
uau
parents: 22365
diff changeset
360 return mpctx->audio_out;
22286
a7e5b99ac083 Fix GUI compilation
uau
parents: 22285
diff changeset
361 }
a7e5b99ac083 Fix GUI compilation
uau
parents: 22285
diff changeset
362
25364
fec8936c8079 Support chapter in OSD menu.
ulion
parents: 25351
diff changeset
363 void *mpctx_get_demuxer(MPContext *mpctx)
fec8936c8079 Support chapter in OSD menu.
ulion
parents: 25351
diff changeset
364 {
fec8936c8079 Support chapter in OSD menu.
ulion
parents: 25351
diff changeset
365 return mpctx->demuxer;
fec8936c8079 Support chapter in OSD menu.
ulion
parents: 25351
diff changeset
366 }
fec8936c8079 Support chapter in OSD menu.
ulion
parents: 25351
diff changeset
367
22284
83366c8e1928 Fix menu to work with mpctx
uau
parents: 22281
diff changeset
368 void *mpctx_get_playtree_iter(MPContext *mpctx)
83366c8e1928 Fix menu to work with mpctx
uau
parents: 22281
diff changeset
369 {
83366c8e1928 Fix menu to work with mpctx
uau
parents: 22281
diff changeset
370 return mpctx->playtree_iter;
83366c8e1928 Fix menu to work with mpctx
uau
parents: 22281
diff changeset
371 }
83366c8e1928 Fix menu to work with mpctx
uau
parents: 22281
diff changeset
372
22286
a7e5b99ac083 Fix GUI compilation
uau
parents: 22285
diff changeset
373 void *mpctx_get_mixer(MPContext *mpctx)
a7e5b99ac083 Fix GUI compilation
uau
parents: 22285
diff changeset
374 {
a7e5b99ac083 Fix GUI compilation
uau
parents: 22285
diff changeset
375 return &mpctx->mixer;
a7e5b99ac083 Fix GUI compilation
uau
parents: 22285
diff changeset
376 }
a7e5b99ac083 Fix GUI compilation
uau
parents: 22285
diff changeset
377
22290
24abe3182dfe Fix nonsense function type
uau
parents: 22288
diff changeset
378 int mpctx_get_global_sub_size(MPContext *mpctx)
22286
a7e5b99ac083 Fix GUI compilation
uau
parents: 22285
diff changeset
379 {
a7e5b99ac083 Fix GUI compilation
uau
parents: 22285
diff changeset
380 return mpctx->global_sub_size;
a7e5b99ac083 Fix GUI compilation
uau
parents: 22285
diff changeset
381 }
a7e5b99ac083 Fix GUI compilation
uau
parents: 22285
diff changeset
382
25026
afead6ecb8ba Remove the pause filter and the cmd queue hack, to know the mplayer going to
ulion
parents: 24982
diff changeset
383 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
384 {
afead6ecb8ba Remove the pause filter and the cmd queue hack, to know the mplayer going to
ulion
parents: 24982
diff changeset
385 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
386 }
afead6ecb8ba Remove the pause filter and the cmd queue hack, to know the mplayer going to
ulion
parents: 24982
diff changeset
387
19532
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
388 static int is_valid_metadata_type (metadata_t type) {
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
389 switch (type)
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
390 {
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
391 /* check for valid video stream */
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
392 case META_VIDEO_CODEC:
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
393 case META_VIDEO_BITRATE:
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
394 case META_VIDEO_RESOLUTION:
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
395 {
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
396 if (!mpctx->sh_video)
19532
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
397 return 0;
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
398 break;
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
399 }
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
400
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
401 /* check for valid audio stream */
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
402 case META_AUDIO_CODEC:
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
403 case META_AUDIO_BITRATE:
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
404 case META_AUDIO_SAMPLES:
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
405 {
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
406 if (!mpctx->sh_audio)
19532
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
407 return 0;
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
408 break;
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
409 }
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
410
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
411 /* check for valid demuxer */
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
412 case META_INFO_TITLE:
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
413 case META_INFO_ARTIST:
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
414 case META_INFO_ALBUM:
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
415 case META_INFO_YEAR:
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
416 case META_INFO_COMMENT:
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
417 case META_INFO_TRACK:
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
418 case META_INFO_GENRE:
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
419 {
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
420 if (!mpctx->demuxer)
19532
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
421 return 0;
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
422 break;
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
423 }
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 default:
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
426 break;
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
427 }
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
428
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
429 return 1;
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
430 }
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
431
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
432 static char *get_demuxer_info (char *tag) {
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
433 char **info = mpctx->demuxer->info;
19532
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
434 int n;
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
435
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
436 if (!info || !tag)
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
437 return NULL;
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
438
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
439 for (n = 0; info[2*n] != NULL ; n++)
29287
8b0f2c4971f4 100l, demuxer info tags are _not_ case sensitive, so use strcasecmp.
reimar
parents: 29263
diff changeset
440 if (!strcasecmp (info[2*n], tag))
19532
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
441 break;
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
442
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
443 return info[2*n+1] ? strdup (info[2*n+1]) : NULL;
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
444 }
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
445
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
446 char *get_metadata (metadata_t type) {
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
447 char *meta = NULL;
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
448 sh_audio_t * const sh_audio = mpctx->sh_audio;
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
449 sh_video_t * const sh_video = mpctx->sh_video;
19532
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
450
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
451 if (!is_valid_metadata_type (type))
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
452 return NULL;
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
453
19532
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
454 switch (type)
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
455 {
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
456 case META_NAME:
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
457 {
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
458 return strdup (mp_basename2 (filename));
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
459 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
460
19532
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
461 case META_VIDEO_CODEC:
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
462 {
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
463 if (sh_video->format == 0x10000001)
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
464 meta = strdup ("mpeg1");
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
465 else if (sh_video->format == 0x10000002)
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
466 meta = strdup ("mpeg2");
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
467 else if (sh_video->format == 0x10000004)
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
468 meta = strdup ("mpeg4");
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
469 else if (sh_video->format == 0x10000005)
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
470 meta = strdup ("h264");
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
471 else if (sh_video->format >= 0x20202020)
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
472 {
23808
f689ce781c5d Get rid of a few more useless malloc casts
reimar
parents: 23807
diff changeset
473 meta = malloc (8);
19532
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
474 sprintf (meta, "%.4s", (char *) &sh_video->format);
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
475 }
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
476 else
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
477 {
23808
f689ce781c5d Get rid of a few more useless malloc casts
reimar
parents: 23807
diff changeset
478 meta = malloc (8);
19532
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
479 sprintf (meta, "0x%08X", sh_video->format);
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
480 }
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
481 return meta;
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
482 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
483
19532
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
484 case META_VIDEO_BITRATE:
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
485 {
23808
f689ce781c5d Get rid of a few more useless malloc casts
reimar
parents: 23807
diff changeset
486 meta = malloc (16);
19532
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
487 sprintf (meta, "%d kbps", (int) (sh_video->i_bps * 8 / 1024));
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
488 return meta;
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
489 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
490
19532
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
491 case META_VIDEO_RESOLUTION:
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
492 {
23808
f689ce781c5d Get rid of a few more useless malloc casts
reimar
parents: 23807
diff changeset
493 meta = malloc (16);
19532
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
494 sprintf (meta, "%d x %d", sh_video->disp_w, sh_video->disp_h);
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
495 return meta;
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
496 }
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
497
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
498 case META_AUDIO_CODEC:
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
499 {
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
500 if (sh_audio->codec && sh_audio->codec->name)
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
501 meta = strdup (sh_audio->codec->name);
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
502 return meta;
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
503 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
504
19532
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
505 case META_AUDIO_BITRATE:
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
506 {
23808
f689ce781c5d Get rid of a few more useless malloc casts
reimar
parents: 23807
diff changeset
507 meta = malloc (16);
19532
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
508 sprintf (meta, "%d kbps", (int) (sh_audio->i_bps * 8/1000));
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
509 return meta;
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
510 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
511
19532
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
512 case META_AUDIO_SAMPLES:
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
513 {
23808
f689ce781c5d Get rid of a few more useless malloc casts
reimar
parents: 23807
diff changeset
514 meta = malloc (16);
19532
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
515 sprintf (meta, "%d Hz, %d ch.", sh_audio->samplerate, sh_audio->channels);
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
516 return meta;
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
517 }
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
518
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
519 /* check for valid demuxer */
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
520 case META_INFO_TITLE:
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
521 return get_demuxer_info ("Title");
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
522
19532
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
523 case META_INFO_ARTIST:
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
524 return get_demuxer_info ("Artist");
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
525
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
526 case META_INFO_ALBUM:
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
527 return get_demuxer_info ("Album");
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
528
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
529 case META_INFO_YEAR:
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
530 return get_demuxer_info ("Year");
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
531
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
532 case META_INFO_COMMENT:
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
533 return get_demuxer_info ("Comment");
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
534
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
535 case META_INFO_TRACK:
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
536 return get_demuxer_info ("Track");
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
537
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
538 case META_INFO_GENRE:
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
539 return get_demuxer_info ("Genre");
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
540
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
541 default:
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
542 break;
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
543 }
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
544
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
545 return meta;
19529
9a59c33bee29 new option for libmenu that allow display of properties and metadata of currently played stream
ben
parents: 19521
diff changeset
546 }
9a59c33bee29 new option for libmenu that allow display of properties and metadata of currently played stream
ben
parents: 19521
diff changeset
547
31277
5d5bda998a2f Move code printing -identify output for a file to a separate function.
reimar
parents: 31262
diff changeset
548 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
549 {
31278
2d75e55e74bc Print media start time with -identify.
reimar
parents: 31277
diff changeset
550 double video_start_pts = MP_NOPTS_VALUE;
31277
5d5bda998a2f Move code printing -identify output for a file to a separate function.
reimar
parents: 31262
diff changeset
551 mp_msg(MSGT_IDENTIFY,MSGL_INFO,"ID_FILENAME=%s\n",
5d5bda998a2f Move code printing -identify output for a file to a separate function.
reimar
parents: 31262
diff changeset
552 filename_recode(filename));
5d5bda998a2f Move code printing -identify output for a file to a separate function.
reimar
parents: 31262
diff changeset
553 mp_msg(MSGT_IDENTIFY,MSGL_INFO,"ID_DEMUXER=%s\n", mpctx->demuxer->desc->name);
5d5bda998a2f Move code printing -identify output for a file to a separate function.
reimar
parents: 31262
diff changeset
554 if (mpctx->sh_video) {
5d5bda998a2f Move code printing -identify output for a file to a separate function.
reimar
parents: 31262
diff changeset
555 /* Assume FOURCC if all bytes >= 0x20 (' ') */
5d5bda998a2f Move code printing -identify output for a file to a separate function.
reimar
parents: 31262
diff changeset
556 if (mpctx->sh_video->format >= 0x20202020)
5d5bda998a2f Move code printing -identify output for a file to a separate function.
reimar
parents: 31262
diff changeset
557 mp_msg(MSGT_IDENTIFY,MSGL_INFO,"ID_VIDEO_FORMAT=%.4s\n", (char *)&mpctx->sh_video->format);
5d5bda998a2f Move code printing -identify output for a file to a separate function.
reimar
parents: 31262
diff changeset
558 else
5d5bda998a2f Move code printing -identify output for a file to a separate function.
reimar
parents: 31262
diff changeset
559 mp_msg(MSGT_IDENTIFY,MSGL_INFO,"ID_VIDEO_FORMAT=0x%08X\n", mpctx->sh_video->format);
5d5bda998a2f Move code printing -identify output for a file to a separate function.
reimar
parents: 31262
diff changeset
560 mp_msg(MSGT_IDENTIFY,MSGL_INFO,"ID_VIDEO_BITRATE=%d\n", mpctx->sh_video->i_bps*8);
5d5bda998a2f Move code printing -identify output for a file to a separate function.
reimar
parents: 31262
diff changeset
561 mp_msg(MSGT_IDENTIFY,MSGL_INFO,"ID_VIDEO_WIDTH=%d\n", mpctx->sh_video->disp_w);
5d5bda998a2f Move code printing -identify output for a file to a separate function.
reimar
parents: 31262
diff changeset
562 mp_msg(MSGT_IDENTIFY,MSGL_INFO,"ID_VIDEO_HEIGHT=%d\n", mpctx->sh_video->disp_h);
5d5bda998a2f Move code printing -identify output for a file to a separate function.
reimar
parents: 31262
diff changeset
563 mp_msg(MSGT_IDENTIFY,MSGL_INFO,"ID_VIDEO_FPS=%5.3f\n", mpctx->sh_video->fps);
5d5bda998a2f Move code printing -identify output for a file to a separate function.
reimar
parents: 31262
diff changeset
564 mp_msg(MSGT_IDENTIFY,MSGL_INFO,"ID_VIDEO_ASPECT=%1.4f\n", mpctx->sh_video->aspect);
31278
2d75e55e74bc Print media start time with -identify.
reimar
parents: 31277
diff changeset
565 video_start_pts = ds_get_next_pts(mpctx->d_video);
31277
5d5bda998a2f Move code printing -identify output for a file to a separate function.
reimar
parents: 31262
diff changeset
566 }
5d5bda998a2f Move code printing -identify output for a file to a separate function.
reimar
parents: 31262
diff changeset
567 if (mpctx->sh_audio) {
5d5bda998a2f Move code printing -identify output for a file to a separate function.
reimar
parents: 31262
diff changeset
568 /* Assume FOURCC if all bytes >= 0x20 (' ') */
5d5bda998a2f Move code printing -identify output for a file to a separate function.
reimar
parents: 31262
diff changeset
569 if (mpctx->sh_audio->format >= 0x20202020)
5d5bda998a2f Move code printing -identify output for a file to a separate function.
reimar
parents: 31262
diff changeset
570 mp_msg(MSGT_IDENTIFY,MSGL_INFO, "ID_AUDIO_FORMAT=%.4s\n", (char *)&mpctx->sh_audio->format);
5d5bda998a2f Move code printing -identify output for a file to a separate function.
reimar
parents: 31262
diff changeset
571 else
5d5bda998a2f Move code printing -identify output for a file to a separate function.
reimar
parents: 31262
diff changeset
572 mp_msg(MSGT_IDENTIFY,MSGL_INFO,"ID_AUDIO_FORMAT=%d\n", mpctx->sh_audio->format);
5d5bda998a2f Move code printing -identify output for a file to a separate function.
reimar
parents: 31262
diff changeset
573 mp_msg(MSGT_IDENTIFY,MSGL_INFO,"ID_AUDIO_BITRATE=%d\n", mpctx->sh_audio->i_bps*8);
5d5bda998a2f Move code printing -identify output for a file to a separate function.
reimar
parents: 31262
diff changeset
574 mp_msg(MSGT_IDENTIFY,MSGL_INFO,"ID_AUDIO_RATE=%d\n", mpctx->sh_audio->samplerate);
5d5bda998a2f Move code printing -identify output for a file to a separate function.
reimar
parents: 31262
diff changeset
575 mp_msg(MSGT_IDENTIFY,MSGL_INFO,"ID_AUDIO_NCH=%d\n", mpctx->sh_audio->channels);
31278
2d75e55e74bc Print media start time with -identify.
reimar
parents: 31277
diff changeset
576 start_pts = ds_get_next_pts(mpctx->d_audio);
31277
5d5bda998a2f Move code printing -identify output for a file to a separate function.
reimar
parents: 31262
diff changeset
577 }
31278
2d75e55e74bc Print media start time with -identify.
reimar
parents: 31277
diff changeset
578 if (video_start_pts != MP_NOPTS_VALUE) {
2d75e55e74bc Print media start time with -identify.
reimar
parents: 31277
diff changeset
579 if (start_pts == MP_NOPTS_VALUE || !mpctx->sh_audio ||
2d75e55e74bc Print media start time with -identify.
reimar
parents: 31277
diff changeset
580 (mpctx->sh_video && video_start_pts < start_pts))
2d75e55e74bc Print media start time with -identify.
reimar
parents: 31277
diff changeset
581 start_pts = video_start_pts;
2d75e55e74bc Print media start time with -identify.
reimar
parents: 31277
diff changeset
582 }
2d75e55e74bc Print media start time with -identify.
reimar
parents: 31277
diff changeset
583 if (start_pts != MP_NOPTS_VALUE)
32352
76f94c00a69f 1000l, %lf is not valid format string for printf (only for scanf) and actually
reimar
parents: 32341
diff changeset
584 mp_msg(MSGT_IDENTIFY,MSGL_INFO,"ID_START_TIME=%.2f\n", start_pts);
31278
2d75e55e74bc Print media start time with -identify.
reimar
parents: 31277
diff changeset
585 else
2d75e55e74bc Print media start time with -identify.
reimar
parents: 31277
diff changeset
586 mp_msg(MSGT_IDENTIFY,MSGL_INFO,"ID_START_TIME=unknown\n");
32352
76f94c00a69f 1000l, %lf is not valid format string for printf (only for scanf) and actually
reimar
parents: 32341
diff changeset
587 mp_msg(MSGT_IDENTIFY,MSGL_INFO,"ID_LENGTH=%.2f\n", demuxer_get_time_length(mpctx->demuxer));
31277
5d5bda998a2f Move code printing -identify output for a file to a separate function.
reimar
parents: 31262
diff changeset
588 mp_msg(MSGT_IDENTIFY,MSGL_INFO,"ID_SEEKABLE=%d\n",
5d5bda998a2f Move code printing -identify output for a file to a separate function.
reimar
parents: 31262
diff changeset
589 mpctx->stream->seek && (!mpctx->demuxer || mpctx->demuxer->seekable));
5d5bda998a2f Move code printing -identify output for a file to a separate function.
reimar
parents: 31262
diff changeset
590 if (mpctx->demuxer) {
5d5bda998a2f Move code printing -identify output for a file to a separate function.
reimar
parents: 31262
diff changeset
591 if (mpctx->demuxer->num_chapters == 0)
5d5bda998a2f Move code printing -identify output for a file to a separate function.
reimar
parents: 31262
diff changeset
592 stream_control(mpctx->demuxer->stream, STREAM_CTRL_GET_NUM_CHAPTERS, &mpctx->demuxer->num_chapters);
5d5bda998a2f Move code printing -identify output for a file to a separate function.
reimar
parents: 31262
diff changeset
593 mp_msg(MSGT_IDENTIFY,MSGL_INFO,"ID_CHAPTERS=%d\n", mpctx->demuxer->num_chapters);
5d5bda998a2f Move code printing -identify output for a file to a separate function.
reimar
parents: 31262
diff changeset
594 }
5d5bda998a2f Move code printing -identify output for a file to a separate function.
reimar
parents: 31262
diff changeset
595 }
5d5bda998a2f Move code printing -identify output for a file to a separate function.
reimar
parents: 31262
diff changeset
596
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
597 #ifdef CONFIG_DVDNAV
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
598 static void mp_dvdnav_context_free(MPContext *ctx){
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
599 if (ctx->nav_smpi) free_mp_image(ctx->nav_smpi);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
600 ctx->nav_smpi = NULL;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
601 if (ctx->nav_buffer) free(ctx->nav_buffer);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
602 ctx->nav_buffer = NULL;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
603 ctx->nav_start = NULL;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
604 ctx->nav_in_size = 0;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
605 }
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
606 #endif
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
607
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
608 void uninit_player(unsigned int mask){
29797
92abe9f73079 Simplify: use &= instead of a = b & a;
reimar
parents: 29796
diff changeset
609 mask &= initialized_flags;
5154
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
610
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
611 mp_msg(MSGT_CPLAYER,MSGL_DBG2,"\n*** uninit(0x%X)\n",mask);
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
612
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
613 if(mask&INITIALIZED_ACODEC){
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
614 initialized_flags&=~INITIALIZED_ACODEC;
7621
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
615 current_module="uninit_acodec";
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
616 if(mpctx->sh_audio) uninit_audio(mpctx->sh_audio);
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
617 #ifdef CONFIG_GUI
22285
5d12a6e96930 Add missing "if (use_gui)" before some GUI calls
uau
parents: 22284
diff changeset
618 if (use_gui) guiGetEvent(guiSetAfilter, (char *)NULL);
14254
21e72b6d8d11 Do not use audio plugins anymore
reimar
parents: 14245
diff changeset
619 #endif
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
620 mpctx->sh_audio=NULL;
23952
b13fc23ee447 mixer.afilter must be set to NULL when filter chain is destroyed on uninit.
reimar
parents: 23903
diff changeset
621 mpctx->mixer.afilter = NULL;
7621
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
622 }
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
623
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
624 if(mask&INITIALIZED_VCODEC){
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
625 initialized_flags&=~INITIALIZED_VCODEC;
7621
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
626 current_module="uninit_vcodec";
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
627 if(mpctx->sh_video) uninit_video(mpctx->sh_video);
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
628 mpctx->sh_video=NULL;
27345
b597fd2924b4 Rename preprocessor directive HAVE_MENU --> CONFIG_MENU.
diego
parents: 27343
diff changeset
629 #ifdef CONFIG_MENU
8198
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
630 vf_menu=NULL;
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
631 #endif
7621
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
632 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
633
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
634 if(mask&INITIALIZED_DEMUXER){
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
635 initialized_flags&=~INITIALIZED_DEMUXER;
7621
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
636 current_module="free_demuxer";
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
637 if(mpctx->demuxer){
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
638 mpctx->stream=mpctx->demuxer->stream;
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
639 free_demuxer(mpctx->demuxer);
8023
3738cc2269a3 get stream back from the demuxer
arpi
parents: 7923
diff changeset
640 }
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
641 mpctx->demuxer=NULL;
7621
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
642 }
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
643
5830
4c17a92220fc uninit libvo before getch2 - requires for clean svgalib uninit
arpi
parents: 5798
diff changeset
644 // kill the cache process:
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
645 if(mask&INITIALIZED_STREAM){
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
646 initialized_flags&=~INITIALIZED_STREAM;
5154
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
647 current_module="uninit_stream";
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
648 if(mpctx->stream) free_stream(mpctx->stream);
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
649 mpctx->stream=NULL;
5154
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
650 }
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
651
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
652 if(mask&INITIALIZED_VO){
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
653 initialized_flags&=~INITIALIZED_VO;
5830
4c17a92220fc uninit libvo before getch2 - requires for clean svgalib uninit
arpi
parents: 5798
diff changeset
654 current_module="uninit_vo";
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
655 mpctx->video_out->uninit();
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
656 mpctx->video_out=NULL;
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
657 #ifdef CONFIG_DVDNAV
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
658 mp_dvdnav_context_free(mpctx);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
659 #endif
31839
5edb6679ccad 100l, do not free vo_spudec if e.g. just the audio is reinitialized.
reimar
parents: 31837
diff changeset
660 if (vo_spudec){
5edb6679ccad 100l, do not free vo_spudec if e.g. just the audio is reinitialized.
reimar
parents: 31837
diff changeset
661 current_module="uninit_spudec";
5edb6679ccad 100l, do not free vo_spudec if e.g. just the audio is reinitialized.
reimar
parents: 31837
diff changeset
662 spudec_free(vo_spudec);
5edb6679ccad 100l, do not free vo_spudec if e.g. just the audio is reinitialized.
reimar
parents: 31837
diff changeset
663 vo_spudec=NULL;
5edb6679ccad 100l, do not free vo_spudec if e.g. just the audio is reinitialized.
reimar
parents: 31837
diff changeset
664 }
5830
4c17a92220fc uninit libvo before getch2 - requires for clean svgalib uninit
arpi
parents: 5798
diff changeset
665 }
4c17a92220fc uninit libvo before getch2 - requires for clean svgalib uninit
arpi
parents: 5798
diff changeset
666
18316
b3be7df634b0 spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents: 18315
diff changeset
667 // Must be after libvo uninit, as few vo drivers (svgalib) have tty code.
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
668 if(mask&INITIALIZED_GETCH2){
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
669 initialized_flags&=~INITIALIZED_GETCH2;
5154
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
670 current_module="uninit_getch2";
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
671 mp_msg(MSGT_CPLAYER,MSGL_DBG2,"\n[[[uninit getch2]]]\n");
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
672 // restore terminal:
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
673 getch2_disable();
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
674 }
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
675
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
676 if(mask&INITIALIZED_VOBSUB){
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
677 initialized_flags&=~INITIALIZED_VOBSUB;
6110
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
678 current_module="uninit_vobsub";
7621
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
679 if(vo_vobsub) vobsub_close(vo_vobsub);
6110
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
680 vo_vobsub=NULL;
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
681 }
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
682
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
683 if(mask&INITIALIZED_AO){
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
684 initialized_flags&=~INITIALIZED_AO;
1856
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
685 current_module="uninit_ao";
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
686 if (mpctx->edl_muted) mixer_mute(&mpctx->mixer);
29866
32af1e6ef8d3 Check that mpctx->audio_out is not NULL when trying to uninit it.
reimar
parents: 29862
diff changeset
687 if (mpctx->audio_out) mpctx->audio_out->uninit(mpctx->eof?0:1);
32af1e6ef8d3 Check that mpctx->audio_out is not NULL when trying to uninit it.
reimar
parents: 29862
diff changeset
688 mpctx->audio_out=NULL;
1856
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
689 }
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
690
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
691 #ifdef CONFIG_GUI
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
692 if(mask&INITIALIZED_GUI){
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
693 initialized_flags&=~INITIALIZED_GUI;
1856
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
694 current_module="uninit_gui";
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4807
diff changeset
695 guiDone();
1856
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
696 }
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
697 #endif
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
698
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
699 if(mask&INITIALIZED_INPUT){
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
700 initialized_flags&=~INITIALIZED_INPUT;
5830
4c17a92220fc uninit libvo before getch2 - requires for clean svgalib uninit
arpi
parents: 5798
diff changeset
701 current_module="uninit_input";
4c17a92220fc uninit libvo before getch2 - requires for clean svgalib uninit
arpi
parents: 5798
diff changeset
702 mp_input_uninit();
27345
b597fd2924b4 Rename preprocessor directive HAVE_MENU --> CONFIG_MENU.
diego
parents: 27343
diff changeset
703 #ifdef CONFIG_MENU
25433
55e3b1a32c65 Make libmenu init and uninit in proper place.
ulion
parents: 25416
diff changeset
704 if (use_menu)
55e3b1a32c65 Make libmenu init and uninit in proper place.
ulion
parents: 25416
diff changeset
705 menu_uninit();
55e3b1a32c65 Make libmenu init and uninit in proper place.
ulion
parents: 25416
diff changeset
706 #endif
5830
4c17a92220fc uninit libvo before getch2 - requires for clean svgalib uninit
arpi
parents: 5798
diff changeset
707 }
4431
44c23fd75005 Added uninit to input
albeu
parents: 4418
diff changeset
708
1863
bb7710b16dc2 reset module status after uninit
arpi
parents: 1857
diff changeset
709 current_module=NULL;
1856
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
710 }
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
711
30518
654cad7ea876 Rename exit_reason_t enum to exit_reason and do not typedef it.
diego
parents: 30506
diff changeset
712 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
713 {
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
714
31982
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents: 31977
diff changeset
715 #ifdef CONFIG_NETWORKING
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents: 31977
diff changeset
716 if (udp_master)
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents: 31977
diff changeset
717 send_udp(udp_ip, udp_port, "bye");
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents: 31977
diff changeset
718 #endif /* CONFIG_NETWORKING */
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents: 31977
diff changeset
719
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
720 if (mpctx->user_muted && !mpctx->edl_muted) mixer_mute(&mpctx->mixer);
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
721 uninit_player(INITIALIZED_ALL);
27727
48c1ae64255b Replace preprocessor check for WIN32 with checks for __MINGW32__ and __CYGWIN__.
diego
parents: 27635
diff changeset
722 #if defined(__MINGW32__) || defined(__CYGWIN__)
26689
4cf30c0ca561 Request a timer resolution of 1 ms on Windows, the default of
reimar
parents: 26479
diff changeset
723 timeEndPeriod(1);
4cf30c0ca561 Request a timer resolution of 1 ms on Windows, the default of
reimar
parents: 26479
diff changeset
724 #endif
27377
d58d06eafe83 Change a bunch of X11-specific preprocessor directives.
diego
parents: 27370
diff changeset
725 #ifdef CONFIG_X11
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
726 #ifdef CONFIG_GUI
6016
be9cd7d845c2 -zoom, -fs with x[11|mga|v] fix -- round two
pontscho
parents: 6015
diff changeset
727 if ( !use_gui )
be9cd7d845c2 -zoom, -fs with x[11|mga|v] fix -- round two
pontscho
parents: 6015
diff changeset
728 #endif
18316
b3be7df634b0 spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents: 18315
diff changeset
729 vo_uninit(); // Close the X11 connection (if any is open).
6015
04fe086ae486 vo_uninit fixed
arpi
parents: 6013
diff changeset
730 #endif
1723
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1709
diff changeset
731
27393
4876c89bafdd Rename font-related preprocessor directives.
diego
parents: 27391
diff changeset
732 #ifdef CONFIG_FREETYPE
13956
5d8f11a627ae free freetype descriptor and library and mconfig data right before exit
iive
parents: 13946
diff changeset
733 current_module="uninit_font";
25852
43c76ab0bb84 Make sure sub_font is freed.
reimar
parents: 25844
diff changeset
734 if (sub_font && sub_font != vo_font) free_font_desc(sub_font);
43c76ab0bb84 Make sure sub_font is freed.
reimar
parents: 25844
diff changeset
735 sub_font = NULL;
13956
5d8f11a627ae free freetype descriptor and library and mconfig data right before exit
iive
parents: 13946
diff changeset
736 if (vo_font) free_font_desc(vo_font);
5d8f11a627ae free freetype descriptor and library and mconfig data right before exit
iive
parents: 13946
diff changeset
737 vo_font = NULL;
5d8f11a627ae free freetype descriptor and library and mconfig data right before exit
iive
parents: 13946
diff changeset
738 done_freetype();
5d8f11a627ae free freetype descriptor and library and mconfig data right before exit
iive
parents: 13946
diff changeset
739 #endif
16036
ab9b25d60934 Fix few memleaks on exit.
iive
parents: 15895
diff changeset
740 free_osd_list();
13956
5d8f11a627ae free freetype descriptor and library and mconfig data right before exit
iive
parents: 13946
diff changeset
741
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
742 #ifdef CONFIG_ASS
20477
de4a66d99f41 Libass interface reworked:
eugeni
parents: 20341
diff changeset
743 ass_library_done(ass_library);
30076
728444c29ec0 Set some freed pointers to NULL.
reimar
parents: 30075
diff changeset
744 ass_library = NULL;
20477
de4a66d99f41 Libass interface reworked:
eugeni
parents: 20341
diff changeset
745 #endif
de4a66d99f41 Libass interface reworked:
eugeni
parents: 20341
diff changeset
746
1856
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
747 current_module="exit_player";
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
748
13956
5d8f11a627ae free freetype descriptor and library and mconfig data right before exit
iive
parents: 13946
diff changeset
749 // free mplayer config
16036
ab9b25d60934 Fix few memleaks on exit.
iive
parents: 15895
diff changeset
750 if(mconfig)
ab9b25d60934 Fix few memleaks on exit.
iive
parents: 15895
diff changeset
751 m_config_free(mconfig);
30076
728444c29ec0 Set some freed pointers to NULL.
reimar
parents: 30075
diff changeset
752 mconfig = NULL;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
753
30075
f7628df3079b Free playtree_iter upon exiting MPlayer
reimar
parents: 30063
diff changeset
754 if(mpctx->playtree_iter)
f7628df3079b Free playtree_iter upon exiting MPlayer
reimar
parents: 30063
diff changeset
755 play_tree_iter_free(mpctx->playtree_iter);
30076
728444c29ec0 Set some freed pointers to NULL.
reimar
parents: 30075
diff changeset
756 mpctx->playtree_iter = NULL;
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
757 if(mpctx->playtree)
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
758 play_tree_free(mpctx->playtree, 1);
30076
728444c29ec0 Set some freed pointers to NULL.
reimar
parents: 30075
diff changeset
759 mpctx->playtree = NULL;
16036
ab9b25d60934 Fix few memleaks on exit.
iive
parents: 15895
diff changeset
760
13956
5d8f11a627ae free freetype descriptor and library and mconfig data right before exit
iive
parents: 13946
diff changeset
761
13358
567875b88aab Hardcoded EDL messages moved to help_mp-en.h, Doxygen comments added, patch
diego
parents: 13353
diff changeset
762 if(edl_records != NULL) free(edl_records); // free mem allocated for EDL
30076
728444c29ec0 Set some freed pointers to NULL.
reimar
parents: 30075
diff changeset
763 edl_records = NULL;
28032
92e770f6e890 Print ID_EXIT and exit reason message in identify mode when exiting.
reimar
parents: 27953
diff changeset
764 switch(how) {
92e770f6e890 Print ID_EXIT and exit reason message in identify mode when exiting.
reimar
parents: 27953
diff changeset
765 case EXIT_QUIT:
92e770f6e890 Print ID_EXIT and exit reason message in identify mode when exiting.
reimar
parents: 27953
diff changeset
766 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_ExitingHow,MSGTR_Exit_quit);
92e770f6e890 Print ID_EXIT and exit reason message in identify mode when exiting.
reimar
parents: 27953
diff changeset
767 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_EXIT=QUIT\n");
92e770f6e890 Print ID_EXIT and exit reason message in identify mode when exiting.
reimar
parents: 27953
diff changeset
768 break;
92e770f6e890 Print ID_EXIT and exit reason message in identify mode when exiting.
reimar
parents: 27953
diff changeset
769 case EXIT_EOF:
92e770f6e890 Print ID_EXIT and exit reason message in identify mode when exiting.
reimar
parents: 27953
diff changeset
770 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_ExitingHow,MSGTR_Exit_eof);
92e770f6e890 Print ID_EXIT and exit reason message in identify mode when exiting.
reimar
parents: 27953
diff changeset
771 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_EXIT=EOF\n");
92e770f6e890 Print ID_EXIT and exit reason message in identify mode when exiting.
reimar
parents: 27953
diff changeset
772 break;
92e770f6e890 Print ID_EXIT and exit reason message in identify mode when exiting.
reimar
parents: 27953
diff changeset
773 case EXIT_ERROR:
92e770f6e890 Print ID_EXIT and exit reason message in identify mode when exiting.
reimar
parents: 27953
diff changeset
774 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_ExitingHow,MSGTR_Exit_error);
92e770f6e890 Print ID_EXIT and exit reason message in identify mode when exiting.
reimar
parents: 27953
diff changeset
775 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_EXIT=ERROR\n");
92e770f6e890 Print ID_EXIT and exit reason message in identify mode when exiting.
reimar
parents: 27953
diff changeset
776 break;
92e770f6e890 Print ID_EXIT and exit reason message in identify mode when exiting.
reimar
parents: 27953
diff changeset
777 default:
92e770f6e890 Print ID_EXIT and exit reason message in identify mode when exiting.
reimar
parents: 27953
diff changeset
778 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_EXIT=NONE\n");
92e770f6e890 Print ID_EXIT and exit reason message in identify mode when exiting.
reimar
parents: 27953
diff changeset
779 }
4733
5bad0d74f6ea standard key support for video out runtime fullscreen switching
alex
parents: 4693
diff changeset
780 mp_msg(MSGT_CPLAYER,MSGL_DBG2,"max framesize was %d bytes\n",max_framesize);
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
781
8644
0bfd73828e33 This patch fixes so that the exit code (or return code if you like) is set
arpi
parents: 8635
diff changeset
782 exit(rc);
0bfd73828e33 This patch fixes so that the exit code (or return code if you like) is set
arpi
parents: 8635
diff changeset
783 }
0bfd73828e33 This patch fixes so that the exit code (or return code if you like) is set
arpi
parents: 8635
diff changeset
784
30518
654cad7ea876 Rename exit_reason_t enum to exit_reason and do not typedef it.
diego
parents: 30506
diff changeset
785 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
786 {
8644
0bfd73828e33 This patch fixes so that the exit code (or return code if you like) is set
arpi
parents: 8635
diff changeset
787 exit_player_with_rc(how, 1);
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
788 }
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
789
13391
b6c3752d9544 handle sigchld in mplayer.c
faust3
parents: 13358
diff changeset
790 #ifndef __MINGW32__
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
791 static void child_sighandler(int x){
13391
b6c3752d9544 handle sigchld in mplayer.c
faust3
parents: 13358
diff changeset
792 pid_t pid;
b6c3752d9544 handle sigchld in mplayer.c
faust3
parents: 13358
diff changeset
793 while((pid=waitpid(-1,NULL,WNOHANG)) > 0);
b6c3752d9544 handle sigchld in mplayer.c
faust3
parents: 13358
diff changeset
794 }
b6c3752d9544 handle sigchld in mplayer.c
faust3
parents: 13358
diff changeset
795 #endif
b6c3752d9544 handle sigchld in mplayer.c
faust3
parents: 13358
diff changeset
796
7559
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
797 static void exit_sighandler(int x){
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
798 static int sig_count=0;
27397
d47744b95b78 Give a CONFIG_ prefix to preprocessor directives that lacked one and
diego
parents: 27393
diff changeset
799 #ifdef CONFIG_CRASH_DEBUG
13794
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
800 if (!crash_debug || x != SIGTRAP)
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
801 #endif
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
802 ++sig_count;
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
803 if(initialized_flags==0 && sig_count>1) exit(1);
13298
a7bde33bd7d8 Don't leave a messed up terminal after a crash
rtognimp
parents: 13269
diff changeset
804 if(sig_count==5)
a7bde33bd7d8 Don't leave a messed up terminal after a crash
rtognimp
parents: 13269
diff changeset
805 {
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
806 /* We're crashing bad and can't uninit cleanly :(
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
807 * by popular request, we make one last (dirty)
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
808 * effort to restore the user's
13298
a7bde33bd7d8 Don't leave a messed up terminal after a crash
rtognimp
parents: 13269
diff changeset
809 * terminal. */
a7bde33bd7d8 Don't leave a messed up terminal after a crash
rtognimp
parents: 13269
diff changeset
810 getch2_disable();
a7bde33bd7d8 Don't leave a messed up terminal after a crash
rtognimp
parents: 13269
diff changeset
811 exit(1);
a7bde33bd7d8 Don't leave a messed up terminal after a crash
rtognimp
parents: 13269
diff changeset
812 }
a7bde33bd7d8 Don't leave a messed up terminal after a crash
rtognimp
parents: 13269
diff changeset
813 if(sig_count==6) exit(1);
a7bde33bd7d8 Don't leave a messed up terminal after a crash
rtognimp
parents: 13269
diff changeset
814 if(sig_count>6){
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
815 // can't stop :(
9831
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
816 #ifndef __MINGW32__
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
817 kill(getpid(),SIGKILL);
9831
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
818 #endif
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
819 }
5127
621a68b911a9 hints on RTFM
arpi
parents: 5112
diff changeset
820 mp_msg(MSGT_CPLAYER,MSGL_FATAL,"\n" MSGTR_IntBySignal,x,
18003
9fc72c7291d5 more cruft
rfelker
parents: 18002
diff changeset
821 current_module?current_module:"unknown"
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
822 );
18237
4231482179b6 Get ride of the several if(identify) messy lines and rearangment of some of the output, both patches by Kiriuja mplayer-patches AT en-directo_net, his changes are barely unrelated, nevertheless Im commiting them thogeter just for the sake of my mental healt, I had both patches already applied on my local three
reynaldo
parents: 18232
diff changeset
823 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_SIGNAL=%d\n", x);
13794
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
824 if(sig_count<=1)
5127
621a68b911a9 hints on RTFM
arpi
parents: 5112
diff changeset
825 switch(x){
621a68b911a9 hints on RTFM
arpi
parents: 5112
diff changeset
826 case SIGINT:
31366
0bf908d29807 SIGPIPE is not really a crash, try to exit cleanly in case we receive one.
reimar
parents: 31319
diff changeset
827 case SIGPIPE:
5127
621a68b911a9 hints on RTFM
arpi
parents: 5112
diff changeset
828 case SIGQUIT:
621a68b911a9 hints on RTFM
arpi
parents: 5112
diff changeset
829 case SIGTERM:
621a68b911a9 hints on RTFM
arpi
parents: 5112
diff changeset
830 case SIGKILL:
25623
b955a135e3a8 Do not use exit_player in the signal handler, this code just can not
reimar
parents: 25622
diff changeset
831 async_quit_request = 1;
b955a135e3a8 Do not use exit_player in the signal handler, this code just can not
reimar
parents: 25622
diff changeset
832 return; // killed from keyboard (^C) or killed [-9]
5127
621a68b911a9 hints on RTFM
arpi
parents: 5112
diff changeset
833 case SIGILL:
29114
06540eb5ef6a Rename RUNTIME_CPUDETECT to CONFIG_RUNTIME_CPUDETECT and always define it.
ramiro
parents: 29069
diff changeset
834 #if CONFIG_RUNTIME_CPUDETECT
8913
f01a53c8de14 Signal handler messages moved to help_mp, so they can be translated
rtognimp
parents: 8819
diff changeset
835 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_Exit_SIGILL_RTCpuSel);
5129
7de3c4209461 rtfm hint msg depends on runtime detection
arpi
parents: 5127
diff changeset
836 #else
8913
f01a53c8de14 Signal handler messages moved to help_mp, so they can be translated
rtognimp
parents: 8819
diff changeset
837 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_Exit_SIGILL);
5129
7de3c4209461 rtfm hint msg depends on runtime detection
arpi
parents: 5127
diff changeset
838 #endif
5127
621a68b911a9 hints on RTFM
arpi
parents: 5112
diff changeset
839 case SIGFPE:
621a68b911a9 hints on RTFM
arpi
parents: 5112
diff changeset
840 case SIGSEGV:
8913
f01a53c8de14 Signal handler messages moved to help_mp, so they can be translated
rtognimp
parents: 8819
diff changeset
841 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_Exit_SIGSEGV_SIGFPE);
5127
621a68b911a9 hints on RTFM
arpi
parents: 5112
diff changeset
842 default:
8913
f01a53c8de14 Signal handler messages moved to help_mp, so they can be translated
rtognimp
parents: 8819
diff changeset
843 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_Exit_SIGCRASH);
27397
d47744b95b78 Give a CONFIG_ prefix to preprocessor directives that lacked one and
diego
parents: 27393
diff changeset
844 #ifdef CONFIG_CRASH_DEBUG
13794
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
845 if (crash_debug) {
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
846 int gdb_pid;
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
847 mp_msg(MSGT_CPLAYER, MSGL_INFO, "Forking...\n");
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
848 gdb_pid = fork();
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
849 mp_msg(MSGT_CPLAYER, MSGL_INFO, "Forked...\n");
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
850 if (gdb_pid == 0) { // We are the child
25625
501847ab4460 Use getppid instead of getpid and move a snprintf to where it is actually needed.
reimar
parents: 25624
diff changeset
851 char spid[20];
501847ab4460 Use getppid instead of getpid and move a snprintf to where it is actually needed.
reimar
parents: 25624
diff changeset
852 snprintf(spid, sizeof(spid), "%i", getppid());
24981
cacb3695a1a4 Restore terminal for gdb with -crash-debug by calling getch2_disable()
reimar
parents: 24947
diff changeset
853 getch2_disable(); // allow terminal to work properly with gdb
24982
5d338b18763d Make crash-debug gdb auto-execute "bt"
reimar
parents: 24981
diff changeset
854 if (execlp("gdb", "gdb", prog_path, spid, "-ex", "bt", NULL) == -1)
13794
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
855 mp_msg(MSGT_CPLAYER, MSGL_ERR, "Couldn't start gdb\n");
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
856 } else if (gdb_pid < 0)
13794
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
857 mp_msg(MSGT_CPLAYER, MSGL_ERR, "Couldn't fork\n");
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
858 else {
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
859 waitpid(gdb_pid, NULL, 0);
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
860 }
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
861 if (x == SIGTRAP) return;
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
862 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
863 #endif
5127
621a68b911a9 hints on RTFM
arpi
parents: 5112
diff changeset
864 }
25623
b955a135e3a8 Do not use exit_player in the signal handler, this code just can not
reimar
parents: 25622
diff changeset
865 getch2_disable();
b955a135e3a8 Do not use exit_player in the signal handler, this code just can not
reimar
parents: 25622
diff changeset
866 exit(1);
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
867 }
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
868
18888
ab29b3c4f94e parse_cfgfiles as static in mplayer.c/mencoder.c, patch by Stefan Huehner, stefan AT huehner-org
reynaldo
parents: 18857
diff changeset
869 static void parse_cfgfiles( m_config_t* conf )
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
870 {
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
871 char *conffile;
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
872 int conffile_fd;
26416
9d53b15aed02 Add options to disable some or all config files.
albeu
parents: 26408
diff changeset
873 if (!disable_system_conf &&
9d53b15aed02 Add options to disable some or all config files.
albeu
parents: 26408
diff changeset
874 m_config_parse_config_file(conf, MPLAYER_CONFDIR "/mplayer.conf") < 0)
28032
92e770f6e890 Print ID_EXIT and exit reason message in identify mode when exiting.
reimar
parents: 27953
diff changeset
875 exit_player(EXIT_NONE);
178
55206b791586 get_path()
szabii
parents: 175
diff changeset
876 if ((conffile = get_path("")) == NULL) {
1583
ca7bf882d2f8 ehh. mp_msgt->mp_msg
arpi
parents: 1582
diff changeset
877 mp_msg(MSGT_CPLAYER,MSGL_WARN,MSGTR_NoHomeDir);
147
0a0d7dd8fb51 new command line/config file parser
szabii
parents: 117
diff changeset
878 } else {
9831
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
879 #ifdef __MINGW32__
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
880 mkdir(conffile);
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
881 #else
178
55206b791586 get_path()
szabii
parents: 175
diff changeset
882 mkdir(conffile, 0777);
9831
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
883 #endif
178
55206b791586 get_path()
szabii
parents: 175
diff changeset
884 free(conffile);
55206b791586 get_path()
szabii
parents: 175
diff changeset
885 if ((conffile = get_path("config")) == NULL) {
1583
ca7bf882d2f8 ehh. mp_msgt->mp_msg
arpi
parents: 1582
diff changeset
886 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_GetpathProblem);
178
55206b791586 get_path()
szabii
parents: 175
diff changeset
887 } else {
55206b791586 get_path()
szabii
parents: 175
diff changeset
888 if ((conffile_fd = open(conffile, O_CREAT | O_EXCL | O_WRONLY, 0666)) != -1) {
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
889 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_CreatingCfgFile, conffile);
178
55206b791586 get_path()
szabii
parents: 175
diff changeset
890 write(conffile_fd, default_config, strlen(default_config));
55206b791586 get_path()
szabii
parents: 175
diff changeset
891 close(conffile_fd);
55206b791586 get_path()
szabii
parents: 175
diff changeset
892 }
26416
9d53b15aed02 Add options to disable some or all config files.
albeu
parents: 26408
diff changeset
893 if (!disable_user_conf &&
9d53b15aed02 Add options to disable some or all config files.
albeu
parents: 26408
diff changeset
894 m_config_parse_config_file(conf, conffile) < 0)
28032
92e770f6e890 Print ID_EXIT and exit reason message in identify mode when exiting.
reimar
parents: 27953
diff changeset
895 exit_player(EXIT_NONE);
178
55206b791586 get_path()
szabii
parents: 175
diff changeset
896 free(conffile);
151
9708d4b2765b cfgparser fix
szabii
parents: 150
diff changeset
897 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
898 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
899 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
900
25635
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
901 #define PROFILE_CFG_PROTOCOL "protocol."
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
902
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
903 static void load_per_protocol_config (m_config_t* conf, const char *const file)
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
904 {
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
905 char *str;
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
906 char protocol[strlen (PROFILE_CFG_PROTOCOL) + strlen (file) + 1];
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
907 m_profile_t *p;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
908
25635
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
909 /* does filename actually uses a protocol ? */
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
910 str = strstr (file, "://");
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
911 if (!str)
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
912 return;
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
913
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
914 sprintf (protocol, "%s%s", PROFILE_CFG_PROTOCOL, file);
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
915 protocol[strlen (PROFILE_CFG_PROTOCOL)+strlen(file)-strlen(str)] = '\0';
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
916 p = m_config_get_profile (conf, protocol);
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
917 if (p)
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
918 {
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
919 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_LoadingProtocolProfile, protocol);
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
920 m_config_set_profile(conf,p);
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
921 }
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
922 }
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
923
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
924 #define PROFILE_CFG_EXTENSION "extension."
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
925
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
926 static void load_per_extension_config (m_config_t* conf, const char *const file)
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
927 {
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
928 char *str;
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
929 char extension[strlen (PROFILE_CFG_EXTENSION) + 8];
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
930 m_profile_t *p;
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
931
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
932 /* does filename actually have an extension ? */
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
933 str = strrchr (filename, '.');
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
934 if (!str)
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
935 return;
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
936
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
937 sprintf (extension, PROFILE_CFG_EXTENSION);
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
938 strncat (extension, ++str, 7);
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
939 p = m_config_get_profile (conf, extension);
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
940 if (p)
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
941 {
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
942 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_LoadingExtensionProfile, extension);
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
943 m_config_set_profile(conf,p);
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
944 }
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
945 }
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
946
25641
58fd8ebcd6e3 allow profile loading per audio/video output
ben
parents: 25636
diff changeset
947 #define PROFILE_CFG_VO "vo."
58fd8ebcd6e3 allow profile loading per audio/video output
ben
parents: 25636
diff changeset
948 #define PROFILE_CFG_AO "ao."
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 static void load_per_output_config (m_config_t* conf, char *cfg, char *out)
58fd8ebcd6e3 allow profile loading per audio/video output
ben
parents: 25636
diff changeset
951 {
58fd8ebcd6e3 allow profile loading per audio/video output
ben
parents: 25636
diff changeset
952 char profile[strlen (cfg) + strlen (out) + 1];
58fd8ebcd6e3 allow profile loading per audio/video output
ben
parents: 25636
diff changeset
953 m_profile_t *p;
58fd8ebcd6e3 allow profile loading per audio/video output
ben
parents: 25636
diff changeset
954
58fd8ebcd6e3 allow profile loading per audio/video output
ben
parents: 25636
diff changeset
955 sprintf (profile, "%s%s", cfg, out);
58fd8ebcd6e3 allow profile loading per audio/video output
ben
parents: 25636
diff changeset
956 p = m_config_get_profile (conf, profile);
58fd8ebcd6e3 allow profile loading per audio/video output
ben
parents: 25636
diff changeset
957 if (p)
58fd8ebcd6e3 allow profile loading per audio/video output
ben
parents: 25636
diff changeset
958 {
58fd8ebcd6e3 allow profile loading per audio/video output
ben
parents: 25636
diff changeset
959 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_LoadingExtensionProfile, profile);
58fd8ebcd6e3 allow profile loading per audio/video output
ben
parents: 25636
diff changeset
960 m_config_set_profile(conf,p);
58fd8ebcd6e3 allow profile loading per audio/video output
ben
parents: 25636
diff changeset
961 }
58fd8ebcd6e3 allow profile loading per audio/video output
ben
parents: 25636
diff changeset
962 }
58fd8ebcd6e3 allow profile loading per audio/video output
ben
parents: 25636
diff changeset
963
29561
82ff5f35918a Factor out code to try and load a config file only if it exists.
reimar
parents: 29432
diff changeset
964 /**
82ff5f35918a Factor out code to try and load a config file only if it exists.
reimar
parents: 29432
diff changeset
965 * Tries to load a config file
82ff5f35918a Factor out code to try and load a config file only if it exists.
reimar
parents: 29432
diff changeset
966 * @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
967 */
82ff5f35918a Factor out code to try and load a config file only if it exists.
reimar
parents: 29432
diff changeset
968 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
969 {
82ff5f35918a Factor out code to try and load a config file only if it exists.
reimar
parents: 29432
diff changeset
970 struct stat st;
82ff5f35918a Factor out code to try and load a config file only if it exists.
reimar
parents: 29432
diff changeset
971 if (stat(file, &st))
82ff5f35918a Factor out code to try and load a config file only if it exists.
reimar
parents: 29432
diff changeset
972 return 0;
82ff5f35918a Factor out code to try and load a config file only if it exists.
reimar
parents: 29432
diff changeset
973 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_LoadingConfig, file);
82ff5f35918a Factor out code to try and load a config file only if it exists.
reimar
parents: 29432
diff changeset
974 m_config_parse_config_file (conf, file);
82ff5f35918a Factor out code to try and load a config file only if it exists.
reimar
parents: 29432
diff changeset
975 return 1;
82ff5f35918a Factor out code to try and load a config file only if it exists.
reimar
parents: 29432
diff changeset
976 }
82ff5f35918a Factor out code to try and load a config file only if it exists.
reimar
parents: 29432
diff changeset
977
25606
a3f9b22287ca Make some functions in mplayer.c static
reimar
parents: 25467
diff changeset
978 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
979 {
49e36bf2f342 The patch adds support for a per-file config, which is loaded before
arpi
parents: 8612
diff changeset
980 char *confpath;
29594
331320b4557b Limit amount of data allocated on stack, strlen(filename) is not a good idea for
reimar
parents: 29592
diff changeset
981 char cfg[PATH_MAX];
8614
49e36bf2f342 The patch adds support for a per-file config, which is loaded before
arpi
parents: 8612
diff changeset
982 char *name;
49e36bf2f342 The patch adds support for a per-file config, which is loaded before
arpi
parents: 8612
diff changeset
983
29594
331320b4557b Limit amount of data allocated on stack, strlen(filename) is not a good idea for
reimar
parents: 29592
diff changeset
984 if (strlen(file) > PATH_MAX - 14) {
331320b4557b Limit amount of data allocated on stack, strlen(filename) is not a good idea for
reimar
parents: 29592
diff changeset
985 mp_msg(MSGT_CPLAYER, MSGL_WARN, "Filename is too long, can not load file or directory specific config files\n");
331320b4557b Limit amount of data allocated on stack, strlen(filename) is not a good idea for
reimar
parents: 29592
diff changeset
986 return;
331320b4557b Limit amount of data allocated on stack, strlen(filename) is not a good idea for
reimar
parents: 29592
diff changeset
987 }
8614
49e36bf2f342 The patch adds support for a per-file config, which is loaded before
arpi
parents: 8612
diff changeset
988 sprintf (cfg, "%s.conf", file);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
989
29562
647445e4999e Fix per-file config file loading for DOS paths (i.e. where \ and : can
reimar
parents: 29561
diff changeset
990 name = strrchr(cfg, '/');
647445e4999e Fix per-file config file loading for DOS paths (i.e. where \ and : can
reimar
parents: 29561
diff changeset
991 if (HAVE_DOS_PATHS) {
647445e4999e Fix per-file config file loading for DOS paths (i.e. where \ and : can
reimar
parents: 29561
diff changeset
992 char *tmp = strrchr(cfg, '\\');
647445e4999e Fix per-file config file loading for DOS paths (i.e. where \ and : can
reimar
parents: 29561
diff changeset
993 if (!name || tmp > name)
647445e4999e Fix per-file config file loading for DOS paths (i.e. where \ and : can
reimar
parents: 29561
diff changeset
994 name = tmp;
647445e4999e Fix per-file config file loading for DOS paths (i.e. where \ and : can
reimar
parents: 29561
diff changeset
995 tmp = strrchr(cfg, ':');
647445e4999e Fix per-file config file loading for DOS paths (i.e. where \ and : can
reimar
parents: 29561
diff changeset
996 if (!name || tmp > name)
647445e4999e Fix per-file config file loading for DOS paths (i.e. where \ and : can
reimar
parents: 29561
diff changeset
997 name = tmp;
647445e4999e Fix per-file config file loading for DOS paths (i.e. where \ and : can
reimar
parents: 29561
diff changeset
998 }
647445e4999e Fix per-file config file loading for DOS paths (i.e. where \ and : can
reimar
parents: 29561
diff changeset
999 if (!name)
8614
49e36bf2f342 The patch adds support for a per-file config, which is loaded before
arpi
parents: 8612
diff changeset
1000 name = cfg;
49e36bf2f342 The patch adds support for a per-file config, which is loaded before
arpi
parents: 8612
diff changeset
1001 else
49e36bf2f342 The patch adds support for a per-file config, which is loaded before
arpi
parents: 8612
diff changeset
1002 name++;
49e36bf2f342 The patch adds support for a per-file config, which is loaded before
arpi
parents: 8612
diff changeset
1003
29592
ccdfb20713eb Add support for directory-specific mplayer.conf configuration file.
reimar
parents: 29571
diff changeset
1004 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
1005 char dircfg[PATH_MAX];
29592
ccdfb20713eb Add support for directory-specific mplayer.conf configuration file.
reimar
parents: 29571
diff changeset
1006 strcpy(dircfg, cfg);
ccdfb20713eb Add support for directory-specific mplayer.conf configuration file.
reimar
parents: 29571
diff changeset
1007 strcpy(dircfg + (name - cfg), "mplayer.conf");
ccdfb20713eb Add support for directory-specific mplayer.conf configuration file.
reimar
parents: 29571
diff changeset
1008 try_load_config(conf, dircfg);
ccdfb20713eb Add support for directory-specific mplayer.conf configuration file.
reimar
parents: 29571
diff changeset
1009
ccdfb20713eb Add support for directory-specific mplayer.conf configuration file.
reimar
parents: 29571
diff changeset
1010 if (try_load_config(conf, cfg))
ccdfb20713eb Add support for directory-specific mplayer.conf configuration file.
reimar
parents: 29571
diff changeset
1011 return;
ccdfb20713eb Add support for directory-specific mplayer.conf configuration file.
reimar
parents: 29571
diff changeset
1012 }
ccdfb20713eb Add support for directory-specific mplayer.conf configuration file.
reimar
parents: 29571
diff changeset
1013
8614
49e36bf2f342 The patch adds support for a per-file config, which is loaded before
arpi
parents: 8612
diff changeset
1014 if ((confpath = get_path (name)) != NULL)
49e36bf2f342 The patch adds support for a per-file config, which is loaded before
arpi
parents: 8612
diff changeset
1015 {
29561
82ff5f35918a Factor out code to try and load a config file only if it exists.
reimar
parents: 29432
diff changeset
1016 try_load_config(conf, confpath);
8614
49e36bf2f342 The patch adds support for a per-file config, which is loaded before
arpi
parents: 8612
diff changeset
1017
49e36bf2f342 The patch adds support for a per-file config, which is loaded before
arpi
parents: 8612
diff changeset
1018 free (confpath);
49e36bf2f342 The patch adds support for a per-file config, which is loaded before
arpi
parents: 8612
diff changeset
1019 }
49e36bf2f342 The patch adds support for a per-file config, which is loaded before
arpi
parents: 8612
diff changeset
1020 }
49e36bf2f342 The patch adds support for a per-file config, which is loaded before
arpi
parents: 8612
diff changeset
1021
18316
b3be7df634b0 spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents: 18315
diff changeset
1022 /* 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
1023 * 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
1024 * if it was interrupted by the user.
b3be7df634b0 spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents: 18315
diff changeset
1025 * The function returns a new value for eof. */
4825
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
1026 static int libmpdemux_was_interrupted(int eof) {
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
1027 mp_cmd_t* cmd;
13603
80fc8f48f14c Do not loose commands while paused.
reimar
parents: 13577
diff changeset
1028 if((cmd = mp_input_get_cmd(0,0,0)) != NULL) {
4825
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
1029 switch(cmd->id) {
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
1030 case MP_CMD_QUIT:
28032
92e770f6e890 Print ID_EXIT and exit reason message in identify mode when exiting.
reimar
parents: 27953
diff changeset
1031 exit_player_with_rc(EXIT_QUIT, (cmd->nargs > 0)? cmd->args[0].v.i : 0);
4825
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
1032 case MP_CMD_PLAY_TREE_STEP: {
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
1033 eof = (cmd->args[0].v.i > 0) ? PT_NEXT_ENTRY : PT_PREV_ENTRY;
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1034 mpctx->play_tree_step = (cmd->args[0].v.i == 0) ? 1 : cmd->args[0].v.i;
4825
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
1035 } break;
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
1036 case MP_CMD_PLAY_TREE_UP_STEP: {
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
1037 eof = (cmd->args[0].v.i > 0) ? PT_UP_NEXT : PT_UP_PREV;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1038 } break;
4825
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
1039 case MP_CMD_PLAY_ALT_SRC_STEP: {
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
1040 eof = (cmd->args[0].v.i > 0) ? PT_NEXT_SRC : PT_PREV_SRC;
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
1041 } break;
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
1042 }
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
1043 mp_cmd_free(cmd);
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
1044 }
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
1045 return eof;
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
1046 }
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
1047
13010
047bbb973011 windows path seperator fixes
joey
parents: 12981
diff changeset
1048 #define mp_basename(s) (strrchr(s,'\\')==NULL?(mp_basename2(s)):(strrchr(s,'\\')+1))
8937
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
1049
25606
a3f9b22287ca Make some functions in mplayer.c static
reimar
parents: 25467
diff changeset
1050 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
1051 {
9301
7841308ad250 this patch fixes latest bug, discovered by .so ... (relative filenames &
arpi
parents: 9291
diff changeset
1052 play_tree_add_bpf(entry,filename);
7841308ad250 this patch fixes latest bug, discovered by .so ... (relative filenames &
arpi
parents: 9291
diff changeset
1053
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
1054 #ifdef CONFIG_GUI
9291
64b8c5a07c2c - It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents: 9217
diff changeset
1055 if (use_gui) {
64b8c5a07c2c - It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents: 9217
diff changeset
1056 if (entry) {
64b8c5a07c2c - It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents: 9217
diff changeset
1057 import_playtree_playlist_into_gui(entry, mconfig);
64b8c5a07c2c - It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents: 9217
diff changeset
1058 play_tree_free_list(entry,1);
64b8c5a07c2c - It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents: 9217
diff changeset
1059 }
64b8c5a07c2c - It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents: 9217
diff changeset
1060 } else
64b8c5a07c2c - It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents: 9217
diff changeset
1061 #endif
64b8c5a07c2c - It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents: 9217
diff changeset
1062 {
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1063 if(!entry) {
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1064 entry = mpctx->playtree_iter->tree;
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1065 if(play_tree_iter_step(mpctx->playtree_iter,1,0) != PLAY_TREE_ITER_ENTRY) {
8925
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8913
diff changeset
1066 return PT_NEXT_ENTRY;
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8913
diff changeset
1067 }
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1068 if(mpctx->playtree_iter->tree == entry ) { // Loop with a single file
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1069 if(play_tree_iter_up_step(mpctx->playtree_iter,1,0) != PLAY_TREE_ITER_ENTRY) {
8925
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8913
diff changeset
1070 return PT_NEXT_ENTRY;
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8913
diff changeset
1071 }
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8913
diff changeset
1072 }
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8913
diff changeset
1073 play_tree_remove(entry,1,1);
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8913
diff changeset
1074 return PT_NEXT_SRC;
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8913
diff changeset
1075 }
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1076 play_tree_insert_entry(mpctx->playtree_iter->tree,entry);
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1077 play_tree_set_params_from(entry,mpctx->playtree_iter->tree);
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1078 entry = mpctx->playtree_iter->tree;
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1079 if(play_tree_iter_step(mpctx->playtree_iter,1,0) != PLAY_TREE_ITER_ENTRY) {
8925
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8913
diff changeset
1080 return PT_NEXT_ENTRY;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1081 }
8925
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8913
diff changeset
1082 play_tree_remove(entry,1,1);
9291
64b8c5a07c2c - It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents: 9217
diff changeset
1083 }
8925
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8913
diff changeset
1084 return PT_NEXT_SRC;
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8913
diff changeset
1085 }
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8913
diff changeset
1086
25264
42aa06653705 When auto loading subs, log warning instead of error for load failure.
ulion
parents: 25251
diff changeset
1087 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
1088 {
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
1089 sub_data *subd;
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
1090 #ifdef CONFIG_ASS
31792
55dacfca4a43 Rename libass types to match upstream libass >= 0.9.7
greg
parents: 31762
diff changeset
1091 ASS_Track *asst = 0;
18937
9e95ac641e77 Initial libass release (without mencoder support).
eugeni
parents: 18934
diff changeset
1092 #endif
9e95ac641e77 Initial libass release (without mencoder support).
eugeni
parents: 18934
diff changeset
1093
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1094 if (filename == NULL || mpctx->set_of_sub_size >= MAX_SUBTITLE_FILES) {
9870
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
1095 return;
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
1096 }
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
1097
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
1098 subd = sub_read_file(filename, fps);
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
1099 #ifdef CONFIG_ASS
18937
9e95ac641e77 Initial libass release (without mencoder support).
eugeni
parents: 18934
diff changeset
1100 if (ass_enabled)
27393
4876c89bafdd Rename font-related preprocessor directives.
diego
parents: 27391
diff changeset
1101 #ifdef CONFIG_ICONV
30473
7446f58b6899 Add support for loading ASS subtitles through the stream layer and thus e.g.
reimar
parents: 30429
diff changeset
1102 asst = ass_read_stream(ass_library, filename, sub_cp);
20477
de4a66d99f41 Libass interface reworked:
eugeni
parents: 20341
diff changeset
1103 #else
30473
7446f58b6899 Add support for loading ASS subtitles through the stream layer and thus e.g.
reimar
parents: 30429
diff changeset
1104 asst = ass_read_stream(ass_library, filename, 0);
20477
de4a66d99f41 Libass interface reworked:
eugeni
parents: 20341
diff changeset
1105 #endif
19468
ecd8f562e19b fix null pointer check in add_subtitles,
gpoirier
parents: 19436
diff changeset
1106 if (ass_enabled && subd && !asst)
20477
de4a66d99f41 Libass interface reworked:
eugeni
parents: 20341
diff changeset
1107 asst = ass_read_subdata(ass_library, subd, fps);
19401
c0c3a2f8bb32 Add subdata to ass_track conversion for external subtitles.
eugeni
parents: 19380
diff changeset
1108
25264
42aa06653705 When auto loading subs, log warning instead of error for load failure.
ulion
parents: 25251
diff changeset
1109 if (!asst && !subd)
18937
9e95ac641e77 Initial libass release (without mencoder support).
eugeni
parents: 18934
diff changeset
1110 #else
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1111 if(!subd)
18937
9e95ac641e77 Initial libass release (without mencoder support).
eugeni
parents: 18934
diff changeset
1112 #endif
25264
42aa06653705 When auto loading subs, log warning instead of error for load failure.
ulion
parents: 25251
diff changeset
1113 mp_msg(MSGT_CPLAYER, noerr ? MSGL_WARN : MSGL_ERR, MSGTR_CantLoadSub,
22002
ebd2d5efb11b filename double-conversion, especially usefull for CJK users :-)
gpoirier
parents: 21930
diff changeset
1114 filename_recode(filename));
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1115
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
1116 #ifdef CONFIG_ASS
18937
9e95ac641e77 Initial libass release (without mencoder support).
eugeni
parents: 18934
diff changeset
1117 if (!asst && !subd) return;
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1118 mpctx->set_of_ass_tracks[mpctx->set_of_sub_size] = asst;
18937
9e95ac641e77 Initial libass release (without mencoder support).
eugeni
parents: 18934
diff changeset
1119 #else
9e95ac641e77 Initial libass release (without mencoder support).
eugeni
parents: 18934
diff changeset
1120 if (!subd) return;
9e95ac641e77 Initial libass release (without mencoder support).
eugeni
parents: 18934
diff changeset
1121 #endif
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1122 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
1123 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
1124 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_FILE_SUB_FILENAME=%s\n",
ebd2d5efb11b filename double-conversion, especially usefull for CJK users :-)
gpoirier
parents: 21930
diff changeset
1125 filename_recode(filename));
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1126 ++mpctx->set_of_sub_size;
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1127 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_AddedSubtitleFile, mpctx->set_of_sub_size,
22002
ebd2d5efb11b filename double-conversion, especially usefull for CJK users :-)
gpoirier
parents: 21930
diff changeset
1128 filename_recode(filename));
9870
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
1129 }
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
1130
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
1131 // 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
1132 void update_set_of_subtitles(void)
9870
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
1133 // subdata was changed, set_of_sub... have to be updated.
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
1134 {
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1135 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
1136 int i;
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1137 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
1138 for (i = mpctx->set_of_sub_pos + 1; i < mpctx->set_of_sub_size; ++i)
9870
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
1139 set_of_subtitles[i-1] = set_of_subtitles[i];
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1140 set_of_subtitles[mpctx->set_of_sub_size-1] = NULL;
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1141 --mpctx->set_of_sub_size;
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1142 if (mpctx->set_of_sub_size > 0) subdata = set_of_subtitles[mpctx->set_of_sub_pos=0];
9870
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
1143 }
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1144 else if (mpctx->set_of_sub_size > 0 && subdata != NULL) { // *subdata was changed
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1145 set_of_subtitles[mpctx->set_of_sub_pos] = subdata;
9870
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
1146 }
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1147 else if (mpctx->set_of_sub_size <= 0 && subdata != NULL) { // *subdata was added
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1148 set_of_subtitles[mpctx->set_of_sub_pos=mpctx->set_of_sub_size] = subdata;
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1149 ++mpctx->set_of_sub_size;
9870
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
1150 }
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
1151 }
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
1152
21119
5f9009952814 Move vo_spudec initialization into a separate function, for later reuse
reimar
parents: 21082
diff changeset
1153 void init_vo_spudec(void) {
5f9009952814 Move vo_spudec initialization into a separate function, for later reuse
reimar
parents: 21082
diff changeset
1154 if (vo_spudec)
5f9009952814 Move vo_spudec initialization into a separate function, for later reuse
reimar
parents: 21082
diff changeset
1155 spudec_free(vo_spudec);
5f9009952814 Move vo_spudec initialization into a separate function, for later reuse
reimar
parents: 21082
diff changeset
1156 vo_spudec = NULL;
30506
a70589785d97 Move the check for valid sh_video into the init_vo_spudec, this fixes a crash
reimar
parents: 30473
diff changeset
1157
a70589785d97 Move the check for valid sh_video into the init_vo_spudec, this fixes a crash
reimar
parents: 30473
diff changeset
1158 // we currently can't work without video stream
a70589785d97 Move the check for valid sh_video into the init_vo_spudec, this fixes a crash
reimar
parents: 30473
diff changeset
1159 if (!mpctx->sh_video)
a70589785d97 Move the check for valid sh_video into the init_vo_spudec, this fixes a crash
reimar
parents: 30473
diff changeset
1160 return;
a70589785d97 Move the check for valid sh_video into the init_vo_spudec, this fixes a crash
reimar
parents: 30473
diff changeset
1161
21119
5f9009952814 Move vo_spudec initialization into a separate function, for later reuse
reimar
parents: 21082
diff changeset
1162 if (spudec_ifo) {
5f9009952814 Move vo_spudec initialization into a separate function, for later reuse
reimar
parents: 21082
diff changeset
1163 unsigned int palette[16], width, height;
5f9009952814 Move vo_spudec initialization into a separate function, for later reuse
reimar
parents: 21082
diff changeset
1164 current_module="spudec_init_vobsub";
5f9009952814 Move vo_spudec initialization into a separate function, for later reuse
reimar
parents: 21082
diff changeset
1165 if (vobsub_parse_ifo(NULL,spudec_ifo, palette, &width, &height, 1, -1, NULL) >= 0)
27807
3ac3d3a51934 Factorize vobsub idx/extradata handling.
aurel
parents: 27805
diff changeset
1166 vo_spudec=spudec_new_scaled(palette, width, height, NULL, 0);
21119
5f9009952814 Move vo_spudec initialization into a separate function, for later reuse
reimar
parents: 21082
diff changeset
1167 }
5f9009952814 Move vo_spudec initialization into a separate function, for later reuse
reimar
parents: 21082
diff changeset
1168
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
1169 #ifdef CONFIG_DVDREAD
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1170 if (vo_spudec==NULL && mpctx->stream->type==STREAMTYPE_DVD) {
21119
5f9009952814 Move vo_spudec initialization into a separate function, for later reuse
reimar
parents: 21082
diff changeset
1171 current_module="spudec_init_dvdread";
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1172 vo_spudec=spudec_new_scaled(((dvd_priv_t *)(mpctx->stream->priv))->cur_pgc->palette,
27807
3ac3d3a51934 Factorize vobsub idx/extradata handling.
aurel
parents: 27805
diff changeset
1173 mpctx->sh_video->disp_w, mpctx->sh_video->disp_h,
3ac3d3a51934 Factorize vobsub idx/extradata handling.
aurel
parents: 27805
diff changeset
1174 NULL, 0);
21119
5f9009952814 Move vo_spudec initialization into a separate function, for later reuse
reimar
parents: 21082
diff changeset
1175 }
5f9009952814 Move vo_spudec initialization into a separate function, for later reuse
reimar
parents: 21082
diff changeset
1176 #endif
5f9009952814 Move vo_spudec initialization into a separate function, for later reuse
reimar
parents: 21082
diff changeset
1177
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
1178 #ifdef CONFIG_DVDNAV
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1179 if (vo_spudec==NULL && mpctx->stream->type==STREAMTYPE_DVDNAV) {
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1180 unsigned int *palette = mp_dvdnav_get_spu_clut(mpctx->stream);
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
1181 current_module="spudec_init_dvdnav";
27807
3ac3d3a51934 Factorize vobsub idx/extradata handling.
aurel
parents: 27805
diff changeset
1182 vo_spudec=spudec_new_scaled(palette, mpctx->sh_video->disp_w, mpctx->sh_video->disp_h, NULL, 0);
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
1183 }
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
1184 #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
1185
21119
5f9009952814 Move vo_spudec initialization into a separate function, for later reuse
reimar
parents: 21082
diff changeset
1186 if (vo_spudec==NULL) {
31837
46c25393f99d Remove useless cast.
reimar
parents: 31801
diff changeset
1187 sh_sub_t *sh = mpctx->d_sub->sh;
21119
5f9009952814 Move vo_spudec initialization into a separate function, for later reuse
reimar
parents: 21082
diff changeset
1188 current_module="spudec_init_normal";
27807
3ac3d3a51934 Factorize vobsub idx/extradata handling.
aurel
parents: 27805
diff changeset
1189 vo_spudec=spudec_new_scaled(NULL, mpctx->sh_video->disp_w, mpctx->sh_video->disp_h, sh->extradata, sh->extradata_len);
21119
5f9009952814 Move vo_spudec initialization into a separate function, for later reuse
reimar
parents: 21082
diff changeset
1190 spudec_set_font_factor(vo_spudec,font_factor);
5f9009952814 Move vo_spudec initialization into a separate function, for later reuse
reimar
parents: 21082
diff changeset
1191 }
5f9009952814 Move vo_spudec initialization into a separate function, for later reuse
reimar
parents: 21082
diff changeset
1192
29069
dc5daa853163 Set the forced_subs_only value correctly whenever a new spudec is created.
reimar
parents: 28835
diff changeset
1193 if (vo_spudec!=NULL) {
dc5daa853163 Set the forced_subs_only value correctly whenever a new spudec is created.
reimar
parents: 28835
diff changeset
1194 mp_property_do("sub_forced_only", M_PROPERTY_SET, &forced_subs_only, mpctx);
dc5daa853163 Set the forced_subs_only value correctly whenever a new spudec is created.
reimar
parents: 28835
diff changeset
1195 }
21119
5f9009952814 Move vo_spudec initialization into a separate function, for later reuse
reimar
parents: 21082
diff changeset
1196 }
5f9009952814 Move vo_spudec initialization into a separate function, for later reuse
reimar
parents: 21082
diff changeset
1197
13710
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
1198 /**
13857
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1199 * \brief append a formatted string
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1200 * \param buf buffer to print into
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1201 * \param pos position of terminating 0 in buf
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1202 * \param len maximum number of characters in buf, not including terminating 0
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1203 * \param format printf format string
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1204 */
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1205 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
1206 {
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1207 va_list va;
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1208 va_start(va, format);
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1209 *pos += vsnprintf(&buf[*pos], len - *pos, format, va);
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1210 va_end(va);
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1211 if (*pos >= len ) {
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1212 buf[len] = 0;
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1213 *pos = len;
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1214 }
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1215 }
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1216
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1217 /**
16654
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
1218 * \brief append time in the hh:mm:ss.f format
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
1219 * \param buf buffer to print into
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
1220 * \param pos position of terminating 0 in buf
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
1221 * \param len maximum number of characters in buf, not including terminating 0
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
1222 * \param time time value to convert/append
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
1223 */
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
1224 static void sadd_hhmmssf(char *buf, unsigned *pos, int len, float time) {
30815
1878922f2ce0 Use int64_t instead of long for variable containing current playback time.
reimar
parents: 30665
diff changeset
1225 int64_t tenths = 10 * time;
16654
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
1226 int f1 = tenths % 10;
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
1227 int ss = (tenths / 10) % 60;
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
1228 int mm = (tenths / 600) % 60;
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
1229 int hh = tenths / 36000;
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
1230 if (time <= 0) {
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
1231 saddf(buf, pos, len, "unknown");
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
1232 return;
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
1233 }
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
1234 if (hh > 0)
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
1235 saddf(buf, pos, len, "%2d:", hh);
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
1236 if (hh > 0 || mm > 0)
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
1237 saddf(buf, pos, len, "%02d:", mm);
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
1238 saddf(buf, pos, len, "%02d.%1d", ss, f1);
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
1239 }
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
1240
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
1241 /**
13857
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1242 * \brief print the status line
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1243 * \param a_pos audio position
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1244 * \param a_v A-V desynchronization
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1245 * \param corr amount out A-V synchronization
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1246 */
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1247 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
1248 {
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1249 sh_video_t * const sh_video = mpctx->sh_video;
13857
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1250 int width;
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1251 char *line;
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1252 unsigned pos = 0;
13906
db2f1e657dfe use get_screen_size from getch2.c instead of ioctl, fixes bug #131.
reimar
parents: 13893
diff changeset
1253 get_screen_size();
db2f1e657dfe use get_screen_size from getch2.c instead of ioctl, fixes bug #131.
reimar
parents: 13893
diff changeset
1254 if (screen_width > 0)
db2f1e657dfe use get_screen_size from getch2.c instead of ioctl, fixes bug #131.
reimar
parents: 13893
diff changeset
1255 width = screen_width;
13857
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1256 else
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1257 width = 80;
27727
48c1ae64255b Replace preprocessor check for WIN32 with checks for __MINGW32__ and __CYGWIN__.
diego
parents: 27635
diff changeset
1258 #if defined(__MINGW32__) || defined(__CYGWIN__) || defined(__OS2__)
18316
b3be7df634b0 spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents: 18315
diff changeset
1259 /* Windows command line is broken (MinGW's rxvt works, but we
b3be7df634b0 spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents: 18315
diff changeset
1260 * should not depend on that). */
13928
6a0b5d320378 fix scrolling status line in windows
reimar
parents: 13906
diff changeset
1261 width--;
6a0b5d320378 fix scrolling status line in windows
reimar
parents: 13906
diff changeset
1262 #endif
18316
b3be7df634b0 spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents: 18315
diff changeset
1263 line = malloc(width + 1); // one additional char for the terminating null
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1264
13857
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1265 // Audio time
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1266 if (mpctx->sh_audio) {
13857
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1267 saddf(line, &pos, width, "A:%6.1f ", a_pos);
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1268 if (!sh_video) {
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1269 float len = demuxer_get_time_length(mpctx->demuxer);
13857
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1270 saddf(line, &pos, width, "(");
16654
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
1271 sadd_hhmmssf(line, &pos, width, a_pos);
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
1272 saddf(line, &pos, width, ") of %.1f (", len);
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
1273 sadd_hhmmssf(line, &pos, width, len);
16742
2d8ace98bb6d Missing space in status line
reimar
parents: 16740
diff changeset
1274 saddf(line, &pos, width, ") ");
13857
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1275 }
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1276 }
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1277
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1278 // Video time
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1279 if (sh_video)
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1280 saddf(line, &pos, width, "V:%6.1f ", sh_video->pts);
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1281
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1282 // A-V sync
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1283 if (mpctx->sh_audio && sh_video)
13857
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1284 saddf(line, &pos, width, "A-V:%7.3f ct:%7.3f ", a_v, corr);
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 // Video stats
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1287 if (sh_video)
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1288 saddf(line, &pos, width, "%3d/%3d ",
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1289 (int)sh_video->num_frames,
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1290 (int)sh_video->num_frames_decoded);
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1291
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1292 // CPU usage
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1293 if (sh_video) {
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1294 if (sh_video->timer > 0.5)
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1295 saddf(line, &pos, width, "%2d%% %2d%% %4.1f%% ",
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1296 (int)(100.0*video_time_usage*playback_speed/(double)sh_video->timer),
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1297 (int)(100.0*vout_time_usage*playback_speed/(double)sh_video->timer),
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1298 (100.0*audio_time_usage*playback_speed/(double)sh_video->timer));
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1299 else
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1300 saddf(line, &pos, width, "??%% ??%% ??,?%% ");
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1301 } else if (mpctx->sh_audio) {
22488
b6aa3eedf49b Move the sh_audio->delay field to mpctx->delay.
uau
parents: 22458
diff changeset
1302 if (mpctx->delay > 0.5)
13857
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1303 saddf(line, &pos, width, "%4.1f%% ",
22488
b6aa3eedf49b Move the sh_audio->delay field to mpctx->delay.
uau
parents: 22458
diff changeset
1304 100.0*audio_time_usage/(double)mpctx->delay);
13857
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1305 else
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1306 saddf(line, &pos, width, "??,?%% ");
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1307 }
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1308
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1309 // VO stats
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1310 if (sh_video)
13857
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1311 saddf(line, &pos, width, "%d %d ", drop_frame_cnt, output_quality);
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1312
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
1313 #ifdef CONFIG_STREAM_CACHE
13857
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1314 // cache stats
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1315 if (stream_cache_size > 0)
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1316 saddf(line, &pos, width, "%d%% ", cache_fill_status);
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1317 #endif
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1318
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1319 // other
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1320 if (playback_speed != 1)
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1321 saddf(line, &pos, width, "%4.2fx ", playback_speed);
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1322
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1323 // end
17258
3d02f6e2a432 change erase to end of line, fall back to old behavior if no termcap found
ods15
parents: 17251
diff changeset
1324 if (erase_to_end_of_line) {
3d02f6e2a432 change erase to end of line, fall back to old behavior if no termcap found
ods15
parents: 17251
diff changeset
1325 line[pos] = 0;
23460
44746cbd4e5b Create a new MSGT for just the status line.
diego
parents: 23338
diff changeset
1326 mp_msg(MSGT_STATUSLINE, MSGL_STATUS, "%s%s\r", line, erase_to_end_of_line);
17258
3d02f6e2a432 change erase to end of line, fall back to old behavior if no termcap found
ods15
parents: 17251
diff changeset
1327 } else {
3d02f6e2a432 change erase to end of line, fall back to old behavior if no termcap found
ods15
parents: 17251
diff changeset
1328 memset(&line[pos], ' ', width - pos);
3d02f6e2a432 change erase to end of line, fall back to old behavior if no termcap found
ods15
parents: 17251
diff changeset
1329 line[width] = 0;
23460
44746cbd4e5b Create a new MSGT for just the status line.
diego
parents: 23338
diff changeset
1330 mp_msg(MSGT_STATUSLINE, MSGL_STATUS, "%s\r", line);
17258
3d02f6e2a432 change erase to end of line, fall back to old behavior if no termcap found
ods15
parents: 17251
diff changeset
1331 }
13857
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1332 free(line);
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1333 }
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1334
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1335 /**
13710
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
1336 * \brief build a chain of audio filters that converts the input format
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
1337 * to the ao's format, taking into account the current playback_speed.
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
1338 * \param sh_audio describes the requested input format of the chain.
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
1339 * \param ao_data describes the requested output format of the chain.
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
1340 */
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1341 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
1342 {
14140
337aa26e20b5 10l, should check for != NULL before using not after...
reimar
parents: 14087
diff changeset
1343 int new_srate;
14172
67912fc34e04 Set mixer.afilter at a more appropriate place.
reimar
parents: 14140
diff changeset
1344 int result;
13710
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
1345 if (!sh_audio)
14172
67912fc34e04 Set mixer.afilter at a more appropriate place.
reimar
parents: 14140
diff changeset
1346 {
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
1347 #ifdef CONFIG_GUI
22285
5d12a6e96930 Add missing "if (use_gui)" before some GUI calls
uau
parents: 22284
diff changeset
1348 if (use_gui) guiGetEvent(guiSetAfilter, (char *)NULL);
14254
21e72b6d8d11 Do not use audio plugins anymore
reimar
parents: 14245
diff changeset
1349 #endif
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1350 mpctx->mixer.afilter = NULL;
13710
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
1351 return 0;
14172
67912fc34e04 Set mixer.afilter at a more appropriate place.
reimar
parents: 14140
diff changeset
1352 }
24896
8133163bd1dd Add audio filter scaletempo
uau
parents: 24895
diff changeset
1353 if(af_control_any_rev(sh_audio->afilter,
8133163bd1dd Add audio filter scaletempo
uau
parents: 24895
diff changeset
1354 AF_CONTROL_PLAYBACK_SPEED | AF_CONTROL_SET,
8133163bd1dd Add audio filter scaletempo
uau
parents: 24895
diff changeset
1355 &playback_speed)) {
8133163bd1dd Add audio filter scaletempo
uau
parents: 24895
diff changeset
1356 new_srate = sh_audio->samplerate;
8133163bd1dd Add audio filter scaletempo
uau
parents: 24895
diff changeset
1357 } else {
8133163bd1dd Add audio filter scaletempo
uau
parents: 24895
diff changeset
1358 new_srate = sh_audio->samplerate * playback_speed;
8133163bd1dd Add audio filter scaletempo
uau
parents: 24895
diff changeset
1359 if (new_srate != ao_data->samplerate) {
8133163bd1dd Add audio filter scaletempo
uau
parents: 24895
diff changeset
1360 // limits are taken from libaf/af_resample.c
8133163bd1dd Add audio filter scaletempo
uau
parents: 24895
diff changeset
1361 if (new_srate < 8000)
8133163bd1dd Add audio filter scaletempo
uau
parents: 24895
diff changeset
1362 new_srate = 8000;
8133163bd1dd Add audio filter scaletempo
uau
parents: 24895
diff changeset
1363 if (new_srate > 192000)
8133163bd1dd Add audio filter scaletempo
uau
parents: 24895
diff changeset
1364 new_srate = 192000;
8133163bd1dd Add audio filter scaletempo
uau
parents: 24895
diff changeset
1365 playback_speed = (float)new_srate / (float)sh_audio->samplerate;
8133163bd1dd Add audio filter scaletempo
uau
parents: 24895
diff changeset
1366 }
13710
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
1367 }
14172
67912fc34e04 Set mixer.afilter at a more appropriate place.
reimar
parents: 14140
diff changeset
1368 result = init_audio_filters(sh_audio, new_srate,
24894
2bfc75674b71 Simplify init_audio_filters() arguments
uau
parents: 24892
diff changeset
1369 &ao_data->samplerate, &ao_data->channels, &ao_data->format);
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1370 mpctx->mixer.afilter = sh_audio->afilter;
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
1371 #ifdef CONFIG_GUI
22285
5d12a6e96930 Add missing "if (use_gui)" before some GUI calls
uau
parents: 22284
diff changeset
1372 if (use_gui) guiGetEvent(guiSetAfilter, (char *)sh_audio->afilter);
14254
21e72b6d8d11 Do not use audio plugins anymore
reimar
parents: 14245
diff changeset
1373 #endif
14172
67912fc34e04 Set mixer.afilter at a more appropriate place.
reimar
parents: 14140
diff changeset
1374 return result;
13710
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
1375 }
8800
2485bc98772d fixed some possible overflow places
alex
parents: 8784
diff changeset
1376
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1377
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1378 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
1379 struct mp_osd_msg {
18261
5bf6b74e793c Doxygen attack! - Chapter 2
albeu
parents: 18243
diff changeset
1380 /// Previous message on the stack.
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1381 mp_osd_msg_t* prev;
18261
5bf6b74e793c Doxygen attack! - Chapter 2
albeu
parents: 18243
diff changeset
1382 /// Message text.
28378
45ddc04c30a1 increase max OSD message size limit
compn
parents: 28325
diff changeset
1383 char msg[128];
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1384 int id,level,started;
18261
5bf6b74e793c Doxygen attack! - Chapter 2
albeu
parents: 18243
diff changeset
1385 /// Display duration in ms.
5bf6b74e793c Doxygen attack! - Chapter 2
albeu
parents: 18243
diff changeset
1386 unsigned time;
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1387 };
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1388
18261
5bf6b74e793c Doxygen attack! - Chapter 2
albeu
parents: 18243
diff changeset
1389 /// OSD message stack.
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1390 static mp_osd_msg_t* osd_msg_stack = NULL;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1391
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1392 /**
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1393 * \brief Add a message on the OSD message stack
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1394 *
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1395 * If a message with the same id is already present in the stack
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1396 * it is pulled on top of the stack, otherwise a new message is created.
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1397 *
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1398 */
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1399
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1400 void set_osd_msg(int id, int level, int time, const char* fmt, ...) {
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1401 mp_osd_msg_t *msg,*last=NULL;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1402 va_list va;
17929
6fe95ee39422 Fix osd_show_msg alignment and make sure msg strings
albeu
parents: 17928
diff changeset
1403 int r;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1404
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1405 // look if the id is already in the stack
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1406 for(msg = osd_msg_stack ; msg && msg->id != id ;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1407 last = msg, msg = msg->prev);
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1408 // not found: alloc it
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1409 if(!msg) {
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1410 msg = calloc(1,sizeof(mp_osd_msg_t));
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1411 msg->prev = osd_msg_stack;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1412 osd_msg_stack = msg;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1413 } else if(last) { // found, but it's not on top of the stack
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1414 last->prev = msg->prev;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1415 msg->prev = osd_msg_stack;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1416 osd_msg_stack = msg;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1417 }
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1418 // write the msg
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1419 va_start(va,fmt);
28378
45ddc04c30a1 increase max OSD message size limit
compn
parents: 28325
diff changeset
1420 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
1421 va_end(va);
28378
45ddc04c30a1 increase max OSD message size limit
compn
parents: 28325
diff changeset
1422 if(r >= 128) msg->msg[127] = 0;
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1423 // set id and time
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1424 msg->id = id;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1425 msg->level = level;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1426 msg->time = time;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1427
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1428 }
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1429
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1430 /**
17057
d301c1833d12 Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents: 17021
diff changeset
1431 * \brief Remove a message from the OSD stack
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1432 *
17057
d301c1833d12 Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents: 17021
diff changeset
1433 * This function can be used to get rid of a message right away.
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1434 *
17057
d301c1833d12 Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents: 17021
diff changeset
1435 */
d301c1833d12 Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents: 17021
diff changeset
1436
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1437 void rm_osd_msg(int id) {
17057
d301c1833d12 Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents: 17021
diff changeset
1438 mp_osd_msg_t *msg,*last=NULL;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1439
17057
d301c1833d12 Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents: 17021
diff changeset
1440 // Search for the msg
d301c1833d12 Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents: 17021
diff changeset
1441 for(msg = osd_msg_stack ; msg && msg->id != id ;
d301c1833d12 Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents: 17021
diff changeset
1442 last = msg, msg = msg->prev);
d301c1833d12 Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents: 17021
diff changeset
1443 if(!msg) return;
d301c1833d12 Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents: 17021
diff changeset
1444
d301c1833d12 Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents: 17021
diff changeset
1445 // Detach it from the stack and free it
d301c1833d12 Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents: 17021
diff changeset
1446 if(last)
d301c1833d12 Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents: 17021
diff changeset
1447 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
1448 else
d301c1833d12 Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents: 17021
diff changeset
1449 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
1450 free(msg);
d301c1833d12 Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents: 17021
diff changeset
1451 }
d301c1833d12 Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents: 17021
diff changeset
1452
d301c1833d12 Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents: 17021
diff changeset
1453 /**
17938
810b407ba6c4 Get rid of 2 osd related hacks.
albeu
parents: 17935
diff changeset
1454 * \brief Remove all messages from the OSD stack
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1455 *
17938
810b407ba6c4 Get rid of 2 osd related hacks.
albeu
parents: 17935
diff changeset
1456 */
810b407ba6c4 Get rid of 2 osd related hacks.
albeu
parents: 17935
diff changeset
1457
810b407ba6c4 Get rid of 2 osd related hacks.
albeu
parents: 17935
diff changeset
1458 static void clear_osd_msgs(void) {
810b407ba6c4 Get rid of 2 osd related hacks.
albeu
parents: 17935
diff changeset
1459 mp_osd_msg_t* msg = osd_msg_stack, *prev = NULL;
810b407ba6c4 Get rid of 2 osd related hacks.
albeu
parents: 17935
diff changeset
1460 while(msg) {
810b407ba6c4 Get rid of 2 osd related hacks.
albeu
parents: 17935
diff changeset
1461 prev = msg->prev;
810b407ba6c4 Get rid of 2 osd related hacks.
albeu
parents: 17935
diff changeset
1462 free(msg);
810b407ba6c4 Get rid of 2 osd related hacks.
albeu
parents: 17935
diff changeset
1463 msg = prev;
810b407ba6c4 Get rid of 2 osd related hacks.
albeu
parents: 17935
diff changeset
1464 }
810b407ba6c4 Get rid of 2 osd related hacks.
albeu
parents: 17935
diff changeset
1465 osd_msg_stack = NULL;
810b407ba6c4 Get rid of 2 osd related hacks.
albeu
parents: 17935
diff changeset
1466 }
810b407ba6c4 Get rid of 2 osd related hacks.
albeu
parents: 17935
diff changeset
1467
810b407ba6c4 Get rid of 2 osd related hacks.
albeu
parents: 17935
diff changeset
1468 /**
18316
b3be7df634b0 spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents: 18315
diff changeset
1469 * \brief Get the current message from the OSD stack.
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1470 *
18316
b3be7df634b0 spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents: 18315
diff changeset
1471 * This function decrements the message timer and destroys the old ones.
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1472 * The message that should be displayed is returned (if any).
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1473 *
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1474 */
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1475
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1476 static mp_osd_msg_t* get_osd_msg(void) {
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1477 mp_osd_msg_t *msg,*prev,*last = NULL;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1478 static unsigned last_update = 0;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1479 unsigned now = GetTimerMS();
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1480 unsigned diff;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1481 char hidden_dec_done = 0;
24091
e7df91814c0f Minor code cleanup
uau
parents: 24070
diff changeset
1482
e7df91814c0f Minor code cleanup
uau
parents: 24070
diff changeset
1483 if (osd_visible) {
e7df91814c0f Minor code cleanup
uau
parents: 24070
diff changeset
1484 // 36000000 means max timed visibility is 1 hour into the future, if
e7df91814c0f Minor code cleanup
uau
parents: 24070
diff changeset
1485 // the difference is greater assume it's wrapped around from below 0
e7df91814c0f Minor code cleanup
uau
parents: 24070
diff changeset
1486 if (osd_visible - now > 36000000) {
e7df91814c0f Minor code cleanup
uau
parents: 24070
diff changeset
1487 osd_visible = 0;
e7df91814c0f Minor code cleanup
uau
parents: 24070
diff changeset
1488 vo_osd_progbar_type = -1; // disable
e7df91814c0f Minor code cleanup
uau
parents: 24070
diff changeset
1489 vo_osd_changed(OSDTYPE_PROGBAR);
e7df91814c0f Minor code cleanup
uau
parents: 24070
diff changeset
1490 if (mpctx->osd_function != OSD_PAUSE)
e7df91814c0f Minor code cleanup
uau
parents: 24070
diff changeset
1491 mpctx->osd_function = OSD_PLAY;
e7df91814c0f Minor code cleanup
uau
parents: 24070
diff changeset
1492 }
e7df91814c0f Minor code cleanup
uau
parents: 24070
diff changeset
1493 }
e7df91814c0f Minor code cleanup
uau
parents: 24070
diff changeset
1494
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1495 if(!last_update) last_update = now;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1496 diff = now >= last_update ? now - last_update : 0;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1497
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1498 last_update = now;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1499
18316
b3be7df634b0 spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents: 18315
diff changeset
1500 // Look for the first message in the stack with high enough level.
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1501 for(msg = osd_msg_stack ; msg ; last = msg, msg = prev) {
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1502 prev = msg->prev;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1503 if(msg->level > osd_level && hidden_dec_done) continue;
18316
b3be7df634b0 spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents: 18315
diff changeset
1504 // 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
1505 // in both cases we decrement the timer or kill it.
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1506 if(!msg->started || msg->time > diff) {
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1507 if(msg->started) msg->time -= diff;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1508 else msg->started = 1;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1509 // display it
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1510 if(msg->level <= osd_level) return msg;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1511 hidden_dec_done = 1;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1512 continue;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1513 }
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1514 // kill the message
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1515 free(msg);
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1516 if(last) {
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1517 last->prev = prev;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1518 msg = last;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1519 } else {
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1520 osd_msg_stack = prev;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1521 msg = NULL;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1522 }
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1523 }
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1524 // Nothing found
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1525 return NULL;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1526 }
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1527
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1528 /**
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1529 * \brief Display the OSD bar.
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1530 *
18316
b3be7df634b0 spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents: 18315
diff changeset
1531 * 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
1532 *
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1533 */
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1534
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1535 void set_osd_bar(int type,const char* name,double min,double max,double val) {
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1536
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1537 if(osd_level < 1) return;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1538
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1539 if(mpctx->sh_video) {
18287
292337d09af2 Remove updating of vo_mouse_timer_const from the main loop and also
uau
parents: 18286
diff changeset
1540 osd_visible = (GetTimerMS() + 1000) | 1;
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1541 vo_osd_progbar_type = type;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1542 vo_osd_progbar_value = 256*(val-min)/(max-min);
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1543 vo_osd_changed(OSDTYPE_PROGBAR);
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1544 return;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1545 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1546
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1547 set_osd_msg(OSD_MSG_BAR,1,osd_duration,"%s: %d %%",
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1548 name,ROUND(100*(val-min)/(max-min)));
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1549 }
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1550
29670
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 * \brief Display text subtitles on the OSD
2e3751815a21 Add support for displaying subtitles on the command-line when playing
reimar
parents: 29668
diff changeset
1553 */
2e3751815a21 Add support for displaying subtitles on the command-line when playing
reimar
parents: 29668
diff changeset
1554 void set_osd_subtitle(subtitle *subs) {
2e3751815a21 Add support for displaying subtitles on the command-line when playing
reimar
parents: 29668
diff changeset
1555 int i;
2e3751815a21 Add support for displaying subtitles on the command-line when playing
reimar
parents: 29668
diff changeset
1556 vo_sub = subs;
2e3751815a21 Add support for displaying subtitles on the command-line when playing
reimar
parents: 29668
diff changeset
1557 vo_osd_changed(OSDTYPE_SUBTITLE);
2e3751815a21 Add support for displaying subtitles on the command-line when playing
reimar
parents: 29668
diff changeset
1558 if (!mpctx->sh_video) {
2e3751815a21 Add support for displaying subtitles on the command-line when playing
reimar
parents: 29668
diff changeset
1559 // 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
1560 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
1561 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
1562 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
1563 else {
2e3751815a21 Add support for displaying subtitles on the command-line when playing
reimar
parents: 29668
diff changeset
1564 // 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
1565 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
1566 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
1567 }
2e3751815a21 Add support for displaying subtitles on the command-line when playing
reimar
parents: 29668
diff changeset
1568 }
2e3751815a21 Add support for displaying subtitles on the command-line when playing
reimar
parents: 29668
diff changeset
1569 }
2e3751815a21 Add support for displaying subtitles on the command-line when playing
reimar
parents: 29668
diff changeset
1570 }
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1571
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1572 /**
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1573 * \brief Update the OSD message line.
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1574 *
18316
b3be7df634b0 spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents: 18315
diff changeset
1575 * 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
1576 * 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
1577 * is displayed (only on the vo OSD).
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1578 *
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1579 */
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1580
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1581 static void update_osd_msg(void) {
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1582 mp_osd_msg_t *msg;
28378
45ddc04c30a1 increase max OSD message size limit
compn
parents: 28325
diff changeset
1583 static char osd_text[128] = "";
45ddc04c30a1 increase max OSD message size limit
compn
parents: 28325
diff changeset
1584 static char osd_text_timer[128];
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1585
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1586 // we need some mem for vo_osd_text
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1587 vo_osd_text = (unsigned char*)osd_text;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1588
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1589 // Look if we have a msg
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1590 if((msg = get_osd_msg())) {
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1591 if(strcmp(osd_text,msg->msg)) {
28378
45ddc04c30a1 increase max OSD message size limit
compn
parents: 28325
diff changeset
1592 strncpy((char*)osd_text, msg->msg, 127);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1593 if(mpctx->sh_video) vo_osd_changed(OSDTYPE_OSD); else
19760
c55b49cd67ba fix broken term_osd output in update_osd_msg()
gpoirier
parents: 19756
diff changeset
1594 if(term_osd) 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
1595 }
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1596 return;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1597 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1598
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1599 if(mpctx->sh_video) {
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1600 // fallback on the timer
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1601 if(osd_level>=2) {
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1602 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
1603 int percentage = -1;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1604 char percentage_text[10];
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1605 int pts = demuxer_get_current_time(mpctx->demuxer);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1606
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1607 if (mpctx->osd_show_percentage)
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1608 percentage = demuxer_get_percent_pos(mpctx->demuxer);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1609
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1610 if (percentage >= 0)
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1611 snprintf(percentage_text, 9, " (%d%%)", percentage);
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1612 else
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1613 percentage_text[0] = 0;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1614
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1615 if (osd_level == 3)
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1616 snprintf(osd_text_timer, 63,
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1617 "%c %02d:%02d:%02d / %02d:%02d:%02d%s",
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1618 mpctx->osd_function,pts/3600,(pts/60)%60,pts%60,
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1619 len/3600,(len/60)%60,len%60,percentage_text);
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1620 else
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1621 snprintf(osd_text_timer, 63, "%c %02d:%02d:%02d%s",
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1622 mpctx->osd_function,pts/3600,(pts/60)%60,
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1623 pts%60,percentage_text);
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1624 } else
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1625 osd_text_timer[0]=0;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1626
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1627 // always decrement the percentage timer
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1628 if(mpctx->osd_show_percentage)
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1629 mpctx->osd_show_percentage--;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1630
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1631 if(strcmp(osd_text,osd_text_timer)) {
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1632 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
1633 vo_osd_changed(OSDTYPE_OSD);
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1634 }
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1635 return;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1636 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1637
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1638 // Clear the term osd line
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1639 if(term_osd && osd_text[0]) {
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1640 osd_text[0] = 0;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1641 printf("%s\n",term_osd_esc);
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1642 }
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1643 }
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1644
18261
5bf6b74e793c Doxygen attack! - Chapter 2
albeu
parents: 18243
diff changeset
1645 ///@}
5bf6b74e793c Doxygen attack! - Chapter 2
albeu
parents: 18243
diff changeset
1646 // OSDMsgStack
5bf6b74e793c Doxygen attack! - Chapter 2
albeu
parents: 18243
diff changeset
1647
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1648
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1649 void reinit_audio_chain(void) {
29801
7ac1f37f8aa5 Whitespace cosmetics: reindent reinit_audio_chain function
reimar
parents: 29800
diff changeset
1650 if (!mpctx->sh_audio)
7ac1f37f8aa5 Whitespace cosmetics: reindent reinit_audio_chain function
reimar
parents: 29800
diff changeset
1651 return;
31671
4541f1921482 Add support for parameter changes (e.g. channel count) during playback.
reimar
parents: 31670
diff changeset
1652 if (!(initialized_flags & INITIALIZED_ACODEC)) {
31673
cb6e9b6d8811 Reindent.
reimar
parents: 31671
diff changeset
1653 current_module="init_audio_codec";
cb6e9b6d8811 Reindent.
reimar
parents: 31671
diff changeset
1654 mp_msg(MSGT_CPLAYER,MSGL_INFO,"==========================================================================\n");
cb6e9b6d8811 Reindent.
reimar
parents: 31671
diff changeset
1655 if(!init_best_audio_codec(mpctx->sh_audio,audio_codec_list,audio_fm_list)){
cb6e9b6d8811 Reindent.
reimar
parents: 31671
diff changeset
1656 goto init_error;
cb6e9b6d8811 Reindent.
reimar
parents: 31671
diff changeset
1657 }
cb6e9b6d8811 Reindent.
reimar
parents: 31671
diff changeset
1658 initialized_flags|=INITIALIZED_ACODEC;
cb6e9b6d8811 Reindent.
reimar
parents: 31671
diff changeset
1659 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
1660 }
4541f1921482 Add support for parameter changes (e.g. channel count) during playback.
reimar
parents: 31670
diff changeset
1661
4541f1921482 Add support for parameter changes (e.g. channel count) during playback.
reimar
parents: 31670
diff changeset
1662
4541f1921482 Add support for parameter changes (e.g. channel count) during playback.
reimar
parents: 31670
diff changeset
1663 if (!(initialized_flags & INITIALIZED_AO)) {
31673
cb6e9b6d8811 Reindent.
reimar
parents: 31671
diff changeset
1664 current_module="af_preinit";
cb6e9b6d8811 Reindent.
reimar
parents: 31671
diff changeset
1665 ao_data.samplerate=force_srate;
cb6e9b6d8811 Reindent.
reimar
parents: 31671
diff changeset
1666 ao_data.channels=0;
cb6e9b6d8811 Reindent.
reimar
parents: 31671
diff changeset
1667 ao_data.format=audio_output_format;
cb6e9b6d8811 Reindent.
reimar
parents: 31671
diff changeset
1668 // first init to detect best values
cb6e9b6d8811 Reindent.
reimar
parents: 31671
diff changeset
1669 if(!init_audio_filters(mpctx->sh_audio, // preliminary init
cb6e9b6d8811 Reindent.
reimar
parents: 31671
diff changeset
1670 // input:
cb6e9b6d8811 Reindent.
reimar
parents: 31671
diff changeset
1671 mpctx->sh_audio->samplerate,
cb6e9b6d8811 Reindent.
reimar
parents: 31671
diff changeset
1672 // output:
cb6e9b6d8811 Reindent.
reimar
parents: 31671
diff changeset
1673 &ao_data.samplerate, &ao_data.channels, &ao_data.format)){
cb6e9b6d8811 Reindent.
reimar
parents: 31671
diff changeset
1674 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_AudioFilterChainPreinitError);
cb6e9b6d8811 Reindent.
reimar
parents: 31671
diff changeset
1675 exit_player(EXIT_ERROR);
cb6e9b6d8811 Reindent.
reimar
parents: 31671
diff changeset
1676 }
cb6e9b6d8811 Reindent.
reimar
parents: 31671
diff changeset
1677 current_module="ao2_init";
cb6e9b6d8811 Reindent.
reimar
parents: 31671
diff changeset
1678 mpctx->audio_out = init_best_audio_out(audio_driver_list,
cb6e9b6d8811 Reindent.
reimar
parents: 31671
diff changeset
1679 0, // plugin flag
cb6e9b6d8811 Reindent.
reimar
parents: 31671
diff changeset
1680 ao_data.samplerate,
cb6e9b6d8811 Reindent.
reimar
parents: 31671
diff changeset
1681 ao_data.channels,
cb6e9b6d8811 Reindent.
reimar
parents: 31671
diff changeset
1682 ao_data.format, 0);
cb6e9b6d8811 Reindent.
reimar
parents: 31671
diff changeset
1683 if(!mpctx->audio_out){
cb6e9b6d8811 Reindent.
reimar
parents: 31671
diff changeset
1684 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CannotInitAO);
cb6e9b6d8811 Reindent.
reimar
parents: 31671
diff changeset
1685 goto init_error;
cb6e9b6d8811 Reindent.
reimar
parents: 31671
diff changeset
1686 }
cb6e9b6d8811 Reindent.
reimar
parents: 31671
diff changeset
1687 initialized_flags|=INITIALIZED_AO;
cb6e9b6d8811 Reindent.
reimar
parents: 31671
diff changeset
1688 mp_msg(MSGT_CPLAYER,MSGL_INFO,"AO: [%s] %dHz %dch %s (%d bytes per sample)\n",
cb6e9b6d8811 Reindent.
reimar
parents: 31671
diff changeset
1689 mpctx->audio_out->info->short_name,
cb6e9b6d8811 Reindent.
reimar
parents: 31671
diff changeset
1690 ao_data.samplerate, ao_data.channels,
cb6e9b6d8811 Reindent.
reimar
parents: 31671
diff changeset
1691 af_fmt2str_short(ao_data.format),
cb6e9b6d8811 Reindent.
reimar
parents: 31671
diff changeset
1692 af_fmt2bits(ao_data.format)/8 );
cb6e9b6d8811 Reindent.
reimar
parents: 31671
diff changeset
1693 mp_msg(MSGT_CPLAYER,MSGL_V,"AO: Description: %s\nAO: Author: %s\n",
cb6e9b6d8811 Reindent.
reimar
parents: 31671
diff changeset
1694 mpctx->audio_out->info->name, mpctx->audio_out->info->author);
cb6e9b6d8811 Reindent.
reimar
parents: 31671
diff changeset
1695 if(strlen(mpctx->audio_out->info->comment) > 0)
cb6e9b6d8811 Reindent.
reimar
parents: 31671
diff changeset
1696 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
1697 }
4541f1921482 Add support for parameter changes (e.g. channel count) during playback.
reimar
parents: 31670
diff changeset
1698
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
1699 // init audio filters:
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
1700 current_module="af_init";
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1701 if(!build_afilter_chain(mpctx->sh_audio, &ao_data)) {
29801
7ac1f37f8aa5 Whitespace cosmetics: reindent reinit_audio_chain function
reimar
parents: 29800
diff changeset
1702 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_NoMatchingFilter);
7ac1f37f8aa5 Whitespace cosmetics: reindent reinit_audio_chain function
reimar
parents: 29800
diff changeset
1703 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
1704 }
29801
7ac1f37f8aa5 Whitespace cosmetics: reindent reinit_audio_chain function
reimar
parents: 29800
diff changeset
1705 mpctx->mixer.audio_out = mpctx->audio_out;
7ac1f37f8aa5 Whitespace cosmetics: reindent reinit_audio_chain function
reimar
parents: 29800
diff changeset
1706 mpctx->mixer.volstep = volstep;
7ac1f37f8aa5 Whitespace cosmetics: reindent reinit_audio_chain function
reimar
parents: 29800
diff changeset
1707 return;
29794
df1826dcdb2d Disable audio when initializing the filter chain fails (can happen e.g. when the hwmpa
reimar
parents: 29785
diff changeset
1708
df1826dcdb2d Disable audio when initializing the filter chain fails (can happen e.g. when the hwmpa
reimar
parents: 29785
diff changeset
1709 init_error:
df1826dcdb2d Disable audio when initializing the filter chain fails (can happen e.g. when the hwmpa
reimar
parents: 29785
diff changeset
1710 uninit_player(INITIALIZED_ACODEC|INITIALIZED_AO); // close codec and possibly AO
df1826dcdb2d Disable audio when initializing the filter chain fails (can happen e.g. when the hwmpa
reimar
parents: 29785
diff changeset
1711 mpctx->sh_audio=mpctx->d_audio->sh=NULL; // -> nosound
df1826dcdb2d Disable audio when initializing the filter chain fails (can happen e.g. when the hwmpa
reimar
parents: 29785
diff changeset
1712 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
1713 }
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
1714
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
18261
5bf6b74e793c Doxygen attack! - Chapter 2
albeu
parents: 18243
diff changeset
1716 ///@}
5bf6b74e793c Doxygen attack! - Chapter 2
albeu
parents: 18243
diff changeset
1717 // Command2Property
5bf6b74e793c Doxygen attack! - Chapter 2
albeu
parents: 18243
diff changeset
1718
18710
c528c6c518f1 Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents: 18682
diff changeset
1719
c528c6c518f1 Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents: 18682
diff changeset
1720 // 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
1721 // ao so far.
c528c6c518f1 Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents: 18682
diff changeset
1722 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
1723 {
24913
38f25bdb3cbc We support gcc 2.95 (fixes r24928).
cehoyos
parents: 24900
diff changeset
1724 double buffered_output;
18710
c528c6c518f1 Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents: 18682
diff changeset
1725 // first calculate the end pts of audio that has been output by decoder
c528c6c518f1 Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents: 18682
diff changeset
1726 double a_pts = sh_audio->pts;
c528c6c518f1 Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents: 18682
diff changeset
1727 if (a_pts != MP_NOPTS_VALUE)
c528c6c518f1 Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents: 18682
diff changeset
1728 // Good, decoder supports new way of calculating audio pts.
c528c6c518f1 Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents: 18682
diff changeset
1729 // sh_audio->pts is the timestamp of the latest input packet with
c528c6c518f1 Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents: 18682
diff changeset
1730 // known pts that the decoder has decoded. sh_audio->pts_bytes is
c528c6c518f1 Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents: 18682
diff changeset
1731 // the amount of bytes the decoder has written after that timestamp.
c528c6c518f1 Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents: 18682
diff changeset
1732 a_pts += sh_audio->pts_bytes / (double) sh_audio->o_bps;
c528c6c518f1 Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents: 18682
diff changeset
1733 else {
c528c6c518f1 Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents: 18682
diff changeset
1734 // Decoder doesn't support new way of calculating pts (or we're
c528c6c518f1 Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents: 18682
diff changeset
1735 // being called before it has decoded anything with known timestamp).
c528c6c518f1 Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents: 18682
diff changeset
1736 // Use the old method of audio pts calculation: take the timestamp
c528c6c518f1 Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents: 18682
diff changeset
1737 // of last packet with known pts the decoder has read data from,
c528c6c518f1 Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents: 18682
diff changeset
1738 // and add amount of bytes read after the beginning of that packet
c528c6c518f1 Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents: 18682
diff changeset
1739 // divided by input bps. This will be inaccurate if the input/output
c528c6c518f1 Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents: 18682
diff changeset
1740 // ratio is not constant for every audio packet or if it is constant
c528c6c518f1 Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents: 18682
diff changeset
1741 // but not accurately known in sh_audio->i_bps.
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 a_pts = d_audio->pts;
19216
5fd000355777 cosmetics: fix incorrect indentation left by reimar and extra word in
uau
parents: 19209
diff changeset
1744 // ds_tell_pts returns bytes read after last timestamp from
18710
c528c6c518f1 Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents: 18682
diff changeset
1745 // demuxing layer, decoder might use sh_audio->a_in_buffer for bytes
c528c6c518f1 Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents: 18682
diff changeset
1746 // it has read but not decoded
19183
942000d171f4 demuxer might not set i_bps, so do not divide by it in that case
reimar
parents: 19110
diff changeset
1747 if (sh_audio->i_bps)
19216
5fd000355777 cosmetics: fix incorrect indentation left by reimar and extra word in
uau
parents: 19209
diff changeset
1748 a_pts += (ds_tell_pts(d_audio) - sh_audio->a_in_buffer_len) /
5fd000355777 cosmetics: fix incorrect indentation left by reimar and extra word in
uau
parents: 19209
diff changeset
1749 (double)sh_audio->i_bps;
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 // 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
1752 // 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
1753
c528c6c518f1 Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents: 18682
diff changeset
1754 // Decoded but not filtered
c528c6c518f1 Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents: 18682
diff changeset
1755 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
1756
24900
9079c9745ff9 A/V sync: take audio filter buffers into account
uau
parents: 24896
diff changeset
1757 // 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
1758 buffered_output = af_calc_delay(sh_audio->afilter);
24900
9079c9745ff9 A/V sync: take audio filter buffers into account
uau
parents: 24896
diff changeset
1759
18710
c528c6c518f1 Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents: 18682
diff changeset
1760 // 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
1761 // accept everything to internal buffers yet
24900
9079c9745ff9 A/V sync: take audio filter buffers into account
uau
parents: 24896
diff changeset
1762 buffered_output += sh_audio->a_out_buffer_len;
9079c9745ff9 A/V sync: take audio filter buffers into account
uau
parents: 24896
diff changeset
1763
9079c9745ff9 A/V sync: take audio filter buffers into account
uau
parents: 24896
diff changeset
1764 // 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
1765 // 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
1766 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
1767
c528c6c518f1 Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents: 18682
diff changeset
1768 return a_pts;
c528c6c518f1 Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents: 18682
diff changeset
1769 }
c528c6c518f1 Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents: 18682
diff changeset
1770
c528c6c518f1 Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents: 18682
diff changeset
1771 // 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
1772 double playing_audio_pts(sh_audio_t *sh_audio, demux_stream_t *d_audio,
25913
21a1dc062bc5 ao_functions_t should be const, part 1
reimar
parents: 25883
diff changeset
1773 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
1774 {
c528c6c518f1 Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents: 18682
diff changeset
1775 return written_audio_pts(sh_audio, d_audio) - playback_speed *
c528c6c518f1 Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents: 18682
diff changeset
1776 audio_out->get_delay();
c528c6c518f1 Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents: 18682
diff changeset
1777 }
c528c6c518f1 Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents: 18682
diff changeset
1778
26228
089dc00275b6 Experimental support for -framedrop with -correct-pts.
reimar
parents: 26159
diff changeset
1779 static int check_framedrop(double frame_time) {
089dc00275b6 Experimental support for -framedrop with -correct-pts.
reimar
parents: 26159
diff changeset
1780 // check for frame-drop:
089dc00275b6 Experimental support for -framedrop with -correct-pts.
reimar
parents: 26159
diff changeset
1781 current_module = "check_framedrop";
089dc00275b6 Experimental support for -framedrop with -correct-pts.
reimar
parents: 26159
diff changeset
1782 if (mpctx->sh_audio && !mpctx->d_audio->eof) {
089dc00275b6 Experimental support for -framedrop with -correct-pts.
reimar
parents: 26159
diff changeset
1783 static int dropped_frames;
089dc00275b6 Experimental support for -framedrop with -correct-pts.
reimar
parents: 26159
diff changeset
1784 float delay = playback_speed*mpctx->audio_out->get_delay();
089dc00275b6 Experimental support for -framedrop with -correct-pts.
reimar
parents: 26159
diff changeset
1785 float d = delay-mpctx->delay;
089dc00275b6 Experimental support for -framedrop with -correct-pts.
reimar
parents: 26159
diff changeset
1786 ++total_frame_cnt;
089dc00275b6 Experimental support for -framedrop with -correct-pts.
reimar
parents: 26159
diff changeset
1787 // we should avoid dropping too many frames in sequence unless we
089dc00275b6 Experimental support for -framedrop with -correct-pts.
reimar
parents: 26159
diff changeset
1788 // are too late. and we allow 100ms A-V delay here:
089dc00275b6 Experimental support for -framedrop with -correct-pts.
reimar
parents: 26159
diff changeset
1789 if (d < -dropped_frames*frame_time-0.100 &&
089dc00275b6 Experimental support for -framedrop with -correct-pts.
reimar
parents: 26159
diff changeset
1790 mpctx->osd_function != OSD_PAUSE) {
089dc00275b6 Experimental support for -framedrop with -correct-pts.
reimar
parents: 26159
diff changeset
1791 ++drop_frame_cnt;
089dc00275b6 Experimental support for -framedrop with -correct-pts.
reimar
parents: 26159
diff changeset
1792 ++dropped_frames;
089dc00275b6 Experimental support for -framedrop with -correct-pts.
reimar
parents: 26159
diff changeset
1793 return frame_dropping;
089dc00275b6 Experimental support for -framedrop with -correct-pts.
reimar
parents: 26159
diff changeset
1794 } else
089dc00275b6 Experimental support for -framedrop with -correct-pts.
reimar
parents: 26159
diff changeset
1795 dropped_frames = 0;
089dc00275b6 Experimental support for -framedrop with -correct-pts.
reimar
parents: 26159
diff changeset
1796 }
089dc00275b6 Experimental support for -framedrop with -correct-pts.
reimar
parents: 26159
diff changeset
1797 return 0;
089dc00275b6 Experimental support for -framedrop with -correct-pts.
reimar
parents: 26159
diff changeset
1798 }
089dc00275b6 Experimental support for -framedrop with -correct-pts.
reimar
parents: 26159
diff changeset
1799
18917
d9a75b26da6c Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents: 18913
diff changeset
1800 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
1801 {
d9a75b26da6c Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents: 18913
diff changeset
1802 unsigned char *start;
d9a75b26da6c Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents: 18913
diff changeset
1803 int in_size;
d9a75b26da6c Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents: 18913
diff changeset
1804 int hit_eof=0;
d9a75b26da6c Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents: 18913
diff changeset
1805 double pts;
d9a75b26da6c Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents: 18913
diff changeset
1806
d9a75b26da6c Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents: 18913
diff changeset
1807 while (1) {
26228
089dc00275b6 Experimental support for -framedrop with -correct-pts.
reimar
parents: 26159
diff changeset
1808 int drop_frame = check_framedrop(sh_video->frametime);
20904
e5456123de82 Fix statement-before-declaration warnings.
reimar
parents: 20903
diff changeset
1809 void *decoded_frame;
18917
d9a75b26da6c Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents: 18913
diff changeset
1810 current_module = "decode video";
d9a75b26da6c Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents: 18913
diff changeset
1811 // XXX Time used in this call is not counted in any performance
20902
bfb6eacd9c4a Update OSD contents only after the correct values for the frame are known.
uau
parents: 20900
diff changeset
1812 // timer now, OSD is not updated correctly for filter-added frames
18917
d9a75b26da6c Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents: 18913
diff changeset
1813 if (vf_output_queued_frame(sh_video->vfilter))
d9a75b26da6c Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents: 18913
diff changeset
1814 break;
d9a75b26da6c Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents: 18913
diff changeset
1815 current_module = "video_read_frame";
d9a75b26da6c Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents: 18913
diff changeset
1816 in_size = ds_get_packet_pts(d_video, &start, &pts);
d9a75b26da6c Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents: 18913
diff changeset
1817 if (in_size < 0) {
d9a75b26da6c Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents: 18913
diff changeset
1818 // try to extract last frames in case of decoder lag
d9a75b26da6c Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents: 18913
diff changeset
1819 in_size = 0;
31148
6957d78df897 Use MP_NOPTS_VALUE as "default" pts for delayed frames instead of some
reimar
parents: 31048
diff changeset
1820 pts = MP_NOPTS_VALUE;
18917
d9a75b26da6c Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents: 18913
diff changeset
1821 hit_eof = 1;
d9a75b26da6c Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents: 18913
diff changeset
1822 }
d9a75b26da6c Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents: 18913
diff changeset
1823 if (in_size > max_framesize)
d9a75b26da6c Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents: 18913
diff changeset
1824 max_framesize = in_size;
20902
bfb6eacd9c4a Update OSD contents only after the correct values for the frame are known.
uau
parents: 20900
diff changeset
1825 current_module = "decode video";
31972
96559880e475 Improve A/V sync when not using -correct-pts.
cehoyos
parents: 31971
diff changeset
1826 decoded_frame = decode_video(sh_video, start, in_size, drop_frame, pts, NULL);
20902
bfb6eacd9c4a Update OSD contents only after the correct values for the frame are known.
uau
parents: 20900
diff changeset
1827 if (decoded_frame) {
29668
ecc719c6d7a9 Make update_subtitles work without sh_video for text subtitles.
reimar
parents: 29642
diff changeset
1828 update_subtitles(sh_video, sh_video->pts, mpctx->d_sub, 0);
23903
037737866f6a Teletext support
voroshil
parents: 23889
diff changeset
1829 update_teletext(sh_video, mpctx->demuxer, 0);
20902
bfb6eacd9c4a Update OSD contents only after the correct values for the frame are known.
uau
parents: 20900
diff changeset
1830 update_osd_msg();
21055
bc2cf8eb55b3 Move subtitle updating to a separate function, fix inverted condition
uau
parents: 21042
diff changeset
1831 current_module = "filter video";
20902
bfb6eacd9c4a Update OSD contents only after the correct values for the frame are known.
uau
parents: 20900
diff changeset
1832 if (filter_video(sh_video, decoded_frame, sh_video->pts))
bfb6eacd9c4a Update OSD contents only after the correct values for the frame are known.
uau
parents: 20900
diff changeset
1833 break;
26228
089dc00275b6 Experimental support for -framedrop with -correct-pts.
reimar
parents: 26159
diff changeset
1834 } else if (drop_frame)
089dc00275b6 Experimental support for -framedrop with -correct-pts.
reimar
parents: 26159
diff changeset
1835 return -1;
18917
d9a75b26da6c Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents: 18913
diff changeset
1836 if (hit_eof)
d9a75b26da6c Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents: 18913
diff changeset
1837 return 0;
d9a75b26da6c Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents: 18913
diff changeset
1838 }
d9a75b26da6c Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents: 18913
diff changeset
1839 return 1;
d9a75b26da6c Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents: 18913
diff changeset
1840 }
d9a75b26da6c Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents: 18913
diff changeset
1841
20887
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1842 #ifdef HAVE_RTC
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1843 int rtc_fd = -1;
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
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1846 static float timing_sleep(float time_frame)
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1847 {
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1848 #ifdef HAVE_RTC
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1849 if (rtc_fd >= 0){
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1850 // -------- RTC -----------
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1851 current_module="sleep_rtc";
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1852 while (time_frame > 0.000) {
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1853 unsigned long rtc_ts;
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1854 if (read(rtc_fd, &rtc_ts, sizeof(rtc_ts)) <= 0)
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1855 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_LinuxRTCReadError, strerror(errno));
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1856 time_frame -= GetRelativeTime();
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1857 }
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1858 } else
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1859 #endif
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1860 {
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1861 // assume kernel HZ=100 for softsleep, works with larger HZ but with
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1862 // unnecessarily high CPU usage
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1863 float margin = softsleep ? 0.011 : 0;
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1864 current_module = "sleep_timer";
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1865 while (time_frame > margin) {
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1866 usec_sleep(1000000 * (time_frame - margin));
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1867 time_frame -= GetRelativeTime();
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1868 }
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1869 if (softsleep){
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1870 current_module = "sleep_soft";
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1871 if (time_frame < 0)
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1872 mp_msg(MSGT_AVSYNC, MSGL_WARN, MSGTR_SoftsleepUnderflow);
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1873 while (time_frame > 0)
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1874 time_frame-=GetRelativeTime(); // burn the CPU
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1875 }
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1876 }
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1877 return time_frame;
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1878 }
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1879
31612
7fc1f051a19f Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents: 31607
diff changeset
1880 static int select_subtitle(MPContext *mpctx)
31201
203789464176 misc cosmetics: K&R style nits, #include placement, indentation
diego
parents: 31148
diff changeset
1881 {
29854
00ebdb6cb87f Factor out code that decides which subtitle to play.
reimar
parents: 29804
diff changeset
1882 // find the best sub to use
31612
7fc1f051a19f Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents: 31607
diff changeset
1883 int id;
7fc1f051a19f Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents: 31607
diff changeset
1884 int found = 0;
29854
00ebdb6cb87f Factor out code that decides which subtitle to play.
reimar
parents: 29804
diff changeset
1885 mpctx->global_sub_pos = -1; // no subs by default
31612
7fc1f051a19f Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents: 31607
diff changeset
1886 if (vobsub_id >= 0) {
29854
00ebdb6cb87f Factor out code that decides which subtitle to play.
reimar
parents: 29804
diff changeset
1887 // if user asks for a vobsub id, use that first.
31612
7fc1f051a19f Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents: 31607
diff changeset
1888 id = vobsub_id;
7fc1f051a19f Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents: 31607
diff changeset
1889 found = mp_property_do("sub_vob", M_PROPERTY_SET, &id, mpctx) == M_PROPERTY_OK;
7fc1f051a19f Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents: 31607
diff changeset
1890 }
7fc1f051a19f Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents: 31607
diff changeset
1891
7fc1f051a19f Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents: 31607
diff changeset
1892 if (!found && dvdsub_id >= 0) {
29854
00ebdb6cb87f Factor out code that decides which subtitle to play.
reimar
parents: 29804
diff changeset
1893 // if user asks for a dvd sub id, use that next.
31612
7fc1f051a19f Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents: 31607
diff changeset
1894 id = dvdsub_id;
7fc1f051a19f Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents: 31607
diff changeset
1895 found = mp_property_do("sub_demux", M_PROPERTY_SET, &id, mpctx) == M_PROPERTY_OK;
7fc1f051a19f Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents: 31607
diff changeset
1896 }
7fc1f051a19f Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents: 31607
diff changeset
1897
7fc1f051a19f Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents: 31607
diff changeset
1898 if (!found) {
29854
00ebdb6cb87f Factor out code that decides which subtitle to play.
reimar
parents: 29804
diff changeset
1899 // if there are text subs to use, use those. (autosubs come last here)
31612
7fc1f051a19f Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents: 31607
diff changeset
1900 id = 0;
7fc1f051a19f Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents: 31607
diff changeset
1901 found = mp_property_do("sub_file", M_PROPERTY_SET, &id, mpctx) == M_PROPERTY_OK;
7fc1f051a19f Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents: 31607
diff changeset
1902 }
7fc1f051a19f Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents: 31607
diff changeset
1903
7fc1f051a19f Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents: 31607
diff changeset
1904 if (!found && dvdsub_id == -1) {
29854
00ebdb6cb87f Factor out code that decides which subtitle to play.
reimar
parents: 29804
diff changeset
1905 // finally select subs by language and container hints
00ebdb6cb87f Factor out code that decides which subtitle to play.
reimar
parents: 29804
diff changeset
1906 if (dvdsub_id == -1 && dvdsub_lang)
00ebdb6cb87f Factor out code that decides which subtitle to play.
reimar
parents: 29804
diff changeset
1907 dvdsub_id = demuxer_sub_track_by_lang(mpctx->demuxer, dvdsub_lang);
00ebdb6cb87f Factor out code that decides which subtitle to play.
reimar
parents: 29804
diff changeset
1908 if (dvdsub_id == -1)
00ebdb6cb87f Factor out code that decides which subtitle to play.
reimar
parents: 29804
diff changeset
1909 dvdsub_id = demuxer_default_sub_track(mpctx->demuxer);
31612
7fc1f051a19f Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents: 31607
diff changeset
1910 if (dvdsub_id >= 0) {
7fc1f051a19f Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents: 31607
diff changeset
1911 id = dvdsub_id;
7fc1f051a19f Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents: 31607
diff changeset
1912 found = mp_property_do("sub_demux", M_PROPERTY_SET, &id, mpctx) == M_PROPERTY_OK;
7fc1f051a19f Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents: 31607
diff changeset
1913 }
29854
00ebdb6cb87f Factor out code that decides which subtitle to play.
reimar
parents: 29804
diff changeset
1914 }
31612
7fc1f051a19f Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents: 31607
diff changeset
1915 return found;
29854
00ebdb6cb87f Factor out code that decides which subtitle to play.
reimar
parents: 29804
diff changeset
1916 }
00ebdb6cb87f Factor out code that decides which subtitle to play.
reimar
parents: 29804
diff changeset
1917
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
1918 #ifdef CONFIG_DVDNAV
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1919 #ifndef FF_B_TYPE
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1920 #define FF_B_TYPE 3
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1921 #endif
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1922 /// store decoded video image
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1923 static mp_image_t * mp_dvdnav_copy_mpi(mp_image_t *to_mpi,
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1924 mp_image_t *from_mpi) {
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1925 mp_image_t *mpi;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1926
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1927 /// Do not store B-frames
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1928 if (from_mpi->pict_type == FF_B_TYPE)
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1929 return to_mpi;
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 if (to_mpi &&
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1932 to_mpi->w == from_mpi->w &&
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1933 to_mpi->h == from_mpi->h &&
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1934 to_mpi->imgfmt == from_mpi->imgfmt)
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1935 mpi = to_mpi;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1936 else {
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1937 if (to_mpi)
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1938 free_mp_image(to_mpi);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1939 if (from_mpi->w == 0 || from_mpi->h == 0)
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1940 return NULL;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1941 mpi = alloc_mpi(from_mpi->w,from_mpi->h,from_mpi->imgfmt);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1942 }
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1943
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1944 copy_mpi(mpi,from_mpi);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1945 return mpi;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1946 }
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1947
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1948 static void mp_dvdnav_reset_stream (MPContext *ctx) {
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1949 if (ctx->sh_video) {
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1950 /// clear video pts
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1951 ctx->d_video->pts = 0.0f;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1952 ctx->sh_video->pts = 0.0f;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1953 ctx->sh_video->i_pts = 0.0f;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1954 ctx->sh_video->last_pts = 0.0f;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1955 ctx->sh_video->num_buffered_pts = 0;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1956 ctx->sh_video->num_frames = 0;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1957 ctx->sh_video->num_frames_decoded = 0;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1958 ctx->sh_video->timer = 0.0f;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1959 ctx->sh_video->stream_delay = 0.0f;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1960 ctx->sh_video->timer = 0;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1961 ctx->demuxer->stream_pts = MP_NOPTS_VALUE;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1962 }
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1963
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1964 if (ctx->sh_audio) {
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1965 /// free audio packets and reset
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1966 ds_free_packs(ctx->d_audio);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1967 audio_delay -= ctx->sh_audio->stream_delay;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1968 ctx->delay =- audio_delay;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1969 ctx->audio_out->reset();
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1970 resync_audio_stream(ctx->sh_audio);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1971 }
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1972
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1973 audio_delay = 0.0f;
31612
7fc1f051a19f Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents: 31607
diff changeset
1974 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
1975 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
1976 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
1977 if (dvdsub_lang_id != dvdsub_id) {
5e279f7d7e5d Remember which subtitle was auto-selected for dvdnav due to -slang
reimar
parents: 29854
diff changeset
1978 dvdsub_id = dvdsub_lang_id;
5e279f7d7e5d Remember which subtitle was auto-selected for dvdnav due to -slang
reimar
parents: 29854
diff changeset
1979 select_subtitle(ctx);
5e279f7d7e5d Remember which subtitle was auto-selected for dvdnav due to -slang
reimar
parents: 29854
diff changeset
1980 }
5e279f7d7e5d Remember which subtitle was auto-selected for dvdnav due to -slang
reimar
parents: 29854
diff changeset
1981 }
25824
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 /// clear all EOF related flags
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1984 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
1985 }
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1986
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1987 /// Restore last decoded DVDNAV (still frame)
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1988 static mp_image_t *mp_dvdnav_restore_smpi(int *in_size,
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1989 unsigned char **start,
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1990 mp_image_t *decoded_frame)
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1991 {
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1992 if (mpctx->stream->type != STREAMTYPE_DVDNAV)
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1993 return decoded_frame;
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 /// a change occured in dvdnav stream
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1996 if (mp_dvdnav_cell_has_changed(mpctx->stream,0)) {
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1997 mp_dvdnav_read_wait(mpctx->stream, 1, 1);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1998 mp_dvdnav_context_free(mpctx);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1999 mp_dvdnav_reset_stream(mpctx);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2000 mp_dvdnav_read_wait(mpctx->stream, 0, 1);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2001 mp_dvdnav_cell_has_changed(mpctx->stream,1);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2002 }
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2003
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2004 if (*in_size < 0) {
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2005 float len;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2006
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2007 /// Display still frame, if any
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2008 if (mpctx->nav_smpi && !mpctx->nav_buffer)
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2009 decoded_frame = mpctx->nav_smpi;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2010
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2011 /// increment video frame : continue playing after still frame
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2012 len = demuxer_get_time_length(mpctx->demuxer);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2013 if (mpctx->sh_video->pts >= len &&
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2014 mpctx->sh_video->pts > 0.0 && len > 0.0) {
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2015 mp_dvdnav_skip_still(mpctx->stream);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2016 mp_dvdnav_skip_wait(mpctx->stream);
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 mpctx->sh_video->pts += 1 / mpctx->sh_video->fps;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
2019
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2020 if (mpctx->nav_buffer) {
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2021 *start = mpctx->nav_start;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2022 *in_size = mpctx->nav_in_size;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2023 if (mpctx->nav_start)
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2024 memcpy(*start,mpctx->nav_buffer,mpctx->nav_in_size);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2025 }
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2026 }
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2027
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2028 return decoded_frame;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2029 }
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2030
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2031 /// Save last decoded DVDNAV (still frame)
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2032 static void mp_dvdnav_save_smpi(int in_size,
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2033 unsigned char *start,
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2034 mp_image_t *decoded_frame)
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2035 {
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2036 if (mpctx->stream->type != STREAMTYPE_DVDNAV)
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2037 return;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
2038
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2039 if (mpctx->nav_buffer)
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2040 free(mpctx->nav_buffer);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2041
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2042 mpctx->nav_buffer = malloc(in_size);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2043 mpctx->nav_start = start;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2044 mpctx->nav_in_size = mpctx->nav_buffer ? in_size : -1;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2045 if (mpctx->nav_buffer)
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2046 memcpy(mpctx->nav_buffer,start,in_size);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2047
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2048 if (decoded_frame && mpctx->nav_smpi != decoded_frame)
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2049 mpctx->nav_smpi = mp_dvdnav_copy_mpi(mpctx->nav_smpi,decoded_frame);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2050 }
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
2051 #endif /* CONFIG_DVDNAV */
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2052
20887
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2053 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
2054 {
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2055 current_module="av_sync";
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2056
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
2057 if(mpctx->sh_audio){
20887
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2058 double a_pts, v_pts;
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2059
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2060 if (autosync)
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2061 /*
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2062 * If autosync is enabled, the value for delay must be calculated
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2063 * a bit differently. It is set only to the difference between
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2064 * the audio and video timers. Any attempt to include the real
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2065 * or corrected delay causes the pts_correction code below to
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2066 * try to correct for the changes in delay which autosync is
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2067 * trying to measure. This keeps the two from competing, but still
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2068 * allows the code to correct for PTS drift *only*. (Using a delay
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2069 * value here, even a "corrected" one, would be incompatible with
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2070 * autosync mode.)
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2071 */
22488
b6aa3eedf49b Move the sh_audio->delay field to mpctx->delay.
uau
parents: 22458
diff changeset
2072 a_pts = written_audio_pts(mpctx->sh_audio, mpctx->d_audio) - mpctx->delay;
20887
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2073 else
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
2074 a_pts = playing_audio_pts(mpctx->sh_audio, mpctx->d_audio, mpctx->audio_out);
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
2075
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
2076 v_pts = mpctx->sh_video->pts;
20887
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2077
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2078 {
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2079 static int drop_message=0;
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2080 double AV_delay = a_pts - audio_delay - v_pts;
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2081 double x;
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2082 if (AV_delay>0.5 && drop_frame_cnt>50 && drop_message==0){
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2083 ++drop_message;
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2084 mp_msg(MSGT_AVSYNC,MSGL_WARN,MSGTR_SystemTooSlow);
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2085 }
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2086 if (autosync)
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2087 x = AV_delay*0.1f;
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2088 else
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2089 /* Do not correct target time for the next frame if this frame
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2090 * was late not because of wrong target time but because the
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2091 * target time could not be met */
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2092 x = (AV_delay + timing_error * playback_speed) * 0.1f;
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2093 if (x < -max_pts_correction)
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2094 x = -max_pts_correction;
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2095 else if (x> max_pts_correction)
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2096 x = max_pts_correction;
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2097 if (default_max_pts_correction >= 0)
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2098 max_pts_correction = default_max_pts_correction;
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2099 else
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
2100 max_pts_correction = mpctx->sh_video->frametime*0.10; // +-10% of time
20887
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2101 if (!between_frames) {
22488
b6aa3eedf49b Move the sh_audio->delay field to mpctx->delay.
uau
parents: 22458
diff changeset
2102 mpctx->delay+=x;
20887
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2103 c_total+=x;
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2104 }
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2105 if(!quiet)
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2106 print_status(a_pts - audio_delay, AV_delay, c_total);
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2107 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
2108
20887
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2109 } else {
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2110 // No audio:
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
2111
20887
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2112 if (!quiet)
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2113 print_status(0, 0, 0);
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2114 }
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2115 }
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2116
20986
2422495f5e78 Mark some functions static
uau
parents: 20978
diff changeset
2117 static int fill_audio_out_buffers(void)
20889
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2118 {
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2119 unsigned int t;
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2120 double tt;
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2121 int playsize;
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2122 int playflags=0;
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2123 int audio_eof=0;
20890
9e2d69c27ddb Try filling audio buffers more if they're very large, add some comments.
uau
parents: 20889
diff changeset
2124 int bytes_to_write;
31671
4541f1921482 Add support for parameter changes (e.g. channel count) during playback.
reimar
parents: 31670
diff changeset
2125 int format_change = 0;
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
2126 sh_audio_t * const sh_audio = mpctx->sh_audio;
20889
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2127
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2128 current_module="play_audio";
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2129
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2130 while (1) {
28185
a3ec147048ce Avoid a uselessly high number of wakeups when playing audio-only files.
reimar
parents: 28051
diff changeset
2131 int sleep_time;
20890
9e2d69c27ddb Try filling audio buffers more if they're very large, add some comments.
uau
parents: 20889
diff changeset
2132 // all the current uses of ao_data.pts seem to be in aos that handle
9e2d69c27ddb Try filling audio buffers more if they're very large, add some comments.
uau
parents: 20889
diff changeset
2133 // sync completely wrong; there should be no need to use ao_data.pts
9e2d69c27ddb Try filling audio buffers more if they're very large, add some comments.
uau
parents: 20889
diff changeset
2134 // in get_space()
22488
b6aa3eedf49b Move the sh_audio->delay field to mpctx->delay.
uau
parents: 22458
diff changeset
2135 ao_data.pts = ((mpctx->sh_video?mpctx->sh_video->timer:0)+mpctx->delay)*90000.0;
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
2136 bytes_to_write = mpctx->audio_out->get_space();
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
2137 if (mpctx->sh_video || bytes_to_write >= ao_data.outburst)
20890
9e2d69c27ddb Try filling audio buffers more if they're very large, add some comments.
uau
parents: 20889
diff changeset
2138 break;
20889
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2139
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2140 // handle audio-only case:
20890
9e2d69c27ddb Try filling audio buffers more if they're very large, add some comments.
uau
parents: 20889
diff changeset
2141 // this is where mplayer sleeps during audio-only playback
9e2d69c27ddb Try filling audio buffers more if they're very large, add some comments.
uau
parents: 20889
diff changeset
2142 // to avoid 100% CPU use
28294
94a62675c105 100l, mixed up ao_data.samplerate and ao_data.bps when calculating sleep time.
reimar
parents: 28289
diff changeset
2143 sleep_time = (ao_data.outburst - bytes_to_write) * 1000 / ao_data.bps;
28185
a3ec147048ce Avoid a uselessly high number of wakeups when playing audio-only files.
reimar
parents: 28051
diff changeset
2144 if (sleep_time < 10) sleep_time = 10; // limit to 100 wakeups per second
a3ec147048ce Avoid a uselessly high number of wakeups when playing audio-only files.
reimar
parents: 28051
diff changeset
2145 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
2146 }
9e2d69c27ddb Try filling audio buffers more if they're very large, add some comments.
uau
parents: 20889
diff changeset
2147
9e2d69c27ddb Try filling audio buffers more if they're very large, add some comments.
uau
parents: 20889
diff changeset
2148 while (bytes_to_write) {
31671
4541f1921482 Add support for parameter changes (e.g. channel count) during playback.
reimar
parents: 31670
diff changeset
2149 int res;
20890
9e2d69c27ddb Try filling audio buffers more if they're very large, add some comments.
uau
parents: 20889
diff changeset
2150 playsize = bytes_to_write;
20889
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2151 if (playsize > MAX_OUTBURST)
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2152 playsize = MAX_OUTBURST;
20890
9e2d69c27ddb Try filling audio buffers more if they're very large, add some comments.
uau
parents: 20889
diff changeset
2153 bytes_to_write -= playsize;
20889
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2154
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2155 // Fill buffer if needed:
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2156 current_module="decode_audio";
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2157 t = GetTimer();
31671
4541f1921482 Add support for parameter changes (e.g. channel count) during playback.
reimar
parents: 31670
diff changeset
2158 if (!format_change) {
31977
4a4dcc72da52 Rename decode_audio() to mp_decode_audio().
diego
parents: 31973
diff changeset
2159 res = mp_decode_audio(sh_audio, playsize);
31671
4541f1921482 Add support for parameter changes (e.g. channel count) during playback.
reimar
parents: 31670
diff changeset
2160 format_change = res == -2;
4541f1921482 Add support for parameter changes (e.g. channel count) during playback.
reimar
parents: 31670
diff changeset
2161 }
4541f1921482 Add support for parameter changes (e.g. channel count) during playback.
reimar
parents: 31670
diff changeset
2162 if (!format_change && res < 0) // EOF or error
24892
80180dc13565 Change decode_audio() interface
uau
parents: 24891
diff changeset
2163 if (mpctx->d_audio->eof) {
80180dc13565 Change decode_audio() interface
uau
parents: 24891
diff changeset
2164 audio_eof = 1;
80180dc13565 Change decode_audio() interface
uau
parents: 24891
diff changeset
2165 if (sh_audio->a_out_buffer_len == 0)
80180dc13565 Change decode_audio() interface
uau
parents: 24891
diff changeset
2166 return 0;
20889
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2167 }
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2168 t = GetTimer() - t;
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2169 tt = t*0.000001f; audio_time_usage+=tt;
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2170 if (playsize > sh_audio->a_out_buffer_len) {
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2171 playsize = sh_audio->a_out_buffer_len;
31671
4541f1921482 Add support for parameter changes (e.g. channel count) during playback.
reimar
parents: 31670
diff changeset
2172 if (audio_eof || format_change)
20889
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2173 playflags |= AOPLAY_FINAL_CHUNK;
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2174 }
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2175 if (!playsize)
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2176 break;
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2177
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
2178 // play audio:
20889
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2179 current_module="play_audio";
20890
9e2d69c27ddb Try filling audio buffers more if they're very large, add some comments.
uau
parents: 20889
diff changeset
2180
9e2d69c27ddb Try filling audio buffers more if they're very large, add some comments.
uau
parents: 20889
diff changeset
2181 // Is this pts value actually useful for the aos that access it?
9e2d69c27ddb Try filling audio buffers more if they're very large, add some comments.
uau
parents: 20889
diff changeset
2182 // They're obviously badly broken in the way they handle av sync;
9e2d69c27ddb Try filling audio buffers more if they're very large, add some comments.
uau
parents: 20889
diff changeset
2183 // would not having access to this make them more broken?
22488
b6aa3eedf49b Move the sh_audio->delay field to mpctx->delay.
uau
parents: 22458
diff changeset
2184 ao_data.pts = ((mpctx->sh_video?mpctx->sh_video->timer:0)+mpctx->delay)*90000.0;
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
2185 playsize = mpctx->audio_out->play(sh_audio->a_out_buffer, playsize, playflags);
20889
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2186
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2187 if (playsize > 0) {
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2188 sh_audio->a_out_buffer_len -= playsize;
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2189 memmove(sh_audio->a_out_buffer, &sh_audio->a_out_buffer[playsize],
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2190 sh_audio->a_out_buffer_len);
22488
b6aa3eedf49b Move the sh_audio->delay field to mpctx->delay.
uau
parents: 22458
diff changeset
2191 mpctx->delay += playback_speed*playsize/(double)ao_data.bps;
20889
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2192 }
31671
4541f1921482 Add support for parameter changes (e.g. channel count) during playback.
reimar
parents: 31670
diff changeset
2193 else if ((format_change || audio_eof) && mpctx->audio_out->get_delay() < .04) {
20889
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2194 // Sanity check to avoid hanging in case current ao doesn't output
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2195 // partial chunks and doesn't check for AOPLAY_FINAL_CHUNK
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2196 mp_msg(MSGT_CPLAYER, MSGL_WARN, "Audio output truncated at end.\n");
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2197 sh_audio->a_out_buffer_len = 0;
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2198 }
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2199 }
31671
4541f1921482 Add support for parameter changes (e.g. channel count) during playback.
reimar
parents: 31670
diff changeset
2200 if (format_change) {
4541f1921482 Add support for parameter changes (e.g. channel count) during playback.
reimar
parents: 31670
diff changeset
2201 uninit_player(INITIALIZED_AO);
4541f1921482 Add support for parameter changes (e.g. channel count) during playback.
reimar
parents: 31670
diff changeset
2202 reinit_audio_chain();
4541f1921482 Add support for parameter changes (e.g. channel count) during playback.
reimar
parents: 31670
diff changeset
2203 }
20889
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2204 return 1;
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2205 }
20887
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2206
20986
2422495f5e78 Mark some functions static
uau
parents: 20978
diff changeset
2207 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
2208 {
20904
e5456123de82 Fix statement-before-declaration warnings.
reimar
parents: 20903
diff changeset
2209 int frame_time_remaining = 0;
20899
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2210 current_module="calc_sleep_time";
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2211
31982
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents: 31977
diff changeset
2212 #ifdef CONFIG_NETWORKING
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents: 31977
diff changeset
2213 if (udp_slave) {
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents: 31977
diff changeset
2214 int udp_master_exited = udp_slave_sync(mpctx);
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents: 31977
diff changeset
2215 if (udp_master_exited) {
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents: 31977
diff changeset
2216 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_MasterQuit);
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents: 31977
diff changeset
2217 exit_player(EXIT_QUIT);
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents: 31977
diff changeset
2218 }
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents: 31977
diff changeset
2219 return 0;
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents: 31977
diff changeset
2220 }
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents: 31977
diff changeset
2221 #endif /* CONFIG_NETWORKING */
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents: 31977
diff changeset
2222
20899
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2223 *time_frame -= GetRelativeTime(); // reset timer
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2224
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
2225 if (mpctx->sh_audio && !mpctx->d_audio->eof) {
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
2226 float delay = mpctx->audio_out->get_delay();
20899
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2227 mp_dbg(MSGT_AVSYNC, MSGL_DBG2, "delay=%f\n", delay);
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2228
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2229 if (autosync) {
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2230 /*
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2231 * Adjust this raw delay value by calculating the expected
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2232 * delay for this frame and generating a new value which is
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2233 * weighted between the two. The higher autosync is, the
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2234 * closer to the delay value gets to that which "-nosound"
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2235 * would have used, and the longer it will take for A/V
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2236 * sync to settle at the right value (but it eventually will.)
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2237 * This settling time is very short for values below 100.
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2238 */
22488
b6aa3eedf49b Move the sh_audio->delay field to mpctx->delay.
uau
parents: 22458
diff changeset
2239 float predicted = mpctx->delay / playback_speed + *time_frame;
20899
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2240 float difference = delay - predicted;
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2241 delay = predicted + difference / (float)autosync;
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2242 }
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2243
22488
b6aa3eedf49b Move the sh_audio->delay field to mpctx->delay.
uau
parents: 22458
diff changeset
2244 *time_frame = delay - mpctx->delay / playback_speed;
20899
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2245
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2246 // delay = amount of audio buffered in soundcard/driver
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2247 if (delay > 0.25) delay=0.25; else
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2248 if (delay < 0.10) delay=0.10;
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2249 if (*time_frame > delay*0.6) {
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2250 // sleep time too big - may cause audio drops (buffer underrun)
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2251 frame_time_remaining = 1;
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2252 *time_frame = delay*0.5;
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2253 }
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2254 } else {
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2255 // If we're lagging more than 200 ms behind the right playback rate,
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2256 // don't try to "catch up".
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2257 // If benchmark is set always output frames as fast as possible
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2258 // without sleeping.
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2259 if (*time_frame < -0.2 || benchmark)
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2260 *time_frame = 0;
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2261 }
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2262
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2263 *aq_sleep_time += *time_frame;
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2264
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2265
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2266 //============================== SLEEP: ===================================
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2267
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2268 // flag 256 means: libvo driver does its timing (dvb card)
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2269 if (*time_frame > 0.001 && !(vo_flags&256))
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2270 *time_frame = timing_sleep(*time_frame);
31982
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents: 31977
diff changeset
2271
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents: 31977
diff changeset
2272 #ifdef CONFIG_NETWORKING
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents: 31977
diff changeset
2273 if (udp_master) {
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents: 31977
diff changeset
2274 char current_time[256];
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents: 31977
diff changeset
2275 sprintf(current_time, "%f", mpctx->sh_video->pts);
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents: 31977
diff changeset
2276 send_udp(udp_ip, udp_port, current_time);
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents: 31977
diff changeset
2277 }
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents: 31977
diff changeset
2278 #endif /* CONFIG_NETWORKING */
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents: 31977
diff changeset
2279
20899
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2280 return frame_time_remaining;
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2281 }
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2282
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
2283 int reinit_video_chain(void) {
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
2284 sh_video_t * const sh_video = mpctx->sh_video;
24302
7d58773ead24 moved to reinit_video_chain() the assignment of sh_video->stream_aspect, where it makes more sense
nicodvb
parents: 24300
diff changeset
2285 double ar=-1.0;
20947
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2286 //================== Init VIDEO (codec & libvo) ==========================
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
2287 if(!fixed_vo || !(initialized_flags&INITIALIZED_VO)){
20947
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2288 current_module="preinit_libvo";
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2289
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2290 //shouldn't we set dvideo->id=-2 when we fail?
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2291 vo_config_count=0;
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
2292 //if((mpctx->video_out->preinit(vo_subdevice))!=0){
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
2293 if(!(mpctx->video_out=init_best_video_out(video_driver_list))){
20947
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2294 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_ErrorInitializingVODevice);
21031
e45bb0ee5558 Make sure sh_video == NULL when reinit_video_chain fails.
reimar
parents: 21030
diff changeset
2295 goto err_out;
20947
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2296 }
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
2297 initialized_flags|=INITIALIZED_VO;
20947
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2298 }
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2299
24302
7d58773ead24 moved to reinit_video_chain() the assignment of sh_video->stream_aspect, where it makes more sense
nicodvb
parents: 24300
diff changeset
2300 if(stream_control(mpctx->demuxer->stream, STREAM_CTRL_GET_ASPECT_RATIO, &ar) != STREAM_UNSUPPORTED)
7d58773ead24 moved to reinit_video_chain() the assignment of sh_video->stream_aspect, where it makes more sense
nicodvb
parents: 24300
diff changeset
2301 mpctx->sh_video->stream_aspect = ar;
20947
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2302 current_module="init_video_filters";
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2303 {
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
2304 char* vf_arg[] = { "_oldargs_", (char*)mpctx->video_out , NULL };
31923
8c6e90c5fcc4 Remove pointless casts.
reimar
parents: 31922
diff changeset
2305 sh_video->vfilter=vf_open_filter(NULL,"vo",vf_arg);
20947
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2306 }
27345
b597fd2924b4 Rename preprocessor directive HAVE_MENU --> CONFIG_MENU.
diego
parents: 27343
diff changeset
2307 #ifdef CONFIG_MENU
20947
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2308 if(use_menu) {
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2309 char* vf_arg[] = { "_oldargs_", menu_root, NULL };
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2310 vf_menu = vf_open_plugin(libmenu_vfs,sh_video->vfilter,"menu",vf_arg);
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2311 if(!vf_menu) {
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2312 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantOpenLibmenuFilterWithThisRootMenu,menu_root);
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2313 use_menu = 0;
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2314 }
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2315 }
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2316 if(vf_menu)
31923
8c6e90c5fcc4 Remove pointless casts.
reimar
parents: 31922
diff changeset
2317 sh_video->vfilter=vf_menu;
20947
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2318 #endif
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2319
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
2320 #ifdef CONFIG_ASS
20947
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2321 if(ass_enabled) {
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2322 int i;
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2323 int insert = 1;
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2324 if (vf_settings)
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2325 for (i = 0; vf_settings[i].name; ++i)
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2326 if (strcmp(vf_settings[i].name, "ass") == 0) {
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2327 insert = 0;
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2328 break;
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2329 }
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2330 if (insert) {
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2331 char* vf_arg[] = {"auto", "1", NULL};
31922
4ed75340d779 Use vf_open_filter, just like in the previous change for mencoder.
reimar
parents: 31882
diff changeset
2332 vf_instance_t* vf_ass = vf_open_filter(sh_video->vfilter,"ass",vf_arg);
20947
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2333 if (vf_ass)
31923
8c6e90c5fcc4 Remove pointless casts.
reimar
parents: 31922
diff changeset
2334 sh_video->vfilter=vf_ass;
20947
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2335 else
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2336 mp_msg(MSGT_CPLAYER,MSGL_ERR, "ASS: cannot add video filter\n");
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2337 }
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2338 }
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2339 #endif
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2340
31923
8c6e90c5fcc4 Remove pointless casts.
reimar
parents: 31922
diff changeset
2341 sh_video->vfilter=append_filters(sh_video->vfilter);
31927
6e0b5a97e00f EOSD/ASS code factorization
cigaes
parents: 31923
diff changeset
2342 eosd_init(sh_video->vfilter);
20947
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2343
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
2344 #ifdef CONFIG_ASS
20947
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2345 if (ass_enabled)
31927
6e0b5a97e00f EOSD/ASS code factorization
cigaes
parents: 31923
diff changeset
2346 eosd_ass_init(ass_library);
20947
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2347 #endif
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2348
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2349 current_module="init_video_codec";
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2350
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2351 mp_msg(MSGT_CPLAYER,MSGL_INFO,"==========================================================================\n");
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2352 init_best_video_codec(sh_video,video_codec_list,video_fm_list);
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2353 mp_msg(MSGT_CPLAYER,MSGL_INFO,"==========================================================================\n");
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2354
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
2355 if(!sh_video->initialized){
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
2356 if(!fixed_vo) uninit_player(INITIALIZED_VO);
21031
e45bb0ee5558 Make sure sh_video == NULL when reinit_video_chain fails.
reimar
parents: 21030
diff changeset
2357 goto err_out;
20947
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2358 }
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2359
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
2360 initialized_flags|=INITIALIZED_VCODEC;
20947
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2361
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2362 if (sh_video->codec)
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2363 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_CODEC=%s\n", sh_video->codec->name);
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2364
21077
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2365 sh_video->last_pts = MP_NOPTS_VALUE;
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2366 sh_video->num_buffered_pts = 0;
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2367 sh_video->next_frame_time = 0;
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2368
20947
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2369 if(auto_quality>0){
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2370 // Auto quality option enabled
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2371 output_quality=get_video_quality_max(sh_video);
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2372 if(auto_quality>output_quality) auto_quality=output_quality;
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2373 else output_quality=auto_quality;
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2374 mp_msg(MSGT_CPLAYER,MSGL_V,"AutoQ: setting quality to %d.\n",output_quality);
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2375 set_video_quality(sh_video,output_quality);
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2376 }
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2377
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2378 // ========== Init display (sh_video->disp_w*sh_video->disp_h/out_fmt) ============
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2379
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2380 current_module="init_vo";
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2381
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2382 return 1;
21031
e45bb0ee5558 Make sure sh_video == NULL when reinit_video_chain fails.
reimar
parents: 21030
diff changeset
2383
e45bb0ee5558 Make sure sh_video == NULL when reinit_video_chain fails.
reimar
parents: 21030
diff changeset
2384 err_out:
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
2385 mpctx->sh_video = mpctx->d_video->sh = NULL;
21031
e45bb0ee5558 Make sure sh_video == NULL when reinit_video_chain fails.
reimar
parents: 21030
diff changeset
2386 return 0;
20947
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2387 }
20899
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2388
21077
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2389 static double update_video(int *blit_frame)
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2390 {
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
2391 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
2392 //-------------------- Decode a frame: -----------------------
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2393 double frame_time;
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2394 *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
2395 if (!correct_pts) {
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2396 unsigned char* start=NULL;
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2397 void *decoded_frame = NULL;
21077
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2398 int drop_frame=0;
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2399 int in_size;
31972
96559880e475 Improve A/V sync when not using -correct-pts.
cehoyos
parents: 31971
diff changeset
2400 int full_frame;
96559880e475 Improve A/V sync when not using -correct-pts.
cehoyos
parents: 31971
diff changeset
2401
96559880e475 Improve A/V sync when not using -correct-pts.
cehoyos
parents: 31971
diff changeset
2402 do {
21077
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2403 current_module = "video_read_frame";
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2404 frame_time = sh_video->next_frame_time;
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2405 in_size = video_read_frame(sh_video, &sh_video->next_frame_time,
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2406 &start, force_fps);
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
2407 #ifdef CONFIG_DVDNAV
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2408 /// wait, still frame or EOF
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2409 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
2410 if (mp_dvdnav_is_eof(mpctx->stream))
203789464176 misc cosmetics: K&R style nits, #include placement, indentation
diego
parents: 31148
diff changeset
2411 return -1;
203789464176 misc cosmetics: K&R style nits, #include placement, indentation
diego
parents: 31148
diff changeset
2412 if (mpctx->d_video)
203789464176 misc cosmetics: K&R style nits, #include placement, indentation
diego
parents: 31148
diff changeset
2413 mpctx->d_video->eof = 0;
203789464176 misc cosmetics: K&R style nits, #include placement, indentation
diego
parents: 31148
diff changeset
2414 if (mpctx->d_audio)
203789464176 misc cosmetics: K&R style nits, #include placement, indentation
diego
parents: 31148
diff changeset
2415 mpctx->d_audio->eof = 0;
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2416 mpctx->stream->eof = 0;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2417 } else
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2418 #endif
21077
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2419 if (in_size < 0)
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2420 return -1;
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2421 if (in_size > max_framesize)
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2422 max_framesize = in_size; // stats
26228
089dc00275b6 Experimental support for -framedrop with -correct-pts.
reimar
parents: 26159
diff changeset
2423 drop_frame = check_framedrop(frame_time);
21077
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2424 current_module = "decode_video";
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
2425 #ifdef CONFIG_DVDNAV
31972
96559880e475 Improve A/V sync when not using -correct-pts.
cehoyos
parents: 31971
diff changeset
2426 full_frame = 1;
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2427 decoded_frame = mp_dvdnav_restore_smpi(&in_size,&start,decoded_frame);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2428 /// still frame has been reached, no need to decode
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2429 if (in_size > 0 && !decoded_frame)
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2430 #endif
21077
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2431 decoded_frame = decode_video(sh_video, start, in_size, drop_frame,
31972
96559880e475 Improve A/V sync when not using -correct-pts.
cehoyos
parents: 31971
diff changeset
2432 sh_video->pts, &full_frame);
96559880e475 Improve A/V sync when not using -correct-pts.
cehoyos
parents: 31971
diff changeset
2433
96559880e475 Improve A/V sync when not using -correct-pts.
cehoyos
parents: 31971
diff changeset
2434 if (full_frame) {
96559880e475 Improve A/V sync when not using -correct-pts.
cehoyos
parents: 31971
diff changeset
2435 sh_video->timer += frame_time;
96559880e475 Improve A/V sync when not using -correct-pts.
cehoyos
parents: 31971
diff changeset
2436
96559880e475 Improve A/V sync when not using -correct-pts.
cehoyos
parents: 31971
diff changeset
2437 // Time-based PTS recalculation.
96559880e475 Improve A/V sync when not using -correct-pts.
cehoyos
parents: 31971
diff changeset
2438 // The key to maintaining A-V sync is to not touch PTS until the proper frame is reached
96559880e475 Improve A/V sync when not using -correct-pts.
cehoyos
parents: 31971
diff changeset
2439 if (sh_video->pts != MP_NOPTS_VALUE) {
96559880e475 Improve A/V sync when not using -correct-pts.
cehoyos
parents: 31971
diff changeset
2440 if (sh_video->last_pts != MP_NOPTS_VALUE) {
96559880e475 Improve A/V sync when not using -correct-pts.
cehoyos
parents: 31971
diff changeset
2441 double pts = sh_video->last_pts + frame_time;
96559880e475 Improve A/V sync when not using -correct-pts.
cehoyos
parents: 31971
diff changeset
2442 double ptsdiff = fabs(pts - sh_video->pts);
96559880e475 Improve A/V sync when not using -correct-pts.
cehoyos
parents: 31971
diff changeset
2443
96559880e475 Improve A/V sync when not using -correct-pts.
cehoyos
parents: 31971
diff changeset
2444 // Allow starting PTS recalculation at the appropriate frame only
96559880e475 Improve A/V sync when not using -correct-pts.
cehoyos
parents: 31971
diff changeset
2445 mpctx->framestep_found |= (ptsdiff <= frame_time * 1.5);
96559880e475 Improve A/V sync when not using -correct-pts.
cehoyos
parents: 31971
diff changeset
2446
96559880e475 Improve A/V sync when not using -correct-pts.
cehoyos
parents: 31971
diff changeset
2447 // replace PTS only if we're not too close and not too far
96559880e475 Improve A/V sync when not using -correct-pts.
cehoyos
parents: 31971
diff changeset
2448 // and a correctly timed frame has been found, otherwise
96559880e475 Improve A/V sync when not using -correct-pts.
cehoyos
parents: 31971
diff changeset
2449 // keep pts to eliminate rounding errors or catch up with stream
96559880e475 Improve A/V sync when not using -correct-pts.
cehoyos
parents: 31971
diff changeset
2450 if (ptsdiff > frame_time * 20)
96559880e475 Improve A/V sync when not using -correct-pts.
cehoyos
parents: 31971
diff changeset
2451 mpctx->framestep_found = 0;
96559880e475 Improve A/V sync when not using -correct-pts.
cehoyos
parents: 31971
diff changeset
2452 if (ptsdiff * 10 > frame_time && mpctx->framestep_found)
96559880e475 Improve A/V sync when not using -correct-pts.
cehoyos
parents: 31971
diff changeset
2453 sh_video->pts = pts;
96559880e475 Improve A/V sync when not using -correct-pts.
cehoyos
parents: 31971
diff changeset
2454 else
96559880e475 Improve A/V sync when not using -correct-pts.
cehoyos
parents: 31971
diff changeset
2455 mp_dbg(MSGT_AVSYNC,MSGL_DBG2,"Keeping PTS at %6.2f\n", sh_video->pts);
96559880e475 Improve A/V sync when not using -correct-pts.
cehoyos
parents: 31971
diff changeset
2456 }
96559880e475 Improve A/V sync when not using -correct-pts.
cehoyos
parents: 31971
diff changeset
2457 sh_video->last_pts = sh_video->pts;
96559880e475 Improve A/V sync when not using -correct-pts.
cehoyos
parents: 31971
diff changeset
2458 }
96559880e475 Improve A/V sync when not using -correct-pts.
cehoyos
parents: 31971
diff changeset
2459 if (mpctx->sh_audio)
96559880e475 Improve A/V sync when not using -correct-pts.
cehoyos
parents: 31971
diff changeset
2460 mpctx->delay -= frame_time;
96559880e475 Improve A/V sync when not using -correct-pts.
cehoyos
parents: 31971
diff changeset
2461 // video_read_frame can change fps (e.g. for ASF video)
96559880e475 Improve A/V sync when not using -correct-pts.
cehoyos
parents: 31971
diff changeset
2462 vo_fps = sh_video->fps;
96559880e475 Improve A/V sync when not using -correct-pts.
cehoyos
parents: 31971
diff changeset
2463 update_subtitles(sh_video, sh_video->pts, mpctx->d_sub, 0);
96559880e475 Improve A/V sync when not using -correct-pts.
cehoyos
parents: 31971
diff changeset
2464 update_teletext(sh_video, mpctx->demuxer, 0);
96559880e475 Improve A/V sync when not using -correct-pts.
cehoyos
parents: 31971
diff changeset
2465 update_osd_msg();
96559880e475 Improve A/V sync when not using -correct-pts.
cehoyos
parents: 31971
diff changeset
2466 }
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
2467 #ifdef CONFIG_DVDNAV
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2468 /// save back last still frame for future display
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2469 mp_dvdnav_save_smpi(in_size,start,decoded_frame);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2470 #endif
31972
96559880e475 Improve A/V sync when not using -correct-pts.
cehoyos
parents: 31971
diff changeset
2471 } while (!full_frame);
96559880e475 Improve A/V sync when not using -correct-pts.
cehoyos
parents: 31971
diff changeset
2472
21077
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2473 current_module = "filter_video";
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2474 *blit_frame = (decoded_frame && filter_video(sh_video, decoded_frame,
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2475 sh_video->pts));
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2476 }
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2477 else {
26228
089dc00275b6 Experimental support for -framedrop with -correct-pts.
reimar
parents: 26159
diff changeset
2478 int res = generate_video_frame(sh_video, mpctx->d_video);
089dc00275b6 Experimental support for -framedrop with -correct-pts.
reimar
parents: 26159
diff changeset
2479 if (!res)
21077
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2480 return -1;
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2481 ((vf_instance_t *)sh_video->vfilter)->control(sh_video->vfilter,
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2482 VFCTRL_GET_PTS, &sh_video->pts);
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2483 if (sh_video->pts == MP_NOPTS_VALUE) {
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2484 mp_msg(MSGT_CPLAYER, MSGL_ERR, "pts after filters MISSING\n");
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2485 sh_video->pts = sh_video->last_pts;
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2486 }
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2487 if (sh_video->last_pts == MP_NOPTS_VALUE)
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2488 sh_video->last_pts= sh_video->pts;
28410
f02a92b6d0a4 Do not print a warning if current pts is equal to previous pts.
diego
parents: 28378
diff changeset
2489 else if (sh_video->last_pts > sh_video->pts) {
31245
a3adde0a5b83 If an invalid pts value is detected, try to to make up some if it seems
reimar
parents: 31243
diff changeset
2490 // make a guess whether this is some kind of discontinuity
a3adde0a5b83 If an invalid pts value is detected, try to to make up some if it seems
reimar
parents: 31243
diff changeset
2491 // we should jump along with or some wron timestamps we
a3adde0a5b83 If an invalid pts value is detected, try to to make up some if it seems
reimar
parents: 31243
diff changeset
2492 // should replace instead
a3adde0a5b83 If an invalid pts value is detected, try to to make up some if it seems
reimar
parents: 31243
diff changeset
2493 if (sh_video->pts < sh_video->last_pts - 20 * sh_video->frametime)
a3adde0a5b83 If an invalid pts value is detected, try to to make up some if it seems
reimar
parents: 31243
diff changeset
2494 sh_video->last_pts = sh_video->pts;
a3adde0a5b83 If an invalid pts value is detected, try to to make up some if it seems
reimar
parents: 31243
diff changeset
2495 else
a3adde0a5b83 If an invalid pts value is detected, try to to make up some if it seems
reimar
parents: 31243
diff changeset
2496 sh_video->pts = sh_video->last_pts + sh_video->frametime;
a3adde0a5b83 If an invalid pts value is detected, try to to make up some if it seems
reimar
parents: 31243
diff changeset
2497 mp_msg(MSGT_CPLAYER, MSGL_V, "pts value < previous\n");
21077
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2498 }
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2499 frame_time = sh_video->pts - sh_video->last_pts;
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2500 sh_video->last_pts = sh_video->pts;
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2501 sh_video->timer += frame_time;
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
2502 if(mpctx->sh_audio)
22488
b6aa3eedf49b Move the sh_audio->delay field to mpctx->delay.
uau
parents: 22458
diff changeset
2503 mpctx->delay -= frame_time;
26228
089dc00275b6 Experimental support for -framedrop with -correct-pts.
reimar
parents: 26159
diff changeset
2504 *blit_frame = res > 0;
21077
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2505 }
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2506 return frame_time;
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2507 }
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2508
25606
a3f9b22287ca Make some functions in mplayer.c static
reimar
parents: 25467
diff changeset
2509 static void pause_loop(void)
21082
ef6a6e777fdd Move pause loop into a separate function.
uau
parents: 21077
diff changeset
2510 {
ef6a6e777fdd Move pause loop into a separate function.
uau
parents: 21077
diff changeset
2511 mp_cmd_t* cmd;
ef6a6e777fdd Move pause loop into a separate function.
uau
parents: 21077
diff changeset
2512 if (!quiet) {
ef6a6e777fdd Move pause loop into a separate function.
uau
parents: 21077
diff changeset
2513 // Small hack to display the pause message on the OSD line.
ef6a6e777fdd Move pause loop into a separate function.
uau
parents: 21077
diff changeset
2514 // The pause string is: "\n == PAUSE == \r" so we need to
ef6a6e777fdd Move pause loop into a separate function.
uau
parents: 21077
diff changeset
2515 // take the first and the last char out
29857
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2516 if (term_osd && !mpctx->sh_video) {
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2517 char msg[128] = MSGTR_Paused;
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2518 int mlen = strlen(msg);
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2519 msg[mlen-1] = '\0';
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2520 set_osd_msg(OSD_MSG_PAUSE, 1, 0, "%s", msg+1);
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2521 update_osd_msg();
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2522 } else
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2523 mp_msg(MSGT_CPLAYER,MSGL_STATUS,MSGTR_Paused);
21082
ef6a6e777fdd Move pause loop into a separate function.
uau
parents: 21077
diff changeset
2524 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_PAUSED\n");
ef6a6e777fdd Move pause loop into a separate function.
uau
parents: 21077
diff changeset
2525 }
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
2526 #ifdef CONFIG_GUI
21082
ef6a6e777fdd Move pause loop into a separate function.
uau
parents: 21077
diff changeset
2527 if (use_gui)
29857
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2528 guiGetEvent(guiCEvent, (char *)guiSetPause);
21082
ef6a6e777fdd Move pause loop into a separate function.
uau
parents: 21077
diff changeset
2529 #endif
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
2530 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
2531 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
2532
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
2533 if (mpctx->audio_out && mpctx->sh_audio)
29857
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2534 mpctx->audio_out->pause(); // pause audio, keep data if possible
21082
ef6a6e777fdd Move pause loop into a separate function.
uau
parents: 21077
diff changeset
2535
28835
6f5824a39ada Make pausing_keep_force the default for the set_mouse_pos and key_down_event -
reimar
parents: 28656
diff changeset
2536 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
2537 if (cmd) {
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2538 cmd = mp_input_get_cmd(0,1,0);
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2539 run_command(mpctx, cmd);
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2540 mp_cmd_free(cmd);
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2541 continue;
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2542 }
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2543 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
2544 mpctx->video_out->check_events();
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
2545 #ifdef CONFIG_GUI
29857
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2546 if (use_gui) {
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2547 guiEventHandling();
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2548 guiGetEvent(guiReDraw, NULL);
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2549 if (guiIntfStruct.Playing!=2 || (rel_seek_secs || abs_seek_pos))
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2550 break;
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2551 }
21082
ef6a6e777fdd Move pause loop into a separate function.
uau
parents: 21077
diff changeset
2552 #endif
27345
b597fd2924b4 Rename preprocessor directive HAVE_MENU --> CONFIG_MENU.
diego
parents: 27343
diff changeset
2553 #ifdef CONFIG_MENU
29857
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2554 if (vf_menu)
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2555 vf_menu_pause_update(vf_menu);
21082
ef6a6e777fdd Move pause loop into a separate function.
uau
parents: 21077
diff changeset
2556 #endif
29857
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2557 usec_sleep(20000);
21082
ef6a6e777fdd Move pause loop into a separate function.
uau
parents: 21077
diff changeset
2558 }
ef6a6e777fdd Move pause loop into a separate function.
uau
parents: 21077
diff changeset
2559 if (cmd && cmd->id == MP_CMD_PAUSE) {
29857
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2560 cmd = mp_input_get_cmd(0,1,0);
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2561 mp_cmd_free(cmd);
21082
ef6a6e777fdd Move pause loop into a separate function.
uau
parents: 21077
diff changeset
2562 }
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
2563 mpctx->osd_function=OSD_PLAY;
29937
d654021c9652 Add braces to avoid ambiguous else.
reimar
parents: 29922
diff changeset
2564 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
2565 if (mpctx->eof) // do not play remaining audio if we e.g. switch to the next file
3a6ae46759de Do not call resume on unpausing if we have already reached eof while
reimar
parents: 29855
diff changeset
2566 mpctx->audio_out->reset();
3a6ae46759de Do not call resume on unpausing if we have already reached eof while
reimar
parents: 29855
diff changeset
2567 else
29857
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2568 mpctx->audio_out->resume(); // resume audio
29937
d654021c9652 Add braces to avoid ambiguous else.
reimar
parents: 29922
diff changeset
2569 }
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
2570 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
2571 mpctx->video_out->control(VOCTRL_RESUME, NULL); // resume video
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2572 (void)GetRelativeTime(); // ignore time that passed during pause
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
2573 #ifdef CONFIG_GUI
21082
ef6a6e777fdd Move pause loop into a separate function.
uau
parents: 21077
diff changeset
2574 if (use_gui) {
29857
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2575 if (guiIntfStruct.Playing == guiSetStop)
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2576 mpctx->eof = 1;
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2577 else
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2578 guiGetEvent(guiCEvent, (char *)guiSetPlay);
21082
ef6a6e777fdd Move pause loop into a separate function.
uau
parents: 21077
diff changeset
2579 }
ef6a6e777fdd Move pause loop into a separate function.
uau
parents: 21077
diff changeset
2580 #endif
ef6a6e777fdd Move pause loop into a separate function.
uau
parents: 21077
diff changeset
2581 }
ef6a6e777fdd Move pause loop into a separate function.
uau
parents: 21077
diff changeset
2582
31956
a6c25d94e60e Add new slave mode command for loading EDL file on demand.
reynaldo
parents: 31945
diff changeset
2583 static void edl_loadfile(void)
a6c25d94e60e Add new slave mode command for loading EDL file on demand.
reynaldo
parents: 31945
diff changeset
2584 {
a6c25d94e60e Add new slave mode command for loading EDL file on demand.
reynaldo
parents: 31945
diff changeset
2585 if (edl_filename) {
a6c25d94e60e Add new slave mode command for loading EDL file on demand.
reynaldo
parents: 31945
diff changeset
2586 if (edl_records) {
a6c25d94e60e Add new slave mode command for loading EDL file on demand.
reynaldo
parents: 31945
diff changeset
2587 free_edl(edl_records);
a6c25d94e60e Add new slave mode command for loading EDL file on demand.
reynaldo
parents: 31945
diff changeset
2588 edl_needs_reset = 1;
a6c25d94e60e Add new slave mode command for loading EDL file on demand.
reynaldo
parents: 31945
diff changeset
2589 }
a6c25d94e60e Add new slave mode command for loading EDL file on demand.
reynaldo
parents: 31945
diff changeset
2590 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
2591 }
a6c25d94e60e Add new slave mode command for loading EDL file on demand.
reynaldo
parents: 31945
diff changeset
2592 }
a6c25d94e60e Add new slave mode command for loading EDL file on demand.
reynaldo
parents: 31945
diff changeset
2593
22298
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2594 // Execute EDL command for the current position if one exists
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2595 static void edl_update(MPContext *mpctx)
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2596 {
31459
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2597 if (!edl_records) {
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2598 return;
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2599 }
22298
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2600
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2601 if (!mpctx->sh_video) {
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2602 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_EdlNOsh_video);
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2603 free_edl(edl_records);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
2604 next_edl_record = NULL;
22298
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2605 edl_records = NULL;
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2606 return;
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2607 }
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2608
31459
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2609 // 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
2610 // 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
2611 if (edl_needs_reset) {
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2612 edl_needs_reset = 0;
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2613 mpctx->edl_muted = 0;
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2614 next_edl_record = edl_records;
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2615
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2616 // 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
2617 // inside any record
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2618 while (next_edl_record) {
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2619 if (next_edl_record->start_sec > mpctx->sh_video->pts)
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2620 break;
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2621 if (next_edl_record->stop_sec >= mpctx->sh_video->pts) {
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2622 if (edl_backward) {
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2623 mpctx->osd_function = OSD_REW;
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2624 edl_decision = 1;
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2625 abs_seek_pos = 0;
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2626 rel_seek_secs = -(mpctx->sh_video->pts -
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2627 next_edl_record->start_sec +
31580
b6c2b541e1a6 Implement edl-backward-delay to avoid jumping right over an
reynaldo
parents: 31515
diff changeset
2628 edl_backward_delay);
31459
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2629 mp_msg(MSGT_CPLAYER, MSGL_DBG4, "EDL_SKIP: pts [%f], "
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2630 "offset [%f], start [%f], stop [%f], length [%f]\n",
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2631 mpctx->sh_video->pts, rel_seek_secs,
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2632 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
2633 next_edl_record->length_sec);
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2634 return;
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2635 }
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2636 break;
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2637 }
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2638
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2639 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
2640 mpctx->edl_muted = !mpctx->edl_muted;
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2641
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2642 next_edl_record = next_edl_record->next;
22298
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2643 }
31459
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2644 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
2645 mixer_mute(&mpctx->mixer);
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2646 }
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2647
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2648 if (next_edl_record &&
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2649 mpctx->sh_video->pts >= next_edl_record->start_sec) {
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2650 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
2651 mpctx->osd_function = OSD_FFW;
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2652 edl_decision = 1;
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2653 abs_seek_pos = 0;
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2654 rel_seek_secs = next_edl_record->stop_sec - mpctx->sh_video->pts;
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2655 mp_msg(MSGT_CPLAYER, MSGL_DBG4, "EDL_SKIP: pts [%f], offset [%f], "
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2656 "start [%f], stop [%f], length [%f]\n",
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2657 mpctx->sh_video->pts, rel_seek_secs,
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2658 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
2659 next_edl_record->length_sec);
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2660 }
22298
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2661 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
2662 mpctx->edl_muted = !mpctx->edl_muted;
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2663 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
2664 mixer_mute(&mpctx->mixer);
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2665 mp_msg(MSGT_CPLAYER, MSGL_DBG4, "EDL_MUTE: [%f]\n",
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2666 next_edl_record->start_sec );
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2667 }
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2668 next_edl_record = next_edl_record->next;
22298
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2669 }
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2670 }
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2671
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2672
25883
baf32110d3fc Use defines to give names to the different seek flags.
reimar
parents: 25852
diff changeset
2673 // style & SEEK_ABSOLUTE == 0 means seek relative to current position, == 1 means absolute
baf32110d3fc Use defines to give names to the different seek flags.
reimar
parents: 25852
diff changeset
2674 // 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
2675 // return -1 if seek failed (non-seekable stream?), 0 otherwise
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2676 static int seek(MPContext *mpctx, double amount, int style)
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2677 {
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2678 current_module = "seek";
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2679 if (demux_seek(mpctx->demuxer, amount, audio_delay, style) == 0)
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2680 return -1;
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2681
30176
6fb92182aff3 At startup and while seeking avoid to introduce pointless sleeps and possibly
reimar
parents: 30175
diff changeset
2682 mpctx->startup_decode_retry = DEFAULT_STARTUP_DECODE_RETRY;
22300
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2683 if (mpctx->sh_video) {
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2684 current_module = "seek_video_reset";
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2685 if (vo_config_count)
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2686 mpctx->video_out->control(VOCTRL_RESET, NULL);
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2687 mpctx->num_buffered_frames = 0;
22488
b6aa3eedf49b Move the sh_audio->delay field to mpctx->delay.
uau
parents: 22458
diff changeset
2688 mpctx->delay = 0;
30175
b7bb4a899a6b Also reset time_frame and next_frame_time on reset, it makes no sense to
reimar
parents: 30136
diff changeset
2689 mpctx->time_frame = 0;
31972
96559880e475 Improve A/V sync when not using -correct-pts.
cehoyos
parents: 31971
diff changeset
2690 mpctx->framestep_found = 0;
22300
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2691 // Not all demuxers set d_video->pts during seek, so this value
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2692 // (which is used by at least vobsub and edl code below) may
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2693 // be completely wrong (probably 0).
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2694 mpctx->sh_video->pts = mpctx->d_video->pts;
29668
ecc719c6d7a9 Make update_subtitles work without sh_video for text subtitles.
reimar
parents: 29642
diff changeset
2695 update_subtitles(mpctx->sh_video, mpctx->sh_video->pts, mpctx->d_sub, 1);
23903
037737866f6a Teletext support
voroshil
parents: 23889
diff changeset
2696 update_teletext(mpctx->sh_video, mpctx->demuxer, 1);
22300
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2697 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
2698
22300
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2699 if (mpctx->sh_audio) {
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2700 current_module = "seek_audio_reset";
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2701 mpctx->audio_out->reset(); // stop audio, throwing away buffered data
29670
2e3751815a21 Add support for displaying subtitles on the command-line when playing
reimar
parents: 29668
diff changeset
2702 if (!mpctx->sh_video)
2e3751815a21 Add support for displaying subtitles on the command-line when playing
reimar
parents: 29668
diff changeset
2703 update_subtitles(NULL, mpctx->sh_audio->pts, mpctx->d_sub, 1);
22300
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2704 }
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2705
25416
a79a22add62a Do not operate on vobsub when no video (Bug #312).
ulion
parents: 25397
diff changeset
2706 if (vo_vobsub && mpctx->sh_video) {
22300
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2707 current_module = "seek_vobsub_reset";
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2708 vobsub_seek(vo_vobsub, mpctx->sh_video->pts);
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2709 }
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2710
31700
121fed0ab46a libass: remove yet another version check
greg
parents: 31673
diff changeset
2711 #ifdef CONFIG_ASS
31227
ee7beb1a3a6e backport ass_flush_events() from upstream libass and make use of it
aurel
parents: 31201
diff changeset
2712 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
2713 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
2714 #endif
ee7beb1a3a6e backport ass_flush_events() from upstream libass and make use of it
aurel
parents: 31201
diff changeset
2715
31459
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2716 if (edl_records) {
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2717 edl_needs_reset = 1;
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2718 edl_backward = amount < 0;
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
2719 }
22300
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2720
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2721 c_total = 0;
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2722 max_pts_correction = 0.1;
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2723 audio_time_usage = 0; video_time_usage = 0; vout_time_usage = 0;
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2724 drop_frame_cnt = 0;
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2725
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2726 current_module = NULL;
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2727 return 0;
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2728 }
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2729
26963
8825552ee585 Fix the linking of TOOLS/netstream and TOOLS/vivodump.
diego
parents: 26877
diff changeset
2730 /* 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
2731 * file for some tools to link against. */
8825552ee585 Fix the linking of TOOLS/netstream and TOOLS/vivodump.
diego
parents: 26877
diff changeset
2732 #ifndef DISABLE_MAIN
21764
309992959801 avoid code duplication.
vayne
parents: 21604
diff changeset
2733 int main(int argc,char* argv[]){
309992959801 avoid code duplication.
vayne
parents: 21604
diff changeset
2734
309992959801 avoid code duplication.
vayne
parents: 21604
diff changeset
2735
309992959801 avoid code duplication.
vayne
parents: 21604
diff changeset
2736 // movie info:
309992959801 avoid code duplication.
vayne
parents: 21604
diff changeset
2737
309992959801 avoid code duplication.
vayne
parents: 21604
diff changeset
2738 /* Flag indicating whether MPlayer should exit without playing anything. */
309992959801 avoid code duplication.
vayne
parents: 21604
diff changeset
2739 int opt_exit = 0;
309992959801 avoid code duplication.
vayne
parents: 21604
diff changeset
2740 int i;
309992959801 avoid code duplication.
vayne
parents: 21604
diff changeset
2741
309992959801 avoid code duplication.
vayne
parents: 21604
diff changeset
2742 int gui_no_filename=0;
309992959801 avoid code duplication.
vayne
parents: 21604
diff changeset
2743
32383
f6e78eef2e1b Avoid duplicating common init code between MPlayer and mencoder.
reimar
parents: 32382
diff changeset
2744 common_preinit();
21764
309992959801 avoid code duplication.
vayne
parents: 21604
diff changeset
2745
26408
7a36d5941fd8 Replace the trivial command line preparser with a more robust version
albeu
parents: 26326
diff changeset
2746 // Create the config context and register the options
7a36d5941fd8 Replace the trivial command line preparser with a more robust version
albeu
parents: 26326
diff changeset
2747 mconfig = m_config_new();
7a36d5941fd8 Replace the trivial command line preparser with a more robust version
albeu
parents: 26326
diff changeset
2748 m_config_register_options(mconfig,mplayer_opts);
31368
f73663d84979 Replace common options template by a common options array.
diego
parents: 31366
diff changeset
2749 m_config_register_options(mconfig, common_opts);
26408
7a36d5941fd8 Replace the trivial command line preparser with a more robust version
albeu
parents: 26326
diff changeset
2750 mp_input_register_options(mconfig);
7a36d5941fd8 Replace the trivial command line preparser with a more robust version
albeu
parents: 26326
diff changeset
2751
7a36d5941fd8 Replace the trivial command line preparser with a more robust version
albeu
parents: 26326
diff changeset
2752 // Preparse the command line
7a36d5941fd8 Replace the trivial command line preparser with a more robust version
albeu
parents: 26326
diff changeset
2753 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
2754
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
2755 #ifdef CONFIG_TV
23889
0ad7037df91f Removing global variables from tv://
voroshil
parents: 23808
diff changeset
2756 stream_tv_defaults.immediate = 1;
7068
6c2d746b17bf 10l, fix compiling without tv. patch by Andreas Hess <jaska@gmx.net>
arpi
parents: 7058
diff changeset
2757 #endif
5572
8cd761968f35 BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents: 5520
diff changeset
2758
19355
ba95c4fa0684 Reintroduce an ugly variant of the -gui/-nogui options.
reimar
parents: 19342
diff changeset
2759 if (argc > 1 && argv[1] &&
ba95c4fa0684 Reintroduce an ugly variant of the -gui/-nogui options.
reimar
parents: 19342
diff changeset
2760 (!strcmp(argv[1], "-gui") || !strcmp(argv[1], "-nogui"))) {
ba95c4fa0684 Reintroduce an ugly variant of the -gui/-nogui options.
reimar
parents: 19342
diff changeset
2761 use_gui = !strcmp(argv[1], "-gui");
ba95c4fa0684 Reintroduce an ugly variant of the -gui/-nogui options.
reimar
parents: 19342
diff changeset
2762 } else
1709
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
2763 if ( argv[0] )
18939
cde5b56f1610 Change use_gui detection to accept also filenames only containing
reimar
parents: 18938
diff changeset
2764 {
cde5b56f1610 Change use_gui detection to accept also filenames only containing
reimar
parents: 18938
diff changeset
2765 char *base = strrchr(argv[0], '/');
cde5b56f1610 Change use_gui detection to accept also filenames only containing
reimar
parents: 18938
diff changeset
2766 if (!base)
cde5b56f1610 Change use_gui detection to accept also filenames only containing
reimar
parents: 18938
diff changeset
2767 base = strrchr(argv[0], '\\');
cde5b56f1610 Change use_gui detection to accept also filenames only containing
reimar
parents: 18938
diff changeset
2768 if (!base)
cde5b56f1610 Change use_gui detection to accept also filenames only containing
reimar
parents: 18938
diff changeset
2769 base = argv[0];
cde5b56f1610 Change use_gui detection to accept also filenames only containing
reimar
parents: 18938
diff changeset
2770 if(strstr(base, "gmplayer"))
1709
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
2771 use_gui=1;
18939
cde5b56f1610 Change use_gui detection to accept also filenames only containing
reimar
parents: 18938
diff changeset
2772 }
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
2773
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2774 parse_cfgfiles(mconfig);
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2775
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
2776 #ifdef CONFIG_GUI
7019
e37a67d5e117 fix (?) cmd line handling
pontscho
parents: 7009
diff changeset
2777 if ( use_gui ) cfg_read();
e37a67d5e117 fix (?) cmd line handling
pontscho
parents: 7009
diff changeset
2778 #endif
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2779
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
2780 mpctx->playtree = m_config_parse_mp_command_line(mconfig, argc, argv);
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
2781 if(mpctx->playtree == NULL)
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
2782 opt_exit = 1;
feb16d0117c8 allow multiple help clauses on the command line, Patch by kiriuja " mplayer-patches AH en-directo POUM net "
gpoirier
parents: 16323
diff changeset
2783 else {
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
2784 mpctx->playtree = play_tree_cleanup(mpctx->playtree);
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
2785 if(mpctx->playtree) {
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
2786 mpctx->playtree_iter = play_tree_iter_new(mpctx->playtree,mconfig);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
2787 if(mpctx->playtree_iter) {
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
2788 if(play_tree_iter_step(mpctx->playtree_iter,0,0) != PLAY_TREE_ITER_ENTRY) {
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
2789 play_tree_iter_free(mpctx->playtree_iter);
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
2790 mpctx->playtree_iter = NULL;
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2791 }
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
2792 filename = play_tree_iter_get_file(mpctx->playtree_iter,1);
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2793 }
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2794 }
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
2795 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
2796
28656
5a0e7cec3f9f Print the version string after the command line has been parsed.
diego
parents: 28485
diff changeset
2797 print_version("MPlayer");
32383
f6e78eef2e1b Avoid duplicating common init code between MPlayer and mencoder.
reimar
parents: 32382
diff changeset
2798 if (!common_init())
f6e78eef2e1b Avoid duplicating common init code between MPlayer and mencoder.
reimar
parents: 32382
diff changeset
2799 exit_player_with_rc(EXIT_NONE, 0);
30855
977fd535cc9d Add -codecpath option.
komh
parents: 30815
diff changeset
2800
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
2801 #ifndef CONFIG_GUI
1709
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
2802 if(use_gui){
1973
5216f108cb4f all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents: 1962
diff changeset
2803 mp_msg(MSGT_CPLAYER,MSGL_WARN,MSGTR_NoGui);
1709
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
2804 use_gui=0;
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
2805 }
1723
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1709
diff changeset
2806 #else
27727
48c1ae64255b Replace preprocessor check for WIN32 with checks for __MINGW32__ and __CYGWIN__.
diego
parents: 27635
diff changeset
2807 #if !defined(__MINGW32__) && !defined(__CYGWIN__)
1723
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1709
diff changeset
2808 if(use_gui && !vo_init()){
1973
5216f108cb4f all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents: 1962
diff changeset
2809 mp_msg(MSGT_CPLAYER,MSGL_WARN,MSGTR_GuiNeedsX);
1723
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1709
diff changeset
2810 use_gui=0;
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1709
diff changeset
2811 }
18945
337d4324c766 No point in checking for X for windows gui, in addition the hackish
reimar
parents: 18939
diff changeset
2812 #endif
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
2813 if (use_gui && mpctx->playtree_iter){
9319
arpi
parents: 9318
diff changeset
2814 char cwd[PATH_MAX+2];
18316
b3be7df634b0 spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents: 18315
diff changeset
2815 // Free Playtree and Playtree-Iter as it's not used by the GUI.
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
2816 play_tree_iter_free(mpctx->playtree_iter);
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
2817 mpctx->playtree_iter=NULL;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
2818
9318
51a9af80d874 PATH_MAX should be more portable, and we even include limits.h to be sure
arpi
parents: 9317
diff changeset
2819 if (getcwd(cwd, PATH_MAX) != (char *)NULL)
9301
7841308ad250 this patch fixes latest bug, discovered by .so ... (relative filenames &
arpi
parents: 9291
diff changeset
2820 {
7841308ad250 this patch fixes latest bug, discovered by .so ... (relative filenames &
arpi
parents: 9291
diff changeset
2821 strcat(cwd, "/");
7841308ad250 this patch fixes latest bug, discovered by .so ... (relative filenames &
arpi
parents: 9291
diff changeset
2822 // Prefix relative paths with current working directory
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
2823 play_tree_add_bpf(mpctx->playtree, cwd);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
2824 }
18316
b3be7df634b0 spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents: 18315
diff changeset
2825 // Import initital playtree into GUI.
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
2826 import_initial_playtree_into_gui(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
2827 }
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
2828 #endif /* CONFIG_GUI */
1709
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
2829
7562
92188b57a062 video out driver list support (like -vc, example: -vo xmga,xv,x11,)
arpi
parents: 7559
diff changeset
2830 if(video_driver_list && strcmp(video_driver_list[0],"help")==0){
92188b57a062 video out driver list support (like -vc, example: -vo xmga,xv,x11,)
arpi
parents: 7559
diff changeset
2831 list_video_out();
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
2832 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
2833 }
5072
a760c9f074df libvo2 #ifs removed
arpi
parents: 5055
diff changeset
2834
7563
e9e4398029de audio out driver list support (example: -ao alsa9,sdl:esd,oss,sdl:oss,)
arpi
parents: 7562
diff changeset
2835 if(audio_driver_list && strcmp(audio_driver_list[0],"help")==0){
e9e4398029de audio out driver list support (example: -ao alsa9,sdl:esd,oss,sdl:oss,)
arpi
parents: 7562
diff changeset
2836 list_audio_out();
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
2837 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
2838 }
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
2839
7522
aa1a1249f239 -ac/-afm rewrite, now works the same way as -vc/-vfm
arpi
parents: 7517
diff changeset
2840 if(audio_codec_list && strcmp(audio_codec_list[0],"help")==0){
6930
cae1dd6343e7 moved messages to help_mp-??.h
jaf
parents: 6921
diff changeset
2841 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_AvailableAudioCodecs);
18237
4231482179b6 Get ride of the several if(identify) messy lines and rearangment of some of the output, both patches by Kiriuja mplayer-patches AT en-directo_net, his changes are barely unrelated, nevertheless Im commiting them thogeter just for the sake of my mental healt, I had both patches already applied on my local three
reynaldo
parents: 18232
diff changeset
2842 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AUDIO_CODECS\n");
1983
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
2843 list_codecs(1);
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
2844 mp_msg(MSGT_FIXME, MSGL_FIXME, "\n");
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
2845 opt_exit = 1;
1983
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
2846 }
7506
c1cb94198e05 -vc/-vfm accepts codec/driver _list_ now. empty list element for -vc means
arpi
parents: 7502
diff changeset
2847 if(video_codec_list && strcmp(video_codec_list[0],"help")==0){
6930
cae1dd6343e7 moved messages to help_mp-??.h
jaf
parents: 6921
diff changeset
2848 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_AvailableVideoCodecs);
18237
4231482179b6 Get ride of the several if(identify) messy lines and rearangment of some of the output, both patches by Kiriuja mplayer-patches AT en-directo_net, his changes are barely unrelated, nevertheless Im commiting them thogeter just for the sake of my mental healt, I had both patches already applied on my local three
reynaldo
parents: 18232
diff changeset
2849 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_CODECS\n");
1983
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
2850 list_codecs(0);
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
2851 mp_msg(MSGT_FIXME, MSGL_FIXME, "\n");
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
2852 opt_exit = 1;
1983
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
2853 }
7506
c1cb94198e05 -vc/-vfm accepts codec/driver _list_ now. empty list element for -vc means
arpi
parents: 7502
diff changeset
2854 if(video_fm_list && strcmp(video_fm_list[0],"help")==0){
7191
1eadce15446c -afm/-vfm help implemenetd, some cosmetics of ad/vd codec names/comments
arpi
parents: 7180
diff changeset
2855 vfm_help();
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
2856 mp_msg(MSGT_FIXME, MSGL_FIXME, "\n");
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
2857 opt_exit = 1;
7191
1eadce15446c -afm/-vfm help implemenetd, some cosmetics of ad/vd codec names/comments
arpi
parents: 7180
diff changeset
2858 }
7522
aa1a1249f239 -ac/-afm rewrite, now works the same way as -vc/-vfm
arpi
parents: 7517
diff changeset
2859 if(audio_fm_list && strcmp(audio_fm_list[0],"help")==0){
7191
1eadce15446c -afm/-vfm help implemenetd, some cosmetics of ad/vd codec names/comments
arpi
parents: 7180
diff changeset
2860 afm_help();
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
2861 mp_msg(MSGT_FIXME, MSGL_FIXME, "\n");
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
2862 opt_exit = 1;
7191
1eadce15446c -afm/-vfm help implemenetd, some cosmetics of ad/vd codec names/comments
arpi
parents: 7180
diff changeset
2863 }
13269
aa13937da8a0 mplayer -af help now lists all available audio filters.
ivo
parents: 13228
diff changeset
2864 if(af_cfg.list && strcmp(af_cfg.list[0],"help")==0){
aa13937da8a0 mplayer -af help now lists all available audio filters.
ivo
parents: 13228
diff changeset
2865 af_help();
aa13937da8a0 mplayer -af help now lists all available audio filters.
ivo
parents: 13228
diff changeset
2866 printf("\n");
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
2867 opt_exit = 1;
13269
aa13937da8a0 mplayer -af help now lists all available audio filters.
ivo
parents: 13228
diff changeset
2868 }
27377
d58d06eafe83 Change a bunch of X11-specific preprocessor directives.
diego
parents: 27370
diff changeset
2869 #ifdef CONFIG_X11
9317
c7f5df43b937 - support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents: 9315
diff changeset
2870 if(vo_fstype_list && strcmp(vo_fstype_list[0],"help")==0){
c7f5df43b937 - support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents: 9315
diff changeset
2871 fstype_help();
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
2872 mp_msg(MSGT_FIXME, MSGL_FIXME, "\n");
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
2873 opt_exit = 1;
9317
c7f5df43b937 - support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents: 9315
diff changeset
2874 }
9336
4d39aa85a723 Forgot about #ifdef HAVE_X11. 10l
filon
parents: 9319
diff changeset
2875 #endif
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
2876 if((demuxer_name && strcmp(demuxer_name,"help")==0) ||
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
2877 (audio_demuxer_name && strcmp(audio_demuxer_name,"help")==0) ||
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
2878 (sub_demuxer_name && strcmp(sub_demuxer_name,"help")==0)){
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
2879 demuxer_help();
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
2880 mp_msg(MSGT_CPLAYER, MSGL_INFO, "\n");
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
2881 opt_exit = 1;
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
2882 }
17914
f9cb6fc1608a Add an option to list the properties: -list-properties
albeu
parents: 17911
diff changeset
2883 if(list_properties) {
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
2884 property_print_help();
17914
f9cb6fc1608a Add an option to list the properties: -list-properties
albeu
parents: 17911
diff changeset
2885 opt_exit = 1;
f9cb6fc1608a Add an option to list the properties: -list-properties
albeu
parents: 17911
diff changeset
2886 }
1983
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
2887
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
2888 if(opt_exit)
28032
92e770f6e890 Print ID_EXIT and exit reason message in identify mode when exiting.
reimar
parents: 27953
diff changeset
2889 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
2890
16347
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
2891 if (player_idle_mode && use_gui) {
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
2892 mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_NoIdleAndGui);
28032
92e770f6e890 Print ID_EXIT and exit reason message in identify mode when exiting.
reimar
parents: 27953
diff changeset
2893 exit_player_with_rc(EXIT_NONE, 1);
16347
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
2894 }
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
2895
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
2896 if(!filename && !player_idle_mode){
1787
de6a0987a08d stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents: 1772
diff changeset
2897 if(!use_gui){
1690
09f9297d2ee6 -vo help fixed
arpi
parents: 1674
diff changeset
2898 // no file/vcd/dvd -> show HELP:
5112
70fb281bb13c changed printf's to mp_msg
alex
parents: 5106
diff changeset
2899 mp_msg(MSGT_CPLAYER, MSGL_INFO, help_text);
28032
92e770f6e890 Print ID_EXIT and exit reason message in identify mode when exiting.
reimar
parents: 27953
diff changeset
2900 exit_player_with_rc(EXIT_NONE, 0);
1787
de6a0987a08d stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents: 1772
diff changeset
2901 } else gui_no_filename=1;
1690
09f9297d2ee6 -vo help fixed
arpi
parents: 1674
diff changeset
2902 }
09f9297d2ee6 -vo help fixed
arpi
parents: 1674
diff changeset
2903
21342
dc98645820b7 Make MPlayer/MEncoder print the compile-time configuration in verbose mode.
diego
parents: 21219
diff changeset
2904 /* Display what configure line was used */
dc98645820b7 Make MPlayer/MEncoder print the compile-time configuration in verbose mode.
diego
parents: 21219
diff changeset
2905 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
2906
1690
09f9297d2ee6 -vo help fixed
arpi
parents: 1674
diff changeset
2907 // Many users forget to include command line in bugreports...
17932
3fe3b2b3a6ce Convert all if(verbose>X) to mp_msg_test calls.
diego
parents: 17929
diff changeset
2908 if( mp_msg_test(MSGT_CPLAYER,MSGL_V) ){
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
2909 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_CommandLine);
14530
ea8a371b7d8d print the actual commandline to stdout, too
faust3
parents: 14381
diff changeset
2910 for(i=1;i<argc;i++)mp_msg(MSGT_CPLAYER, MSGL_INFO," '%s'",argv[i]);
ea8a371b7d8d print the actual commandline to stdout, too
faust3
parents: 14381
diff changeset
2911 mp_msg(MSGT_CPLAYER, MSGL_INFO, "\n");
1690
09f9297d2ee6 -vo help fixed
arpi
parents: 1674
diff changeset
2912 }
09f9297d2ee6 -vo help fixed
arpi
parents: 1674
diff changeset
2913
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
2914 //------ load global data first ------
955
3a3304cd9fd5 libao support
arpi_esp
parents: 940
diff changeset
2915
3015
8bf21c807656 RTC is autodetected
arpi
parents: 2941
diff changeset
2916 #ifdef HAVE_RTC
5055
534167719e91 nortc patch by Attila Kinali
atmos4
parents: 5046
diff changeset
2917 if(!nortc)
534167719e91 nortc patch by Attila Kinali
atmos4
parents: 5046
diff changeset
2918 {
7494
229287c14cd4 RTC fixes by Sidik Isani <lksi@cfht.hawaii.edu>
arpi
parents: 7486
diff changeset
2919 // seteuid(0); /* Can't hurt to try to get root here */
12681
6d815f12e3e5 rtc-device cmd option by James Noble
alex
parents: 12672
diff changeset
2920 if ((rtc_fd = open(rtc_device ? rtc_device : "/dev/rtc", O_RDONLY)) < 0)
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
2921 mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_RTCDeviceNotOpenable,
12681
6d815f12e3e5 rtc-device cmd option by James Noble
alex
parents: 12672
diff changeset
2922 rtc_device ? rtc_device : "/dev/rtc", strerror(errno));
7494
229287c14cd4 RTC fixes by Sidik Isani <lksi@cfht.hawaii.edu>
arpi
parents: 7486
diff changeset
2923 else {
229287c14cd4 RTC fixes by Sidik Isani <lksi@cfht.hawaii.edu>
arpi
parents: 7486
diff changeset
2924 unsigned long irqp = 1024; /* 512 seemed OK. 128 is jerky. */
229287c14cd4 RTC fixes by Sidik Isani <lksi@cfht.hawaii.edu>
arpi
parents: 7486
diff changeset
2925
229287c14cd4 RTC fixes by Sidik Isani <lksi@cfht.hawaii.edu>
arpi
parents: 7486
diff changeset
2926 if (ioctl(rtc_fd, RTC_IRQP_SET, irqp) < 0) {
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
2927 mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_LinuxRTCInitErrorIrqpSet, irqp, strerror(errno));
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
2928 mp_msg(MSGT_CPLAYER, MSGL_HINT, MSGTR_IncreaseRTCMaxUserFreq, irqp);
7494
229287c14cd4 RTC fixes by Sidik Isani <lksi@cfht.hawaii.edu>
arpi
parents: 7486
diff changeset
2929 close (rtc_fd);
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
2930 rtc_fd = -1;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
2931 } else if (ioctl(rtc_fd, RTC_PIE_ON, 0) < 0) {
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
2932 /* variable only by the root */
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
2933 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_LinuxRTCInitErrorPieOn, strerror(errno));
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
2934 close (rtc_fd);
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
2935 rtc_fd = -1;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
2936 } else
13946
e632b43f0598 Reduce excessive verbosity.
diego
parents: 13928
diff changeset
2937 mp_msg(MSGT_CPLAYER, MSGL_V, MSGTR_UsingRTCTiming, irqp);
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
2938 }
5055
534167719e91 nortc patch by Attila Kinali
atmos4
parents: 5046
diff changeset
2939 }
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
2940 #ifdef CONFIG_GUI
3825
7735c5a87121 setuid hack disabled
arpi
parents: 3823
diff changeset
2941 // breaks DGA and SVGAlib and VESA drivers: --A'rpi
4176
116abdd0aed1 small gtk bug fix (-display bug, baze gabu, miattad fogok elkarhozni:), and remove gui dependencie in mencoder
pontscho
parents: 4160
diff changeset
2942 // and now ? -- Pontscho
116abdd0aed1 small gtk bug fix (-display bug, baze gabu, miattad fogok elkarhozni:), and remove gui dependencie in mencoder
pontscho
parents: 4160
diff changeset
2943 if(use_gui) setuid( getuid() ); // strongly test, please check this.
116abdd0aed1 small gtk bug fix (-display bug, baze gabu, miattad fogok elkarhozni:), and remove gui dependencie in mencoder
pontscho
parents: 4160
diff changeset
2944 #endif
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
2945 if(rtc_fd<0)
16490
f17b3c152fd6 Add comments to a few #endif statements in order to make clear which
diego
parents: 16489
diff changeset
2946 #endif /* HAVE_RTC */
13946
e632b43f0598 Reduce excessive verbosity.
diego
parents: 13928
diff changeset
2947 mp_msg(MSGT_CPLAYER, MSGL_V, "Using %s timing\n",
12954
f9755d9c479a Native darwin timer update.
wight
parents: 12893
diff changeset
2948 softsleep?"software":timer_name);
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
2949
27359
d788e177a35e Rename some preprocessor directives from CONFIG_* to HAVE_* where appropriate;
diego
parents: 27345
diff changeset
2950 #ifdef HAVE_TERMCAP
3618
772729dd7b40 better dvd support
pontscho
parents: 3597
diff changeset
2951 if ( !use_gui ) load_termcap(NULL); // load key-codes
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
2952 #endif
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
2953
1816
c8bc613eb4f8 fixed 'n' key bug :)
arpi
parents: 1809
diff changeset
2954 // ========== Init keyboard FIFO (connection to libvo) ============
1694
0def229bd8bc GUI support (--enable-gui)
arpi
parents: 1690
diff changeset
2955
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2956 // Init input system
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2957 current_module = "init_input";
31319
14bbe725b50e Remove unused mp_input_init parameter.
reimar
parents: 31283
diff changeset
2958 mp_input_init();
9831
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
2959 mp_input_add_key_fd(-1,0,mplayer_get_key,NULL);
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2960 if(slave_mode)
26016
528bdf17dd8a OS/2 getch2() support
diego
parents: 26015
diff changeset
2961 mp_input_add_cmd_fd(0,USE_SELECT,MP_INPUT_SLAVE_CMD_FUNC,NULL);
12816
fba780800efe -use-stdin renamed to -noconsolecontrols.
diego
parents: 12753
diff changeset
2962 else if(!noconsolecontrols)
24132
9f234010c4be Add separate event input type for terminal+vo
uau
parents: 24092
diff changeset
2963 mp_input_add_event_fd(0, getch2);
26326
5bfc1d8bece9 Remove the need for code using stream to export an mp_input_check_interrupt()
albeu
parents: 26288
diff changeset
2964 // Set the libstream interrupt callback
5bfc1d8bece9 Remove the need for code using stream to export an mp_input_check_interrupt()
albeu
parents: 26288
diff changeset
2965 stream_set_interrupt_callback(mp_input_check_interrupt);
9831
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
2966
27345
b597fd2924b4 Rename preprocessor directive HAVE_MENU --> CONFIG_MENU.
diego
parents: 27343
diff changeset
2967 #ifdef CONFIG_MENU
8198
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
2968 if(use_menu) {
22284
83366c8e1928 Fix menu to work with mpctx
uau
parents: 22281
diff changeset
2969 if(menu_cfg && menu_init(mpctx, menu_cfg))
29189
a7bb794af98d sane verbosity levels for menu initialization
diego
parents: 29114
diff changeset
2970 mp_msg(MSGT_CPLAYER, MSGL_V, MSGTR_MenuInitialized, menu_cfg);
8198
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
2971 else {
8723
48a2c2545d5c Use system-wide menu.conf file if nothing else is availible,
filon
parents: 8672
diff changeset
2972 menu_cfg = get_path("menu.conf");
22284
83366c8e1928 Fix menu to work with mpctx
uau
parents: 22281
diff changeset
2973 if(menu_init(mpctx, menu_cfg))
29189
a7bb794af98d sane verbosity levels for menu initialization
diego
parents: 29114
diff changeset
2974 mp_msg(MSGT_CPLAYER, MSGL_V, MSGTR_MenuInitialized, menu_cfg);
8723
48a2c2545d5c Use system-wide menu.conf file if nothing else is availible,
filon
parents: 8672
diff changeset
2975 else {
22284
83366c8e1928 Fix menu to work with mpctx
uau
parents: 22281
diff changeset
2976 if(menu_init(mpctx, MPLAYER_CONFDIR "/menu.conf"))
29189
a7bb794af98d sane verbosity levels for menu initialization
diego
parents: 29114
diff changeset
2977 mp_msg(MSGT_CPLAYER, MSGL_V, MSGTR_MenuInitialized, MPLAYER_CONFDIR"/menu.conf");
8723
48a2c2545d5c Use system-wide menu.conf file if nothing else is availible,
filon
parents: 8672
diff changeset
2978 else {
29189
a7bb794af98d sane verbosity levels for menu initialization
diego
parents: 29114
diff changeset
2979 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_MenuInitFailed);
8723
48a2c2545d5c Use system-wide menu.conf file if nothing else is availible,
filon
parents: 8672
diff changeset
2980 use_menu = 0;
48a2c2545d5c Use system-wide menu.conf file if nothing else is availible,
filon
parents: 8672
diff changeset
2981 }
48a2c2545d5c Use system-wide menu.conf file if nothing else is availible,
filon
parents: 8672
diff changeset
2982 }
8198
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
2983 }
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
2984 }
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
2985 #endif
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
2986
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
2987 initialized_flags|=INITIALIZED_INPUT;
25433
55e3b1a32c65 Make libmenu init and uninit in proper place.
ulion
parents: 25416
diff changeset
2988 current_module = NULL;
55e3b1a32c65 Make libmenu init and uninit in proper place.
ulion
parents: 25416
diff changeset
2989
13391
b6c3752d9544 handle sigchld in mplayer.c
faust3
parents: 13358
diff changeset
2990 /// Catch signals
b6c3752d9544 handle sigchld in mplayer.c
faust3
parents: 13358
diff changeset
2991 #ifndef __MINGW32__
b6c3752d9544 handle sigchld in mplayer.c
faust3
parents: 13358
diff changeset
2992 signal(SIGCHLD,child_sighandler);
b6c3752d9544 handle sigchld in mplayer.c
faust3
parents: 13358
diff changeset
2993 #endif
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2994
27397
d47744b95b78 Give a CONFIG_ prefix to preprocessor directives that lacked one and
diego
parents: 27393
diff changeset
2995 #ifdef CONFIG_CRASH_DEBUG
13794
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
2996 prog_path = argv[0];
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
2997 #endif
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
2998 //========= Catch terminate signals: ================
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
2999 // terminate requests:
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
3000 signal(SIGTERM,exit_sighandler); // kill
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
3001 signal(SIGHUP,exit_sighandler); // kill -HUP / xterm closed
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
3002
1729
d6c99f70449e fix hprogressbar
pontscho
parents: 1727
diff changeset
3003 signal(SIGINT,exit_sighandler); // Interrupt from keyboard
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
3004
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
3005 signal(SIGQUIT,exit_sighandler); // Quit from keyboard
16049
0ccf19820216 define SIGHUP and SIGPIPE for MinGW and catch SIGPIPE also in mplayer
reimar
parents: 16036
diff changeset
3006 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
3007 #ifdef CONFIG_SIGHANDLER
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
3008 // fatal errors:
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
3009 signal(SIGBUS,exit_sighandler); // bus error
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
3010 signal(SIGSEGV,exit_sighandler); // segfault
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
3011 signal(SIGILL,exit_sighandler); // illegal instruction
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
3012 signal(SIGFPE,exit_sighandler); // floating point exc.
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
3013 signal(SIGABRT,exit_sighandler); // abort()
27397
d47744b95b78 Give a CONFIG_ prefix to preprocessor directives that lacked one and
diego
parents: 27393
diff changeset
3014 #ifdef CONFIG_CRASH_DEBUG
13794
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
3015 if (crash_debug)
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
3016 signal(SIGTRAP,exit_sighandler);
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
3017 #endif
5367
658ea5d7316a Allow to disable crasj sighandler to enable creation of coredump files.
atmos4
parents: 5326
diff changeset
3018 #endif
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
3019
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
3020 #ifdef CONFIG_GUI
4963
13262bd21965 small changes
pontscho
parents: 4950
diff changeset
3021 if(use_gui){
6218
8cfddba867b4 fix text render chrash ...
pontscho
parents: 6217
diff changeset
3022 guiInit();
22286
a7e5b99ac083 Fix GUI compilation
uau
parents: 22285
diff changeset
3023 guiGetEvent(guiSetContext, mpctx);
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
3024 initialized_flags|=INITIALIZED_GUI;
4974
5da7b1522a9f small bug fixed and workarounds :(
pontscho
parents: 4965
diff changeset
3025 guiGetEvent( guiCEvent,(char *)((gui_no_filename) ? 0 : 1) );
4963
13262bd21965 small changes
pontscho
parents: 4950
diff changeset
3026 }
13262bd21965 small changes
pontscho
parents: 4950
diff changeset
3027 #endif
13262bd21965 small changes
pontscho
parents: 4950
diff changeset
3028
5983
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
3029 // ******************* Now, let's see the per-file stuff ********************
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
3030
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
3031 play_next_file:
1787
de6a0987a08d stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents: 1772
diff changeset
3032
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
3033 // init global sub numbers
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3034 mpctx->global_sub_size = 0;
31612
7fc1f051a19f Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents: 31607
diff changeset
3035 memset(mpctx->sub_counts, 0, sizeof(mpctx->sub_counts));
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
3036
25636
3b0fed65048d factorizes variable check
ben
parents: 25635
diff changeset
3037 if (filename) {
3b0fed65048d factorizes variable check
ben
parents: 25635
diff changeset
3038 load_per_protocol_config (mconfig, filename);
3b0fed65048d factorizes variable check
ben
parents: 25635
diff changeset
3039 load_per_extension_config (mconfig, filename);
3b0fed65048d factorizes variable check
ben
parents: 25635
diff changeset
3040 load_per_file_config (mconfig, filename);
3b0fed65048d factorizes variable check
ben
parents: 25635
diff changeset
3041 }
8614
49e36bf2f342 The patch adds support for a per-file config, which is loaded before
arpi
parents: 8612
diff changeset
3042
25641
58fd8ebcd6e3 allow profile loading per audio/video output
ben
parents: 25636
diff changeset
3043 if (video_driver_list)
58fd8ebcd6e3 allow profile loading per audio/video output
ben
parents: 25636
diff changeset
3044 load_per_output_config (mconfig, PROFILE_CFG_VO, video_driver_list[0]);
58fd8ebcd6e3 allow profile loading per audio/video output
ben
parents: 25636
diff changeset
3045 if (audio_driver_list)
58fd8ebcd6e3 allow profile loading per audio/video output
ben
parents: 25636
diff changeset
3046 load_per_output_config (mconfig, PROFILE_CFG_AO, audio_driver_list[0]);
58fd8ebcd6e3 allow profile loading per audio/video output
ben
parents: 25636
diff changeset
3047
4835
1f59d4d73558 Fix my mistake (forgot to remove a getch2_enable) but in the rigth
albeu
parents: 4834
diff changeset
3048 // We must enable getch2 here to be able to interrupt network connection
1f59d4d73558 Fix my mistake (forgot to remove a getch2_enable) but in the rigth
albeu
parents: 4834
diff changeset
3049 // or cache filling
12816
fba780800efe -use-stdin renamed to -noconsolecontrols.
diego
parents: 12753
diff changeset
3050 if(!noconsolecontrols && !slave_mode){
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
3051 if(initialized_flags&INITIALIZED_GETCH2)
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
3052 mp_msg(MSGT_CPLAYER,MSGL_WARN,MSGTR_Getch2InitializedTwice);
5983
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
3053 else
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
3054 getch2_enable(); // prepare stdin for hotkeys...
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
3055 initialized_flags|=INITIALIZED_GETCH2;
5154
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
3056 mp_msg(MSGT_CPLAYER,MSGL_DBG2,"\n[[[init getch2]]]\n");
4835
1f59d4d73558 Fix my mistake (forgot to remove a getch2_enable) but in the rigth
albeu
parents: 4834
diff changeset
3057 }
4825
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
3058
5983
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
3059 // =================== GUI idle loop (STOP state) ===========================
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
3060 #ifdef CONFIG_GUI
1787
de6a0987a08d stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents: 1772
diff changeset
3061 if ( use_gui ) {
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3062 mpctx->file_format=DEMUXER_TYPE_UNKNOWN;
8423
c6a1a5b6ba25 - fix three submenu bug
pontscho
parents: 8366
diff changeset
3063 guiGetEvent( guiSetDefaults,0 );
5665
3e7f39c4110c fix dvd playing under gui
pontscho
parents: 5655
diff changeset
3064 while ( guiIntfStruct.Playing != 1 )
3e7f39c4110c fix dvd playing under gui
pontscho
parents: 5655
diff changeset
3065 {
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
3066 mp_cmd_t* cmd;
9464
a4e50ab9ac14 3x10l found by Dan Christiansen <danchr@daimi.au.dk>
alex
parents: 9380
diff changeset
3067 usec_sleep(20000);
4798
c39affa2b376 new interface ? :)
pontscho
parents: 4788
diff changeset
3068 guiEventHandling();
6619
f554e7271587 fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents: 6590
diff changeset
3069 guiGetEvent( guiReDraw,NULL );
24947
7667b611e6b4 Fix memory leak caused by after calling mp_input_get_cmd didn't free the cmd.
ulion
parents: 24934
diff changeset
3070 if ( (cmd = mp_input_get_cmd(0,0,0)) != NULL) {
7667b611e6b4 Fix memory leak caused by after calling mp_input_get_cmd didn't free the cmd.
ulion
parents: 24934
diff changeset
3071 guiGetEvent(guiIEvent, (char *)cmd->id);
7667b611e6b4 Fix memory leak caused by after calling mp_input_get_cmd didn't free the cmd.
ulion
parents: 24934
diff changeset
3072 mp_cmd_free(cmd);
7667b611e6b4 Fix memory leak caused by after calling mp_input_get_cmd didn't free the cmd.
ulion
parents: 24934
diff changeset
3073 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
3074 }
8423
c6a1a5b6ba25 - fix three submenu bug
pontscho
parents: 8366
diff changeset
3075 guiGetEvent( guiSetParameters,NULL );
c6a1a5b6ba25 - fix three submenu bug
pontscho
parents: 8366
diff changeset
3076 if ( guiIntfStruct.StreamType == STREAMTYPE_STREAM )
3543
5a11cbf8791f some small sub bug fix
pontscho
parents: 3540
diff changeset
3077 {
4950
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
3078 play_tree_t * entry = play_tree_new();
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
3079 play_tree_add_file( entry,guiIntfStruct.Filename );
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3080 if ( mpctx->playtree ) play_tree_free_list( mpctx->playtree->child,1 );
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3081 else mpctx->playtree=play_tree_new();
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3082 play_tree_set_child( mpctx->playtree,entry );
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3083 if(mpctx->playtree)
4950
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
3084 {
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3085 mpctx->playtree_iter = play_tree_iter_new(mpctx->playtree,mconfig);
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3086 if(mpctx->playtree_iter)
4950
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
3087 {
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3088 if(play_tree_iter_step(mpctx->playtree_iter,0,0) != PLAY_TREE_ITER_ENTRY)
4950
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
3089 {
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3090 play_tree_iter_free(mpctx->playtree_iter);
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3091 mpctx->playtree_iter = NULL;
4950
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
3092 }
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3093 filename = play_tree_iter_get_file(mpctx->playtree_iter,1);
4950
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
3094 }
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
3095 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
3096 }
1787
de6a0987a08d stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents: 1772
diff changeset
3097 }
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
3098 #endif /* CONFIG_GUI */
16347
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
3099
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
3100 while (player_idle_mode && !filename) {
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
3101 play_tree_t * entry = NULL;
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
3102 mp_cmd_t * cmd;
30618
c061152a5d84 Send VOCTRL_PAUSE/VOCTRL_RESUME events also when pausing for idle mode.
reimar
parents: 30616
diff changeset
3103 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
3104 mpctx->video_out->control(VOCTRL_PAUSE, NULL);
16347
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
3105 while (!(cmd = mp_input_get_cmd(0,1,0))) { // wait for command
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3106 if (mpctx->video_out && vo_config_count) mpctx->video_out->check_events();
16347
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
3107 usec_sleep(20000);
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
3108 }
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
3109 switch (cmd->id) {
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
3110 case MP_CMD_LOADFILE:
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
3111 // 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
3112 entry = play_tree_new();
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
3113 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
3114 // 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
3115 break;
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
3116 case MP_CMD_LOADLIST:
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
3117 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
3118 break;
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
3119 case MP_CMD_QUIT:
28032
92e770f6e890 Print ID_EXIT and exit reason message in identify mode when exiting.
reimar
parents: 27953
diff changeset
3120 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
3121 break;
31670
05a6d70df204 Allow fullscreen switching during -idle. Useful in combination
reimar
parents: 31612
diff changeset
3122 case MP_CMD_VO_FULLSCREEN:
26264
a80db7629478 Handle property commands in idle mode.
reimar
parents: 26228
diff changeset
3123 case MP_CMD_GET_PROPERTY:
a80db7629478 Handle property commands in idle mode.
reimar
parents: 26228
diff changeset
3124 case MP_CMD_SET_PROPERTY:
a80db7629478 Handle property commands in idle mode.
reimar
parents: 26228
diff changeset
3125 case MP_CMD_STEP_PROPERTY:
a80db7629478 Handle property commands in idle mode.
reimar
parents: 26228
diff changeset
3126 run_command(mpctx, cmd);
a80db7629478 Handle property commands in idle mode.
reimar
parents: 26228
diff changeset
3127 break;
16347
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
3128 }
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
3129
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
3130 mp_cmd_free(cmd);
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
3131
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
3132 if (entry) { // user entered a command that gave a valid entry
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3133 if (mpctx->playtree) // the playtree is always a node with one child. let's clear it
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3134 play_tree_free_list(mpctx->playtree->child, 1);
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3135 else mpctx->playtree=play_tree_new(); // .. or make a brand new playtree
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3136
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3137 if (!mpctx->playtree) continue; // couldn't make playtree! wait for next command
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3138
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3139 play_tree_set_child(mpctx->playtree, entry);
16347
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
3140
18316
b3be7df634b0 spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents: 18315
diff changeset
3141 /* Make iterator start at the top the of tree. */
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3142 mpctx->playtree_iter = play_tree_iter_new(mpctx->playtree, mconfig);
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3143 if (!mpctx->playtree_iter) continue;
16347
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
3144
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
3145 // find the first real item in the tree
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3146 if (play_tree_iter_step(mpctx->playtree_iter,0,0) != PLAY_TREE_ITER_ENTRY) {
16347
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
3147 // no items!
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3148 play_tree_iter_free(mpctx->playtree_iter);
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3149 mpctx->playtree_iter = NULL;
16347
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
3150 continue; // wait for next command
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
3151 }
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3152 filename = play_tree_iter_get_file(mpctx->playtree_iter, 1);
16347
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
3153 }
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
3154 }
5983
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
3155 //---------------------------------------------------------------------------
1787
de6a0987a08d stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents: 1772
diff changeset
3156
30618
c061152a5d84 Send VOCTRL_PAUSE/VOCTRL_RESUME events also when pausing for idle mode.
reimar
parents: 30616
diff changeset
3157 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
3158 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
3159
29862
fbb1f57a313e Added -name, -title and -use-filename-title options and implementation in X11 vos
ptt
parents: 29857
diff changeset
3160 if(filename) {
22002
ebd2d5efb11b filename double-conversion, especially usefull for CJK users :-)
gpoirier
parents: 21930
diff changeset
3161 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_Playing,
ebd2d5efb11b filename double-conversion, especially usefull for CJK users :-)
gpoirier
parents: 21930
diff changeset
3162 filename_recode(filename));
29862
fbb1f57a313e Added -name, -title and -use-filename-title options and implementation in X11 vos
ptt
parents: 29857
diff changeset
3163 if(use_filename_title && vo_wintitle == NULL)
fbb1f57a313e Added -name, -title and -use-filename-title options and implementation in X11 vos
ptt
parents: 29857
diff changeset
3164 vo_wintitle = strdup ( mp_basename2 (filename));
fbb1f57a313e Added -name, -title and -use-filename-title options and implementation in X11 vos
ptt
parents: 29857
diff changeset
3165 }
1650
7502b16bce63 make automatic subfile detection working with many files
atlka
parents: 1641
diff changeset
3166
31956
a6c25d94e60e Add new slave mode command for loading EDL file on demand.
reynaldo
parents: 31945
diff changeset
3167 edl_loadfile();
31963
e9d8a677874b Cosmetics
reynaldo
parents: 31962
diff changeset
3168
e9d8a677874b Cosmetics
reynaldo
parents: 31962
diff changeset
3169 if (edl_output_filename) {
e9d8a677874b Cosmetics
reynaldo
parents: 31962
diff changeset
3170 if (edl_fd)
e9d8a677874b Cosmetics
reynaldo
parents: 31962
diff changeset
3171 fclose(edl_fd);
31970
7779efdd10a7 Cosmetics pointed out by Diego Biurrun
reynaldo
parents: 31963
diff changeset
3172 if ((edl_fd = fopen(edl_output_filename, "w")) == NULL) {
31963
e9d8a677874b Cosmetics
reynaldo
parents: 31962
diff changeset
3173 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_EdlCantOpenForWrite,
31970
7779efdd10a7 Cosmetics pointed out by Diego Biurrun
reynaldo
parents: 31963
diff changeset
3174 filename_recode(edl_output_filename));
31963
e9d8a677874b Cosmetics
reynaldo
parents: 31962
diff changeset
3175 }
17109
327be31a101d Fix EDL to be per file, allow -edlout and -edl together as there is really
ods15
parents: 17106
diff changeset
3176 }
327be31a101d Fix EDL to be per file, allow -edlout and -edl together as there is really
ods15
parents: 17106
diff changeset
3177
5983
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
3178 //==================== Open VOB-Sub ============================
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
3179
4770
59f8fd64538b autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents: 4754
diff changeset
3180 current_module="vobsub";
59f8fd64538b autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents: 4754
diff changeset
3181 if (vobsub_name){
6110
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
3182 vo_vobsub=vobsub_open(vobsub_name,spudec_ifo,1,&vo_spudec);
4770
59f8fd64538b autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents: 4754
diff changeset
3183 if(vo_vobsub==NULL)
22002
ebd2d5efb11b filename double-conversion, especially usefull for CJK users :-)
gpoirier
parents: 21930
diff changeset
3184 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadSub,
ebd2d5efb11b filename double-conversion, especially usefull for CJK users :-)
gpoirier
parents: 21930
diff changeset
3185 filename_recode(vobsub_name));
25790
6aad76cd84d3 Fix auto-sub code to support filenames with any extension length.
ulion
parents: 25765
diff changeset
3186 } else if (sub_auto && filename){
4770
59f8fd64538b autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents: 4754
diff changeset
3187 /* try to autodetect vobsub from movie filename ::atmos */
25790
6aad76cd84d3 Fix auto-sub code to support filenames with any extension length.
ulion
parents: 25765
diff changeset
3188 char *buf = strdup(filename), *psub;
6aad76cd84d3 Fix auto-sub code to support filenames with any extension length.
ulion
parents: 25765
diff changeset
3189 char *pdot = strrchr(buf, '.');
6aad76cd84d3 Fix auto-sub code to support filenames with any extension length.
ulion
parents: 25765
diff changeset
3190 char *pslash = strrchr(buf, '/');
27727
48c1ae64255b Replace preprocessor check for WIN32 with checks for __MINGW32__ and __CYGWIN__.
diego
parents: 27635
diff changeset
3191 #if defined(__MINGW32__) || defined(__CYGWIN__)
25790
6aad76cd84d3 Fix auto-sub code to support filenames with any extension length.
ulion
parents: 25765
diff changeset
3192 if (!pslash) pslash = strrchr(buf, '\\');
6aad76cd84d3 Fix auto-sub code to support filenames with any extension length.
ulion
parents: 25765
diff changeset
3193 #endif
6aad76cd84d3 Fix auto-sub code to support filenames with any extension length.
ulion
parents: 25765
diff changeset
3194 if (pdot && (!pslash || pdot > pslash))
6aad76cd84d3 Fix auto-sub code to support filenames with any extension length.
ulion
parents: 25765
diff changeset
3195 *pdot = '\0';
6110
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
3196 vo_vobsub=vobsub_open(buf,spudec_ifo,0,&vo_spudec);
16897
ed8e079a1705 Autoload vobsub's from ~/.mplayer/sub
albeu
parents: 16788
diff changeset
3197 /* try from ~/.mplayer/sub */
ed8e079a1705 Autoload vobsub's from ~/.mplayer/sub
albeu
parents: 16788
diff changeset
3198 if(!vo_vobsub && (psub = get_path( "sub/" ))) {
ed8e079a1705 Autoload vobsub's from ~/.mplayer/sub
albeu
parents: 16788
diff changeset
3199 char *bname;
ed8e079a1705 Autoload vobsub's from ~/.mplayer/sub
albeu
parents: 16788
diff changeset
3200 int l;
ed8e079a1705 Autoload vobsub's from ~/.mplayer/sub
albeu
parents: 16788
diff changeset
3201 bname = strrchr(buf,'/');
27727
48c1ae64255b Replace preprocessor check for WIN32 with checks for __MINGW32__ and __CYGWIN__.
diego
parents: 27635
diff changeset
3202 #if defined(__MINGW32__) || defined(__CYGWIN__)
16897
ed8e079a1705 Autoload vobsub's from ~/.mplayer/sub
albeu
parents: 16788
diff changeset
3203 if(!bname) bname = strrchr(buf,'\\');
ed8e079a1705 Autoload vobsub's from ~/.mplayer/sub
albeu
parents: 16788
diff changeset
3204 #endif
ed8e079a1705 Autoload vobsub's from ~/.mplayer/sub
albeu
parents: 16788
diff changeset
3205 if(bname) bname++;
ed8e079a1705 Autoload vobsub's from ~/.mplayer/sub
albeu
parents: 16788
diff changeset
3206 else bname = buf;
ed8e079a1705 Autoload vobsub's from ~/.mplayer/sub
albeu
parents: 16788
diff changeset
3207 l = strlen(psub) + strlen(bname) + 1;
ed8e079a1705 Autoload vobsub's from ~/.mplayer/sub
albeu
parents: 16788
diff changeset
3208 psub = realloc(psub,l);
ed8e079a1705 Autoload vobsub's from ~/.mplayer/sub
albeu
parents: 16788
diff changeset
3209 strcat(psub,bname);
ed8e079a1705 Autoload vobsub's from ~/.mplayer/sub
albeu
parents: 16788
diff changeset
3210 vo_vobsub=vobsub_open(psub,spudec_ifo,0,&vo_spudec);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
3211 free(psub);
16897
ed8e079a1705 Autoload vobsub's from ~/.mplayer/sub
albeu
parents: 16788
diff changeset
3212 }
4770
59f8fd64538b autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents: 4754
diff changeset
3213 free(buf);
59f8fd64538b autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents: 4754
diff changeset
3214 }
7621
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
3215 if(vo_vobsub){
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
3216 initialized_flags|=INITIALIZED_VOBSUB;
8535
bc7bd163fff9 Here is the patch to make vobsub subtitle use -slang option, I have not made a
arpi
parents: 8534
diff changeset
3217 vobsub_set_from_lang(vo_vobsub, dvdsub_lang);
29069
dc5daa853163 Set the forced_subs_only value correctly whenever a new spudec is created.
reimar
parents: 28835
diff changeset
3218 mp_property_do("sub_forced_only", M_PROPERTY_SET, &forced_subs_only, mpctx);
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
3219
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
3220 // setup global sub numbering
31612
7fc1f051a19f Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents: 31607
diff changeset
3221 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
3222 }
4770
59f8fd64538b autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents: 4754
diff changeset
3223
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
3224 //============ Open & Sync STREAM --- fork cache2 ====================
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
3225
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3226 mpctx->stream=NULL;
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3227 mpctx->demuxer=NULL;
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3228 if (mpctx->d_audio) {
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3229 //free_demuxer_stream(mpctx->d_audio);
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3230 mpctx->d_audio=NULL;
10959
905acfd20c59 fix a memory leak when playing several files in a row (playlist for instance)
pl
parents: 10953
diff changeset
3231 }
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3232 if (mpctx->d_video) {
10997
2f7c74ce8c9a 1000l to pl, this made mplayer crash when playing playlists longer
rfelker
parents: 10959
diff changeset
3233 //free_demuxer_stream(d_video);
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3234 mpctx->d_video=NULL;
10959
905acfd20c59 fix a memory leak when playing several files in a row (playlist for instance)
pl
parents: 10953
diff changeset
3235 }
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3236 mpctx->sh_audio=NULL;
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3237 mpctx->sh_video=NULL;
5983
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
3238
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
3239 current_module="open_stream";
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3240 mpctx->stream=open_stream(filename,0,&mpctx->file_format);
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3241 if(!mpctx->stream) { // error...
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3242 mpctx->eof = libmpdemux_was_interrupted(PT_NEXT_ENTRY);
4825
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
3243 goto goto_next_file;
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
3244 }
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
3245 initialized_flags|=INITIALIZED_STREAM;
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
3246
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
3247 #ifdef CONFIG_GUI
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3248 if ( use_gui ) guiGetEvent( guiSetStream,(char *)mpctx->stream );
8423
c6a1a5b6ba25 - fix three submenu bug
pontscho
parents: 8366
diff changeset
3249 #endif
c6a1a5b6ba25 - fix three submenu bug
pontscho
parents: 8366
diff changeset
3250
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3251 if(mpctx->file_format == DEMUXER_TYPE_PLAYLIST) {
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
3252 play_tree_t* entry;
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
3253 // Handle playlist
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
3254 current_module="handle_playlist";
22002
ebd2d5efb11b filename double-conversion, especially usefull for CJK users :-)
gpoirier
parents: 21930
diff changeset
3255 mp_msg(MSGT_CPLAYER,MSGL_V,"Parsing playlist %s...\n",
ebd2d5efb11b filename double-conversion, especially usefull for CJK users :-)
gpoirier
parents: 21930
diff changeset
3256 filename_recode(filename));
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3257 entry = parse_playtree(mpctx->stream,0);
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3258 mpctx->eof=playtree_add_playlist(entry);
4825
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
3259 goto goto_next_file;
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
3260 }
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3261 mpctx->stream->start_pos+=seek_to_byte;
598
c7117e17e20b OSD seekbar fixed for mpeg/VCD
arpi_esp
parents: 595
diff changeset
3262
3257
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
3263 if(stream_dump_type==5){
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
3264 unsigned char buf[4096];
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
3265 int len;
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
3266 FILE *f;
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
3267 current_module="dumpstream";
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3268 stream_reset(mpctx->stream);
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3269 stream_seek(mpctx->stream,mpctx->stream->start_pos);
3257
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
3270 f=fopen(stream_dump_name,"wb");
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
3271 if(!f){
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
3272 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_CantOpenDumpfile);
28032
92e770f6e890 Print ID_EXIT and exit reason message in identify mode when exiting.
reimar
parents: 27953
diff changeset
3273 exit_player(EXIT_ERROR);
3257
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
3274 }
26832
6af954f69fe4 Re-add (hackish) support for -chapter (only start chapter, end is not supported) with -dumpstream.
reimar
parents: 26818
diff changeset
3275 if (dvd_chapter > 1) {
6af954f69fe4 Re-add (hackish) support for -chapter (only start chapter, end is not supported) with -dumpstream.
reimar
parents: 26818
diff changeset
3276 int chapter = dvd_chapter - 1;
6af954f69fe4 Re-add (hackish) support for -chapter (only start chapter, end is not supported) with -dumpstream.
reimar
parents: 26818
diff changeset
3277 stream_control(mpctx->stream, STREAM_CTRL_SEEK_TO_CHAPTER, &chapter);
6af954f69fe4 Re-add (hackish) support for -chapter (only start chapter, end is not supported) with -dumpstream.
reimar
parents: 26818
diff changeset
3278 }
27060
351c7a56708e Try harder to honour CTRL+C etc. during dumpstream
reimar
parents: 27039
diff changeset
3279 while(!mpctx->stream->eof && !async_quit_request){
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3280 len=stream_read(mpctx->stream,buf,4096);
10225
785c945f6796 check for -dumpstream file writes, patch by Eric Lammerts <eric@lammerts.org>
alex
parents: 10223
diff changeset
3281 if(len>0) {
785c945f6796 check for -dumpstream file writes, patch by Eric Lammerts <eric@lammerts.org>
alex
parents: 10223
diff changeset
3282 if(fwrite(buf,len,1,f) != 1) {
785c945f6796 check for -dumpstream file writes, patch by Eric Lammerts <eric@lammerts.org>
alex
parents: 10223
diff changeset
3283 mp_msg(MSGT_MENCODER,MSGL_FATAL,MSGTR_ErrorWritingFile,stream_dump_name);
28032
92e770f6e890 Print ID_EXIT and exit reason message in identify mode when exiting.
reimar
parents: 27953
diff changeset
3284 exit_player(EXIT_ERROR);
10225
785c945f6796 check for -dumpstream file writes, patch by Eric Lammerts <eric@lammerts.org>
alex
parents: 10223
diff changeset
3285 }
785c945f6796 check for -dumpstream file writes, patch by Eric Lammerts <eric@lammerts.org>
alex
parents: 10223
diff changeset
3286 }
27953
e5918aa8557f Reimplement -endchapter support again for -dump*, it was broken in r25987.
reimar
parents: 27838
diff changeset
3287 if(dvd_last_chapter > 0) {
e5918aa8557f Reimplement -endchapter support again for -dump*, it was broken in r25987.
reimar
parents: 27838
diff changeset
3288 int chapter = -1;
e5918aa8557f Reimplement -endchapter support again for -dump*, it was broken in r25987.
reimar
parents: 27838
diff changeset
3289 if (stream_control(mpctx->stream, STREAM_CTRL_GET_CURRENT_CHAPTER,
e5918aa8557f Reimplement -endchapter support again for -dump*, it was broken in r25987.
reimar
parents: 27838
diff changeset
3290 &chapter) == STREAM_OK && chapter + 1 > dvd_last_chapter)
e5918aa8557f Reimplement -endchapter support again for -dump*, it was broken in r25987.
reimar
parents: 27838
diff changeset
3291 break;
e5918aa8557f Reimplement -endchapter support again for -dump*, it was broken in r25987.
reimar
parents: 27838
diff changeset
3292 }
3257
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
3293 }
10225
785c945f6796 check for -dumpstream file writes, patch by Eric Lammerts <eric@lammerts.org>
alex
parents: 10223
diff changeset
3294 if(fclose(f)) {
785c945f6796 check for -dumpstream file writes, patch by Eric Lammerts <eric@lammerts.org>
alex
parents: 10223
diff changeset
3295 mp_msg(MSGT_MENCODER,MSGL_FATAL,MSGTR_ErrorWritingFile,stream_dump_name);
28032
92e770f6e890 Print ID_EXIT and exit reason message in identify mode when exiting.
reimar
parents: 27953
diff changeset
3296 exit_player(EXIT_ERROR);
10225
785c945f6796 check for -dumpstream file writes, patch by Eric Lammerts <eric@lammerts.org>
alex
parents: 10223
diff changeset
3297 }
3257
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
3298 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_CoreDumped);
28032
92e770f6e890 Print ID_EXIT and exit reason message in identify mode when exiting.
reimar
parents: 27953
diff changeset
3299 exit_player_with_rc(EXIT_EOF, 0);
3257
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
3300 }
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
3301
31877
e30fe0cb79cd Add incomplete clipinf reading support to display audio
reimar
parents: 31839
diff changeset
3302 if(mpctx->stream->type==STREAMTYPE_BD){
31882
ef30e1505969 Do not call *_aid_from_lang when audio_lang is NULL.
reimar
parents: 31877
diff changeset
3303 if(audio_lang && audio_id==-1) audio_id=bd_aid_from_lang(mpctx->stream,audio_lang);
31877
e30fe0cb79cd Add incomplete clipinf reading support to display audio
reimar
parents: 31839
diff changeset
3304 if(dvdsub_lang && dvdsub_id==-1) dvdsub_id=bd_sid_from_lang(mpctx->stream,dvdsub_lang);
e30fe0cb79cd Add incomplete clipinf reading support to display audio
reimar
parents: 31839
diff changeset
3305 }
e30fe0cb79cd Add incomplete clipinf reading support to display audio
reimar
parents: 31839
diff changeset
3306
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
3307 #ifdef CONFIG_DVDREAD
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3308 if(mpctx->stream->type==STREAMTYPE_DVD){
5425
f3a451b6f794 -alang sig11 when playing avis fixed - 10l
arpi
parents: 5411
diff changeset
3309 current_module="dvd lang->id";
31882
ef30e1505969 Do not call *_aid_from_lang when audio_lang is NULL.
reimar
parents: 31877
diff changeset
3310 if(audio_lang && audio_id==-1) audio_id=dvd_aid_from_lang(mpctx->stream,audio_lang);
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3311 if(dvdsub_lang && dvdsub_id==-1) dvdsub_id=dvd_sid_from_lang(mpctx->stream,dvdsub_lang);
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
3312 // setup global sub numbering
31612
7fc1f051a19f Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents: 31607
diff changeset
3313 mpctx->sub_counts[SUB_SOURCE_DEMUX] = dvd_number_of_subs(mpctx->stream);
5425
f3a451b6f794 -alang sig11 when playing avis fixed - 10l
arpi
parents: 5411
diff changeset
3314 current_module=NULL;
f3a451b6f794 -alang sig11 when playing avis fixed - 10l
arpi
parents: 5411
diff changeset
3315 }
4274
f5759bbdd7be -alang/-slang fixed
arpi
parents: 4260
diff changeset
3316 #endif
f5759bbdd7be -alang/-slang fixed
arpi
parents: 4260
diff changeset
3317
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
3318 #ifdef CONFIG_DVDNAV
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3319 if(mpctx->stream->type==STREAMTYPE_DVDNAV){
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
3320 current_module="dvdnav lang->id";
31882
ef30e1505969 Do not call *_aid_from_lang when audio_lang is NULL.
reimar
parents: 31877
diff changeset
3321 if(audio_lang && audio_id==-1) audio_id=mp_dvdnav_aid_from_lang(mpctx->stream,audio_lang);
29855
5e279f7d7e5d Remember which subtitle was auto-selected for dvdnav due to -slang
reimar
parents: 29854
diff changeset
3322 dvdsub_lang_id = -3;
5e279f7d7e5d Remember which subtitle was auto-selected for dvdnav due to -slang
reimar
parents: 29854
diff changeset
3323 if(dvdsub_lang && dvdsub_id==-1)
5e279f7d7e5d Remember which subtitle was auto-selected for dvdnav due to -slang
reimar
parents: 29854
diff changeset
3324 dvdsub_lang_id=dvdsub_id=mp_dvdnav_sid_from_lang(mpctx->stream,dvdsub_lang);
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
3325 // setup global sub numbering
31612
7fc1f051a19f Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents: 31607
diff changeset
3326 mpctx->sub_counts[SUB_SOURCE_DEMUX] = mp_dvdnav_number_of_subs(mpctx->stream);
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
3327 current_module=NULL;
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
3328 }
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
3329 #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
3330
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
3331 // CACHE2: initial prefill: 20% later: 5% (should be set by -cacheopts)
11352
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 11331
diff changeset
3332 goto_enable_cache:
7881
aba9301ed3c4 allow cache to be disabled (-nocache should override cachesize autodetection
arpi
parents: 7867
diff changeset
3333 if(stream_cache_size>0){
30360
c74a5f8ffab3 Change code to allow playing a stream even if enabling the cache failed
reimar
parents: 30176
diff changeset
3334 int res;
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
3335 current_module="enable_cache";
30360
c74a5f8ffab3 Change code to allow playing a stream even if enabling the cache failed
reimar
parents: 30176
diff changeset
3336 res = stream_enable_cache(mpctx->stream,stream_cache_size*1024,
16152
10a69a812eff remove unused cache-prefill and create cache-seek-min that controls when seek_long is prefered over waiting for cache to fill
iive
parents: 16079
diff changeset
3337 stream_cache_size*1024*(stream_cache_min_percent / 100.0),
30360
c74a5f8ffab3 Change code to allow playing a stream even if enabling the cache failed
reimar
parents: 30176
diff changeset
3338 stream_cache_size*1024*(stream_cache_seek_min_percent / 100.0));
c74a5f8ffab3 Change code to allow playing a stream even if enabling the cache failed
reimar
parents: 30176
diff changeset
3339 if(res == 0)
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3340 if((mpctx->eof = libmpdemux_was_interrupted(PT_NEXT_ENTRY))) goto goto_next_file;
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
3341 }
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
3342
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
3343 //============ Open DEMUXERS --- DETECT file type =======================
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
3344 current_module="demux_open";
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
3345
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3346 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
3347
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3348 // HACK to get MOV Reference Files working
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3349
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3350 if (mpctx->demuxer && mpctx->demuxer->type==DEMUXER_TYPE_PLAYLIST)
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
3351 {
8937
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3352 unsigned char* playlist_entry;
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3353 play_tree_t *list = NULL, *entry = NULL;
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3354
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3355 current_module="handle_demux_playlist";
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3356 while (ds_get_packet(mpctx->demuxer->video,&playlist_entry)>0)
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
3357 {
8937
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3358 char *temp, *bname;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
3359
22002
ebd2d5efb11b filename double-conversion, especially usefull for CJK users :-)
gpoirier
parents: 21930
diff changeset
3360 mp_msg(MSGT_CPLAYER,MSGL_V,"Adding file %s to element entry.\n",
ebd2d5efb11b filename double-conversion, especially usefull for CJK users :-)
gpoirier
parents: 21930
diff changeset
3361 filename_recode(playlist_entry));
8937
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3362
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3363 bname=mp_basename(playlist_entry);
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3364 if ((strlen(bname)>10) && !strncmp(bname,"qt",2) && !strncmp(bname+3,"gateQT",6))
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3365 continue;
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3366
29571
94524110f645 Make the loop detection for mov reference files less aggressive, fixes
reimar
parents: 29562
diff changeset
3367 if (!strcmp(playlist_entry,filename)) // ignoring self-reference
9124
ff773800b598 I also added that a self-reference is not endlessly played ... (Happened
arpi
parents: 9105
diff changeset
3368 continue;
ff773800b598 I also added that a self-reference is not endlessly played ... (Happened
arpi
parents: 9105
diff changeset
3369
8937
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3370 entry = play_tree_new();
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
3371
8937
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3372 if (filename && !strcmp(mp_basename(playlist_entry),playlist_entry)) // add reference path of current file
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3373 {
18857
0ba653cbc29f more sizeof(char) fun
reynaldo
parents: 18818
diff changeset
3374 temp=malloc((strlen(filename)-strlen(mp_basename(filename))+strlen(playlist_entry)+1));
8937
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3375 if (temp)
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3376 {
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3377 strncpy(temp, filename, strlen(filename)-strlen(mp_basename(filename)));
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3378 temp[strlen(filename)-strlen(mp_basename(filename))]='\0';
29595
9e014b68ecb9 10l, fix misplaced check in r29613, for loop detection we must compare
reimar
parents: 29594
diff changeset
3379 strcat(temp, playlist_entry);
29571
94524110f645 Make the loop detection for mov reference files less aggressive, fixes
reimar
parents: 29562
diff changeset
3380 if (!strcmp(temp, filename)) {
94524110f645 Make the loop detection for mov reference files less aggressive, fixes
reimar
parents: 29562
diff changeset
3381 free(temp);
94524110f645 Make the loop detection for mov reference files less aggressive, fixes
reimar
parents: 29562
diff changeset
3382 continue;
94524110f645 Make the loop detection for mov reference files less aggressive, fixes
reimar
parents: 29562
diff changeset
3383 }
8937
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3384 play_tree_add_file(entry,temp);
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
3385 mp_msg(MSGT_CPLAYER,MSGL_V,"Resolving reference to %s.\n",temp);
8937
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3386 free(temp);
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3387 }
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3388 }
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3389 else
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3390 play_tree_add_file(entry,playlist_entry);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
3391
8937
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3392 if(!list)
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3393 list = entry;
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3394 else
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3395 play_tree_append_entry(list,entry);
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3396 }
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3397 free_demuxer(mpctx->demuxer);
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3398 mpctx->demuxer = NULL;
8937
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3399
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3400 if (list)
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3401 {
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3402 entry = play_tree_new();
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3403 play_tree_set_child(entry,list);
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3404 mpctx->eof=playtree_add_playlist(entry);
8937
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3405 goto goto_next_file;
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3406 }
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3407 }
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3408
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
3409 if(!mpctx->demuxer)
8925
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8913
diff changeset
3410 goto goto_next_file;
25955
eff9e1b25743 -chapter is now handled uniformly calling demuxer_seek_chapter() instead
nicodvb
parents: 25920
diff changeset
3411 if(dvd_chapter>1) {
eff9e1b25743 -chapter is now handled uniformly calling demuxer_seek_chapter() instead
nicodvb
parents: 25920
diff changeset
3412 float pts;
26081
2cb4aabb7dd8 Attempt to fix -chapter broken for mkv in r25987
reimar
parents: 26027
diff changeset
3413 if (demuxer_seek_chapter(mpctx->demuxer, dvd_chapter-1, 1, &pts, NULL, NULL) >= 0 && pts > -1.0)
2cb4aabb7dd8 Attempt to fix -chapter broken for mkv in r25987
reimar
parents: 26027
diff changeset
3414 seek(mpctx, pts, SEEK_ABSOLUTE);
25955
eff9e1b25743 -chapter is now handled uniformly calling demuxer_seek_chapter() instead
nicodvb
parents: 25920
diff changeset
3415 }
eff9e1b25743 -chapter is now handled uniformly calling demuxer_seek_chapter() instead
nicodvb
parents: 25920
diff changeset
3416
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
3417 initialized_flags|=INITIALIZED_DEMUXER;
7058
2e5c07262861 new v4l capture patch by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>:
arpi
parents: 7055
diff changeset
3418
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
3419 #ifdef CONFIG_ASS
25658
0d0c48ecba90 Instead of keeping attachments in mkv demuxer, use demuxer_add_attachment().
eugeni
parents: 25641
diff changeset
3420 if (ass_enabled && ass_library) {
0d0c48ecba90 Instead of keeping attachments in mkv demuxer, use demuxer_add_attachment().
eugeni
parents: 25641
diff changeset
3421 for (i = 0; i < mpctx->demuxer->num_attachments; ++i) {
0d0c48ecba90 Instead of keeping attachments in mkv demuxer, use demuxer_add_attachment().
eugeni
parents: 25641
diff changeset
3422 demux_attachment_t* att = mpctx->demuxer->attachments + i;
0d0c48ecba90 Instead of keeping attachments in mkv demuxer, use demuxer_add_attachment().
eugeni
parents: 25641
diff changeset
3423 if (extract_embedded_fonts &&
0d0c48ecba90 Instead of keeping attachments in mkv demuxer, use demuxer_add_attachment().
eugeni
parents: 25641
diff changeset
3424 att->name && att->type && att->data && att->data_size &&
0d0c48ecba90 Instead of keeping attachments in mkv demuxer, use demuxer_add_attachment().
eugeni
parents: 25641
diff changeset
3425 (strcmp(att->type, "application/x-truetype-font") == 0 ||
0d0c48ecba90 Instead of keeping attachments in mkv demuxer, use demuxer_add_attachment().
eugeni
parents: 25641
diff changeset
3426 strcmp(att->type, "application/x-font") == 0))
0d0c48ecba90 Instead of keeping attachments in mkv demuxer, use demuxer_add_attachment().
eugeni
parents: 25641
diff changeset
3427 ass_add_font(ass_library, att->name, att->data, att->data_size);
0d0c48ecba90 Instead of keeping attachments in mkv demuxer, use demuxer_add_attachment().
eugeni
parents: 25641
diff changeset
3428 }
0d0c48ecba90 Instead of keeping attachments in mkv demuxer, use demuxer_add_attachment().
eugeni
parents: 25641
diff changeset
3429 }
0d0c48ecba90 Instead of keeping attachments in mkv demuxer, use demuxer_add_attachment().
eugeni
parents: 25641
diff changeset
3430 #endif
0d0c48ecba90 Instead of keeping attachments in mkv demuxer, use demuxer_add_attachment().
eugeni
parents: 25641
diff changeset
3431
5175
8354d89498d4 video codec selection redesigned and moved to libmpcodecs - now it's 'intelligent'
arpi
parents: 5154
diff changeset
3432 current_module="demux_open2";
8354d89498d4 video codec selection redesigned and moved to libmpcodecs - now it's 'intelligent'
arpi
parents: 5154
diff changeset
3433
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3434 mpctx->d_audio=mpctx->demuxer->audio;
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3435 mpctx->d_video=mpctx->demuxer->video;
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3436 mpctx->d_sub=mpctx->demuxer->sub;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3437
29804
edecbb61e41f Use switch_program property from mplayer.c to set ts_prog.
reimar
parents: 29801
diff changeset
3438 if (ts_prog) {
edecbb61e41f Use switch_program property from mplayer.c to set ts_prog.
reimar
parents: 29801
diff changeset
3439 int tmp = ts_prog;
edecbb61e41f Use switch_program property from mplayer.c to set ts_prog.
reimar
parents: 29801
diff changeset
3440 mp_property_do("switch_program", M_PROPERTY_SET, &tmp, mpctx);
edecbb61e41f Use switch_program property from mplayer.c to set ts_prog.
reimar
parents: 29801
diff changeset
3441 }
26090
c585e2ad8ebf Select audio stream in mplayer and mencoder, overriding demuxer decision.
eugeni
parents: 26087
diff changeset
3442 // select audio stream
c585e2ad8ebf Select audio stream in mplayer and mencoder, overriding demuxer decision.
eugeni
parents: 26087
diff changeset
3443 select_audio(mpctx->demuxer, audio_id, audio_lang);
c585e2ad8ebf Select audio stream in mplayer and mencoder, overriding demuxer decision.
eugeni
parents: 26087
diff changeset
3444
792
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
3445 // DUMP STREAMS:
6209
e46b3bf16df5 added -dumpsrtsub option for SubRip format
iive
parents: 6204
diff changeset
3446 if((stream_dump_type)&&(stream_dump_type<4)){
792
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
3447 FILE *f;
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
3448 demux_stream_t *ds=NULL;
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
3449 current_module="dump";
792
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
3450 // select stream to dump
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
3451 switch(stream_dump_type){
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3452 case 1: ds=mpctx->d_audio;break;
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3453 case 2: ds=mpctx->d_video;break;
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3454 case 3: ds=mpctx->d_sub;break;
792
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
3455 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
3456 if(!ds){
7805
f71bc57c4da9 Fixed two typos noticed by Sycotic Smith (I think).
diego
parents: 7790
diff changeset
3457 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_DumpSelectedStreamMissing);
28032
92e770f6e890 Print ID_EXIT and exit reason message in identify mode when exiting.
reimar
parents: 27953
diff changeset
3458 exit_player(EXIT_ERROR);
792
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
3459 }
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
3460 // disable other streams:
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3461 if(mpctx->d_audio && mpctx->d_audio!=ds) {ds_free_packs(mpctx->d_audio); mpctx->d_audio->id=-2; }
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3462 if(mpctx->d_video && mpctx->d_video!=ds) {ds_free_packs(mpctx->d_video); mpctx->d_video->id=-2; }
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3463 if(mpctx->d_sub && mpctx->d_sub!=ds) {ds_free_packs(mpctx->d_sub); mpctx->d_sub->id=-2; }
792
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
3464 // let's dump it!
3257
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
3465 f=fopen(stream_dump_name,"wb");
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
3466 if(!f){
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
3467 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_CantOpenDumpfile);
28032
92e770f6e890 Print ID_EXIT and exit reason message in identify mode when exiting.
reimar
parents: 27953
diff changeset
3468 exit_player(EXIT_ERROR);
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
3469 }
792
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
3470 while(!ds->eof){
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
3471 unsigned char* start;
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
3472 int in_size=ds_get_packet(ds,&start);
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3473 if( (mpctx->demuxer->file_format==DEMUXER_TYPE_AVI || mpctx->demuxer->file_format==DEMUXER_TYPE_ASF || mpctx->demuxer->file_format==DEMUXER_TYPE_MOV)
1246
7f69c1dd1e91 -dumpvideo stores frame size for avi/asf video frames (for ffmpeg testing)
arpi
parents: 1237
diff changeset
3474 && stream_dump_type==2) fwrite(&in_size,1,4,f);
792
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
3475 if(in_size>0) fwrite(start,in_size,1,f);
27953
e5918aa8557f Reimplement -endchapter support again for -dump*, it was broken in r25987.
reimar
parents: 27838
diff changeset
3476 if(dvd_last_chapter>0) {
e5918aa8557f Reimplement -endchapter support again for -dump*, it was broken in r25987.
reimar
parents: 27838
diff changeset
3477 int cur_chapter = demuxer_get_current_chapter(mpctx->demuxer);
e5918aa8557f Reimplement -endchapter support again for -dump*, it was broken in r25987.
reimar
parents: 27838
diff changeset
3478 if(cur_chapter!=-1 && cur_chapter+1>dvd_last_chapter)
e5918aa8557f Reimplement -endchapter support again for -dump*, it was broken in r25987.
reimar
parents: 27838
diff changeset
3479 break;
e5918aa8557f Reimplement -endchapter support again for -dump*, it was broken in r25987.
reimar
parents: 27838
diff changeset
3480 }
792
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
3481 }
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
3482 fclose(f);
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
3483 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_CoreDumped);
28032
92e770f6e890 Print ID_EXIT and exit reason message in identify mode when exiting.
reimar
parents: 27953
diff changeset
3484 exit_player_with_rc(EXIT_EOF, 0);
792
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
3485 }
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
3486
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3487 mpctx->sh_audio=mpctx->d_audio->sh;
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3488 mpctx->sh_video=mpctx->d_video->sh;
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3489
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3490 if(mpctx->sh_video){
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3491
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
3492 current_module="video_read_properties";
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3493 if(!video_read_properties(mpctx->sh_video)) {
7805
f71bc57c4da9 Fixed two typos noticed by Sycotic Smith (I think).
diego
parents: 7790
diff changeset
3494 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CannotReadVideoProperties);
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3495 mpctx->sh_video=mpctx->d_video->sh=NULL;
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
3496 } else {
26479
0e069fe7cf0d use existing MSGTR_FilefmtFourccSizeFpsFtime translatable string macro
corey
parents: 26416
diff changeset
3497 mp_msg(MSGT_CPLAYER,MSGL_V,MSGTR_FilefmtFourccSizeFpsFtime,
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3498 mpctx->demuxer->file_format,mpctx->sh_video->format, mpctx->sh_video->disp_w,mpctx->sh_video->disp_h,
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3499 mpctx->sh_video->fps,mpctx->sh_video->frametime
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
3500 );
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3501
4598
badb76094897 setting vo_fps, required for vo_yuv4mpeg
arpi
parents: 4593
diff changeset
3502 /* need to set fps here for output encoders to pick it up in their init */
badb76094897 setting vo_fps, required for vo_yuv4mpeg
arpi
parents: 4593
diff changeset
3503 if(force_fps){
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3504 mpctx->sh_video->fps=force_fps;
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3505 mpctx->sh_video->frametime=1.0f/mpctx->sh_video->fps;
4598
badb76094897 setting vo_fps, required for vo_yuv4mpeg
arpi
parents: 4593
diff changeset
3506 }
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3507 vo_fps = mpctx->sh_video->fps;
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3508
31262
a22559ea1c28 If we have no FPS value, try enabling -correct-pts mode, it does
reimar
parents: 31251
diff changeset
3509 if(!mpctx->sh_video->fps && !force_fps && !correct_pts){
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
3510 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_FPSnotspecified);
31262
a22559ea1c28 If we have no FPS value, try enabling -correct-pts mode, it does
reimar
parents: 31251
diff changeset
3511 correct_pts = 1;
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
3512 }
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1369
diff changeset
3513 }
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1369
diff changeset
3514
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1369
diff changeset
3515 }
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
3516
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3517 if(!mpctx->sh_video && !mpctx->sh_audio){
6930
cae1dd6343e7 moved messages to help_mp-??.h
jaf
parents: 6921
diff changeset
3518 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
3519 #ifdef CONFIG_DVBIN
25377
31e0937ebe38 dvb cleanup: call dvb_(set|step)_channel() without dereferencing stream->priv (1000l to me)
nicodvb
parents: 25364
diff changeset
3520 if(mpctx->stream->type == STREAMTYPE_DVB)
10708
a57e8d980652 This patch fixes:
alex
parents: 10707
diff changeset
3521 {
a57e8d980652 This patch fixes:
alex
parents: 10707
diff changeset
3522 int dir;
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3523 int v = mpctx->last_dvb_step;
10708
a57e8d980652 This patch fixes:
alex
parents: 10707
diff changeset
3524 if(v > 0)
a57e8d980652 This patch fixes:
alex
parents: 10707
diff changeset
3525 dir = DVB_CHANNEL_HIGHER;
a57e8d980652 This patch fixes:
alex
parents: 10707
diff changeset
3526 else
a57e8d980652 This patch fixes:
alex
parents: 10707
diff changeset
3527 dir = DVB_CHANNEL_LOWER;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
3528
25377
31e0937ebe38 dvb cleanup: call dvb_(set|step)_channel() without dereferencing stream->priv (1000l to me)
nicodvb
parents: 25364
diff changeset
3529 if(dvb_step_channel(mpctx->stream, dir))
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3530 mpctx->eof = mpctx->dvbin_reopen = 1;
10708
a57e8d980652 This patch fixes:
alex
parents: 10707
diff changeset
3531 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
3532 #endif
1641
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
3533 goto goto_next_file; // exit_player(MSGTR_Exit_error);
778
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
3534 }
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
3535
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
3536 /* display clip info */
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3537 demux_info_print(mpctx->demuxer);
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
3538
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
3539 //================== Read SUBTITLES (DVD & TEXT) ==========================
30506
a70589785d97 Move the check for valid sh_video into the init_vo_spudec, this fixes a crash
reimar
parents: 30473
diff changeset
3540 if(vo_spudec==NULL &&
27805
92f83263b154 Avoid calling init_vo_spudec() too early.
aurel
parents: 27727
diff changeset
3541 (mpctx->stream->type==STREAMTYPE_DVD || mpctx->stream->type == STREAMTYPE_DVDNAV)){
21119
5f9009952814 Move vo_spudec initialization into a separate function, for later reuse
reimar
parents: 21082
diff changeset
3542 init_vo_spudec();
6110
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
3543 }
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
3544
29686
add9ce0b0e55 Enable loading of external subtitles also for audio-only files.
reimar
parents: 29685
diff changeset
3545 if(1 || mpctx->sh_video) {
4064
3c747168eb6e 1. subs know are readed after reading AVI header so we already know fps
atlka
parents: 4052
diff changeset
3546 // after reading video params we should load subtitles because
18316
b3be7df634b0 spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents: 18315
diff changeset
3547 // we know fps so now we can adjust subtitle time to ~6 seconds AST
4064
3c747168eb6e 1. subs know are readed after reading AVI header so we already know fps
atlka
parents: 4052
diff changeset
3548 // check .sub
29686
add9ce0b0e55 Enable loading of external subtitles also for audio-only files.
reimar
parents: 29685
diff changeset
3549 double fps = mpctx->sh_video ? mpctx->sh_video->fps : 25;
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
3550 current_module="read_subtitles_file";
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
3551 if(sub_name){
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
3552 for (i = 0; sub_name[i] != NULL; ++i)
29686
add9ce0b0e55 Enable loading of external subtitles also for audio-only files.
reimar
parents: 29685
diff changeset
3553 add_subtitles (sub_name[i], fps, 0);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
3554 }
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
3555 if(sub_auto) { // auto load sub file ...
11767
e6db1c939c25 prevent sig11 when $HOME is not set
attila
parents: 11759
diff changeset
3556 char *psub = get_path( "sub/" );
e6db1c939c25 prevent sig11 when $HOME is not set
attila
parents: 11759
diff changeset
3557 char **tmp = sub_filenames((psub ? psub : ""), filename);
15603
2d1ad16b6021 strdup subtitle filename at a more appropriate place, fixing memleaks and
reimar
parents: 15584
diff changeset
3558 int i = 0;
12890
9a45f43bf9a0 false-use-of-get_path() memleak fixes.
al
parents: 12841
diff changeset
3559 free(psub); // release the buffer created by get_path() above
15603
2d1ad16b6021 strdup subtitle filename at a more appropriate place, fixing memleaks and
reimar
parents: 15584
diff changeset
3560 while (tmp[i]) {
29686
add9ce0b0e55 Enable loading of external subtitles also for audio-only files.
reimar
parents: 29685
diff changeset
3561 add_subtitles (tmp[i], fps, 1);
15603
2d1ad16b6021 strdup subtitle filename at a more appropriate place, fixing memleaks and
reimar
parents: 15584
diff changeset
3562 free(tmp[i++]);
2d1ad16b6021 strdup subtitle filename at a more appropriate place, fixing memleaks and
reimar
parents: 15584
diff changeset
3563 }
9870
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
3564 free(tmp);
4064
3c747168eb6e 1. subs know are readed after reading AVI header so we already know fps
atlka
parents: 4052
diff changeset
3565 }
31612
7fc1f051a19f Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents: 31607
diff changeset
3566 if (mpctx->set_of_sub_size > 0)
7fc1f051a19f Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents: 31607
diff changeset
3567 mpctx->sub_counts[SUB_SOURCE_SUBS] = mpctx->set_of_sub_size;
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
3568 }
6110
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
3569
31612
7fc1f051a19f Change global subtitle numbering scheme so that demuxers can "asynchronously"
reimar
parents: 31607
diff changeset
3570 if (select_subtitle(mpctx)) {
17935
d72e7330c548 Subtitles properties: move sub_select, sub_pos, sub_visibilty,
albeu
parents: 17932
diff changeset
3571 if(subdata)
d72e7330c548 Subtitles properties: move sub_select, sub_pos, sub_visibilty,
albeu
parents: 17932
diff changeset
3572 switch (stream_dump_type) {
d72e7330c548 Subtitles properties: move sub_select, sub_pos, sub_visibilty,
albeu
parents: 17932
diff changeset
3573 case 3: list_sub_file(subdata); break;
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3574 case 4: dump_mpsub(subdata, mpctx->sh_video->fps); break;
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3575 case 6: dump_srt(subdata, mpctx->sh_video->fps); break;
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3576 case 7: dump_microdvd(subdata, mpctx->sh_video->fps); break;
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3577 case 8: dump_jacosub(subdata, mpctx->sh_video->fps); break;
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3578 case 9: dump_sami(subdata, mpctx->sh_video->fps); break;
17935
d72e7330c548 Subtitles properties: move sub_select, sub_pos, sub_visibilty,
albeu
parents: 17932
diff changeset
3579 }
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
3580 }
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
3581
31277
5d5bda998a2f Move code printing -identify output for a file to a separate function.
reimar
parents: 31262
diff changeset
3582 print_file_properties(mpctx, filename);
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3583
31957
49848f9a8f30 Add -edl-start-pts option to Adjust positions in EDL records according
reynaldo
parents: 31956
diff changeset
3584 // Adjust EDL positions with start_pts
49848f9a8f30 Add -edl-start-pts option to Adjust positions in EDL records according
reynaldo
parents: 31956
diff changeset
3585 if (edl_start_pts && start_pts) {
49848f9a8f30 Add -edl-start-pts option to Adjust positions in EDL records according
reynaldo
parents: 31956
diff changeset
3586 edl_record_ptr edl = edl_records;
49848f9a8f30 Add -edl-start-pts option to Adjust positions in EDL records according
reynaldo
parents: 31956
diff changeset
3587 while (edl) {
49848f9a8f30 Add -edl-start-pts option to Adjust positions in EDL records according
reynaldo
parents: 31956
diff changeset
3588 edl->start_sec += start_pts;
31962
52509abc73e6 Cosmetics
reynaldo
parents: 31957
diff changeset
3589 edl->stop_sec += start_pts;
31957
49848f9a8f30 Add -edl-start-pts option to Adjust positions in EDL records according
reynaldo
parents: 31956
diff changeset
3590 edl = edl->next;
49848f9a8f30 Add -edl-start-pts option to Adjust positions in EDL records according
reynaldo
parents: 31956
diff changeset
3591 }
49848f9a8f30 Add -edl-start-pts option to Adjust positions in EDL records according
reynaldo
parents: 31956
diff changeset
3592 }
49848f9a8f30 Add -edl-start-pts option to Adjust positions in EDL records according
reynaldo
parents: 31956
diff changeset
3593
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3594 if(!mpctx->sh_video) goto main; // audio-only
175
d43c7e6412f0 added DirectShow support
arpi_esp
parents: 162
diff changeset
3595
20947
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
3596 if(!reinit_video_chain()) {
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3597 if(!mpctx->sh_video){
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3598 if(!mpctx->sh_audio) goto goto_next_file;
20947
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
3599 goto main; // exit_player(MSGTR_Exit_error);
8198
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
3600 }
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
3601 }
6755
a31b9f15cbff - fix audio equalizer
pontscho
parents: 6713
diff changeset
3602
6110
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
3603 if(vo_flags & 0x08 && vo_spudec)
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
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
7122
0dc9cb756b68 freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents: 7111
diff changeset
3607 force_load_font = 1;
0dc9cb756b68 freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents: 7111
diff changeset
3608 #endif
0dc9cb756b68 freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents: 7111
diff changeset
3609
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3610 //================== MAIN: ==========================
7502
6a2b6f3d619c best audio/video codec selection & init moved to libmpcodecs
arpi
parents: 7495
diff changeset
3611 main:
6a2b6f3d619c best audio/video codec selection & init moved to libmpcodecs
arpi
parents: 7495
diff changeset
3612 current_module="main";
6a2b6f3d619c best audio/video codec selection & init moved to libmpcodecs
arpi
parents: 7495
diff changeset
3613
17911
52f95509cd05 Add the new property API and implement a couple properties.
albeu
parents: 17910
diff changeset
3614 if(playing_msg) {
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3615 char* msg = property_expand_string(mpctx, playing_msg);
17911
52f95509cd05 Add the new property API and implement a couple properties.
albeu
parents: 17910
diff changeset
3616 mp_msg(MSGT_CPLAYER,MSGL_INFO,"%s",msg);
52f95509cd05 Add the new property API and implement a couple properties.
albeu
parents: 17910
diff changeset
3617 free(msg);
52f95509cd05 Add the new property API and implement a couple properties.
albeu
parents: 17910
diff changeset
3618 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
3619
17911
52f95509cd05 Add the new property API and implement a couple properties.
albeu
parents: 17910
diff changeset
3620
18316
b3be7df634b0 spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents: 18315
diff changeset
3621 // Disable the term OSD in verbose mode
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
3622 if(verbose) term_osd = 0;
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
3623
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3624 {
5929
9e7d54e7be58 - frame_time delayed one frame, as it's really duration of current frame,
arpi
parents: 5927
diff changeset
3625 int frame_time_remaining=0; // flag
9e7d54e7be58 - frame_time delayed one frame, as it's really duration of current frame,
arpi
parents: 5927
diff changeset
3626 int blit_frame=0;
22288
da8ba4c0fc57 Cleanup, move "global" state from the frame_time_remaining mainloop
uau
parents: 22286
diff changeset
3627 mpctx->num_buffered_frames=0;
31972
96559880e475 Improve A/V sync when not using -correct-pts.
cehoyos
parents: 31971
diff changeset
3628 mpctx->framestep_found=0;
5929
9e7d54e7be58 - frame_time delayed one frame, as it's really duration of current frame,
arpi
parents: 5927
diff changeset
3629
18316
b3be7df634b0 spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents: 18315
diff changeset
3630 // Make sure old OSD does not stay around,
16402
75532be41c6d clear OSD when playing new file
reimar
parents: 16360
diff changeset
3631 // e.g. with -fixed-vo and same-resolution files
17938
810b407ba6c4 Get rid of 2 osd related hacks.
albeu
parents: 17935
diff changeset
3632 clear_osd_msgs();
810b407ba6c4 Get rid of 2 osd related hacks.
albeu
parents: 17935
diff changeset
3633 update_osd_msg();
6028
bd016664dc18 UMRs fixed - noticed by Nilmoni Deb <ndeb@ece.cmu.edu>
arpi
parents: 6016
diff changeset
3634
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3635 //================ SETUP AUDIO ==========================
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3636
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3637 if(mpctx->sh_audio){
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
3638 reinit_audio_chain();
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3639 if (mpctx->sh_audio && mpctx->sh_audio->codec)
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3640 mp_msg(MSGT_IDENTIFY,MSGL_INFO, "ID_AUDIO_CODEC=%s\n", mpctx->sh_audio->codec->name);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3641 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3642
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
3643 current_module="av_init";
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
3644
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3645 if(mpctx->sh_video){
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3646 mpctx->sh_video->timer=0;
17654
16633b9c0953 New option: -ignore-start
corey
parents: 17643
diff changeset
3647 if (! ignore_start)
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3648 audio_delay += mpctx->sh_video->stream_delay;
17643
cea08919336b dwStart support for mplayer.
corey
parents: 17636
diff changeset
3649 }
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3650 if(mpctx->sh_audio){
27838
13738bdebf9a Add an option that sets initial playback volume.
diego
parents: 27807
diff changeset
3651 if (start_volume >= 0)
13738bdebf9a Add an option that sets initial playback volume.
diego
parents: 27807
diff changeset
3652 mixer_setvolume(&mpctx->mixer, start_volume, start_volume);
17654
16633b9c0953 New option: -ignore-start
corey
parents: 17643
diff changeset
3653 if (! ignore_start)
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3654 audio_delay -= mpctx->sh_audio->stream_delay;
22488
b6aa3eedf49b Move the sh_audio->delay field to mpctx->delay.
uau
parents: 22458
diff changeset
3655 mpctx->delay=-audio_delay;
17643
cea08919336b dwStart support for mplayer.
corey
parents: 17636
diff changeset
3656 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3657
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3658 if(!mpctx->sh_audio){
1973
5216f108cb4f all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents: 1962
diff changeset
3659 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_NoSound);
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3660 mp_msg(MSGT_CPLAYER,MSGL_V,"Freeing %d unused audio chunks.\n",mpctx->d_audio->packs);
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3661 ds_free_packs(mpctx->d_audio); // free buffered chunks
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3662 //mpctx->d_audio->id=-2; // do not read audio chunks
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
3663 //uninit_player(INITIALIZED_AO); // close device
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3664 }
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3665 if(!mpctx->sh_video){
6930
cae1dd6343e7 moved messages to help_mp-??.h
jaf
parents: 6921
diff changeset
3666 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_Video_NoVideo);
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3667 mp_msg(MSGT_CPLAYER,MSGL_V,"Freeing %d unused video chunks.\n",mpctx->d_video->packs);
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3668 ds_free_packs(mpctx->d_video);
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3669 mpctx->d_video->id=-2;
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
3670 //if(!fixed_vo) uninit_player(INITIALIZED_VO);
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
3671 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3672
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3673 if (!mpctx->sh_video && !mpctx->sh_audio)
6185
7e769ea2acc7 jump to next file (or exit) if can't decode audio && video
alex
parents: 6183
diff changeset
3674 goto goto_next_file;
7e769ea2acc7 jump to next file (or exit) if can't decode audio && video
alex
parents: 6183
diff changeset
3675
8030
2b39ff3860b7 cleanup of .AVI timestamp calculation (ugly hack from mplayer.c removed,
arpi
parents: 8027
diff changeset
3676 //if(demuxer->file_format!=DEMUXER_TYPE_AVI) pts_from_bps=0; // it must be 0 for mpeg/asf!
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3677 if(force_fps && mpctx->sh_video){
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3678 vo_fps = mpctx->sh_video->fps=force_fps;
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3679 mpctx->sh_video->frametime=1.0f/mpctx->sh_video->fps;
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3680 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_FPSforced,mpctx->sh_video->fps,mpctx->sh_video->frametime);
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
3681 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3682
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
3683 #ifdef CONFIG_GUI
19946
ef94dfe93fe8 Fix the sound mute switch in the GUI menu by moving the corresponding
diego
parents: 19945
diff changeset
3684 if ( use_gui ) {
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3685 if ( mpctx->sh_audio ) guiIntfStruct.AudioType=mpctx->sh_audio->channels; else guiIntfStruct.AudioType=0;
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3686 if ( !mpctx->sh_video && mpctx->sh_audio ) guiGetEvent( guiSetAudioOnly,(char *)1 ); else guiGetEvent( guiSetAudioOnly,(char *)0 );
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3687 guiGetEvent( guiSetFileFormat,(char *)mpctx->demuxer->file_format );
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3688 if ( guiGetEvent( guiSetValues,(char *)mpctx->sh_video ) ) goto goto_next_file;
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3689 guiGetEvent( guiSetDemuxer,(char *)mpctx->demuxer );
19946
ef94dfe93fe8 Fix the sound mute switch in the GUI menu by moving the corresponding
diego
parents: 19945
diff changeset
3690 }
ef94dfe93fe8 Fix the sound mute switch in the GUI menu by moving the corresponding
diego
parents: 19945
diff changeset
3691 #endif
ef94dfe93fe8 Fix the sound mute switch in the GUI menu by moving the corresponding
diego
parents: 19945
diff changeset
3692
23477
15710094cb15 implement "bind sections"
voroshil
parents: 23460
diff changeset
3693 mp_input_set_section(NULL);
15710094cb15 implement "bind sections"
voroshil
parents: 23460
diff changeset
3694 //TODO: add desired (stream-based) sections here
15710094cb15 implement "bind sections"
voroshil
parents: 23460
diff changeset
3695 if (mpctx->stream->type==STREAMTYPE_TV) mp_input_set_section("tv");
26728
a42c300ec8bf Delcare a dvdnav-specific input section if the currently played
ben
parents: 26721
diff changeset
3696 if (mpctx->stream->type==STREAMTYPE_DVDNAV) mp_input_set_section("dvdnav");
23477
15710094cb15 implement "bind sections"
voroshil
parents: 23460
diff changeset
3697
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
3698 //==================== START PLAYING =======================
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
3699
23726
11abe5f3dcaa Move loop_times into mpctx.
albeu
parents: 23573
diff changeset
3700 if(mpctx->loop_times>1) mpctx->loop_times--; else
11abe5f3dcaa Move loop_times into mpctx.
albeu
parents: 23573
diff changeset
3701 if(mpctx->loop_times==1) mpctx->loop_times = -1;
9105
9b387eae87e6 Secondly, fixed bug where -loop after file would play one too many times.
arpi
parents: 9090
diff changeset
3702
22299
073bd05d00a6 Remove useless fflush(stdout) calls. mp_msg already flushes output, and
uau
parents: 22298
diff changeset
3703 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_StartPlaying);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3704
1124
0e95f30ffd4c -frames and -benchmark options to make chl & gabucino happy
arpi_esp
parents: 1059
diff changeset
3705 total_time_usage_start=GetTimer();
3934
e8e7ca8995a1 codecs.conf parser hangup fixed by iive, cpu usage reset at start
arpi
parents: 3843
diff changeset
3706 audio_time_usage=0; video_time_usage=0; vout_time_usage=0;
6585
eb10ce6b3f18 multifile (informal output) fix by Balazs Tibor (tibcu)
alex
parents: 6545
diff changeset
3707 total_frame_cnt=0; drop_frame_cnt=0; // fix for multifile fps benchmark
6590
bfc209bb3f48 -frames 0 fix, multifile frames support by tibcu
alex
parents: 6585
diff changeset
3708 play_n_frames=play_n_frames_mf;
30176
6fb92182aff3 At startup and while seeking avoid to introduce pointless sleeps and possibly
reimar
parents: 30175
diff changeset
3709 mpctx->startup_decode_retry = DEFAULT_STARTUP_DECODE_RETRY;
6590
bfc209bb3f48 -frames 0 fix, multifile frames support by tibcu
alex
parents: 6585
diff changeset
3710
bfc209bb3f48 -frames 0 fix, multifile frames support by tibcu
alex
parents: 6585
diff changeset
3711 if(play_n_frames==0){
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3712 mpctx->eof=PT_NEXT_ENTRY; goto goto_next_file;
6590
bfc209bb3f48 -frames 0 fix, multifile frames support by tibcu
alex
parents: 6585
diff changeset
3713 }
bfc209bb3f48 -frames 0 fix, multifile frames support by tibcu
alex
parents: 6585
diff changeset
3714
22338
434cd072b0d3 Seek to -ss position without first starting audio/video from the start.
uau
parents: 22313
diff changeset
3715 if (seek_to_sec) {
25883
baf32110d3fc Use defines to give names to the different seek flags.
reimar
parents: 25852
diff changeset
3716 seek(mpctx, seek_to_sec, SEEK_ABSOLUTE);
22338
434cd072b0d3 Seek to -ss position without first starting audio/video from the start.
uau
parents: 22313
diff changeset
3717 end_at.pos += seek_to_sec;
434cd072b0d3 Seek to -ss position without first starting audio/video from the start.
uau
parents: 22313
diff changeset
3718 }
434cd072b0d3 Seek to -ss position without first starting audio/video from the start.
uau
parents: 22313
diff changeset
3719
434cd072b0d3 Seek to -ss position without first starting audio/video from the start.
uau
parents: 22313
diff changeset
3720 if (end_at.type == END_AT_SIZE) {
434cd072b0d3 Seek to -ss position without first starting audio/video from the start.
uau
parents: 22313
diff changeset
3721 mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_MPEndposNoSizeBased);
434cd072b0d3 Seek to -ss position without first starting audio/video from the start.
uau
parents: 22313
diff changeset
3722 end_at.type = END_AT_NONE;
434cd072b0d3 Seek to -ss position without first starting audio/video from the start.
uau
parents: 22313
diff changeset
3723 }
434cd072b0d3 Seek to -ss position without first starting audio/video from the start.
uau
parents: 22313
diff changeset
3724
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
3725 #ifdef CONFIG_DVDNAV
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
3726 mp_dvdnav_context_free(mpctx);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
3727 if (mpctx->stream->type == STREAMTYPE_DVDNAV) {
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
3728 mp_dvdnav_read_wait(mpctx->stream, 0, 1);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
3729 mp_dvdnav_cell_has_changed(mpctx->stream,1);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
3730 }
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
3731 #endif
22338
434cd072b0d3 Seek to -ss position without first starting audio/video from the start.
uau
parents: 22313
diff changeset
3732
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3733 while(!mpctx->eof){
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
3734 float aq_sleep_time=0;
25955
eff9e1b25743 -chapter is now handled uniformly calling demuxer_seek_chapter() instead
nicodvb
parents: 25920
diff changeset
3735
eff9e1b25743 -chapter is now handled uniformly calling demuxer_seek_chapter() instead
nicodvb
parents: 25920
diff changeset
3736 if(dvd_last_chapter>0) {
eff9e1b25743 -chapter is now handled uniformly calling demuxer_seek_chapter() instead
nicodvb
parents: 25920
diff changeset
3737 int cur_chapter = demuxer_get_current_chapter(mpctx->demuxer);
eff9e1b25743 -chapter is now handled uniformly calling demuxer_seek_chapter() instead
nicodvb
parents: 25920
diff changeset
3738 if(cur_chapter!=-1 && cur_chapter+1>dvd_last_chapter)
eff9e1b25743 -chapter is now handled uniformly calling demuxer_seek_chapter() instead
nicodvb
parents: 25920
diff changeset
3739 goto goto_next_file;
eff9e1b25743 -chapter is now handled uniformly calling demuxer_seek_chapter() instead
nicodvb
parents: 25920
diff changeset
3740 }
eff9e1b25743 -chapter is now handled uniformly calling demuxer_seek_chapter() instead
nicodvb
parents: 25920
diff changeset
3741
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3742 if(!mpctx->sh_audio && mpctx->d_audio->sh) {
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3743 mpctx->sh_audio = mpctx->d_audio->sh;
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3744 mpctx->sh_audio->ds = mpctx->d_audio;
18897
78547a882a09 support for audio streams that appear after unsuccessful probing
nicodvb
parents: 18888
diff changeset
3745 reinit_audio_chain();
78547a882a09 support for audio streams that appear after unsuccessful probing
nicodvb
parents: 18888
diff changeset
3746 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3747
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3748 /*========================== PLAY AUDIO ============================*/
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
3749
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3750 if (mpctx->sh_audio)
20889
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
3751 if (!fill_audio_out_buffers())
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
3752 // at eof, all audio at least written to ao
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3753 if (!mpctx->sh_video)
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3754 mpctx->eof = PT_NEXT_ENTRY;
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3755
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3756
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3757 if(!mpctx->sh_video) {
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
3758 // handle audio-only case:
19973
02a18c52a42a after a long time, finally i could add -endpos option to mplayer executable.
ptt
parents: 19946
diff changeset
3759 double a_pos=0;
26818
089ac698f8b1 Avoid crash with video stream switching and -nosound
reimar
parents: 26728
diff changeset
3760 // sh_audio can be NULL due to video stream switching
089ac698f8b1 Avoid crash with video stream switching and -nosound
reimar
parents: 26728
diff changeset
3761 // TODO: handle this better
089ac698f8b1 Avoid crash with video stream switching and -nosound
reimar
parents: 26728
diff changeset
3762 if((!quiet || end_at.type == END_AT_TIME) && mpctx->sh_audio)
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3763 a_pos = playing_audio_pts(mpctx->sh_audio, mpctx->d_audio, mpctx->audio_out);
19973
02a18c52a42a after a long time, finally i could add -endpos option to mplayer executable.
ptt
parents: 19946
diff changeset
3764
02a18c52a42a after a long time, finally i could add -endpos option to mplayer executable.
ptt
parents: 19946
diff changeset
3765 if(!quiet)
13857
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
3766 print_status(a_pos, 0, 0);
19973
02a18c52a42a after a long time, finally i could add -endpos option to mplayer executable.
ptt
parents: 19946
diff changeset
3767
02a18c52a42a after a long time, finally i could add -endpos option to mplayer executable.
ptt
parents: 19946
diff changeset
3768 if(end_at.type == END_AT_TIME && end_at.pos < a_pos)
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3769 mpctx->eof = PT_NEXT_ENTRY;
29685
f0b559a7c17b Use a_pos to update subtitle for audio-only files instead of mpctx->sh_audio->pts
reimar
parents: 29670
diff changeset
3770 update_subtitles(NULL, a_pos, mpctx->d_sub, 0);
20902
bfb6eacd9c4a Update OSD contents only after the correct values for the frame are known.
uau
parents: 20900
diff changeset
3771 update_osd_msg();
19973
02a18c52a42a after a long time, finally i could add -endpos option to mplayer executable.
ptt
parents: 19946
diff changeset
3772
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
3773 } else {
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
3774
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3775 /*========================== PLAY VIDEO ============================*/
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3776
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3777 vo_pts=mpctx->sh_video->timer*90000.0;
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3778 vo_fps=mpctx->sh_video->fps;
5929
9e7d54e7be58 - frame_time delayed one frame, as it's really duration of current frame,
arpi
parents: 5927
diff changeset
3779
22288
da8ba4c0fc57 Cleanup, move "global" state from the frame_time_remaining mainloop
uau
parents: 22286
diff changeset
3780 if (!mpctx->num_buffered_frames) {
21077
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
3781 double frame_time = update_video(&blit_frame);
30176
6fb92182aff3 At startup and while seeking avoid to introduce pointless sleeps and possibly
reimar
parents: 30175
diff changeset
3782 while (!blit_frame && mpctx->startup_decode_retry > 0) {
6fb92182aff3 At startup and while seeking avoid to introduce pointless sleeps and possibly
reimar
parents: 30175
diff changeset
3783 double delay = mpctx->delay;
6fb92182aff3 At startup and while seeking avoid to introduce pointless sleeps and possibly
reimar
parents: 30175
diff changeset
3784 // these initial decode failures are probably due to codec delay,
6fb92182aff3 At startup and while seeking avoid to introduce pointless sleeps and possibly
reimar
parents: 30175
diff changeset
3785 // ignore them and also their probably nonsense durations
6fb92182aff3 At startup and while seeking avoid to introduce pointless sleeps and possibly
reimar
parents: 30175
diff changeset
3786 update_video(&blit_frame);
6fb92182aff3 At startup and while seeking avoid to introduce pointless sleeps and possibly
reimar
parents: 30175
diff changeset
3787 mpctx->delay = delay;
6fb92182aff3 At startup and while seeking avoid to introduce pointless sleeps and possibly
reimar
parents: 30175
diff changeset
3788 mpctx->startup_decode_retry--;
6fb92182aff3 At startup and while seeking avoid to introduce pointless sleeps and possibly
reimar
parents: 30175
diff changeset
3789 }
6fb92182aff3 At startup and while seeking avoid to introduce pointless sleeps and possibly
reimar
parents: 30175
diff changeset
3790 mpctx->startup_decode_retry = 0;
21077
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
3791 mp_dbg(MSGT_AVSYNC,MSGL_DBG2,"*** ftime=%5.3f ***\n",frame_time);
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
3792 if (mpctx->sh_video->vf_initialized < 0) {
21077
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
3793 mp_msg(MSGT_CPLAYER,MSGL_FATAL, MSGTR_NotInitializeVOPorVO);
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3794 mpctx->eof = 1; goto goto_next_file;
21077
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
3795 }
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
3796 if (frame_time < 0)
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3797 mpctx->eof = 1;
22288
da8ba4c0fc57 Cleanup, move "global" state from the frame_time_remaining mainloop
uau
parents: 22286
diff changeset
3798 else {
da8ba4c0fc57 Cleanup, move "global" state from the frame_time_remaining mainloop
uau
parents: 22286
diff changeset
3799 // might return with !eof && !blit_frame if !correct_pts
da8ba4c0fc57 Cleanup, move "global" state from the frame_time_remaining mainloop
uau
parents: 22286
diff changeset
3800 mpctx->num_buffered_frames += blit_frame;
30175
b7bb4a899a6b Also reset time_frame and next_frame_time on reset, it makes no sense to
reimar
parents: 30136
diff changeset
3801 mpctx->time_frame += frame_time / playback_speed; // for nosound
22288
da8ba4c0fc57 Cleanup, move "global" state from the frame_time_remaining mainloop
uau
parents: 22286
diff changeset
3802 }
5929
9e7d54e7be58 - frame_time delayed one frame, as it's really duration of current frame,
arpi
parents: 5927
diff changeset
3803 }
9e7d54e7be58 - frame_time delayed one frame, as it's really duration of current frame,
arpi
parents: 5927
diff changeset
3804
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
3805 // ==========================================================================
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
3806
5643
3d9de27d9bd0 OSD handled by vf control()
arpi
parents: 5640
diff changeset
3807 // current_module="draw_osd";
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3808 // if(vo_config_count) mpctx->video_out->draw_osd();
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3809
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
3810 #ifdef CONFIG_GUI
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
3811 if(use_gui) guiEventHandling();
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
3812 #endif
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
3813
20894
8753befb60ad move vo event check together with gui event check
uau
parents: 20892
diff changeset
3814 current_module="vo_check_events";
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3815 if (vo_config_count) mpctx->video_out->check_events();
20894
8753befb60ad move vo event check together with gui event check
uau
parents: 20892
diff changeset
3816
27377
d58d06eafe83 Change a bunch of X11-specific preprocessor directives.
diego
parents: 27370
diff changeset
3817 #ifdef CONFIG_X11
20900
b0f2e9a16bb1 Move xscreensaver_heartbeat call next to vo check_events
uau
parents: 20899
diff changeset
3818 if (stop_xscreensaver) {
b0f2e9a16bb1 Move xscreensaver_heartbeat call next to vo check_events
uau
parents: 20899
diff changeset
3819 current_module = "stop_xscreensaver";
b0f2e9a16bb1 Move xscreensaver_heartbeat call next to vo check_events
uau
parents: 20899
diff changeset
3820 xscreensaver_heartbeat();
b0f2e9a16bb1 Move xscreensaver_heartbeat call next to vo check_events
uau
parents: 20899
diff changeset
3821 }
b0f2e9a16bb1 Move xscreensaver_heartbeat call next to vo check_events
uau
parents: 20899
diff changeset
3822 #endif
25611
27ffe914df15 Add heartbeat-cmd option
reimar
parents: 25606
diff changeset
3823 if (heartbeat_cmd) {
27ffe914df15 Add heartbeat-cmd option
reimar
parents: 25606
diff changeset
3824 static unsigned last_heartbeat;
27ffe914df15 Add heartbeat-cmd option
reimar
parents: 25606
diff changeset
3825 unsigned now = GetTimerMS();
27ffe914df15 Add heartbeat-cmd option
reimar
parents: 25606
diff changeset
3826 if (now - last_heartbeat > 30000) {
27ffe914df15 Add heartbeat-cmd option
reimar
parents: 25606
diff changeset
3827 last_heartbeat = now;
27ffe914df15 Add heartbeat-cmd option
reimar
parents: 25606
diff changeset
3828 system(heartbeat_cmd);
27ffe914df15 Add heartbeat-cmd option
reimar
parents: 25606
diff changeset
3829 }
27ffe914df15 Add heartbeat-cmd option
reimar
parents: 25606
diff changeset
3830 }
20900
b0f2e9a16bb1 Move xscreensaver_heartbeat call next to vo check_events
uau
parents: 20899
diff changeset
3831
30175
b7bb4a899a6b Also reset time_frame and next_frame_time on reset, it makes no sense to
reimar
parents: 30136
diff changeset
3832 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
3833
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
3834 //====================== FLIP PAGE (VIDEO BLT): =========================
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
3835
31459
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
3836 if (!edl_needs_reset) {
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
3837 current_module="flip_page";
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
3838 if (!frame_time_remaining && blit_frame) {
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
3839 unsigned int t2=GetTimer();
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
3840
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
3841 if(vo_config_count) mpctx->video_out->flip_page();
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
3842 mpctx->num_buffered_frames--;
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
3843
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
3844 vout_time_usage += (GetTimer() - t2) * 0.000001;
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
3845 }
1cf0f471ceee Improves EDL to avoid jumping into a skipped out scene. It also
reynaldo
parents: 31368
diff changeset
3846 }
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
3847 //====================== A-V TIMESTAMP CORRECTION: =========================
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
3848
30175
b7bb4a899a6b Also reset time_frame and next_frame_time on reset, it makes no sense to
reimar
parents: 30136
diff changeset
3849 adjust_sync_and_print_status(frame_time_remaining, mpctx->time_frame);
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
3850
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
3851 //============================ Auto QUALITY ============================
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3852
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
3853 /*Output quality adjustments:*/
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
3854 if(auto_quality>0){
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
3855 current_module="autoq";
1496
8c3e93ef116d cleanup...
arpi
parents: 1487
diff changeset
3856 // float total=0.000001f * (GetTimer()-aq_total_time);
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
3857 // if(output_quality<auto_quality && aq_sleep_time>0.05f*total)
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
3858 if(output_quality<auto_quality && aq_sleep_time>0)
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
3859 ++output_quality;
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
3860 else
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
3861 // if(output_quality>0 && aq_sleep_time<-0.05f*total)
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
3862 if(output_quality>1 && aq_sleep_time<0)
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
3863 --output_quality;
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
3864 else
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
3865 if(output_quality>0 && aq_sleep_time<-0.050f) // 50ms
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
3866 output_quality=0;
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
3867 // printf("total: %8.6f sleep: %8.6f q: %d\n",(0.000001f*aq_total_time),aq_sleep_time,output_quality);
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3868 set_video_quality(mpctx->sh_video,output_quality);
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
3869 }
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
3870
20897
b85131ecee3d Move -frames check out of frame flip code (like -endpos earlier)
uau
parents: 20896
diff changeset
3871 if (play_n_frames >= 0 && !frame_time_remaining && blit_frame) {
b85131ecee3d Move -frames check out of frame flip code (like -endpos earlier)
uau
parents: 20896
diff changeset
3872 --play_n_frames;
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3873 if (play_n_frames <= 0) mpctx->eof = PT_NEXT_ENTRY;
20897
b85131ecee3d Move -frames check out of frame flip code (like -endpos earlier)
uau
parents: 20896
diff changeset
3874 }
b85131ecee3d Move -frames check out of frame flip code (like -endpos earlier)
uau
parents: 20896
diff changeset
3875
b85131ecee3d Move -frames check out of frame flip code (like -endpos earlier)
uau
parents: 20896
diff changeset
3876
20895
798356663969 Move endpos handling from page flip code to a saner location, change < to <=
uau
parents: 20894
diff changeset
3877 // FIXME: add size based support for -endpos
798356663969 Move endpos handling from page flip code to a saner location, change < to <=
uau
parents: 20894
diff changeset
3878 if (end_at.type == END_AT_TIME &&
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3879 !frame_time_remaining && end_at.pos <= mpctx->sh_video->pts)
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3880 mpctx->eof = PT_NEXT_ENTRY;
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3881
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3882 } // end if(mpctx->sh_video)
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
3883
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
3884 #ifdef CONFIG_DVDNAV
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3885 if (mpctx->stream->type == STREAMTYPE_DVDNAV) {
21200
c7b5dd2b2291 better nav highlight handling
ben
parents: 21193
diff changeset
3886 nav_highlight_t hl;
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3887 mp_dvdnav_get_highlight (mpctx->stream, &hl);
31762
da0bfd02286c Support for image highlights for dvdnav menus.
reimar
parents: 31700
diff changeset
3888 if (!vo_spudec || !spudec_apply_palette_crop(vo_spudec, hl.palette, hl.sx, hl.sy, hl.ex, hl.ey)) {
21219
8258747951d7 keep nav highlight event in dvdnav priv structure
ben
parents: 21203
diff changeset
3889 osd_set_nav_box (hl.sx, hl.sy, hl.ex, hl.ey);
8258747951d7 keep nav highlight event in dvdnav priv structure
ben
parents: 21203
diff changeset
3890 vo_osd_changed (OSDTYPE_DVDNAV);
31762
da0bfd02286c Support for image highlights for dvdnav menus.
reimar
parents: 31700
diff changeset
3891 } else {
da0bfd02286c Support for image highlights for dvdnav menus.
reimar
parents: 31700
diff changeset
3892 osd_set_nav_box(0, 0, 0, 0);
da0bfd02286c Support for image highlights for dvdnav menus.
reimar
parents: 31700
diff changeset
3893 vo_osd_changed(OSDTYPE_DVDNAV);
da0bfd02286c Support for image highlights for dvdnav menus.
reimar
parents: 31700
diff changeset
3894 vo_osd_changed(OSDTYPE_SPU);
da0bfd02286c Support for image highlights for dvdnav menus.
reimar
parents: 31700
diff changeset
3895 }
25831
9463ef1a0e63 Check for stream change in dvdnav.
ben
parents: 25824
diff changeset
3896
9463ef1a0e63 Check for stream change in dvdnav.
ben
parents: 25824
diff changeset
3897 if (mp_dvdnav_stream_has_changed(mpctx->stream)) {
9463ef1a0e63 Check for stream change in dvdnav.
ben
parents: 25824
diff changeset
3898 double ar = -1.0;
31048
ba91602b82c5 Fix crash if a DVD is played with dvdnav:// and without video
reimar
parents: 30902
diff changeset
3899 if (mpctx->sh_video &&
ba91602b82c5 Fix crash if a DVD is played with dvdnav:// and without video
reimar
parents: 30902
diff changeset
3900 stream_control (mpctx->demuxer->stream,
25831
9463ef1a0e63 Check for stream change in dvdnav.
ben
parents: 25824
diff changeset
3901 STREAM_CTRL_GET_ASPECT_RATIO, &ar)
9463ef1a0e63 Check for stream change in dvdnav.
ben
parents: 25824
diff changeset
3902 != STREAM_UNSUPPORTED)
9463ef1a0e63 Check for stream change in dvdnav.
ben
parents: 25824
diff changeset
3903 mpctx->sh_video->stream_aspect = ar;
9463ef1a0e63 Check for stream change in dvdnav.
ben
parents: 25824
diff changeset
3904 }
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
3905 }
a067e7e18b50 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents: 21161
diff changeset
3906 #endif
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
3907
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
3908 //============================ Handle PAUSE ===============================
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
3909
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
3910 current_module="pause";
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
3911
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3912 if (mpctx->osd_function == OSD_PAUSE) {
27634
9d0094f6cdf6 Since the pause loop now also runs commands, set mpctx->was_paused
reimar
parents: 27633
diff changeset
3913 mpctx->was_paused = 1;
21082
ef6a6e777fdd Move pause loop into a separate function.
uau
parents: 21077
diff changeset
3914 pause_loop();
371
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
3915 }
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
3916
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
3917 // handle -sstep
2436
18c12656c816 -sstep patch by Aleksander V. Dyomin <fly@shax.ru>
arpi
parents: 2365
diff changeset
3918 if(step_sec>0) {
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3919 mpctx->osd_function=OSD_FFW;
2436
18c12656c816 -sstep patch by Aleksander V. Dyomin <fly@shax.ru>
arpi
parents: 2365
diff changeset
3920 rel_seek_secs+=step_sec;
18c12656c816 -sstep patch by Aleksander V. Dyomin <fly@shax.ru>
arpi
parents: 2365
diff changeset
3921 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3922
22298
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
3923 edl_update(mpctx);
8531
1aa2c9b460af Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents: 8494
diff changeset
3924
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3925 //================= Keyboard events, SEEKing ====================
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3926
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
3927 current_module="key_events";
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
3928
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3929 {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3930 mp_cmd_t* cmd;
10409
4c9ca4819bed Commands are read in a loop, but for some commands we need to break
albeu
parents: 10397
diff changeset
3931 int brk_cmd = 0;
13603
80fc8f48f14c Do not loose commands while paused.
reimar
parents: 13577
diff changeset
3932 while( !brk_cmd && (cmd = mp_input_get_cmd(0,0,0)) != NULL) {
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3933 brk_cmd = run_command(mpctx, cmd);
31956
a6c25d94e60e Add new slave mode command for loading EDL file on demand.
reynaldo
parents: 31945
diff changeset
3934 if (cmd->id == MP_CMD_EDL_LOADFILE) {
31963
e9d8a677874b Cosmetics
reynaldo
parents: 31962
diff changeset
3935 if (edl_filename)
e9d8a677874b Cosmetics
reynaldo
parents: 31962
diff changeset
3936 free(edl_filename);
31956
a6c25d94e60e Add new slave mode command for loading EDL file on demand.
reynaldo
parents: 31945
diff changeset
3937 edl_filename = strdup(cmd->args[0].v.s);
a6c25d94e60e Add new slave mode command for loading EDL file on demand.
reynaldo
parents: 31945
diff changeset
3938 if (edl_filename)
a6c25d94e60e Add new slave mode command for loading EDL file on demand.
reynaldo
parents: 31945
diff changeset
3939 edl_loadfile();
a6c25d94e60e Add new slave mode command for loading EDL file on demand.
reynaldo
parents: 31945
diff changeset
3940 else
a6c25d94e60e Add new slave mode command for loading EDL file on demand.
reynaldo
parents: 31945
diff changeset
3941 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_EdlOutOfMemFile,
31970
7779efdd10a7 Cosmetics pointed out by Diego Biurrun
reynaldo
parents: 31963
diff changeset
3942 cmd->args[0].v.s);
31956
a6c25d94e60e Add new slave mode command for loading EDL file on demand.
reynaldo
parents: 31945
diff changeset
3943 }
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3944 mp_cmd_free(cmd);
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3945 if (brk_cmd == 2)
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3946 goto goto_enable_cache;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3947 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3948 }
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3949 mpctx->was_paused = 0;
7111
b65b78640d49 removed old input code
alex
parents: 7068
diff changeset
3950
2365
93616490c0dd -loop patch by Pascal Haakmat <a.haakmat@chello.nl>
arpi
parents: 2353
diff changeset
3951 /* Looping. */
23726
11abe5f3dcaa Move loop_times into mpctx.
albeu
parents: 23573
diff changeset
3952 if(mpctx->eof==1 && mpctx->loop_times>=0) {
11abe5f3dcaa Move loop_times into mpctx.
albeu
parents: 23573
diff changeset
3953 mp_msg(MSGT_CPLAYER,MSGL_V,"loop_times = %d, eof = %d\n", mpctx->loop_times,mpctx->eof);
11abe5f3dcaa Move loop_times into mpctx.
albeu
parents: 23573
diff changeset
3954
11abe5f3dcaa Move loop_times into mpctx.
albeu
parents: 23573
diff changeset
3955 if(mpctx->loop_times>1) mpctx->loop_times--; else
11abe5f3dcaa Move loop_times into mpctx.
albeu
parents: 23573
diff changeset
3956 if(mpctx->loop_times==1) mpctx->loop_times=-1;
8198
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
3957 play_n_frames=play_n_frames_mf;
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3958 mpctx->eof=0;
25883
baf32110d3fc Use defines to give names to the different seek flags.
reimar
parents: 25852
diff changeset
3959 abs_seek_pos=SEEK_ABSOLUTE; rel_seek_secs=seek_to_sec;
8784
6e190ea2abba don't show OSD progbar when -loop seeks back
arpi
parents: 8745
diff changeset
3960 loop_seek = 1;
2365
93616490c0dd -loop patch by Pascal Haakmat <a.haakmat@chello.nl>
arpi
parents: 2353
diff changeset
3961 }
93616490c0dd -loop patch by Pascal Haakmat <a.haakmat@chello.nl>
arpi
parents: 2353
diff changeset
3962
1627
eeaee1632340 absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents: 1626
diff changeset
3963 if(rel_seek_secs || abs_seek_pos){
22300
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
3964 if (seek(mpctx, rel_seek_secs, abs_seek_pos) >= 0) {
1334
061cabfbc07b some more cleanup
arpi
parents: 1331
diff changeset
3965 // Set OSD:
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
3966 if(!loop_seek){
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
3967 if( !edl_decision )
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3968 set_osd_bar(0,"Position",0,100,demuxer_get_percent_pos(mpctx->demuxer));
1334
061cabfbc07b some more cleanup
arpi
parents: 1331
diff changeset
3969 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3970 }
22298
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
3971
1405
8ecf18884ad8 seeking code moved out from mplayer.c -> seek.c
arpi
parents: 1402
diff changeset
3972 rel_seek_secs=0;
1627
eeaee1632340 absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents: 1626
diff changeset
3973 abs_seek_pos=0;
8784
6e190ea2abba don't show OSD progbar when -loop seeks back
arpi
parents: 8745
diff changeset
3974 loop_seek=0;
22301
e4950f7dc165 Reset the edl_decision flag after the seek is done.
uau
parents: 22300
diff changeset
3975 edl_decision = 0;
1466
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1462
diff changeset
3976 }
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1462
diff changeset
3977
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
3978 #ifdef CONFIG_GUI
1723
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1709
diff changeset
3979 if(use_gui){
5789
0132c5747e8a fix audio only files play
pontscho
parents: 5698
diff changeset
3980 guiEventHandling();
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3981 if(mpctx->demuxer->file_format==DEMUXER_TYPE_AVI && mpctx->sh_video && mpctx->sh_video->video.dwLength>2){
1735
bdc1ec6fe668 gui seekbar position fixed
arpi
parents: 1730
diff changeset
3982 // get pos from frame number / total frames
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3983 guiIntfStruct.Position=(float)mpctx->d_video->pack_no*100.0f/mpctx->sh_video->video.dwLength;
1735
bdc1ec6fe668 gui seekbar position fixed
arpi
parents: 1730
diff changeset
3984 } else {
22808
c9b6a804f753 Gui: Allow progress bar to move when playing mov or mp4 files
cehoyos
parents: 22751
diff changeset
3985 guiIntfStruct.Position=demuxer_get_percent_pos(mpctx->demuxer);
1735
bdc1ec6fe668 gui seekbar position fixed
arpi
parents: 1730
diff changeset
3986 }
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3987 if ( mpctx->sh_video ) guiIntfStruct.TimeSec=mpctx->sh_video->pts;
22835
9c2c08ad519f Gui: Show correct time after seeking in audio-only files.
cehoyos
parents: 22823
diff changeset
3988 else if ( mpctx->sh_audio ) guiIntfStruct.TimeSec=playing_audio_pts(mpctx->sh_audio, mpctx->d_audio, mpctx->audio_out);
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3989 guiIntfStruct.LengthInSec=demuxer_get_time_length(mpctx->demuxer);
6619
f554e7271587 fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents: 6590
diff changeset
3990 guiGetEvent( guiReDraw,NULL );
6903
c2d4100c964e - fix mixer handling
pontscho
parents: 6888
diff changeset
3991 guiGetEvent( guiSetVolume,NULL );
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4807
diff changeset
3992 if(guiIntfStruct.Playing==0) break; // STOP
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3993 if(guiIntfStruct.Playing==2) mpctx->osd_function=OSD_PAUSE;
8423
c6a1a5b6ba25 - fix three submenu bug
pontscho
parents: 8366
diff changeset
3994 if ( guiIntfStruct.DiskChanged || guiIntfStruct.NewPlay ) goto goto_next_file;
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
3995 #ifdef CONFIG_DVDREAD
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3996 if ( mpctx->stream->type == STREAMTYPE_DVD )
3054
9507f90d8254 add half dvd support for gui
pontscho
parents: 3050
diff changeset
3997 {
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3998 dvd_priv_t * dvdp = mpctx->stream->priv;
7854
d6c29d863f15 dvd chapter detect function from Gregory Kovriga
pontscho
parents: 7805
diff changeset
3999 guiIntfStruct.DVD.current_chapter=dvd_chapter_from_cell(dvdp,guiIntfStruct.DVD.current_title-1, dvdp->cur_cell)+1;
3054
9507f90d8254 add half dvd support for gui
pontscho
parents: 3050
diff changeset
4000 }
9507f90d8254 add half dvd support for gui
pontscho
parents: 3050
diff changeset
4001 #endif
1723
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1709
diff changeset
4002 }
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
4003 #endif /* CONFIG_GUI */
1723
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1709
diff changeset
4004
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
4005 } // while(!mpctx->eof)
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
4006
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
4007 mp_msg(MSGT_GLOBAL,MSGL_V,"EOF code: %d \n",mpctx->eof);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
4008
27370
14c5017f40d2 Change a bunch of video/audio-output-specific preprocessor directives from
diego
parents: 27359
diff changeset
4009 #ifdef CONFIG_DVBIN
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
4010 if(mpctx->dvbin_reopen)
18286
e0470e00b3bd simplified management of dvb channel switching
nicodvb
parents: 18261
diff changeset
4011 {
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
4012 mpctx->eof = 0;
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
4013 uninit_player(INITIALIZED_ALL-(INITIALIZED_GUI|INITIALIZED_STREAM|INITIALIZED_INPUT|INITIALIZED_GETCH2|(fixed_vo?INITIALIZED_VO:0)));
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
4014 cache_uninit(mpctx->stream);
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
4015 mpctx->dvbin_reopen = 0;
18286
e0470e00b3bd simplified management of dvb channel switching
nicodvb
parents: 18261
diff changeset
4016 goto goto_enable_cache;
e0470e00b3bd simplified management of dvb channel switching
nicodvb
parents: 18261
diff changeset
4017 }
e0470e00b3bd simplified management of dvb channel switching
nicodvb
parents: 18261
diff changeset
4018 #endif
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
4019 }
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
4020
3618
772729dd7b40 better dvd support
pontscho
parents: 3597
diff changeset
4021 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
4022
6138
523014df7d32 big cosmetics patch, cleanup of messages printed by mplayer and libs.
arpi
parents: 6135
diff changeset
4023 mp_msg(MSGT_CPLAYER,MSGL_INFO,"\n");
523014df7d32 big cosmetics patch, cleanup of messages printed by mplayer and libs.
arpi
parents: 6135
diff changeset
4024
4221
401149ba73fd Fixed bug with benchmark option
albeu
parents: 4203
diff changeset
4025 if(benchmark){
26159
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4026 double tot=video_time_usage+vout_time_usage+audio_time_usage;
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4027 double total_time_usage;
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4028 total_time_usage_start=GetTimer()-total_time_usage_start;
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4029 total_time_usage = (float)total_time_usage_start*0.000001;
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4030 mp_msg(MSGT_CPLAYER,MSGL_INFO,"\nBENCHMARKs: VC:%8.3fs VO:%8.3fs A:%8.3fs Sys:%8.3fs = %8.3fs\n",
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4031 video_time_usage,vout_time_usage,audio_time_usage,
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4032 total_time_usage-tot,total_time_usage);
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4033 if(total_time_usage>0.0)
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4034 mp_msg(MSGT_CPLAYER,MSGL_INFO,"BENCHMARK%%: VC:%8.4f%% VO:%8.4f%% A:%8.4f%% Sys:%8.4f%% = %8.4f%%\n",
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4035 100.0*video_time_usage/total_time_usage,
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4036 100.0*vout_time_usage/total_time_usage,
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4037 100.0*audio_time_usage/total_time_usage,
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4038 100.0*(total_time_usage-tot)/total_time_usage,
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4039 100.0);
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4040 if(total_frame_cnt && frame_dropping)
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4041 mp_msg(MSGT_CPLAYER,MSGL_INFO,"BENCHMARKn: disp: %d (%3.2f fps) drop: %d (%d%%) total: %d (%3.2f fps)\n",
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4042 total_frame_cnt-drop_frame_cnt,
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4043 (total_time_usage>0.5)?((total_frame_cnt-drop_frame_cnt)/total_time_usage):0,
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4044 drop_frame_cnt,
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4045 100*drop_frame_cnt/total_frame_cnt,
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4046 total_frame_cnt,
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4047 (total_time_usage>0.5)?(total_frame_cnt/total_time_usage):0);
4221
401149ba73fd Fixed bug with benchmark option
albeu
parents: 4203
diff changeset
4048 }
401149ba73fd Fixed bug with benchmark option
albeu
parents: 4203
diff changeset
4049
5983
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
4050 // time to uninit all, except global stuff:
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
4051 uninit_player(INITIALIZED_ALL-(INITIALIZED_GUI+INITIALIZED_INPUT+(fixed_vo?INITIALIZED_VO:0)));
5154
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
4052
26159
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4053 if(mpctx->set_of_sub_size > 0) {
9048
arpi
parents: 9045
diff changeset
4054 current_module="sub_free";
26159
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4055 for(i = 0; i < mpctx->set_of_sub_size; ++i) {
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4056 sub_free(mpctx->set_of_subtitles[i]);
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
4057 #ifdef CONFIG_ASS
26159
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4058 if(mpctx->set_of_ass_tracks[i])
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
4059 ass_free_track( mpctx->set_of_ass_tracks[i] );
18937
9e95ac641e77 Initial libass release (without mencoder support).
eugeni
parents: 18934
diff changeset
4060 #endif
9e95ac641e77 Initial libass release (without mencoder support).
eugeni
parents: 18934
diff changeset
4061 }
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
4062 mpctx->set_of_sub_size = 0;
26159
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4063 }
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4064 vo_sub_last = vo_sub=NULL;
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4065 subdata=NULL;
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
4066 #ifdef CONFIG_ASS
26159
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4067 ass_track = NULL;
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4068 if(ass_library)
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4069 ass_clear_fonts(ass_library);
18937
9e95ac641e77 Initial libass release (without mencoder support).
eugeni
parents: 18934
diff changeset
4070 #endif
9048
arpi
parents: 9045
diff changeset
4071
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
4072 if(mpctx->eof == PT_NEXT_ENTRY || mpctx->eof == PT_PREV_ENTRY) {
26159
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4073 mpctx->eof = mpctx->eof == PT_NEXT_ENTRY ? 1 : -1;
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4074 if(play_tree_iter_step(mpctx->playtree_iter,mpctx->play_tree_step,0) == PLAY_TREE_ITER_ENTRY) {
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4075 mpctx->eof = 1;
9368
918248af048f fuckin' 10l
pontscho
parents: 9352
diff changeset
4076 } else {
26159
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4077 play_tree_iter_free(mpctx->playtree_iter);
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4078 mpctx->playtree_iter = NULL;
9368
918248af048f fuckin' 10l
pontscho
parents: 9352
diff changeset
4079 }
26159
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4080 mpctx->play_tree_step = 1;
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4081 } else if(mpctx->eof == PT_UP_NEXT || mpctx->eof == PT_UP_PREV) {
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4082 mpctx->eof = mpctx->eof == PT_UP_NEXT ? 1 : -1;
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4083 if(mpctx->playtree_iter) {
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4084 if(play_tree_iter_up_step(mpctx->playtree_iter,mpctx->eof,0) == PLAY_TREE_ITER_ENTRY) {
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4085 mpctx->eof = 1;
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4086 } else {
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4087 play_tree_iter_free(mpctx->playtree_iter);
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4088 mpctx->playtree_iter = NULL;
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4089 }
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4090 }
26877
4ab1cfcee430 Add a slave command to stop stream playback.
ben
parents: 26832
diff changeset
4091 } else if (mpctx->eof == PT_STOP) {
4ab1cfcee430 Add a slave command to stop stream playback.
ben
parents: 26832
diff changeset
4092 play_tree_iter_free(mpctx->playtree_iter);
4ab1cfcee430 Add a slave command to stop stream playback.
ben
parents: 26832
diff changeset
4093 mpctx->playtree_iter = NULL;
5154
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
4094 } else { // NEXT PREV SRC
26159
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4095 mpctx->eof = mpctx->eof == PT_PREV_SRC ? -1 : 1;
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
4096 }
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
4097
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
4098 if(mpctx->eof == 0) mpctx->eof = 1;
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
4099
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
4100 while(mpctx->playtree_iter != NULL) {
26159
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4101 filename = play_tree_iter_get_file(mpctx->playtree_iter,mpctx->eof);
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4102 if(filename == NULL) {
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4103 if(play_tree_iter_step(mpctx->playtree_iter,mpctx->eof,0) != PLAY_TREE_ITER_ENTRY) {
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4104 play_tree_iter_free(mpctx->playtree_iter);
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4105 mpctx->playtree_iter = NULL;
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4106 };
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4107 } else
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4108 break;
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
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
26159
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4112 if(use_gui && !mpctx->playtree_iter) {
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
4113 #ifdef CONFIG_DVDREAD
26159
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4114 if(!guiIntfStruct.DiskChanged)
5910
20c335d98ab3 fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents: 5908
diff changeset
4115 #endif
26159
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4116 mplEnd();
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4117 }
5910
20c335d98ab3 fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents: 5908
diff changeset
4118 #endif
20c335d98ab3 fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents: 5908
diff changeset
4119
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
4120 if(use_gui || mpctx->playtree_iter != NULL || player_idle_mode){
26159
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4121 if(!mpctx->playtree_iter) filename = NULL;
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4122 mpctx->eof = 0;
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4123 goto play_next_file;
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
4124 }
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
4125
7122
0dc9cb756b68 freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents: 7111
diff changeset
4126
28032
92e770f6e890 Print ID_EXIT and exit reason message in identify mode when exiting.
reimar
parents: 27953
diff changeset
4127 exit_player_with_rc(EXIT_EOF, 0);
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
4128
109
ed4178146cc5 small code cleanup, removed unused variables
arpi_esp
parents: 103
diff changeset
4129 return 1;
ed4178146cc5 small code cleanup, removed unused variables
arpi_esp
parents: 103
diff changeset
4130 }
26963
8825552ee585 Fix the linking of TOOLS/netstream and TOOLS/vivodump.
diego
parents: 26877
diff changeset
4131 #endif /* DISABLE_MAIN */