annotate mplayer.c @ 31316:de902c34c33c

Remove unused includes.
author reimar
date Sun, 13 Jun 2010 12:05:58 +0000
parents 680403ff2d14
children 14bbe725b50e
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
1430
1728d249c783 missing unistd.h (requires for off_t under freebsd)
arpi
parents: 1429
diff changeset
22 #include <stdio.h>
1728d249c783 missing unistd.h (requires for off_t under freebsd)
arpi
parents: 1429
diff changeset
23 #include <stdlib.h>
12360
85f18227756f 10l on cygwin WIN32 gets defined in config.h
faust3
parents: 12358
diff changeset
24 #include "config.h"
85f18227756f 10l on cygwin WIN32 gets defined in config.h
faust3
parents: 12358
diff changeset
25
27727
48c1ae64255b Replace preprocessor check for WIN32 with checks for __MINGW32__ and __CYGWIN__.
diego
parents: 27635
diff changeset
26 #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
27 #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
28 #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
29 #endif
1430
1728d249c783 missing unistd.h (requires for off_t under freebsd)
arpi
parents: 1429
diff changeset
30 #include <string.h>
1728d249c783 missing unistd.h (requires for off_t under freebsd)
arpi
parents: 1429
diff changeset
31 #include <unistd.h>
1428
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1422
diff changeset
32
5288
370d13663229 we don't use mmap() in mplayer.c, so why should we include mman.h...
arpi
parents: 5221
diff changeset
33 // #include <sys/mman.h>
1428
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1422
diff changeset
34 #include <sys/types.h>
9831
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
35 #ifndef __MINGW32__
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
36 #include <sys/ioctl.h>
1428
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1422
diff changeset
37 #include <sys/wait.h>
9831
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
38 #else
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
39 #define SIGHUP 1 /* hangup */
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
40 #define SIGQUIT 3 /* quit */
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
41 #define SIGKILL 9 /* kill (cannot be caught or ignored) */
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
42 #define SIGBUS 10 /* bus error */
16049
0ccf19820216 define SIGHUP and SIGPIPE for MinGW and catch SIGPIPE also in mplayer
reimar
parents: 16036
diff changeset
43 #define SIGPIPE 13 /* broken pipe */
9831
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
44 #endif
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
45
1428
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1422
diff changeset
46 #include <sys/time.h>
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1422
diff changeset
47 #include <sys/stat.h>
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1422
diff changeset
48
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1422
diff changeset
49 #include <signal.h>
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1422
diff changeset
50 #include <time.h>
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1422
diff changeset
51 #include <fcntl.h>
9318
51a9af80d874 PATH_MAX should be more portable, and we even include limits.h to be sure
arpi
parents: 9317
diff changeset
52 #include <limits.h>
1428
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1422
diff changeset
53
5112
70fb281bb13c changed printf's to mp_msg
alex
parents: 5106
diff changeset
54 #include <errno.h>
70fb281bb13c changed printf's to mp_msg
alex
parents: 5106
diff changeset
55
1564
9fa2a290fa99 mp_msg init
arpi
parents: 1548
diff changeset
56 #include "mp_msg.h"
27039
f00e76437efe Add the ugly HELP_MP_DEFINE_STATIC back, otherwise we produce warnings like
diego
parents: 27036
diff changeset
57
f00e76437efe Add the ugly HELP_MP_DEFINE_STATIC back, otherwise we produce warnings like
diego
parents: 27036
diff changeset
58 #define HELP_MP_DEFINE_STATIC
1584
e49b3927c793 more messages for translator :)
arpi
parents: 1583
diff changeset
59 #include "help_mp.h"
e49b3927c793 more messages for translator :)
arpi
parents: 1583
diff changeset
60
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents: 8123
diff changeset
61 #include "m_option.h"
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents: 8123
diff changeset
62 #include "m_config.h"
17911
52f95509cd05 Add the new property API and implement a couple properties.
albeu
parents: 17910
diff changeset
63 #include "m_property.h"
31201
203789464176 misc cosmetics: K&R style nits, #include placement, indentation
diego
parents: 31148
diff changeset
64 #include "mplayer.h"
203789464176 misc cosmetics: K&R style nits, #include placement, indentation
diego
parents: 31148
diff changeset
65 #include "access_mpcontext.h"
9752
3db72324a0fe Stream cleanup, don't use blah_on options anymore.
albeu
parents: 9695
diff changeset
66
151
9708d4b2765b cfgparser fix
szabii
parents: 150
diff changeset
67 #include "cfg-mplayer-def.h"
147
0a0d7dd8fb51 new command line/config file parser
szabii
parents: 117
diff changeset
68
25844
6b01c546c5c3 Support vobsub palette in extradata, as exported by libavformat
reimar
parents: 25831
diff changeset
69 #include "libavutil/intreadwrite.h"
29592
ccdfb20713eb Add support for directory-specific mplayer.conf configuration file.
reimar
parents: 29571
diff changeset
70 #include "libavutil/avstring.h"
25844
6b01c546c5c3 Support vobsub palette in extradata, as exported by libavformat
reimar
parents: 25831
diff changeset
71
258
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
72 #include "subreader.h"
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
73
36
846535ace7a2 libmpeg2-0.2.0 merge
arpi_esp
parents: 33
diff changeset
74 #include "libvo/video_out.h"
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
75
5293
fd992ece4367 include font_load.h directly, instead of via video_out.h
arpi
parents: 5288
diff changeset
76 #include "libvo/font_load.h"
220
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
77 #include "libvo/sub.h"
36
846535ace7a2 libmpeg2-0.2.0 merge
arpi_esp
parents: 33
diff changeset
78
27377
d58d06eafe83 Change a bunch of X11-specific preprocessor directives.
diego
parents: 27370
diff changeset
79 #ifdef CONFIG_X11
10211
4bc481804519 warning fixes by Dominik Mierzejewski <dominik@rangers.eu.org>
alex
parents: 10167
diff changeset
80 #include "libvo/x11_common.h"
4bc481804519 warning fixes by Dominik Mierzejewski <dominik@rangers.eu.org>
alex
parents: 10167
diff changeset
81 #endif
4bc481804519 warning fixes by Dominik Mierzejewski <dominik@rangers.eu.org>
alex
parents: 10167
diff changeset
82
955
3a3304cd9fd5 libao support
arpi_esp
parents: 940
diff changeset
83 #include "libao2/audio_out.h"
3a3304cd9fd5 libao support
arpi_esp
parents: 940
diff changeset
84
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
85 #include "codec-cfg.h"
175
d43c7e6412f0 added DirectShow support
arpi_esp
parents: 162
diff changeset
86
8531
1aa2c9b460af Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents: 8494
diff changeset
87 #include "edl.h"
560
28ae99036574 Separated dvdsub code to be able to work with it easier
lgb
parents: 557
diff changeset
88 #include "spudec.h"
4079
ae78dd1d8daf Add vobsub support.
kmkaplan
parents: 4064
diff changeset
89 #include "vobsub.h"
492
888a85621f50 preliminary DVD support using libcss
lgb
parents: 487
diff changeset
90
9380
edfe34c5405d linux->osdep
arpi
parents: 9368
diff changeset
91 #include "osdep/getch2.h"
edfe34c5405d linux->osdep
arpi
parents: 9368
diff changeset
92 #include "osdep/timer.h"
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
93
23077
17bf4f4b0715 Gui --> gui
diego
parents: 22993
diff changeset
94 #include "gui/interface.h"
2036
029bad24d022 baz.. fixed wrong cvs merge.
atmos4
parents: 2034
diff changeset
95
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
96 #include "input/input.h"
30872
eb1b97313903 Follow a more proper way to support -codecpath.
komh
parents: 30855
diff changeset
97
3322
cdd3f5ac06b2 -slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents: 3302
diff changeset
98 int slave_mode=0;
16347
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
99 int player_idle_mode=0;
11875
6b28eb95c08b * changes mencoder's exit code on explicit kill to 2
attila
parents: 11778
diff changeset
100 int quiet=0;
19850
4919b3ce8d5e report to mplayer with a slave command the coordinates of the pointer reported by x11; rescale coordinates to [0,1]x[0,1] range - patch by Jonas Jermann and me
nicodvb
parents: 19837
diff changeset
101 int enable_mouse_movements=0;
27838
13738bdebf9a Add an option that sets initial playback volume.
diego
parents: 27807
diff changeset
102 float start_volume = -1;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
103
28485
3f597aacbb69 Add priority support for OS/2 and factorize the Windows priority support.
diego
parents: 28462
diff changeset
104 #include "osdep/priority.h"
15042
265d8b8adbbe windows priority support patch by Rune Petersen <runner at mail.tele.dk> with the freedom to shoot yourself in the foot
faust3
parents: 14818
diff changeset
105
25611
27ffe914df15 Add heartbeat-cmd option
reimar
parents: 25606
diff changeset
106 char *heartbeat_cmd;
27ffe914df15 Add heartbeat-cmd option
reimar
parents: 25606
diff changeset
107
8606
d80edba39db9 This patch makes subtitle and A-V delays display correctly rounded
arpi
parents: 8593
diff changeset
108 #define ROUND(x) ((int)((x)<0 ? (x)-0.5 : (x)+0.5))
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
109
3015
8bf21c807656 RTC is autodetected
arpi
parents: 2941
diff changeset
110 #ifdef HAVE_RTC
14381
dc7b86065e3c RTC support on FreeBSD, inspired by a patch from Michael Johnson
diego
parents: 14296
diff changeset
111 #ifdef __linux__
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
112 #include <linux/rtc.h>
14381
dc7b86065e3c RTC support on FreeBSD, inspired by a patch from Michael Johnson
diego
parents: 14296
diff changeset
113 #else
dc7b86065e3c RTC support on FreeBSD, inspired by a patch from Michael Johnson
diego
parents: 14296
diff changeset
114 #include <rtc.h>
dc7b86065e3c RTC support on FreeBSD, inspired by a patch from Michael Johnson
diego
parents: 14296
diff changeset
115 #define RTC_IRQP_SET RTCIO_IRQP_SET
dc7b86065e3c RTC support on FreeBSD, inspired by a patch from Michael Johnson
diego
parents: 14296
diff changeset
116 #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
117 #endif /* __linux__ */
f17b3c152fd6 Add comments to a few #endif statements in order to make clear which
diego
parents: 16489
diff changeset
118 #endif /* HAVE_RTC */
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
119
19271
64d82a45a05d introduce new 'stream' directory for all stream layer related components and split them from libmpdemux
ben
parents: 19227
diff changeset
120 #include "stream/tv.h"
19568
bd821fd3e244 Radio support, patch by Vladimir Voroshilov (voroshil gmail com)
reimar
parents: 19533
diff changeset
121 #include "stream/stream_radio.h"
29432
47808d1fca5a Only #include stream/dvbin.h when DVB is enabled.
diego
parents: 29429
diff changeset
122 #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
123 #include "stream/dvbin.h"
29432
47808d1fca5a Only #include stream/dvbin.h when DVB is enabled.
diego
parents: 29429
diff changeset
124 #endif
19808
5385740067a1 * remove extern definitions of functions in .c files
attila
parents: 19774
diff changeset
125 #include "stream/cache2.h"
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents: 9593
diff changeset
126
258
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
127 //**************************************************************************//
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
128 // Playtree
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
129 //**************************************************************************//
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
130 #include "playtree.h"
10211
4bc481804519 warning fixes by Dominik Mierzejewski <dominik@rangers.eu.org>
alex
parents: 10167
diff changeset
131 #include "playtreeparser.h"
4bc481804519 warning fixes by Dominik Mierzejewski <dominik@rangers.eu.org>
alex
parents: 10167
diff changeset
132
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
133 //**************************************************************************//
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
134 // Config
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
135 //**************************************************************************//
19808
5385740067a1 * remove extern definitions of functions in .c files
attila
parents: 19774
diff changeset
136 #include "parser-cfg.h"
5385740067a1 * remove extern definitions of functions in .c files
attila
parents: 19774
diff changeset
137 #include "parser-mpcmd.h"
5385740067a1 * remove extern definitions of functions in .c files
attila
parents: 19774
diff changeset
138
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
139 m_config_t* mconfig;
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
140
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
141 //**************************************************************************//
258
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
142 // Config file
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
143 //**************************************************************************//
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
144
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
145 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
146
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
147 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
148 return m_config_parse_config_file(mconfig, filename);
162
effc62af528c new option: -include
szabii
parents: 154
diff changeset
149 }
effc62af528c new option: -include
szabii
parents: 154
diff changeset
150
30901
76a13038105e Rename get_path.[ch] --> path.[ch].
diego
parents: 30900
diff changeset
151 #include "path.h"
178
55206b791586 get_path()
szabii
parents: 175
diff changeset
152
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
153 //**************************************************************************//
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
154 //**************************************************************************//
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
155 // Input media streaming & demultiplexer:
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
156 //**************************************************************************//
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
157
1289
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
158 static int max_framesize=0;
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
159
19271
64d82a45a05d introduce new 'stream' directory for all stream layer related components and split them from libmpdemux
ben
parents: 19227
diff changeset
160 #include "stream/stream.h"
7559
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
161 #include "libmpdemux/demuxer.h"
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
162 #include "libmpdemux/stheader.h"
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
163
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
164 #ifdef CONFIG_DVDREAD
19271
64d82a45a05d introduce new 'stream' directory for all stream layer related components and split them from libmpdemux
ben
parents: 19227
diff changeset
165 #include "stream/stream_dvd.h"
18682
bee3186a06f7 include stream_dvd's interface from libmpdemux/stream_dvd.h
nicodvb
parents: 18679
diff changeset
166 #endif
21200
c7b5dd2b2291 better nav highlight handling
ben
parents: 21193
diff changeset
167 #include "stream/stream_dvdnav.h"
c7b5dd2b2291 better nav highlight handling
ben
parents: 21193
diff changeset
168
5607
1972c3475d93 mp_image.h and img_format.h moved to libmpcodecs
arpi
parents: 5572
diff changeset
169 #include "libmpcodecs/dec_audio.h"
1972c3475d93 mp_image.h and img_format.h moved to libmpcodecs
arpi
parents: 5572
diff changeset
170 #include "libmpcodecs/dec_video.h"
8198
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
171 #include "libmpcodecs/mp_image.h"
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
172 #include "libmpcodecs/vf.h"
17088
f067a9de373c mplayer.c:1928: warning: implicit declaration of function 'cache_uninit'
rathann
parents: 17057
diff changeset
173 #include "libmpcodecs/vd.h"
2563
fc124f9db88e more cleanup, warnings fixed
arpi
parents: 2557
diff changeset
174
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
175 #include "mixer.h"
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
176
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
177 #include "mp_core.h"
20156
42b46a42f83b added OSD audio switching visualization
ptt
parents: 19973
diff changeset
178
42b46a42f83b added OSD audio switching visualization
ptt
parents: 19973
diff changeset
179 //**************************************************************************//
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
180 //**************************************************************************//
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
181
112
b69d29c06b3f code cleanup around codecctrl
arpi_esp
parents: 111
diff changeset
182 // Common FIFO functions, and keyboard/event FIFO code
22823
98eaf29b5dee Code cleanup: don't include a .c file in mplayer.c and fix a few
rathann
parents: 22808
diff changeset
183 #include "mp_fifo.h"
12816
fba780800efe -use-stdin renamed to -noconsolecontrols.
diego
parents: 12753
diff changeset
184 int noconsolecontrols=0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
185 //**************************************************************************//
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
186
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
187 // 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
188 static MPContext mpctx_s = {
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
189 .osd_function = OSD_PLAY,
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
190 .begin_skip = MP_NOPTS_VALUE,
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
191 .play_tree_step = 1,
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
192 .global_sub_pos = -1,
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
193 .set_of_sub_pos = -1,
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
194 .file_format = DEMUXER_TYPE_UNKNOWN,
23726
11abe5f3dcaa Move loop_times into mpctx.
albeu
parents: 23573
diff changeset
195 .loop_times = -1,
27370
14c5017f40d2 Change a bunch of video/audio-output-specific preprocessor directives from
diego
parents: 27359
diff changeset
196 #ifdef CONFIG_DVBIN
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
197 .last_dvb_step = 1,
22281
f00e6b43e79f Add missing #ifdef
uau
parents: 22280
diff changeset
198 #endif
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
199 };
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
200
22993
5e6fa9cabacc big surprise.. uau broke gcc 2.95 as usual
rfelker
parents: 22835
diff changeset
201 static MPContext *mpctx = &mpctx_s;
5e6fa9cabacc big surprise.. uau broke gcc 2.95 as usual
rfelker
parents: 22835
diff changeset
202
7677
33562a65e9e8 _EXPERIMENTAL_ option: -fixed-vo for libvo spec compliance testing
arpi
parents: 7628
diff changeset
203 int fixed_vo=0;
33562a65e9e8 _EXPERIMENTAL_ option: -fixed-vo for libvo spec compliance testing
arpi
parents: 7628
diff changeset
204
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
205 // benchmark:
1291
36ed1692c0b8 video codec stuff moved to dec_video.c
arpi
parents: 1289
diff changeset
206 double video_time_usage=0;
36ed1692c0b8 video codec stuff moved to dec_video.c
arpi
parents: 1289
diff changeset
207 double vout_time_usage=0;
1289
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
208 static double audio_time_usage=0;
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
209 static int total_time_usage_start=0;
5621
0426f9b887cd some more statistics: BENCHMARKn
arpi
parents: 5612
diff changeset
210 static int total_frame_cnt=0;
0426f9b887cd some more statistics: BENCHMARKn
arpi
parents: 5612
diff changeset
211 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
212 int benchmark=0;
1124
0e95f30ffd4c -frames and -benchmark options to make chl & gabucino happy
arpi_esp
parents: 1059
diff changeset
213
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
214 // options:
30176
6fb92182aff3 At startup and while seeking avoid to introduce pointless sleeps and possibly
reimar
parents: 30175
diff changeset
215 #define DEFAULT_STARTUP_DECODE_RETRY 8
6796
9c828335b2d0 add preferences to gui
pontscho
parents: 6792
diff changeset
216 int auto_quality=0;
1496
8c3e93ef116d cleanup...
arpi
parents: 1487
diff changeset
217 static int output_quality=0;
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
218
7605
c3bbe602aff3 new option -speed, to set playback speed rate (examples: -speed 1:3 or -speed 5)
arpi
parents: 7604
diff changeset
219 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
220
1709
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
221 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
222
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
223 #ifdef CONFIG_GUI
9291
64b8c5a07c2c - It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents: 9217
diff changeset
224 int enqueue=0;
64b8c5a07c2c - It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents: 9217
diff changeset
225 #endif
64b8c5a07c2c - It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents: 9217
diff changeset
226
17914
f9cb6fc1608a Add an option to list the properties: -list-properties
albeu
parents: 17911
diff changeset
227 static int list_properties = 0;
f9cb6fc1608a Add an option to list the properties: -list-properties
albeu
parents: 17911
diff changeset
228
6921
762c98c47f01 osdlevel=1 by default
arpi
parents: 6914
diff changeset
229 int osd_level=1;
18287
292337d09af2 Remove updating of vo_mouse_timer_const from the main loop and also
uau
parents: 18286
diff changeset
230 // 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
231 unsigned int osd_visible;
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
232 int osd_duration = 1000;
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
233
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
234 int term_osd = 1;
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
235 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
236 static char* playing_msg = NULL;
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
237 // seek:
22312
cca9ff25bed2 Move parsing of the -ss option to the option code.
uau
parents: 22302
diff changeset
238 static double seek_to_sec;
7559
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
239 static off_t seek_to_byte=0;
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
240 static off_t step_sec=0;
8784
6e190ea2abba don't show OSD progbar when -loop seeks back
arpi
parents: 8745
diff changeset
241 static int loop_seek=0;
7559
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
242
19973
02a18c52a42a after a long time, finally i could add -endpos option to mplayer executable.
ptt
parents: 19946
diff changeset
243 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
244
7576
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
245 // A/V sync:
8311
37ab4e646f65 add autosync && some 10l bugfix
pontscho
parents: 8306
diff changeset
246 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
247
7559
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
248 // may be changed by GUI: (FIXME!)
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
249 float rel_seek_secs=0;
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
250 int abs_seek_pos=0;
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
251
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
252 // codecs:
7529
c276bfb414fb removed obsolete/unused audio|video_fm|codec, has_audio|video
arpi
parents: 7526
diff changeset
253 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
254 char **video_codec_list=NULL; // override video codec
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
255 char **audio_fm_list=NULL; // override audio codec family
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
256 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
257
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
258 // demuxer:
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
259 extern char *demuxer_name; // override demuxer
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
260 extern char *audio_demuxer_name; // override audio demuxer
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
261 extern char *sub_demuxer_name; // override sub demuxer
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
262
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
263 // streaming:
3532
19998399f4d5 Made audio_id and video_id non static variable.
bertrand
parents: 3499
diff changeset
264 int audio_id=-1;
19998399f4d5 Made audio_id and video_id non static variable.
bertrand
parents: 3499
diff changeset
265 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
266 int dvdsub_id=-1;
29855
5e279f7d7e5d Remember which subtitle was auto-selected for dvdnav due to -slang
reimar
parents: 29854
diff changeset
267 // this dvdsub_id was selected via slang
5e279f7d7e5d Remember which subtitle was auto-selected for dvdnav due to -slang
reimar
parents: 29854
diff changeset
268 // 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
269 // 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
270 int dvdsub_lang_id;
4079
ae78dd1d8daf Add vobsub support.
kmkaplan
parents: 4064
diff changeset
271 int vobsub_id=-1;
10167
531b00ad6f2d Support for selecting the audio track in Matroska files via -alang.
mosu
parents: 10116
diff changeset
272 char* audio_lang=NULL;
9870
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
273 char* dvdsub_lang=NULL;
5388
3af2729c5c87 * New command line switch for mplayer & mencoder:
kmkaplan
parents: 5380
diff changeset
274 static char* spudec_ifo=NULL;
6627
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
275 char* filename=NULL; //"MI2-Trailer.avi";
10917
d45870f67728 Forced subtitles patch by Arne Driescher <driescher@mpi-magdeburg.mpg.de>
attila
parents: 10884
diff changeset
276 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
277 int file_filter=1;
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
278
2353
a3daec6c49e4 cache full status added
arpi
parents: 2342
diff changeset
279 // cache2:
7881
aba9301ed3c4 allow cache to be disabled (-nocache should override cachesize autodetection
arpi
parents: 7867
diff changeset
280 int stream_cache_size=-1;
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
281 #ifdef CONFIG_STREAM_CACHE
2353
a3daec6c49e4 cache full status added
arpi
parents: 2342
diff changeset
282 extern int cache_fill_status;
12835
4235ae5a2d60 cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents: 12816
diff changeset
283
4235ae5a2d60 cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents: 12816
diff changeset
284 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
285 float stream_cache_seek_min_percent=50.0;
2353
a3daec6c49e4 cache full status added
arpi
parents: 2342
diff changeset
286 #else
a3daec6c49e4 cache full status added
arpi
parents: 2342
diff changeset
287 #define cache_fill_status 0
a3daec6c49e4 cache full status added
arpi
parents: 2342
diff changeset
288 #endif
a3daec6c49e4 cache full status added
arpi
parents: 2342
diff changeset
289
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
290 // dump:
3257
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
291 static char *stream_dump_name="stream.dump";
6796
9c828335b2d0 add preferences to gui
pontscho
parents: 6792
diff changeset
292 int stream_dump_type=0;
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
293
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
294 // A-V sync:
31283
680403ff2d14 Make -mc 1 the default.
cehoyos
parents: 31278
diff changeset
295 static float default_max_pts_correction=1;
1498
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
296 static float max_pts_correction=0;//default_max_pts_correction;
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
297 static float c_total=0;
6796
9c828335b2d0 add preferences to gui
pontscho
parents: 6792
diff changeset
298 float audio_delay=0;
17654
16633b9c0953 New option: -ignore-start
corey
parents: 17643
diff changeset
299 static int ignore_start=0;
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
300
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
301 static int softsleep=0;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
302
25965
4cd12675cfbb Change force_fps and force_ofps to double
reimar
parents: 25962
diff changeset
303 double force_fps=0;
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
304 static int force_srate=0;
20771
1e78e35b6c7b Change value used to indicate "unknown audio format" from 0 to -1.
uau
parents: 20750
diff changeset
305 static int audio_output_format=-1; // AF_FORMAT_UNKNOWN
6796
9c828335b2d0 add preferences to gui
pontscho
parents: 6792
diff changeset
306 int frame_dropping=0; // option 0=no drop 1= drop vo 2= drop decode
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
307 static int play_n_frames=-1;
6590
bfc209bb3f48 -frames 0 fix, multifile frames support by tibcu
alex
parents: 6585
diff changeset
308 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
309
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
310 // screen info:
7562
92188b57a062 video out driver list support (like -vc, example: -vo xmga,xv,x11,)
arpi
parents: 7559
diff changeset
311 char** video_driver_list=NULL;
92188b57a062 video out driver list support (like -vc, example: -vo xmga,xv,x11,)
arpi
parents: 7559
diff changeset
312 char** audio_driver_list=NULL;
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5072
diff changeset
313
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
314 // sub:
212
7034ef1f685d new option: -font
arpi_esp
parents: 208
diff changeset
315 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
316 char *sub_font_name=NULL;
11584
alex
parents: 11580
diff changeset
317 extern int font_fontconfig;
215
09d565842a33 font alpha resampling, see -ffactor
arpi_esp
parents: 212
diff changeset
318 float font_factor=0.75;
9870
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
319 char **sub_name=NULL;
258
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
320 float sub_delay=0;
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
321 float sub_fps=0;
510
2951d138ddaf add sub autoread & remove 'c' key
pontscho
parents: 500
diff changeset
322 int sub_auto = 1;
4079
ae78dd1d8daf Add vobsub support.
kmkaplan
parents: 4064
diff changeset
323 char *vobsub_name=NULL;
1255
94f2853ec6f4 -dsp option removed, displaying help text (-ao oss:dsp_path)
alex
parents: 1250
diff changeset
324 /*DSP!!char *dsp=NULL;*/
6784
b38e38b6f88f DVD Closed Captioning support, patch by Matteo Giani <matgiani@ctonet.it>, small changes by me.
atmos4
parents: 6781
diff changeset
325 int subcc_enabled=0;
8361
2202c00001e3 overlapping subtitles support is now optional, can be disabled (-nooverlapsub)
arpi
parents: 8360
diff changeset
326 int suboverlap_enabled = 1;
21140
b42f1c1ef651 Make compilation depending on USE_SUB unconditional.
uau
parents: 21120
diff changeset
327
18937
9e95ac641e77 Initial libass release (without mencoder support).
eugeni
parents: 18934
diff changeset
328 #include "libass/ass_mp.h"
9e95ac641e77 Initial libass release (without mencoder support).
eugeni
parents: 18934
diff changeset
329
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4807
diff changeset
330 char* current_module=NULL; // for debugging
1856
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
331
6781
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
332
6755
a31b9f15cbff - fix audio equalizer
pontscho
parents: 6713
diff changeset
333 // ---
a31b9f15cbff - fix audio equalizer
pontscho
parents: 6713
diff changeset
334
27345
b597fd2924b4 Rename preprocessor directive HAVE_MENU --> CONFIG_MENU.
diego
parents: 27343
diff changeset
335 #ifdef CONFIG_MENU
8198
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
336 #include "m_struct.h"
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
337 #include "libmenu/menu.h"
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
338 extern vf_info_t vf_info_menu;
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
339 static vf_info_t* libmenu_vfs[] = {
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
340 &vf_info_menu,
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
341 NULL
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
342 };
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
343 static vf_instance_t* vf_menu = NULL;
25461
7ef04742572c OSD menu support mouse selection.
ulion
parents: 25436
diff changeset
344 int use_menu = 0;
8198
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
345 static char* menu_cfg = NULL;
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
346 static char* menu_root = "main";
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
347 #endif
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
348
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
349
5055
534167719e91 nortc patch by Attila Kinali
atmos4
parents: 5046
diff changeset
350 #ifdef HAVE_RTC
19756
f5584340d2e6 Disable rtc timing by default.
uau
parents: 19568
diff changeset
351 static int nortc = 1;
12681
6d815f12e3e5 rtc-device cmd option by James Noble
alex
parents: 12672
diff changeset
352 static char* rtc_device;
5055
534167719e91 nortc patch by Attila Kinali
atmos4
parents: 5046
diff changeset
353 #endif
534167719e91 nortc patch by Attila Kinali
atmos4
parents: 5046
diff changeset
354
13858
4178a4eee72c fixed some doxygen comments, patch by Oded Shimon
reynaldo
parents: 13857
diff changeset
355 edl_record_ptr edl_records = NULL; ///< EDL entries memory area
4178a4eee72c fixed some doxygen comments, patch by Oded Shimon
reynaldo
parents: 13857
diff changeset
356 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
357 short edl_decision = 0; ///< 1 when an EDL operation has been made.
b3be7df634b0 spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents: 18315
diff changeset
358 FILE* edl_fd = NULL; ///< fd to write to when in -edlout mode.
20251
2971196cd8c6 Disable loading of file-specific configuration file from the same
rtogni
parents: 20207
diff changeset
359 int use_filedir_conf;
29862
fbb1f57a313e Added -name, -title and -use-filename-title options and implementation in X11 vos
ptt
parents: 29857
diff changeset
360 int use_filename_title;
8531
1aa2c9b460af Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents: 8494
diff changeset
361
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
362 static unsigned int initialized_flags=0;
22233
5bf6c178f09a Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
reimar
parents: 22184
diff changeset
363 #include "mpcommon.h"
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
364 #include "command.h"
1856
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
365
19532
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
366 #include "metadata.h"
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
367
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
368 #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
369
25765
304fc0bbefe1 audio_out / video_out structs should be treated as const
reimar
parents: 25658
diff changeset
370 const void *mpctx_get_video_out(MPContext *mpctx)
22284
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 return mpctx->video_out;
83366c8e1928 Fix menu to work with mpctx
uau
parents: 22281
diff changeset
373 }
83366c8e1928 Fix menu to work with mpctx
uau
parents: 22281
diff changeset
374
28259
f313c0ff6882 Add missing const qualifier to mpctx_get_audio_out function declaration.
diego
parents: 28185
diff changeset
375 const void *mpctx_get_audio_out(MPContext *mpctx)
22286
a7e5b99ac083 Fix GUI compilation
uau
parents: 22285
diff changeset
376 {
22411
cf4c052b6d60 Fix copy-paste bug (must have broken something in the GUI)
uau
parents: 22365
diff changeset
377 return mpctx->audio_out;
22286
a7e5b99ac083 Fix GUI compilation
uau
parents: 22285
diff changeset
378 }
a7e5b99ac083 Fix GUI compilation
uau
parents: 22285
diff changeset
379
25364
fec8936c8079 Support chapter in OSD menu.
ulion
parents: 25351
diff changeset
380 void *mpctx_get_demuxer(MPContext *mpctx)
fec8936c8079 Support chapter in OSD menu.
ulion
parents: 25351
diff changeset
381 {
fec8936c8079 Support chapter in OSD menu.
ulion
parents: 25351
diff changeset
382 return mpctx->demuxer;
fec8936c8079 Support chapter in OSD menu.
ulion
parents: 25351
diff changeset
383 }
fec8936c8079 Support chapter in OSD menu.
ulion
parents: 25351
diff changeset
384
22284
83366c8e1928 Fix menu to work with mpctx
uau
parents: 22281
diff changeset
385 void *mpctx_get_playtree_iter(MPContext *mpctx)
83366c8e1928 Fix menu to work with mpctx
uau
parents: 22281
diff changeset
386 {
83366c8e1928 Fix menu to work with mpctx
uau
parents: 22281
diff changeset
387 return mpctx->playtree_iter;
83366c8e1928 Fix menu to work with mpctx
uau
parents: 22281
diff changeset
388 }
83366c8e1928 Fix menu to work with mpctx
uau
parents: 22281
diff changeset
389
22286
a7e5b99ac083 Fix GUI compilation
uau
parents: 22285
diff changeset
390 void *mpctx_get_mixer(MPContext *mpctx)
a7e5b99ac083 Fix GUI compilation
uau
parents: 22285
diff changeset
391 {
a7e5b99ac083 Fix GUI compilation
uau
parents: 22285
diff changeset
392 return &mpctx->mixer;
a7e5b99ac083 Fix GUI compilation
uau
parents: 22285
diff changeset
393 }
a7e5b99ac083 Fix GUI compilation
uau
parents: 22285
diff changeset
394
22290
24abe3182dfe Fix nonsense function type
uau
parents: 22288
diff changeset
395 int mpctx_get_global_sub_size(MPContext *mpctx)
22286
a7e5b99ac083 Fix GUI compilation
uau
parents: 22285
diff changeset
396 {
a7e5b99ac083 Fix GUI compilation
uau
parents: 22285
diff changeset
397 return mpctx->global_sub_size;
a7e5b99ac083 Fix GUI compilation
uau
parents: 22285
diff changeset
398 }
a7e5b99ac083 Fix GUI compilation
uau
parents: 22285
diff changeset
399
25026
afead6ecb8ba Remove the pause filter and the cmd queue hack, to know the mplayer going to
ulion
parents: 24982
diff changeset
400 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
401 {
afead6ecb8ba Remove the pause filter and the cmd queue hack, to know the mplayer going to
ulion
parents: 24982
diff changeset
402 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
403 }
afead6ecb8ba Remove the pause filter and the cmd queue hack, to know the mplayer going to
ulion
parents: 24982
diff changeset
404
19532
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
405 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
406 switch (type)
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
407 {
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
408 /* check for valid video stream */
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
409 case META_VIDEO_CODEC:
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
410 case META_VIDEO_BITRATE:
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
411 case META_VIDEO_RESOLUTION:
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
412 {
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
413 if (!mpctx->sh_video)
19532
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
414 return 0;
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
415 break;
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
416 }
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
417
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
418 /* check for valid audio stream */
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
419 case META_AUDIO_CODEC:
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
420 case META_AUDIO_BITRATE:
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
421 case META_AUDIO_SAMPLES:
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
422 {
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
423 if (!mpctx->sh_audio)
19532
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
424 return 0;
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
425 break;
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
426 }
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 /* check for valid demuxer */
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
429 case META_INFO_TITLE:
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
430 case META_INFO_ARTIST:
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
431 case META_INFO_ALBUM:
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
432 case META_INFO_YEAR:
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
433 case META_INFO_COMMENT:
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
434 case META_INFO_TRACK:
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
435 case META_INFO_GENRE:
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
436 {
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
437 if (!mpctx->demuxer)
19532
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
438 return 0;
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
439 break;
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
440 }
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
441
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
442 default:
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
443 break;
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 return 1;
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
447 }
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
448
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
449 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
450 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
451 int n;
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
452
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
453 if (!info || !tag)
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
454 return NULL;
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 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
457 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
458 break;
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
459
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
460 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
461 }
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 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
464 char *meta = NULL;
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
465 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
466 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
467
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
468 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
469 return NULL;
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
470
19532
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
471 switch (type)
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
472 {
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
473 case META_NAME:
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
474 {
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
475 return strdup (mp_basename2 (filename));
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
476 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
477
19532
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
478 case META_VIDEO_CODEC:
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
479 {
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
480 if (sh_video->format == 0x10000001)
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
481 meta = strdup ("mpeg1");
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
482 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
483 meta = strdup ("mpeg2");
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
484 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
485 meta = strdup ("mpeg4");
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
486 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
487 meta = strdup ("h264");
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
488 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
489 {
23808
f689ce781c5d Get rid of a few more useless malloc casts
reimar
parents: 23807
diff changeset
490 meta = malloc (8);
19532
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
491 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
492 }
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
493 else
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
494 {
23808
f689ce781c5d Get rid of a few more useless malloc casts
reimar
parents: 23807
diff changeset
495 meta = malloc (8);
19532
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
496 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
497 }
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
498 return meta;
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
499 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
500
19532
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
501 case META_VIDEO_BITRATE:
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
502 {
23808
f689ce781c5d Get rid of a few more useless malloc casts
reimar
parents: 23807
diff changeset
503 meta = malloc (16);
19532
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
504 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
505 return meta;
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
506 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
507
19532
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
508 case META_VIDEO_RESOLUTION:
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
509 {
23808
f689ce781c5d Get rid of a few more useless malloc casts
reimar
parents: 23807
diff changeset
510 meta = malloc (16);
19532
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
511 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
512 return meta;
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
513 }
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
514
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
515 case META_AUDIO_CODEC:
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
516 {
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
517 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
518 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
519 return meta;
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
520 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
521
19532
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
522 case META_AUDIO_BITRATE:
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
523 {
23808
f689ce781c5d Get rid of a few more useless malloc casts
reimar
parents: 23807
diff changeset
524 meta = malloc (16);
19532
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
525 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
526 return meta;
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
527 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
528
19532
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
529 case META_AUDIO_SAMPLES:
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
530 {
23808
f689ce781c5d Get rid of a few more useless malloc casts
reimar
parents: 23807
diff changeset
531 meta = malloc (16);
19532
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
532 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
533 return meta;
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
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
536 /* check for valid demuxer */
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
537 case META_INFO_TITLE:
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
538 return get_demuxer_info ("Title");
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
539
19532
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
540 case META_INFO_ARTIST:
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
541 return get_demuxer_info ("Artist");
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
542
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
543 case META_INFO_ALBUM:
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
544 return get_demuxer_info ("Album");
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
545
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
546 case META_INFO_YEAR:
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
547 return get_demuxer_info ("Year");
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
548
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
549 case META_INFO_COMMENT:
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
550 return get_demuxer_info ("Comment");
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
551
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
552 case META_INFO_TRACK:
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
553 return get_demuxer_info ("Track");
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
554
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
555 case META_INFO_GENRE:
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
556 return get_demuxer_info ("Genre");
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
557
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
558 default:
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
559 break;
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
560 }
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
561
13599373bb02 added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents: 19529
diff changeset
562 return meta;
19529
9a59c33bee29 new option for libmenu that allow display of properties and metadata of currently played stream
ben
parents: 19521
diff changeset
563 }
9a59c33bee29 new option for libmenu that allow display of properties and metadata of currently played stream
ben
parents: 19521
diff changeset
564
31277
5d5bda998a2f Move code printing -identify output for a file to a separate function.
reimar
parents: 31262
diff changeset
565 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
566 {
31278
2d75e55e74bc Print media start time with -identify.
reimar
parents: 31277
diff changeset
567 double start_pts = MP_NOPTS_VALUE;
2d75e55e74bc Print media start time with -identify.
reimar
parents: 31277
diff changeset
568 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
569 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
570 filename_recode(filename));
5d5bda998a2f Move code printing -identify output for a file to a separate function.
reimar
parents: 31262
diff changeset
571 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
572 if (mpctx->sh_video) {
5d5bda998a2f Move code printing -identify output for a file to a separate function.
reimar
parents: 31262
diff changeset
573 /* Assume FOURCC if all bytes >= 0x20 (' ') */
5d5bda998a2f Move code printing -identify output for a file to a separate function.
reimar
parents: 31262
diff changeset
574 if (mpctx->sh_video->format >= 0x20202020)
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_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
576 else
5d5bda998a2f Move code printing -identify output for a file to a separate function.
reimar
parents: 31262
diff changeset
577 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
578 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
579 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
580 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
581 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
582 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
583 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
584 }
5d5bda998a2f Move code printing -identify output for a file to a separate function.
reimar
parents: 31262
diff changeset
585 if (mpctx->sh_audio) {
5d5bda998a2f Move code printing -identify output for a file to a separate function.
reimar
parents: 31262
diff changeset
586 /* Assume FOURCC if all bytes >= 0x20 (' ') */
5d5bda998a2f Move code printing -identify output for a file to a separate function.
reimar
parents: 31262
diff changeset
587 if (mpctx->sh_audio->format >= 0x20202020)
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_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
589 else
5d5bda998a2f Move code printing -identify output for a file to a separate function.
reimar
parents: 31262
diff changeset
590 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
591 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
592 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
593 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
594 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
595 }
31278
2d75e55e74bc Print media start time with -identify.
reimar
parents: 31277
diff changeset
596 if (video_start_pts != MP_NOPTS_VALUE) {
2d75e55e74bc Print media start time with -identify.
reimar
parents: 31277
diff changeset
597 if (start_pts == MP_NOPTS_VALUE || !mpctx->sh_audio ||
2d75e55e74bc Print media start time with -identify.
reimar
parents: 31277
diff changeset
598 (mpctx->sh_video && video_start_pts < start_pts))
2d75e55e74bc Print media start time with -identify.
reimar
parents: 31277
diff changeset
599 start_pts = video_start_pts;
2d75e55e74bc Print media start time with -identify.
reimar
parents: 31277
diff changeset
600 }
2d75e55e74bc Print media start time with -identify.
reimar
parents: 31277
diff changeset
601 if (start_pts != MP_NOPTS_VALUE)
2d75e55e74bc Print media start time with -identify.
reimar
parents: 31277
diff changeset
602 mp_msg(MSGT_IDENTIFY,MSGL_INFO,"ID_START_TIME=%.2lf\n", start_pts);
2d75e55e74bc Print media start time with -identify.
reimar
parents: 31277
diff changeset
603 else
2d75e55e74bc Print media start time with -identify.
reimar
parents: 31277
diff changeset
604 mp_msg(MSGT_IDENTIFY,MSGL_INFO,"ID_START_TIME=unknown\n");
31277
5d5bda998a2f Move code printing -identify output for a file to a separate function.
reimar
parents: 31262
diff changeset
605 mp_msg(MSGT_IDENTIFY,MSGL_INFO,"ID_LENGTH=%.2lf\n", demuxer_get_time_length(mpctx->demuxer));
5d5bda998a2f Move code printing -identify output for a file to a separate function.
reimar
parents: 31262
diff changeset
606 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
607 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
608 if (mpctx->demuxer) {
5d5bda998a2f Move code printing -identify output for a file to a separate function.
reimar
parents: 31262
diff changeset
609 if (mpctx->demuxer->num_chapters == 0)
5d5bda998a2f Move code printing -identify output for a file to a separate function.
reimar
parents: 31262
diff changeset
610 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
611 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
612 }
5d5bda998a2f Move code printing -identify output for a file to a separate function.
reimar
parents: 31262
diff changeset
613 }
5d5bda998a2f Move code printing -identify output for a file to a separate function.
reimar
parents: 31262
diff changeset
614
21802
fa9422a466e5 restore volume if muted at exit
ben
parents: 21764
diff changeset
615 /// step size of mixer changes
fa9422a466e5 restore volume if muted at exit
ben
parents: 21764
diff changeset
616 int volstep = 3;
fa9422a466e5 restore volume if muted at exit
ben
parents: 21764
diff changeset
617
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
618 #ifdef CONFIG_DVDNAV
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
619 static void mp_dvdnav_context_free(MPContext *ctx){
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
620 if (ctx->nav_smpi) free_mp_image(ctx->nav_smpi);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
621 ctx->nav_smpi = NULL;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
622 if (ctx->nav_buffer) free(ctx->nav_buffer);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
623 ctx->nav_buffer = NULL;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
624 ctx->nav_start = NULL;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
625 ctx->nav_in_size = 0;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
626 }
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
627 #endif
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
628
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
629 void uninit_player(unsigned int mask){
29797
92abe9f73079 Simplify: use &= instead of a = b & a;
reimar
parents: 29796
diff changeset
630 mask &= initialized_flags;
5154
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
631
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
632 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
633
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
634 if(mask&INITIALIZED_ACODEC){
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
635 initialized_flags&=~INITIALIZED_ACODEC;
7621
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
636 current_module="uninit_acodec";
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
637 if(mpctx->sh_audio) uninit_audio(mpctx->sh_audio);
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
638 #ifdef CONFIG_GUI
22285
5d12a6e96930 Add missing "if (use_gui)" before some GUI calls
uau
parents: 22284
diff changeset
639 if (use_gui) guiGetEvent(guiSetAfilter, (char *)NULL);
14254
21e72b6d8d11 Do not use audio plugins anymore
reimar
parents: 14245
diff changeset
640 #endif
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
641 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
642 mpctx->mixer.afilter = NULL;
7621
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
643 }
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
644
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
645 if(mask&INITIALIZED_VCODEC){
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
646 initialized_flags&=~INITIALIZED_VCODEC;
7621
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
647 current_module="uninit_vcodec";
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
648 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
649 mpctx->sh_video=NULL;
27345
b597fd2924b4 Rename preprocessor directive HAVE_MENU --> CONFIG_MENU.
diego
parents: 27343
diff changeset
650 #ifdef CONFIG_MENU
8198
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
651 vf_menu=NULL;
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
652 #endif
7621
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
653 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
654
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
655 if(mask&INITIALIZED_DEMUXER){
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
656 initialized_flags&=~INITIALIZED_DEMUXER;
7621
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
657 current_module="free_demuxer";
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
658 if(mpctx->demuxer){
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
659 mpctx->stream=mpctx->demuxer->stream;
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
660 free_demuxer(mpctx->demuxer);
8023
3738cc2269a3 get stream back from the demuxer
arpi
parents: 7923
diff changeset
661 }
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
662 mpctx->demuxer=NULL;
7621
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
663 }
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
664
5830
4c17a92220fc uninit libvo before getch2 - requires for clean svgalib uninit
arpi
parents: 5798
diff changeset
665 // kill the cache process:
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
666 if(mask&INITIALIZED_STREAM){
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
667 initialized_flags&=~INITIALIZED_STREAM;
5154
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
668 current_module="uninit_stream";
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
669 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
670 mpctx->stream=NULL;
5154
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
671 }
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
672
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
673 if(mask&INITIALIZED_VO){
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
674 initialized_flags&=~INITIALIZED_VO;
5830
4c17a92220fc uninit libvo before getch2 - requires for clean svgalib uninit
arpi
parents: 5798
diff changeset
675 current_module="uninit_vo";
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
676 mpctx->video_out->uninit();
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
677 mpctx->video_out=NULL;
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
678 #ifdef CONFIG_DVDNAV
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
679 mp_dvdnav_context_free(mpctx);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
680 #endif
5830
4c17a92220fc uninit libvo before getch2 - requires for clean svgalib uninit
arpi
parents: 5798
diff changeset
681 }
4c17a92220fc uninit libvo before getch2 - requires for clean svgalib uninit
arpi
parents: 5798
diff changeset
682
18316
b3be7df634b0 spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents: 18315
diff changeset
683 // Must be after libvo uninit, as few vo drivers (svgalib) have tty code.
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
684 if(mask&INITIALIZED_GETCH2){
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
685 initialized_flags&=~INITIALIZED_GETCH2;
5154
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
686 current_module="uninit_getch2";
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
687 mp_msg(MSGT_CPLAYER,MSGL_DBG2,"\n[[[uninit getch2]]]\n");
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
688 // restore terminal:
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
689 getch2_disable();
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
690 }
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
691
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
692 if(mask&INITIALIZED_VOBSUB){
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
693 initialized_flags&=~INITIALIZED_VOBSUB;
6110
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
694 current_module="uninit_vobsub";
7621
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
695 if(vo_vobsub) vobsub_close(vo_vobsub);
6110
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
696 vo_vobsub=NULL;
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
697 }
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
698
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
699 if (mask&INITIALIZED_SPUDEC){
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
700 initialized_flags&=~INITIALIZED_SPUDEC;
3034
24d3dca4e813 DVD sub patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>
arpi
parents: 3015
diff changeset
701 current_module="uninit_spudec";
24d3dca4e813 DVD sub patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>
arpi
parents: 3015
diff changeset
702 spudec_free(vo_spudec);
5411
6918c74caa4d 1 step closed to solving memory corruptions
arpi
parents: 5410
diff changeset
703 vo_spudec=NULL;
3034
24d3dca4e813 DVD sub patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>
arpi
parents: 3015
diff changeset
704 }
5488
3f183ca22747 fixed SPU pts, it's 1024/90000 based instead of 1/100
arpi
parents: 5463
diff changeset
705
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
706 if(mask&INITIALIZED_AO){
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
707 initialized_flags&=~INITIALIZED_AO;
1856
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
708 current_module="uninit_ao";
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
709 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
710 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
711 mpctx->audio_out=NULL;
1856
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
712 }
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
713
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
714 #ifdef CONFIG_GUI
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
715 if(mask&INITIALIZED_GUI){
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
716 initialized_flags&=~INITIALIZED_GUI;
1856
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
717 current_module="uninit_gui";
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4807
diff changeset
718 guiDone();
1856
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
719 }
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
720 #endif
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
721
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
722 if(mask&INITIALIZED_INPUT){
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
723 initialized_flags&=~INITIALIZED_INPUT;
5830
4c17a92220fc uninit libvo before getch2 - requires for clean svgalib uninit
arpi
parents: 5798
diff changeset
724 current_module="uninit_input";
4c17a92220fc uninit libvo before getch2 - requires for clean svgalib uninit
arpi
parents: 5798
diff changeset
725 mp_input_uninit();
27345
b597fd2924b4 Rename preprocessor directive HAVE_MENU --> CONFIG_MENU.
diego
parents: 27343
diff changeset
726 #ifdef CONFIG_MENU
25433
55e3b1a32c65 Make libmenu init and uninit in proper place.
ulion
parents: 25416
diff changeset
727 if (use_menu)
55e3b1a32c65 Make libmenu init and uninit in proper place.
ulion
parents: 25416
diff changeset
728 menu_uninit();
55e3b1a32c65 Make libmenu init and uninit in proper place.
ulion
parents: 25416
diff changeset
729 #endif
5830
4c17a92220fc uninit libvo before getch2 - requires for clean svgalib uninit
arpi
parents: 5798
diff changeset
730 }
4431
44c23fd75005 Added uninit to input
albeu
parents: 4418
diff changeset
731
1863
bb7710b16dc2 reset module status after uninit
arpi
parents: 1857
diff changeset
732 current_module=NULL;
1856
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
733 }
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
734
30518
654cad7ea876 Rename exit_reason_t enum to exit_reason and do not typedef it.
diego
parents: 30506
diff changeset
735 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
736 {
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
737
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
738 if (mpctx->user_muted && !mpctx->edl_muted) mixer_mute(&mpctx->mixer);
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
739 uninit_player(INITIALIZED_ALL);
27727
48c1ae64255b Replace preprocessor check for WIN32 with checks for __MINGW32__ and __CYGWIN__.
diego
parents: 27635
diff changeset
740 #if defined(__MINGW32__) || defined(__CYGWIN__)
26689
4cf30c0ca561 Request a timer resolution of 1 ms on Windows, the default of
reimar
parents: 26479
diff changeset
741 timeEndPeriod(1);
4cf30c0ca561 Request a timer resolution of 1 ms on Windows, the default of
reimar
parents: 26479
diff changeset
742 #endif
27377
d58d06eafe83 Change a bunch of X11-specific preprocessor directives.
diego
parents: 27370
diff changeset
743 #ifdef CONFIG_X11
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
744 #ifdef CONFIG_GUI
6016
be9cd7d845c2 -zoom, -fs with x[11|mga|v] fix -- round two
pontscho
parents: 6015
diff changeset
745 if ( !use_gui )
be9cd7d845c2 -zoom, -fs with x[11|mga|v] fix -- round two
pontscho
parents: 6015
diff changeset
746 #endif
18316
b3be7df634b0 spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents: 18315
diff changeset
747 vo_uninit(); // Close the X11 connection (if any is open).
6015
04fe086ae486 vo_uninit fixed
arpi
parents: 6013
diff changeset
748 #endif
1723
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1709
diff changeset
749
27393
4876c89bafdd Rename font-related preprocessor directives.
diego
parents: 27391
diff changeset
750 #ifdef CONFIG_FREETYPE
13956
5d8f11a627ae free freetype descriptor and library and mconfig data right before exit
iive
parents: 13946
diff changeset
751 current_module="uninit_font";
25852
43c76ab0bb84 Make sure sub_font is freed.
reimar
parents: 25844
diff changeset
752 if (sub_font && sub_font != vo_font) free_font_desc(sub_font);
43c76ab0bb84 Make sure sub_font is freed.
reimar
parents: 25844
diff changeset
753 sub_font = NULL;
13956
5d8f11a627ae free freetype descriptor and library and mconfig data right before exit
iive
parents: 13946
diff changeset
754 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
755 vo_font = NULL;
5d8f11a627ae free freetype descriptor and library and mconfig data right before exit
iive
parents: 13946
diff changeset
756 done_freetype();
5d8f11a627ae free freetype descriptor and library and mconfig data right before exit
iive
parents: 13946
diff changeset
757 #endif
16036
ab9b25d60934 Fix few memleaks on exit.
iive
parents: 15895
diff changeset
758 free_osd_list();
13956
5d8f11a627ae free freetype descriptor and library and mconfig data right before exit
iive
parents: 13946
diff changeset
759
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
760 #ifdef CONFIG_ASS
20477
de4a66d99f41 Libass interface reworked:
eugeni
parents: 20341
diff changeset
761 ass_library_done(ass_library);
30076
728444c29ec0 Set some freed pointers to NULL.
reimar
parents: 30075
diff changeset
762 ass_library = NULL;
20477
de4a66d99f41 Libass interface reworked:
eugeni
parents: 20341
diff changeset
763 #endif
de4a66d99f41 Libass interface reworked:
eugeni
parents: 20341
diff changeset
764
1856
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
765 current_module="exit_player";
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
766
13956
5d8f11a627ae free freetype descriptor and library and mconfig data right before exit
iive
parents: 13946
diff changeset
767 // free mplayer config
16036
ab9b25d60934 Fix few memleaks on exit.
iive
parents: 15895
diff changeset
768 if(mconfig)
ab9b25d60934 Fix few memleaks on exit.
iive
parents: 15895
diff changeset
769 m_config_free(mconfig);
30076
728444c29ec0 Set some freed pointers to NULL.
reimar
parents: 30075
diff changeset
770 mconfig = NULL;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
771
30075
f7628df3079b Free playtree_iter upon exiting MPlayer
reimar
parents: 30063
diff changeset
772 if(mpctx->playtree_iter)
f7628df3079b Free playtree_iter upon exiting MPlayer
reimar
parents: 30063
diff changeset
773 play_tree_iter_free(mpctx->playtree_iter);
30076
728444c29ec0 Set some freed pointers to NULL.
reimar
parents: 30075
diff changeset
774 mpctx->playtree_iter = NULL;
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
775 if(mpctx->playtree)
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
776 play_tree_free(mpctx->playtree, 1);
30076
728444c29ec0 Set some freed pointers to NULL.
reimar
parents: 30075
diff changeset
777 mpctx->playtree = NULL;
16036
ab9b25d60934 Fix few memleaks on exit.
iive
parents: 15895
diff changeset
778
13956
5d8f11a627ae free freetype descriptor and library and mconfig data right before exit
iive
parents: 13946
diff changeset
779
13358
567875b88aab Hardcoded EDL messages moved to help_mp-en.h, Doxygen comments added, patch
diego
parents: 13353
diff changeset
780 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
781 edl_records = NULL;
28032
92e770f6e890 Print ID_EXIT and exit reason message in identify mode when exiting.
reimar
parents: 27953
diff changeset
782 switch(how) {
92e770f6e890 Print ID_EXIT and exit reason message in identify mode when exiting.
reimar
parents: 27953
diff changeset
783 case EXIT_QUIT:
92e770f6e890 Print ID_EXIT and exit reason message in identify mode when exiting.
reimar
parents: 27953
diff changeset
784 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
785 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
786 break;
92e770f6e890 Print ID_EXIT and exit reason message in identify mode when exiting.
reimar
parents: 27953
diff changeset
787 case EXIT_EOF:
92e770f6e890 Print ID_EXIT and exit reason message in identify mode when exiting.
reimar
parents: 27953
diff changeset
788 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
789 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
790 break;
92e770f6e890 Print ID_EXIT and exit reason message in identify mode when exiting.
reimar
parents: 27953
diff changeset
791 case EXIT_ERROR:
92e770f6e890 Print ID_EXIT and exit reason message in identify mode when exiting.
reimar
parents: 27953
diff changeset
792 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
793 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
794 break;
92e770f6e890 Print ID_EXIT and exit reason message in identify mode when exiting.
reimar
parents: 27953
diff changeset
795 default:
92e770f6e890 Print ID_EXIT and exit reason message in identify mode when exiting.
reimar
parents: 27953
diff changeset
796 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
797 }
4733
5bad0d74f6ea standard key support for video out runtime fullscreen switching
alex
parents: 4693
diff changeset
798 mp_msg(MSGT_CPLAYER,MSGL_DBG2,"max framesize was %d bytes\n",max_framesize);
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
799
8644
0bfd73828e33 This patch fixes so that the exit code (or return code if you like) is set
arpi
parents: 8635
diff changeset
800 exit(rc);
0bfd73828e33 This patch fixes so that the exit code (or return code if you like) is set
arpi
parents: 8635
diff changeset
801 }
0bfd73828e33 This patch fixes so that the exit code (or return code if you like) is set
arpi
parents: 8635
diff changeset
802
30518
654cad7ea876 Rename exit_reason_t enum to exit_reason and do not typedef it.
diego
parents: 30506
diff changeset
803 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
804 {
8644
0bfd73828e33 This patch fixes so that the exit code (or return code if you like) is set
arpi
parents: 8635
diff changeset
805 exit_player_with_rc(how, 1);
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
806 }
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
807
13391
b6c3752d9544 handle sigchld in mplayer.c
faust3
parents: 13358
diff changeset
808 #ifndef __MINGW32__
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
809 static void child_sighandler(int x){
13391
b6c3752d9544 handle sigchld in mplayer.c
faust3
parents: 13358
diff changeset
810 pid_t pid;
b6c3752d9544 handle sigchld in mplayer.c
faust3
parents: 13358
diff changeset
811 while((pid=waitpid(-1,NULL,WNOHANG)) > 0);
b6c3752d9544 handle sigchld in mplayer.c
faust3
parents: 13358
diff changeset
812 }
b6c3752d9544 handle sigchld in mplayer.c
faust3
parents: 13358
diff changeset
813 #endif
b6c3752d9544 handle sigchld in mplayer.c
faust3
parents: 13358
diff changeset
814
27397
d47744b95b78 Give a CONFIG_ prefix to preprocessor directives that lacked one and
diego
parents: 27393
diff changeset
815 #ifdef CONFIG_CRASH_DEBUG
13794
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
816 static char *prog_path;
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
817 static int crash_debug = 0;
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
818 #endif
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
819
7559
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
820 static void exit_sighandler(int x){
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
821 static int sig_count=0;
27397
d47744b95b78 Give a CONFIG_ prefix to preprocessor directives that lacked one and
diego
parents: 27393
diff changeset
822 #ifdef CONFIG_CRASH_DEBUG
13794
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
823 if (!crash_debug || x != SIGTRAP)
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
824 #endif
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
825 ++sig_count;
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
826 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
827 if(sig_count==5)
a7bde33bd7d8 Don't leave a messed up terminal after a crash
rtognimp
parents: 13269
diff changeset
828 {
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
829 /* We're crashing bad and can't uninit cleanly :(
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
830 * by popular request, we make one last (dirty)
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
831 * effort to restore the user's
13298
a7bde33bd7d8 Don't leave a messed up terminal after a crash
rtognimp
parents: 13269
diff changeset
832 * terminal. */
a7bde33bd7d8 Don't leave a messed up terminal after a crash
rtognimp
parents: 13269
diff changeset
833 getch2_disable();
a7bde33bd7d8 Don't leave a messed up terminal after a crash
rtognimp
parents: 13269
diff changeset
834 exit(1);
a7bde33bd7d8 Don't leave a messed up terminal after a crash
rtognimp
parents: 13269
diff changeset
835 }
a7bde33bd7d8 Don't leave a messed up terminal after a crash
rtognimp
parents: 13269
diff changeset
836 if(sig_count==6) exit(1);
a7bde33bd7d8 Don't leave a messed up terminal after a crash
rtognimp
parents: 13269
diff changeset
837 if(sig_count>6){
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
838 // can't stop :(
9831
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
839 #ifndef __MINGW32__
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
840 kill(getpid(),SIGKILL);
9831
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
841 #endif
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
842 }
5127
621a68b911a9 hints on RTFM
arpi
parents: 5112
diff changeset
843 mp_msg(MSGT_CPLAYER,MSGL_FATAL,"\n" MSGTR_IntBySignal,x,
18003
9fc72c7291d5 more cruft
rfelker
parents: 18002
diff changeset
844 current_module?current_module:"unknown"
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
845 );
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
846 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_SIGNAL=%d\n", x);
13794
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
847 if(sig_count<=1)
5127
621a68b911a9 hints on RTFM
arpi
parents: 5112
diff changeset
848 switch(x){
621a68b911a9 hints on RTFM
arpi
parents: 5112
diff changeset
849 case SIGINT:
621a68b911a9 hints on RTFM
arpi
parents: 5112
diff changeset
850 case SIGQUIT:
621a68b911a9 hints on RTFM
arpi
parents: 5112
diff changeset
851 case SIGTERM:
621a68b911a9 hints on RTFM
arpi
parents: 5112
diff changeset
852 case SIGKILL:
25623
b955a135e3a8 Do not use exit_player in the signal handler, this code just can not
reimar
parents: 25622
diff changeset
853 async_quit_request = 1;
b955a135e3a8 Do not use exit_player in the signal handler, this code just can not
reimar
parents: 25622
diff changeset
854 return; // killed from keyboard (^C) or killed [-9]
5127
621a68b911a9 hints on RTFM
arpi
parents: 5112
diff changeset
855 case SIGILL:
29114
06540eb5ef6a Rename RUNTIME_CPUDETECT to CONFIG_RUNTIME_CPUDETECT and always define it.
ramiro
parents: 29069
diff changeset
856 #if CONFIG_RUNTIME_CPUDETECT
8913
f01a53c8de14 Signal handler messages moved to help_mp, so they can be translated
rtognimp
parents: 8819
diff changeset
857 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_Exit_SIGILL_RTCpuSel);
5129
7de3c4209461 rtfm hint msg depends on runtime detection
arpi
parents: 5127
diff changeset
858 #else
8913
f01a53c8de14 Signal handler messages moved to help_mp, so they can be translated
rtognimp
parents: 8819
diff changeset
859 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_Exit_SIGILL);
5129
7de3c4209461 rtfm hint msg depends on runtime detection
arpi
parents: 5127
diff changeset
860 #endif
5127
621a68b911a9 hints on RTFM
arpi
parents: 5112
diff changeset
861 case SIGFPE:
621a68b911a9 hints on RTFM
arpi
parents: 5112
diff changeset
862 case SIGSEGV:
8913
f01a53c8de14 Signal handler messages moved to help_mp, so they can be translated
rtognimp
parents: 8819
diff changeset
863 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_Exit_SIGSEGV_SIGFPE);
5127
621a68b911a9 hints on RTFM
arpi
parents: 5112
diff changeset
864 default:
8913
f01a53c8de14 Signal handler messages moved to help_mp, so they can be translated
rtognimp
parents: 8819
diff changeset
865 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
866 #ifdef CONFIG_CRASH_DEBUG
13794
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
867 if (crash_debug) {
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
868 int gdb_pid;
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
869 mp_msg(MSGT_CPLAYER, MSGL_INFO, "Forking...\n");
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
870 gdb_pid = fork();
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
871 mp_msg(MSGT_CPLAYER, MSGL_INFO, "Forked...\n");
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
872 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
873 char spid[20];
501847ab4460 Use getppid instead of getpid and move a snprintf to where it is actually needed.
reimar
parents: 25624
diff changeset
874 snprintf(spid, sizeof(spid), "%i", getppid());
24981
cacb3695a1a4 Restore terminal for gdb with -crash-debug by calling getch2_disable()
reimar
parents: 24947
diff changeset
875 getch2_disable(); // allow terminal to work properly with gdb
24982
5d338b18763d Make crash-debug gdb auto-execute "bt"
reimar
parents: 24981
diff changeset
876 if (execlp("gdb", "gdb", prog_path, spid, "-ex", "bt", NULL) == -1)
13794
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
877 mp_msg(MSGT_CPLAYER, MSGL_ERR, "Couldn't start gdb\n");
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
878 } else if (gdb_pid < 0)
13794
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
879 mp_msg(MSGT_CPLAYER, MSGL_ERR, "Couldn't fork\n");
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
880 else {
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
881 waitpid(gdb_pid, NULL, 0);
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
882 }
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
883 if (x == SIGTRAP) return;
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
884 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
885 #endif
5127
621a68b911a9 hints on RTFM
arpi
parents: 5112
diff changeset
886 }
25623
b955a135e3a8 Do not use exit_player in the signal handler, this code just can not
reimar
parents: 25622
diff changeset
887 getch2_disable();
b955a135e3a8 Do not use exit_player in the signal handler, this code just can not
reimar
parents: 25622
diff changeset
888 exit(1);
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
889 }
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
890
147
0a0d7dd8fb51 new command line/config file parser
szabii
parents: 117
diff changeset
891 #include "cfg-mplayer.h"
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
892
18888
ab29b3c4f94e parse_cfgfiles as static in mplayer.c/mencoder.c, patch by Stefan Huehner, stefan AT huehner-org
reynaldo
parents: 18857
diff changeset
893 static void parse_cfgfiles( m_config_t* conf )
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
894 {
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
895 char *conffile;
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
896 int conffile_fd;
26416
9d53b15aed02 Add options to disable some or all config files.
albeu
parents: 26408
diff changeset
897 if (!disable_system_conf &&
9d53b15aed02 Add options to disable some or all config files.
albeu
parents: 26408
diff changeset
898 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
899 exit_player(EXIT_NONE);
178
55206b791586 get_path()
szabii
parents: 175
diff changeset
900 if ((conffile = get_path("")) == NULL) {
1583
ca7bf882d2f8 ehh. mp_msgt->mp_msg
arpi
parents: 1582
diff changeset
901 mp_msg(MSGT_CPLAYER,MSGL_WARN,MSGTR_NoHomeDir);
147
0a0d7dd8fb51 new command line/config file parser
szabii
parents: 117
diff changeset
902 } else {
9831
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
903 #ifdef __MINGW32__
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
904 mkdir(conffile);
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
905 #else
178
55206b791586 get_path()
szabii
parents: 175
diff changeset
906 mkdir(conffile, 0777);
9831
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
907 #endif
178
55206b791586 get_path()
szabii
parents: 175
diff changeset
908 free(conffile);
55206b791586 get_path()
szabii
parents: 175
diff changeset
909 if ((conffile = get_path("config")) == NULL) {
1583
ca7bf882d2f8 ehh. mp_msgt->mp_msg
arpi
parents: 1582
diff changeset
910 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_GetpathProblem);
178
55206b791586 get_path()
szabii
parents: 175
diff changeset
911 } else {
55206b791586 get_path()
szabii
parents: 175
diff changeset
912 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
913 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_CreatingCfgFile, conffile);
178
55206b791586 get_path()
szabii
parents: 175
diff changeset
914 write(conffile_fd, default_config, strlen(default_config));
55206b791586 get_path()
szabii
parents: 175
diff changeset
915 close(conffile_fd);
55206b791586 get_path()
szabii
parents: 175
diff changeset
916 }
26416
9d53b15aed02 Add options to disable some or all config files.
albeu
parents: 26408
diff changeset
917 if (!disable_user_conf &&
9d53b15aed02 Add options to disable some or all config files.
albeu
parents: 26408
diff changeset
918 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
919 exit_player(EXIT_NONE);
178
55206b791586 get_path()
szabii
parents: 175
diff changeset
920 free(conffile);
151
9708d4b2765b cfgparser fix
szabii
parents: 150
diff changeset
921 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
922 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
923 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
924
25635
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
925 #define PROFILE_CFG_PROTOCOL "protocol."
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
926
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
927 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
928 {
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
929 char *str;
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
930 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
931 m_profile_t *p;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
932
25635
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
933 /* does filename actually uses a protocol ? */
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
934 str = strstr (file, "://");
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
935 if (!str)
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
936 return;
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
937
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
938 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
939 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
940 p = m_config_get_profile (conf, protocol);
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
941 if (p)
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
942 {
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
943 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
944 m_config_set_profile(conf,p);
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 }
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
947
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
948 #define PROFILE_CFG_EXTENSION "extension."
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
949
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
950 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
951 {
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
952 char *str;
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
953 char extension[strlen (PROFILE_CFG_EXTENSION) + 8];
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
954 m_profile_t *p;
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
955
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
956 /* does filename actually have an extension ? */
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
957 str = strrchr (filename, '.');
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
958 if (!str)
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
959 return;
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
960
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
961 sprintf (extension, PROFILE_CFG_EXTENSION);
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
962 strncat (extension, ++str, 7);
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
963 p = m_config_get_profile (conf, extension);
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
964 if (p)
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
965 {
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
966 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
967 m_config_set_profile(conf,p);
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
968 }
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
969 }
25f6dca4df74 add support for per protocol and per extension playback profile loading
ben
parents: 25625
diff changeset
970
25641
58fd8ebcd6e3 allow profile loading per audio/video output
ben
parents: 25636
diff changeset
971 #define PROFILE_CFG_VO "vo."
58fd8ebcd6e3 allow profile loading per audio/video output
ben
parents: 25636
diff changeset
972 #define PROFILE_CFG_AO "ao."
58fd8ebcd6e3 allow profile loading per audio/video output
ben
parents: 25636
diff changeset
973
58fd8ebcd6e3 allow profile loading per audio/video output
ben
parents: 25636
diff changeset
974 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
975 {
58fd8ebcd6e3 allow profile loading per audio/video output
ben
parents: 25636
diff changeset
976 char profile[strlen (cfg) + strlen (out) + 1];
58fd8ebcd6e3 allow profile loading per audio/video output
ben
parents: 25636
diff changeset
977 m_profile_t *p;
58fd8ebcd6e3 allow profile loading per audio/video output
ben
parents: 25636
diff changeset
978
58fd8ebcd6e3 allow profile loading per audio/video output
ben
parents: 25636
diff changeset
979 sprintf (profile, "%s%s", cfg, out);
58fd8ebcd6e3 allow profile loading per audio/video output
ben
parents: 25636
diff changeset
980 p = m_config_get_profile (conf, profile);
58fd8ebcd6e3 allow profile loading per audio/video output
ben
parents: 25636
diff changeset
981 if (p)
58fd8ebcd6e3 allow profile loading per audio/video output
ben
parents: 25636
diff changeset
982 {
58fd8ebcd6e3 allow profile loading per audio/video output
ben
parents: 25636
diff changeset
983 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_LoadingExtensionProfile, profile);
58fd8ebcd6e3 allow profile loading per audio/video output
ben
parents: 25636
diff changeset
984 m_config_set_profile(conf,p);
58fd8ebcd6e3 allow profile loading per audio/video output
ben
parents: 25636
diff changeset
985 }
58fd8ebcd6e3 allow profile loading per audio/video output
ben
parents: 25636
diff changeset
986 }
58fd8ebcd6e3 allow profile loading per audio/video output
ben
parents: 25636
diff changeset
987
29561
82ff5f35918a Factor out code to try and load a config file only if it exists.
reimar
parents: 29432
diff changeset
988 /**
82ff5f35918a Factor out code to try and load a config file only if it exists.
reimar
parents: 29432
diff changeset
989 * 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
990 * @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
991 */
82ff5f35918a Factor out code to try and load a config file only if it exists.
reimar
parents: 29432
diff changeset
992 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
993 {
82ff5f35918a Factor out code to try and load a config file only if it exists.
reimar
parents: 29432
diff changeset
994 struct stat st;
82ff5f35918a Factor out code to try and load a config file only if it exists.
reimar
parents: 29432
diff changeset
995 if (stat(file, &st))
82ff5f35918a Factor out code to try and load a config file only if it exists.
reimar
parents: 29432
diff changeset
996 return 0;
82ff5f35918a Factor out code to try and load a config file only if it exists.
reimar
parents: 29432
diff changeset
997 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
998 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
999 return 1;
82ff5f35918a Factor out code to try and load a config file only if it exists.
reimar
parents: 29432
diff changeset
1000 }
82ff5f35918a Factor out code to try and load a config file only if it exists.
reimar
parents: 29432
diff changeset
1001
25606
a3f9b22287ca Make some functions in mplayer.c static
reimar
parents: 25467
diff changeset
1002 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
1003 {
49e36bf2f342 The patch adds support for a per-file config, which is loaded before
arpi
parents: 8612
diff changeset
1004 char *confpath;
29594
331320b4557b Limit amount of data allocated on stack, strlen(filename) is not a good idea for
reimar
parents: 29592
diff changeset
1005 char cfg[PATH_MAX];
8614
49e36bf2f342 The patch adds support for a per-file config, which is loaded before
arpi
parents: 8612
diff changeset
1006 char *name;
49e36bf2f342 The patch adds support for a per-file config, which is loaded before
arpi
parents: 8612
diff changeset
1007
29594
331320b4557b Limit amount of data allocated on stack, strlen(filename) is not a good idea for
reimar
parents: 29592
diff changeset
1008 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
1009 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
1010 return;
331320b4557b Limit amount of data allocated on stack, strlen(filename) is not a good idea for
reimar
parents: 29592
diff changeset
1011 }
8614
49e36bf2f342 The patch adds support for a per-file config, which is loaded before
arpi
parents: 8612
diff changeset
1012 sprintf (cfg, "%s.conf", file);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1013
29562
647445e4999e Fix per-file config file loading for DOS paths (i.e. where \ and : can
reimar
parents: 29561
diff changeset
1014 name = strrchr(cfg, '/');
647445e4999e Fix per-file config file loading for DOS paths (i.e. where \ and : can
reimar
parents: 29561
diff changeset
1015 if (HAVE_DOS_PATHS) {
647445e4999e Fix per-file config file loading for DOS paths (i.e. where \ and : can
reimar
parents: 29561
diff changeset
1016 char *tmp = strrchr(cfg, '\\');
647445e4999e Fix per-file config file loading for DOS paths (i.e. where \ and : can
reimar
parents: 29561
diff changeset
1017 if (!name || tmp > name)
647445e4999e Fix per-file config file loading for DOS paths (i.e. where \ and : can
reimar
parents: 29561
diff changeset
1018 name = tmp;
647445e4999e Fix per-file config file loading for DOS paths (i.e. where \ and : can
reimar
parents: 29561
diff changeset
1019 tmp = strrchr(cfg, ':');
647445e4999e Fix per-file config file loading for DOS paths (i.e. where \ and : can
reimar
parents: 29561
diff changeset
1020 if (!name || tmp > name)
647445e4999e Fix per-file config file loading for DOS paths (i.e. where \ and : can
reimar
parents: 29561
diff changeset
1021 name = tmp;
647445e4999e Fix per-file config file loading for DOS paths (i.e. where \ and : can
reimar
parents: 29561
diff changeset
1022 }
647445e4999e Fix per-file config file loading for DOS paths (i.e. where \ and : can
reimar
parents: 29561
diff changeset
1023 if (!name)
8614
49e36bf2f342 The patch adds support for a per-file config, which is loaded before
arpi
parents: 8612
diff changeset
1024 name = cfg;
49e36bf2f342 The patch adds support for a per-file config, which is loaded before
arpi
parents: 8612
diff changeset
1025 else
49e36bf2f342 The patch adds support for a per-file config, which is loaded before
arpi
parents: 8612
diff changeset
1026 name++;
49e36bf2f342 The patch adds support for a per-file config, which is loaded before
arpi
parents: 8612
diff changeset
1027
29592
ccdfb20713eb Add support for directory-specific mplayer.conf configuration file.
reimar
parents: 29571
diff changeset
1028 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
1029 char dircfg[PATH_MAX];
29592
ccdfb20713eb Add support for directory-specific mplayer.conf configuration file.
reimar
parents: 29571
diff changeset
1030 strcpy(dircfg, cfg);
ccdfb20713eb Add support for directory-specific mplayer.conf configuration file.
reimar
parents: 29571
diff changeset
1031 strcpy(dircfg + (name - cfg), "mplayer.conf");
ccdfb20713eb Add support for directory-specific mplayer.conf configuration file.
reimar
parents: 29571
diff changeset
1032 try_load_config(conf, dircfg);
ccdfb20713eb Add support for directory-specific mplayer.conf configuration file.
reimar
parents: 29571
diff changeset
1033
ccdfb20713eb Add support for directory-specific mplayer.conf configuration file.
reimar
parents: 29571
diff changeset
1034 if (try_load_config(conf, cfg))
ccdfb20713eb Add support for directory-specific mplayer.conf configuration file.
reimar
parents: 29571
diff changeset
1035 return;
ccdfb20713eb Add support for directory-specific mplayer.conf configuration file.
reimar
parents: 29571
diff changeset
1036 }
ccdfb20713eb Add support for directory-specific mplayer.conf configuration file.
reimar
parents: 29571
diff changeset
1037
8614
49e36bf2f342 The patch adds support for a per-file config, which is loaded before
arpi
parents: 8612
diff changeset
1038 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
1039 {
29561
82ff5f35918a Factor out code to try and load a config file only if it exists.
reimar
parents: 29432
diff changeset
1040 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
1041
49e36bf2f342 The patch adds support for a per-file config, which is loaded before
arpi
parents: 8612
diff changeset
1042 free (confpath);
49e36bf2f342 The patch adds support for a per-file config, which is loaded before
arpi
parents: 8612
diff changeset
1043 }
49e36bf2f342 The patch adds support for a per-file config, which is loaded before
arpi
parents: 8612
diff changeset
1044 }
49e36bf2f342 The patch adds support for a per-file config, which is loaded before
arpi
parents: 8612
diff changeset
1045
18316
b3be7df634b0 spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents: 18315
diff changeset
1046 /* 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
1047 * 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
1048 * if it was interrupted by the user.
b3be7df634b0 spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents: 18315
diff changeset
1049 * 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
1050 static int libmpdemux_was_interrupted(int eof) {
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
1051 mp_cmd_t* cmd;
13603
80fc8f48f14c Do not loose commands while paused.
reimar
parents: 13577
diff changeset
1052 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
1053 switch(cmd->id) {
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
1054 case MP_CMD_QUIT:
28032
92e770f6e890 Print ID_EXIT and exit reason message in identify mode when exiting.
reimar
parents: 27953
diff changeset
1055 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
1056 case MP_CMD_PLAY_TREE_STEP: {
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
1057 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
1058 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
1059 } break;
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
1060 case MP_CMD_PLAY_TREE_UP_STEP: {
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
1061 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
1062 } break;
4825
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
1063 case MP_CMD_PLAY_ALT_SRC_STEP: {
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
1064 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
1065 } break;
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
1066 }
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
1067 mp_cmd_free(cmd);
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
1068 }
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
1069 return eof;
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
1070 }
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
1071
13010
047bbb973011 windows path seperator fixes
joey
parents: 12981
diff changeset
1072 #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
1073
25606
a3f9b22287ca Make some functions in mplayer.c static
reimar
parents: 25467
diff changeset
1074 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
1075 {
9301
7841308ad250 this patch fixes latest bug, discovered by .so ... (relative filenames &
arpi
parents: 9291
diff changeset
1076 play_tree_add_bpf(entry,filename);
7841308ad250 this patch fixes latest bug, discovered by .so ... (relative filenames &
arpi
parents: 9291
diff changeset
1077
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
1078 #ifdef CONFIG_GUI
9291
64b8c5a07c2c - It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents: 9217
diff changeset
1079 if (use_gui) {
64b8c5a07c2c - It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents: 9217
diff changeset
1080 if (entry) {
64b8c5a07c2c - It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents: 9217
diff changeset
1081 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
1082 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
1083 }
64b8c5a07c2c - It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents: 9217
diff changeset
1084 } else
64b8c5a07c2c - It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents: 9217
diff changeset
1085 #endif
64b8c5a07c2c - It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents: 9217
diff changeset
1086 {
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1087 if(!entry) {
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1088 entry = mpctx->playtree_iter->tree;
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1089 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
1090 return PT_NEXT_ENTRY;
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8913
diff changeset
1091 }
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1092 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
1093 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
1094 return PT_NEXT_ENTRY;
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8913
diff changeset
1095 }
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8913
diff changeset
1096 }
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8913
diff changeset
1097 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
1098 return PT_NEXT_SRC;
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8913
diff changeset
1099 }
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1100 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
1101 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
1102 entry = mpctx->playtree_iter->tree;
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1103 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
1104 return PT_NEXT_ENTRY;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1105 }
8925
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8913
diff changeset
1106 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
1107 }
8925
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8913
diff changeset
1108 return PT_NEXT_SRC;
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8913
diff changeset
1109 }
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8913
diff changeset
1110
25264
42aa06653705 When auto loading subs, log warning instead of error for load failure.
ulion
parents: 25251
diff changeset
1111 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
1112 {
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
1113 sub_data *subd;
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
1114 #ifdef CONFIG_ASS
18937
9e95ac641e77 Initial libass release (without mencoder support).
eugeni
parents: 18934
diff changeset
1115 ass_track_t *asst = 0;
9e95ac641e77 Initial libass release (without mencoder support).
eugeni
parents: 18934
diff changeset
1116 #endif
9e95ac641e77 Initial libass release (without mencoder support).
eugeni
parents: 18934
diff changeset
1117
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1118 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
1119 return;
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
1120 }
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
1121
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
1122 subd = sub_read_file(filename, fps);
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
1123 #ifdef CONFIG_ASS
18937
9e95ac641e77 Initial libass release (without mencoder support).
eugeni
parents: 18934
diff changeset
1124 if (ass_enabled)
27393
4876c89bafdd Rename font-related preprocessor directives.
diego
parents: 27391
diff changeset
1125 #ifdef CONFIG_ICONV
30473
7446f58b6899 Add support for loading ASS subtitles through the stream layer and thus e.g.
reimar
parents: 30429
diff changeset
1126 asst = ass_read_stream(ass_library, filename, sub_cp);
20477
de4a66d99f41 Libass interface reworked:
eugeni
parents: 20341
diff changeset
1127 #else
30473
7446f58b6899 Add support for loading ASS subtitles through the stream layer and thus e.g.
reimar
parents: 30429
diff changeset
1128 asst = ass_read_stream(ass_library, filename, 0);
20477
de4a66d99f41 Libass interface reworked:
eugeni
parents: 20341
diff changeset
1129 #endif
19468
ecd8f562e19b fix null pointer check in add_subtitles,
gpoirier
parents: 19436
diff changeset
1130 if (ass_enabled && subd && !asst)
20477
de4a66d99f41 Libass interface reworked:
eugeni
parents: 20341
diff changeset
1131 asst = ass_read_subdata(ass_library, subd, fps);
19401
c0c3a2f8bb32 Add subdata to ass_track conversion for external subtitles.
eugeni
parents: 19380
diff changeset
1132
25264
42aa06653705 When auto loading subs, log warning instead of error for load failure.
ulion
parents: 25251
diff changeset
1133 if (!asst && !subd)
18937
9e95ac641e77 Initial libass release (without mencoder support).
eugeni
parents: 18934
diff changeset
1134 #else
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1135 if(!subd)
18937
9e95ac641e77 Initial libass release (without mencoder support).
eugeni
parents: 18934
diff changeset
1136 #endif
25264
42aa06653705 When auto loading subs, log warning instead of error for load failure.
ulion
parents: 25251
diff changeset
1137 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
1138 filename_recode(filename));
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1139
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
1140 #ifdef CONFIG_ASS
18937
9e95ac641e77 Initial libass release (without mencoder support).
eugeni
parents: 18934
diff changeset
1141 if (!asst && !subd) return;
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1142 mpctx->set_of_ass_tracks[mpctx->set_of_sub_size] = asst;
18937
9e95ac641e77 Initial libass release (without mencoder support).
eugeni
parents: 18934
diff changeset
1143 #else
9e95ac641e77 Initial libass release (without mencoder support).
eugeni
parents: 18934
diff changeset
1144 if (!subd) return;
9e95ac641e77 Initial libass release (without mencoder support).
eugeni
parents: 18934
diff changeset
1145 #endif
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1146 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
1147 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
1148 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
1149 filename_recode(filename));
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1150 ++mpctx->set_of_sub_size;
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1151 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
1152 filename_recode(filename));
9870
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
1153 }
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
1154
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
1155 // 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
1156 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
1157 // 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
1158 {
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1159 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
1160 int i;
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1161 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
1162 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
1163 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
1164 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
1165 --mpctx->set_of_sub_size;
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1166 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
1167 }
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1168 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
1169 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
1170 }
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1171 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
1172 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
1173 ++mpctx->set_of_sub_size;
9870
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
1174 }
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
1175 }
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
1176
21119
5f9009952814 Move vo_spudec initialization into a separate function, for later reuse
reimar
parents: 21082
diff changeset
1177 void init_vo_spudec(void) {
5f9009952814 Move vo_spudec initialization into a separate function, for later reuse
reimar
parents: 21082
diff changeset
1178 if (vo_spudec)
5f9009952814 Move vo_spudec initialization into a separate function, for later reuse
reimar
parents: 21082
diff changeset
1179 spudec_free(vo_spudec);
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
1180 initialized_flags &= ~INITIALIZED_SPUDEC;
21119
5f9009952814 Move vo_spudec initialization into a separate function, for later reuse
reimar
parents: 21082
diff changeset
1181 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
1182
a70589785d97 Move the check for valid sh_video into the init_vo_spudec, this fixes a crash
reimar
parents: 30473
diff changeset
1183 // 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
1184 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
1185 return;
a70589785d97 Move the check for valid sh_video into the init_vo_spudec, this fixes a crash
reimar
parents: 30473
diff changeset
1186
21119
5f9009952814 Move vo_spudec initialization into a separate function, for later reuse
reimar
parents: 21082
diff changeset
1187 if (spudec_ifo) {
5f9009952814 Move vo_spudec initialization into a separate function, for later reuse
reimar
parents: 21082
diff changeset
1188 unsigned int palette[16], width, height;
5f9009952814 Move vo_spudec initialization into a separate function, for later reuse
reimar
parents: 21082
diff changeset
1189 current_module="spudec_init_vobsub";
5f9009952814 Move vo_spudec initialization into a separate function, for later reuse
reimar
parents: 21082
diff changeset
1190 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
1191 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
1192 }
5f9009952814 Move vo_spudec initialization into a separate function, for later reuse
reimar
parents: 21082
diff changeset
1193
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
1194 #ifdef CONFIG_DVDREAD
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1195 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
1196 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
1197 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
1198 mpctx->sh_video->disp_w, mpctx->sh_video->disp_h,
3ac3d3a51934 Factorize vobsub idx/extradata handling.
aurel
parents: 27805
diff changeset
1199 NULL, 0);
21119
5f9009952814 Move vo_spudec initialization into a separate function, for later reuse
reimar
parents: 21082
diff changeset
1200 }
5f9009952814 Move vo_spudec initialization into a separate function, for later reuse
reimar
parents: 21082
diff changeset
1201 #endif
5f9009952814 Move vo_spudec initialization into a separate function, for later reuse
reimar
parents: 21082
diff changeset
1202
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
1203 #ifdef CONFIG_DVDNAV
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1204 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
1205 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
1206 current_module="spudec_init_dvdnav";
27807
3ac3d3a51934 Factorize vobsub idx/extradata handling.
aurel
parents: 27805
diff changeset
1207 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
1208 }
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
1209 #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
1210
21119
5f9009952814 Move vo_spudec initialization into a separate function, for later reuse
reimar
parents: 21082
diff changeset
1211 if (vo_spudec==NULL) {
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1212 sh_sub_t *sh = (sh_sub_t *)mpctx->d_sub->sh;
21119
5f9009952814 Move vo_spudec initialization into a separate function, for later reuse
reimar
parents: 21082
diff changeset
1213 current_module="spudec_init_normal";
27807
3ac3d3a51934 Factorize vobsub idx/extradata handling.
aurel
parents: 27805
diff changeset
1214 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
1215 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
1216 }
5f9009952814 Move vo_spudec initialization into a separate function, for later reuse
reimar
parents: 21082
diff changeset
1217
29069
dc5daa853163 Set the forced_subs_only value correctly whenever a new spudec is created.
reimar
parents: 28835
diff changeset
1218 if (vo_spudec!=NULL) {
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
1219 initialized_flags|=INITIALIZED_SPUDEC;
29069
dc5daa853163 Set the forced_subs_only value correctly whenever a new spudec is created.
reimar
parents: 28835
diff changeset
1220 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
1221 }
21119
5f9009952814 Move vo_spudec initialization into a separate function, for later reuse
reimar
parents: 21082
diff changeset
1222 }
5f9009952814 Move vo_spudec initialization into a separate function, for later reuse
reimar
parents: 21082
diff changeset
1223
7201
22beff6edf75 Improved MacOS X SDL support, enable SDL main() wrapper for Darwin, remove unused envp.
atmos4
parents: 7191
diff changeset
1224 /*
22beff6edf75 Improved MacOS X SDL support, enable SDL main() wrapper for Darwin, remove unused envp.
atmos4
parents: 7191
diff changeset
1225 * In Mac OS X the SDL-lib is built upon Cocoa. The easiest way to
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1226 * make it all work is to use the builtin SDL-bootstrap code, which
7201
22beff6edf75 Improved MacOS X SDL support, enable SDL main() wrapper for Darwin, remove unused envp.
atmos4
parents: 7191
diff changeset
1227 * will be done automatically by replacing our main() if we include SDL.h.
22beff6edf75 Improved MacOS X SDL support, enable SDL main() wrapper for Darwin, remove unused envp.
atmos4
parents: 7191
diff changeset
1228 */
27370
14c5017f40d2 Change a bunch of video/audio-output-specific preprocessor directives from
diego
parents: 27359
diff changeset
1229 #if defined(__APPLE__) && defined(CONFIG_SDL)
30136
dc1d66a20ec2 Fixup SDL configure check:
reimar
parents: 30076
diff changeset
1230 #ifdef CONFIG_SDL_SDL_H
dc1d66a20ec2 Fixup SDL configure check:
reimar
parents: 30076
diff changeset
1231 #include <SDL/SDL.h>
dc1d66a20ec2 Fixup SDL configure check:
reimar
parents: 30076
diff changeset
1232 #else
7201
22beff6edf75 Improved MacOS X SDL support, enable SDL main() wrapper for Darwin, remove unused envp.
atmos4
parents: 7191
diff changeset
1233 #include <SDL.h>
22beff6edf75 Improved MacOS X SDL support, enable SDL main() wrapper for Darwin, remove unused envp.
atmos4
parents: 7191
diff changeset
1234 #endif
30136
dc1d66a20ec2 Fixup SDL configure check:
reimar
parents: 30076
diff changeset
1235 #endif
7201
22beff6edf75 Improved MacOS X SDL support, enable SDL main() wrapper for Darwin, remove unused envp.
atmos4
parents: 7191
diff changeset
1236
13710
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
1237 /**
13857
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1238 * \brief append a formatted string
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1239 * \param buf buffer to print into
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1240 * \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
1241 * \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
1242 * \param format printf format string
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1243 */
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1244 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
1245 {
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1246 va_list va;
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1247 va_start(va, format);
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1248 *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
1249 va_end(va);
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1250 if (*pos >= len ) {
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1251 buf[len] = 0;
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1252 *pos = len;
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1253 }
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1254 }
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1255
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1256 /**
16654
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
1257 * \brief append time in the hh:mm:ss.f format
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
1258 * \param buf buffer to print into
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
1259 * \param pos position of terminating 0 in buf
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
1260 * \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
1261 * \param time time value to convert/append
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
1262 */
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
1263 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
1264 int64_t tenths = 10 * time;
16654
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
1265 int f1 = tenths % 10;
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
1266 int ss = (tenths / 10) % 60;
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
1267 int mm = (tenths / 600) % 60;
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
1268 int hh = tenths / 36000;
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
1269 if (time <= 0) {
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
1270 saddf(buf, pos, len, "unknown");
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
1271 return;
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
1272 }
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
1273 if (hh > 0)
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
1274 saddf(buf, pos, len, "%2d:", hh);
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
1275 if (hh > 0 || mm > 0)
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
1276 saddf(buf, pos, len, "%02d:", mm);
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
1277 saddf(buf, pos, len, "%02d.%1d", ss, f1);
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
1278 }
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
1279
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
1280 /**
13857
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1281 * \brief print the status line
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1282 * \param a_pos audio position
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1283 * \param a_v A-V desynchronization
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1284 * \param corr amount out A-V synchronization
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 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
1287 {
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1288 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
1289 int width;
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1290 char *line;
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1291 unsigned pos = 0;
13906
db2f1e657dfe use get_screen_size from getch2.c instead of ioctl, fixes bug #131.
reimar
parents: 13893
diff changeset
1292 get_screen_size();
db2f1e657dfe use get_screen_size from getch2.c instead of ioctl, fixes bug #131.
reimar
parents: 13893
diff changeset
1293 if (screen_width > 0)
db2f1e657dfe use get_screen_size from getch2.c instead of ioctl, fixes bug #131.
reimar
parents: 13893
diff changeset
1294 width = screen_width;
13857
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1295 else
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1296 width = 80;
27727
48c1ae64255b Replace preprocessor check for WIN32 with checks for __MINGW32__ and __CYGWIN__.
diego
parents: 27635
diff changeset
1297 #if defined(__MINGW32__) || defined(__CYGWIN__) || defined(__OS2__)
18316
b3be7df634b0 spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents: 18315
diff changeset
1298 /* 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
1299 * should not depend on that). */
13928
6a0b5d320378 fix scrolling status line in windows
reimar
parents: 13906
diff changeset
1300 width--;
6a0b5d320378 fix scrolling status line in windows
reimar
parents: 13906
diff changeset
1301 #endif
18316
b3be7df634b0 spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents: 18315
diff changeset
1302 line = malloc(width + 1); // one additional char for the terminating null
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1303
13857
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1304 // Audio time
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1305 if (mpctx->sh_audio) {
13857
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1306 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
1307 if (!sh_video) {
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1308 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
1309 saddf(line, &pos, width, "(");
16654
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
1310 sadd_hhmmssf(line, &pos, width, a_pos);
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
1311 saddf(line, &pos, width, ") of %.1f (", len);
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
1312 sadd_hhmmssf(line, &pos, width, len);
16742
2d8ace98bb6d Missing space in status line
reimar
parents: 16740
diff changeset
1313 saddf(line, &pos, width, ") ");
13857
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1314 }
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1315 }
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1316
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1317 // Video time
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1318 if (sh_video)
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1319 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
1320
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1321 // A-V sync
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1322 if (mpctx->sh_audio && sh_video)
13857
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1323 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
1324
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1325 // Video stats
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1326 if (sh_video)
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1327 saddf(line, &pos, width, "%3d/%3d ",
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1328 (int)sh_video->num_frames,
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1329 (int)sh_video->num_frames_decoded);
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1330
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1331 // CPU usage
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1332 if (sh_video) {
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1333 if (sh_video->timer > 0.5)
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1334 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
1335 (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
1336 (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
1337 (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
1338 else
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1339 saddf(line, &pos, width, "??%% ??%% ??,?%% ");
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1340 } else if (mpctx->sh_audio) {
22488
b6aa3eedf49b Move the sh_audio->delay field to mpctx->delay.
uau
parents: 22458
diff changeset
1341 if (mpctx->delay > 0.5)
13857
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1342 saddf(line, &pos, width, "%4.1f%% ",
22488
b6aa3eedf49b Move the sh_audio->delay field to mpctx->delay.
uau
parents: 22458
diff changeset
1343 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
1344 else
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1345 saddf(line, &pos, width, "??,?%% ");
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1346 }
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1347
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1348 // VO stats
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1349 if (sh_video)
13857
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1350 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
1351
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
1352 #ifdef CONFIG_STREAM_CACHE
13857
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1353 // cache stats
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1354 if (stream_cache_size > 0)
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1355 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
1356 #endif
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1357
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1358 // other
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1359 if (playback_speed != 1)
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1360 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
1361
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1362 // end
17258
3d02f6e2a432 change erase to end of line, fall back to old behavior if no termcap found
ods15
parents: 17251
diff changeset
1363 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
1364 line[pos] = 0;
23460
44746cbd4e5b Create a new MSGT for just the status line.
diego
parents: 23338
diff changeset
1365 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
1366 } else {
3d02f6e2a432 change erase to end of line, fall back to old behavior if no termcap found
ods15
parents: 17251
diff changeset
1367 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
1368 line[width] = 0;
23460
44746cbd4e5b Create a new MSGT for just the status line.
diego
parents: 23338
diff changeset
1369 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
1370 }
13857
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1371 free(line);
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1372 }
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1373
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
1374 /**
13710
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
1375 * \brief build a chain of audio filters that converts the input format
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
1376 * to the ao's format, taking into account the current playback_speed.
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
1377 * \param sh_audio describes the requested input format of the chain.
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
1378 * \param ao_data describes the requested output format of the chain.
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
1379 */
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1380 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
1381 {
14140
337aa26e20b5 10l, should check for != NULL before using not after...
reimar
parents: 14087
diff changeset
1382 int new_srate;
14172
67912fc34e04 Set mixer.afilter at a more appropriate place.
reimar
parents: 14140
diff changeset
1383 int result;
13710
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
1384 if (!sh_audio)
14172
67912fc34e04 Set mixer.afilter at a more appropriate place.
reimar
parents: 14140
diff changeset
1385 {
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
1386 #ifdef CONFIG_GUI
22285
5d12a6e96930 Add missing "if (use_gui)" before some GUI calls
uau
parents: 22284
diff changeset
1387 if (use_gui) guiGetEvent(guiSetAfilter, (char *)NULL);
14254
21e72b6d8d11 Do not use audio plugins anymore
reimar
parents: 14245
diff changeset
1388 #endif
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1389 mpctx->mixer.afilter = NULL;
13710
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
1390 return 0;
14172
67912fc34e04 Set mixer.afilter at a more appropriate place.
reimar
parents: 14140
diff changeset
1391 }
24896
8133163bd1dd Add audio filter scaletempo
uau
parents: 24895
diff changeset
1392 if(af_control_any_rev(sh_audio->afilter,
8133163bd1dd Add audio filter scaletempo
uau
parents: 24895
diff changeset
1393 AF_CONTROL_PLAYBACK_SPEED | AF_CONTROL_SET,
8133163bd1dd Add audio filter scaletempo
uau
parents: 24895
diff changeset
1394 &playback_speed)) {
8133163bd1dd Add audio filter scaletempo
uau
parents: 24895
diff changeset
1395 new_srate = sh_audio->samplerate;
8133163bd1dd Add audio filter scaletempo
uau
parents: 24895
diff changeset
1396 } else {
8133163bd1dd Add audio filter scaletempo
uau
parents: 24895
diff changeset
1397 new_srate = sh_audio->samplerate * playback_speed;
8133163bd1dd Add audio filter scaletempo
uau
parents: 24895
diff changeset
1398 if (new_srate != ao_data->samplerate) {
8133163bd1dd Add audio filter scaletempo
uau
parents: 24895
diff changeset
1399 // limits are taken from libaf/af_resample.c
8133163bd1dd Add audio filter scaletempo
uau
parents: 24895
diff changeset
1400 if (new_srate < 8000)
8133163bd1dd Add audio filter scaletempo
uau
parents: 24895
diff changeset
1401 new_srate = 8000;
8133163bd1dd Add audio filter scaletempo
uau
parents: 24895
diff changeset
1402 if (new_srate > 192000)
8133163bd1dd Add audio filter scaletempo
uau
parents: 24895
diff changeset
1403 new_srate = 192000;
8133163bd1dd Add audio filter scaletempo
uau
parents: 24895
diff changeset
1404 playback_speed = (float)new_srate / (float)sh_audio->samplerate;
8133163bd1dd Add audio filter scaletempo
uau
parents: 24895
diff changeset
1405 }
13710
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
1406 }
14172
67912fc34e04 Set mixer.afilter at a more appropriate place.
reimar
parents: 14140
diff changeset
1407 result = init_audio_filters(sh_audio, new_srate,
24894
2bfc75674b71 Simplify init_audio_filters() arguments
uau
parents: 24892
diff changeset
1408 &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
1409 mpctx->mixer.afilter = sh_audio->afilter;
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
1410 #ifdef CONFIG_GUI
22285
5d12a6e96930 Add missing "if (use_gui)" before some GUI calls
uau
parents: 22284
diff changeset
1411 if (use_gui) guiGetEvent(guiSetAfilter, (char *)sh_audio->afilter);
14254
21e72b6d8d11 Do not use audio plugins anymore
reimar
parents: 14245
diff changeset
1412 #endif
14172
67912fc34e04 Set mixer.afilter at a more appropriate place.
reimar
parents: 14140
diff changeset
1413 return result;
13710
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
1414 }
8800
2485bc98772d fixed some possible overflow places
alex
parents: 8784
diff changeset
1415
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1416
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1417 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
1418 struct mp_osd_msg {
18261
5bf6b74e793c Doxygen attack! - Chapter 2
albeu
parents: 18243
diff changeset
1419 /// Previous message on the stack.
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1420 mp_osd_msg_t* prev;
18261
5bf6b74e793c Doxygen attack! - Chapter 2
albeu
parents: 18243
diff changeset
1421 /// Message text.
28378
45ddc04c30a1 increase max OSD message size limit
compn
parents: 28325
diff changeset
1422 char msg[128];
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1423 int id,level,started;
18261
5bf6b74e793c Doxygen attack! - Chapter 2
albeu
parents: 18243
diff changeset
1424 /// Display duration in ms.
5bf6b74e793c Doxygen attack! - Chapter 2
albeu
parents: 18243
diff changeset
1425 unsigned time;
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1426 };
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1427
18261
5bf6b74e793c Doxygen attack! - Chapter 2
albeu
parents: 18243
diff changeset
1428 /// OSD message stack.
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1429 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
1430
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1431 /**
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1432 * \brief Add a message on the OSD message stack
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1433 *
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1434 * 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
1435 * 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
1436 *
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1437 */
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1438
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1439 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
1440 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
1441 va_list va;
17929
6fe95ee39422 Fix osd_show_msg alignment and make sure msg strings
albeu
parents: 17928
diff changeset
1442 int r;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1443
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1444 // 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
1445 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
1446 last = msg, msg = msg->prev);
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1447 // not found: alloc it
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1448 if(!msg) {
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1449 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
1450 msg->prev = osd_msg_stack;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1451 osd_msg_stack = msg;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1452 } 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
1453 last->prev = msg->prev;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1454 msg->prev = osd_msg_stack;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1455 osd_msg_stack = msg;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1456 }
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1457 // write the msg
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1458 va_start(va,fmt);
28378
45ddc04c30a1 increase max OSD message size limit
compn
parents: 28325
diff changeset
1459 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
1460 va_end(va);
28378
45ddc04c30a1 increase max OSD message size limit
compn
parents: 28325
diff changeset
1461 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
1462 // set id and time
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1463 msg->id = id;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1464 msg->level = level;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1465 msg->time = time;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1466
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1467 }
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1468
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1469 /**
17057
d301c1833d12 Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents: 17021
diff changeset
1470 * \brief Remove a message from the OSD stack
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1471 *
17057
d301c1833d12 Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents: 17021
diff changeset
1472 * 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
1473 *
17057
d301c1833d12 Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents: 17021
diff changeset
1474 */
d301c1833d12 Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents: 17021
diff changeset
1475
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1476 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
1477 mp_osd_msg_t *msg,*last=NULL;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1478
17057
d301c1833d12 Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents: 17021
diff changeset
1479 // 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
1480 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
1481 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
1482 if(!msg) return;
d301c1833d12 Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents: 17021
diff changeset
1483
d301c1833d12 Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents: 17021
diff changeset
1484 // 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
1485 if(last)
d301c1833d12 Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents: 17021
diff changeset
1486 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
1487 else
d301c1833d12 Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents: 17021
diff changeset
1488 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
1489 free(msg);
d301c1833d12 Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents: 17021
diff changeset
1490 }
d301c1833d12 Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents: 17021
diff changeset
1491
d301c1833d12 Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents: 17021
diff changeset
1492 /**
17938
810b407ba6c4 Get rid of 2 osd related hacks.
albeu
parents: 17935
diff changeset
1493 * \brief Remove all messages from the OSD stack
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1494 *
17938
810b407ba6c4 Get rid of 2 osd related hacks.
albeu
parents: 17935
diff changeset
1495 */
810b407ba6c4 Get rid of 2 osd related hacks.
albeu
parents: 17935
diff changeset
1496
810b407ba6c4 Get rid of 2 osd related hacks.
albeu
parents: 17935
diff changeset
1497 static void clear_osd_msgs(void) {
810b407ba6c4 Get rid of 2 osd related hacks.
albeu
parents: 17935
diff changeset
1498 mp_osd_msg_t* msg = osd_msg_stack, *prev = NULL;
810b407ba6c4 Get rid of 2 osd related hacks.
albeu
parents: 17935
diff changeset
1499 while(msg) {
810b407ba6c4 Get rid of 2 osd related hacks.
albeu
parents: 17935
diff changeset
1500 prev = msg->prev;
810b407ba6c4 Get rid of 2 osd related hacks.
albeu
parents: 17935
diff changeset
1501 free(msg);
810b407ba6c4 Get rid of 2 osd related hacks.
albeu
parents: 17935
diff changeset
1502 msg = prev;
810b407ba6c4 Get rid of 2 osd related hacks.
albeu
parents: 17935
diff changeset
1503 }
810b407ba6c4 Get rid of 2 osd related hacks.
albeu
parents: 17935
diff changeset
1504 osd_msg_stack = NULL;
810b407ba6c4 Get rid of 2 osd related hacks.
albeu
parents: 17935
diff changeset
1505 }
810b407ba6c4 Get rid of 2 osd related hacks.
albeu
parents: 17935
diff changeset
1506
810b407ba6c4 Get rid of 2 osd related hacks.
albeu
parents: 17935
diff changeset
1507 /**
18316
b3be7df634b0 spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents: 18315
diff changeset
1508 * \brief Get the current message from the OSD stack.
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1509 *
18316
b3be7df634b0 spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents: 18315
diff changeset
1510 * 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
1511 * The message that should be displayed is returned (if any).
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1512 *
16992
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
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1515 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
1516 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
1517 static unsigned last_update = 0;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1518 unsigned now = GetTimerMS();
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1519 unsigned diff;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1520 char hidden_dec_done = 0;
24091
e7df91814c0f Minor code cleanup
uau
parents: 24070
diff changeset
1521
e7df91814c0f Minor code cleanup
uau
parents: 24070
diff changeset
1522 if (osd_visible) {
e7df91814c0f Minor code cleanup
uau
parents: 24070
diff changeset
1523 // 36000000 means max timed visibility is 1 hour into the future, if
e7df91814c0f Minor code cleanup
uau
parents: 24070
diff changeset
1524 // the difference is greater assume it's wrapped around from below 0
e7df91814c0f Minor code cleanup
uau
parents: 24070
diff changeset
1525 if (osd_visible - now > 36000000) {
e7df91814c0f Minor code cleanup
uau
parents: 24070
diff changeset
1526 osd_visible = 0;
e7df91814c0f Minor code cleanup
uau
parents: 24070
diff changeset
1527 vo_osd_progbar_type = -1; // disable
e7df91814c0f Minor code cleanup
uau
parents: 24070
diff changeset
1528 vo_osd_changed(OSDTYPE_PROGBAR);
e7df91814c0f Minor code cleanup
uau
parents: 24070
diff changeset
1529 if (mpctx->osd_function != OSD_PAUSE)
e7df91814c0f Minor code cleanup
uau
parents: 24070
diff changeset
1530 mpctx->osd_function = OSD_PLAY;
e7df91814c0f Minor code cleanup
uau
parents: 24070
diff changeset
1531 }
e7df91814c0f Minor code cleanup
uau
parents: 24070
diff changeset
1532 }
e7df91814c0f Minor code cleanup
uau
parents: 24070
diff changeset
1533
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1534 if(!last_update) last_update = now;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1535 diff = now >= last_update ? now - last_update : 0;
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 last_update = now;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1538
18316
b3be7df634b0 spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents: 18315
diff changeset
1539 // 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
1540 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
1541 prev = msg->prev;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1542 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
1543 // 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
1544 // 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
1545 if(!msg->started || msg->time > diff) {
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1546 if(msg->started) msg->time -= diff;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1547 else msg->started = 1;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1548 // display it
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1549 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
1550 hidden_dec_done = 1;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1551 continue;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1552 }
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1553 // kill the message
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1554 free(msg);
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1555 if(last) {
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1556 last->prev = prev;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1557 msg = last;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1558 } else {
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1559 osd_msg_stack = prev;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1560 msg = NULL;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1561 }
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1562 }
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1563 // Nothing found
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1564 return NULL;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1565 }
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1566
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1567 /**
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1568 * \brief Display the OSD bar.
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1569 *
18316
b3be7df634b0 spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents: 18315
diff changeset
1570 * 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
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
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1574 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
1575
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1576 if(osd_level < 1) return;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1577
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1578 if(mpctx->sh_video) {
18287
292337d09af2 Remove updating of vo_mouse_timer_const from the main loop and also
uau
parents: 18286
diff changeset
1579 osd_visible = (GetTimerMS() + 1000) | 1;
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1580 vo_osd_progbar_type = type;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1581 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
1582 vo_osd_changed(OSDTYPE_PROGBAR);
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1583 return;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1584 }
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 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
1587 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
1588 }
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1589
29670
2e3751815a21 Add support for displaying subtitles on the command-line when playing
reimar
parents: 29668
diff changeset
1590 /**
2e3751815a21 Add support for displaying subtitles on the command-line when playing
reimar
parents: 29668
diff changeset
1591 * \brief Display text subtitles on the OSD
2e3751815a21 Add support for displaying subtitles on the command-line when playing
reimar
parents: 29668
diff changeset
1592 */
2e3751815a21 Add support for displaying subtitles on the command-line when playing
reimar
parents: 29668
diff changeset
1593 void set_osd_subtitle(subtitle *subs) {
2e3751815a21 Add support for displaying subtitles on the command-line when playing
reimar
parents: 29668
diff changeset
1594 int i;
2e3751815a21 Add support for displaying subtitles on the command-line when playing
reimar
parents: 29668
diff changeset
1595 vo_sub = subs;
2e3751815a21 Add support for displaying subtitles on the command-line when playing
reimar
parents: 29668
diff changeset
1596 vo_osd_changed(OSDTYPE_SUBTITLE);
2e3751815a21 Add support for displaying subtitles on the command-line when playing
reimar
parents: 29668
diff changeset
1597 if (!mpctx->sh_video) {
2e3751815a21 Add support for displaying subtitles on the command-line when playing
reimar
parents: 29668
diff changeset
1598 // 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
1599 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
1600 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
1601 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
1602 else {
2e3751815a21 Add support for displaying subtitles on the command-line when playing
reimar
parents: 29668
diff changeset
1603 // 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
1604 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
1605 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
1606 }
2e3751815a21 Add support for displaying subtitles on the command-line when playing
reimar
parents: 29668
diff changeset
1607 }
2e3751815a21 Add support for displaying subtitles on the command-line when playing
reimar
parents: 29668
diff changeset
1608 }
2e3751815a21 Add support for displaying subtitles on the command-line when playing
reimar
parents: 29668
diff changeset
1609 }
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1610
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1611 /**
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1612 * \brief Update the OSD message line.
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1613 *
18316
b3be7df634b0 spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents: 18315
diff changeset
1614 * 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
1615 * 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
1616 * is displayed (only on the vo OSD).
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1617 *
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1618 */
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1619
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1620 static void update_osd_msg(void) {
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1621 mp_osd_msg_t *msg;
28378
45ddc04c30a1 increase max OSD message size limit
compn
parents: 28325
diff changeset
1622 static char osd_text[128] = "";
45ddc04c30a1 increase max OSD message size limit
compn
parents: 28325
diff changeset
1623 static char osd_text_timer[128];
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1624
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1625 // 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
1626 vo_osd_text = (unsigned char*)osd_text;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1627
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1628 // Look if we have a msg
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1629 if((msg = get_osd_msg())) {
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1630 if(strcmp(osd_text,msg->msg)) {
28378
45ddc04c30a1 increase max OSD message size limit
compn
parents: 28325
diff changeset
1631 strncpy((char*)osd_text, msg->msg, 127);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1632 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
1633 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
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
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1638 if(mpctx->sh_video) {
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1639 // fallback on the timer
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1640 if(osd_level>=2) {
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1641 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
1642 int percentage = -1;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1643 char percentage_text[10];
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1644 int pts = demuxer_get_current_time(mpctx->demuxer);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1645
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1646 if (mpctx->osd_show_percentage)
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1647 percentage = demuxer_get_percent_pos(mpctx->demuxer);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1648
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1649 if (percentage >= 0)
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1650 snprintf(percentage_text, 9, " (%d%%)", percentage);
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1651 else
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1652 percentage_text[0] = 0;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1653
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1654 if (osd_level == 3)
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1655 snprintf(osd_text_timer, 63,
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1656 "%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
1657 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
1658 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
1659 else
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1660 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
1661 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
1662 pts%60,percentage_text);
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1663 } else
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1664 osd_text_timer[0]=0;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1665
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1666 // 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
1667 if(mpctx->osd_show_percentage)
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1668 mpctx->osd_show_percentage--;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1669
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1670 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
1671 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
1672 vo_osd_changed(OSDTYPE_OSD);
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1673 }
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1674 return;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1675 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
1676
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1677 // Clear the term osd line
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1678 if(term_osd && osd_text[0]) {
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1679 osd_text[0] = 0;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1680 printf("%s\n",term_osd_esc);
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1681 }
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1682 }
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1683
18261
5bf6b74e793c Doxygen attack! - Chapter 2
albeu
parents: 18243
diff changeset
1684 ///@}
5bf6b74e793c Doxygen attack! - Chapter 2
albeu
parents: 18243
diff changeset
1685 // OSDMsgStack
5bf6b74e793c Doxygen attack! - Chapter 2
albeu
parents: 18243
diff changeset
1686
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1687
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1688 void reinit_audio_chain(void) {
29801
7ac1f37f8aa5 Whitespace cosmetics: reindent reinit_audio_chain function
reimar
parents: 29800
diff changeset
1689 if (!mpctx->sh_audio)
7ac1f37f8aa5 Whitespace cosmetics: reindent reinit_audio_chain function
reimar
parents: 29800
diff changeset
1690 return;
7ac1f37f8aa5 Whitespace cosmetics: reindent reinit_audio_chain function
reimar
parents: 29800
diff changeset
1691 current_module="init_audio_codec";
7ac1f37f8aa5 Whitespace cosmetics: reindent reinit_audio_chain function
reimar
parents: 29800
diff changeset
1692 mp_msg(MSGT_CPLAYER,MSGL_INFO,"==========================================================================\n");
7ac1f37f8aa5 Whitespace cosmetics: reindent reinit_audio_chain function
reimar
parents: 29800
diff changeset
1693 if(!init_best_audio_codec(mpctx->sh_audio,audio_codec_list,audio_fm_list)){
7ac1f37f8aa5 Whitespace cosmetics: reindent reinit_audio_chain function
reimar
parents: 29800
diff changeset
1694 goto init_error;
7ac1f37f8aa5 Whitespace cosmetics: reindent reinit_audio_chain function
reimar
parents: 29800
diff changeset
1695 }
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
1696 initialized_flags|=INITIALIZED_ACODEC;
29801
7ac1f37f8aa5 Whitespace cosmetics: reindent reinit_audio_chain function
reimar
parents: 29800
diff changeset
1697 mp_msg(MSGT_CPLAYER,MSGL_INFO,"==========================================================================\n");
7ac1f37f8aa5 Whitespace cosmetics: reindent reinit_audio_chain function
reimar
parents: 29800
diff changeset
1698
7ac1f37f8aa5 Whitespace cosmetics: reindent reinit_audio_chain function
reimar
parents: 29800
diff changeset
1699
7ac1f37f8aa5 Whitespace cosmetics: reindent reinit_audio_chain function
reimar
parents: 29800
diff changeset
1700 current_module="af_preinit";
7ac1f37f8aa5 Whitespace cosmetics: reindent reinit_audio_chain function
reimar
parents: 29800
diff changeset
1701 ao_data.samplerate=force_srate;
7ac1f37f8aa5 Whitespace cosmetics: reindent reinit_audio_chain function
reimar
parents: 29800
diff changeset
1702 ao_data.channels=0;
7ac1f37f8aa5 Whitespace cosmetics: reindent reinit_audio_chain function
reimar
parents: 29800
diff changeset
1703 ao_data.format=audio_output_format;
7ac1f37f8aa5 Whitespace cosmetics: reindent reinit_audio_chain function
reimar
parents: 29800
diff changeset
1704 // first init to detect best values
7ac1f37f8aa5 Whitespace cosmetics: reindent reinit_audio_chain function
reimar
parents: 29800
diff changeset
1705 if(!init_audio_filters(mpctx->sh_audio, // preliminary init
7ac1f37f8aa5 Whitespace cosmetics: reindent reinit_audio_chain function
reimar
parents: 29800
diff changeset
1706 // input:
7ac1f37f8aa5 Whitespace cosmetics: reindent reinit_audio_chain function
reimar
parents: 29800
diff changeset
1707 mpctx->sh_audio->samplerate,
7ac1f37f8aa5 Whitespace cosmetics: reindent reinit_audio_chain function
reimar
parents: 29800
diff changeset
1708 // output:
7ac1f37f8aa5 Whitespace cosmetics: reindent reinit_audio_chain function
reimar
parents: 29800
diff changeset
1709 &ao_data.samplerate, &ao_data.channels, &ao_data.format)){
7ac1f37f8aa5 Whitespace cosmetics: reindent reinit_audio_chain function
reimar
parents: 29800
diff changeset
1710 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_AudioFilterChainPreinitError);
7ac1f37f8aa5 Whitespace cosmetics: reindent reinit_audio_chain function
reimar
parents: 29800
diff changeset
1711 exit_player(EXIT_ERROR);
7ac1f37f8aa5 Whitespace cosmetics: reindent reinit_audio_chain function
reimar
parents: 29800
diff changeset
1712 }
7ac1f37f8aa5 Whitespace cosmetics: reindent reinit_audio_chain function
reimar
parents: 29800
diff changeset
1713 current_module="ao2_init";
7ac1f37f8aa5 Whitespace cosmetics: reindent reinit_audio_chain function
reimar
parents: 29800
diff changeset
1714 mpctx->audio_out = init_best_audio_out(audio_driver_list,
7ac1f37f8aa5 Whitespace cosmetics: reindent reinit_audio_chain function
reimar
parents: 29800
diff changeset
1715 0, // plugin flag
7ac1f37f8aa5 Whitespace cosmetics: reindent reinit_audio_chain function
reimar
parents: 29800
diff changeset
1716 ao_data.samplerate,
7ac1f37f8aa5 Whitespace cosmetics: reindent reinit_audio_chain function
reimar
parents: 29800
diff changeset
1717 ao_data.channels,
7ac1f37f8aa5 Whitespace cosmetics: reindent reinit_audio_chain function
reimar
parents: 29800
diff changeset
1718 ao_data.format, 0);
7ac1f37f8aa5 Whitespace cosmetics: reindent reinit_audio_chain function
reimar
parents: 29800
diff changeset
1719 if(!mpctx->audio_out){
7ac1f37f8aa5 Whitespace cosmetics: reindent reinit_audio_chain function
reimar
parents: 29800
diff changeset
1720 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CannotInitAO);
7ac1f37f8aa5 Whitespace cosmetics: reindent reinit_audio_chain function
reimar
parents: 29800
diff changeset
1721 goto init_error;
7ac1f37f8aa5 Whitespace cosmetics: reindent reinit_audio_chain function
reimar
parents: 29800
diff changeset
1722 }
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
1723 initialized_flags|=INITIALIZED_AO;
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
1724 mp_msg(MSGT_CPLAYER,MSGL_INFO,"AO: [%s] %dHz %dch %s (%d bytes per sample)\n",
29801
7ac1f37f8aa5 Whitespace cosmetics: reindent reinit_audio_chain function
reimar
parents: 29800
diff changeset
1725 mpctx->audio_out->info->short_name,
7ac1f37f8aa5 Whitespace cosmetics: reindent reinit_audio_chain function
reimar
parents: 29800
diff changeset
1726 ao_data.samplerate, ao_data.channels,
7ac1f37f8aa5 Whitespace cosmetics: reindent reinit_audio_chain function
reimar
parents: 29800
diff changeset
1727 af_fmt2str_short(ao_data.format),
7ac1f37f8aa5 Whitespace cosmetics: reindent reinit_audio_chain function
reimar
parents: 29800
diff changeset
1728 af_fmt2bits(ao_data.format)/8 );
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
1729 mp_msg(MSGT_CPLAYER,MSGL_V,"AO: Description: %s\nAO: Author: %s\n",
29801
7ac1f37f8aa5 Whitespace cosmetics: reindent reinit_audio_chain function
reimar
parents: 29800
diff changeset
1730 mpctx->audio_out->info->name, mpctx->audio_out->info->author);
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1731 if(strlen(mpctx->audio_out->info->comment) > 0)
29801
7ac1f37f8aa5 Whitespace cosmetics: reindent reinit_audio_chain function
reimar
parents: 29800
diff changeset
1732 mp_msg(MSGT_CPLAYER,MSGL_V,"AO: Comment: %s\n", mpctx->audio_out->info->comment);
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
1733 // 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
1734 current_module="af_init";
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
1735 if(!build_afilter_chain(mpctx->sh_audio, &ao_data)) {
29801
7ac1f37f8aa5 Whitespace cosmetics: reindent reinit_audio_chain function
reimar
parents: 29800
diff changeset
1736 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_NoMatchingFilter);
7ac1f37f8aa5 Whitespace cosmetics: reindent reinit_audio_chain function
reimar
parents: 29800
diff changeset
1737 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
1738 }
29801
7ac1f37f8aa5 Whitespace cosmetics: reindent reinit_audio_chain function
reimar
parents: 29800
diff changeset
1739 mpctx->mixer.audio_out = mpctx->audio_out;
7ac1f37f8aa5 Whitespace cosmetics: reindent reinit_audio_chain function
reimar
parents: 29800
diff changeset
1740 mpctx->mixer.volstep = volstep;
7ac1f37f8aa5 Whitespace cosmetics: reindent reinit_audio_chain function
reimar
parents: 29800
diff changeset
1741 return;
29794
df1826dcdb2d Disable audio when initializing the filter chain fails (can happen e.g. when the hwmpa
reimar
parents: 29785
diff changeset
1742
df1826dcdb2d Disable audio when initializing the filter chain fails (can happen e.g. when the hwmpa
reimar
parents: 29785
diff changeset
1743 init_error:
df1826dcdb2d Disable audio when initializing the filter chain fails (can happen e.g. when the hwmpa
reimar
parents: 29785
diff changeset
1744 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
1745 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
1746 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
1747 }
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
1748
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
1749
18261
5bf6b74e793c Doxygen attack! - Chapter 2
albeu
parents: 18243
diff changeset
1750 ///@}
5bf6b74e793c Doxygen attack! - Chapter 2
albeu
parents: 18243
diff changeset
1751 // Command2Property
5bf6b74e793c Doxygen attack! - Chapter 2
albeu
parents: 18243
diff changeset
1752
18710
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 // 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
1755 // ao so far.
c528c6c518f1 Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents: 18682
diff changeset
1756 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
1757 {
24913
38f25bdb3cbc We support gcc 2.95 (fixes r24928).
cehoyos
parents: 24900
diff changeset
1758 double buffered_output;
18710
c528c6c518f1 Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents: 18682
diff changeset
1759 // 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
1760 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
1761 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
1762 // 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
1763 // 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
1764 // 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
1765 // 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
1766 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
1767 else {
c528c6c518f1 Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents: 18682
diff changeset
1768 // 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
1769 // 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
1770 // 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
1771 // 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
1772 // 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
1773 // 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
1774 // 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
1775 // 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
1776
c528c6c518f1 Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents: 18682
diff changeset
1777 a_pts = d_audio->pts;
19216
5fd000355777 cosmetics: fix incorrect indentation left by reimar and extra word in
uau
parents: 19209
diff changeset
1778 // 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
1779 // 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
1780 // 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
1781 if (sh_audio->i_bps)
19216
5fd000355777 cosmetics: fix incorrect indentation left by reimar and extra word in
uau
parents: 19209
diff changeset
1782 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
1783 (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
1784 }
c528c6c518f1 Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents: 18682
diff changeset
1785 // 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
1786 // 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
1787
c528c6c518f1 Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents: 18682
diff changeset
1788 // Decoded but not filtered
c528c6c518f1 Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents: 18682
diff changeset
1789 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
1790
24900
9079c9745ff9 A/V sync: take audio filter buffers into account
uau
parents: 24896
diff changeset
1791 // 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
1792 buffered_output = af_calc_delay(sh_audio->afilter);
24900
9079c9745ff9 A/V sync: take audio filter buffers into account
uau
parents: 24896
diff changeset
1793
18710
c528c6c518f1 Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents: 18682
diff changeset
1794 // 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
1795 // accept everything to internal buffers yet
24900
9079c9745ff9 A/V sync: take audio filter buffers into account
uau
parents: 24896
diff changeset
1796 buffered_output += sh_audio->a_out_buffer_len;
9079c9745ff9 A/V sync: take audio filter buffers into account
uau
parents: 24896
diff changeset
1797
9079c9745ff9 A/V sync: take audio filter buffers into account
uau
parents: 24896
diff changeset
1798 // 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
1799 // 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
1800 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
1801
c528c6c518f1 Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents: 18682
diff changeset
1802 return a_pts;
c528c6c518f1 Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents: 18682
diff changeset
1803 }
c528c6c518f1 Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents: 18682
diff changeset
1804
c528c6c518f1 Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents: 18682
diff changeset
1805 // 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
1806 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
1807 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
1808 {
c528c6c518f1 Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents: 18682
diff changeset
1809 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
1810 audio_out->get_delay();
c528c6c518f1 Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents: 18682
diff changeset
1811 }
c528c6c518f1 Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents: 18682
diff changeset
1812
26228
089dc00275b6 Experimental support for -framedrop with -correct-pts.
reimar
parents: 26159
diff changeset
1813 static int check_framedrop(double frame_time) {
089dc00275b6 Experimental support for -framedrop with -correct-pts.
reimar
parents: 26159
diff changeset
1814 // check for frame-drop:
089dc00275b6 Experimental support for -framedrop with -correct-pts.
reimar
parents: 26159
diff changeset
1815 current_module = "check_framedrop";
089dc00275b6 Experimental support for -framedrop with -correct-pts.
reimar
parents: 26159
diff changeset
1816 if (mpctx->sh_audio && !mpctx->d_audio->eof) {
089dc00275b6 Experimental support for -framedrop with -correct-pts.
reimar
parents: 26159
diff changeset
1817 static int dropped_frames;
089dc00275b6 Experimental support for -framedrop with -correct-pts.
reimar
parents: 26159
diff changeset
1818 float delay = playback_speed*mpctx->audio_out->get_delay();
089dc00275b6 Experimental support for -framedrop with -correct-pts.
reimar
parents: 26159
diff changeset
1819 float d = delay-mpctx->delay;
089dc00275b6 Experimental support for -framedrop with -correct-pts.
reimar
parents: 26159
diff changeset
1820 ++total_frame_cnt;
089dc00275b6 Experimental support for -framedrop with -correct-pts.
reimar
parents: 26159
diff changeset
1821 // we should avoid dropping too many frames in sequence unless we
089dc00275b6 Experimental support for -framedrop with -correct-pts.
reimar
parents: 26159
diff changeset
1822 // are too late. and we allow 100ms A-V delay here:
089dc00275b6 Experimental support for -framedrop with -correct-pts.
reimar
parents: 26159
diff changeset
1823 if (d < -dropped_frames*frame_time-0.100 &&
089dc00275b6 Experimental support for -framedrop with -correct-pts.
reimar
parents: 26159
diff changeset
1824 mpctx->osd_function != OSD_PAUSE) {
089dc00275b6 Experimental support for -framedrop with -correct-pts.
reimar
parents: 26159
diff changeset
1825 ++drop_frame_cnt;
089dc00275b6 Experimental support for -framedrop with -correct-pts.
reimar
parents: 26159
diff changeset
1826 ++dropped_frames;
089dc00275b6 Experimental support for -framedrop with -correct-pts.
reimar
parents: 26159
diff changeset
1827 return frame_dropping;
089dc00275b6 Experimental support for -framedrop with -correct-pts.
reimar
parents: 26159
diff changeset
1828 } else
089dc00275b6 Experimental support for -framedrop with -correct-pts.
reimar
parents: 26159
diff changeset
1829 dropped_frames = 0;
089dc00275b6 Experimental support for -framedrop with -correct-pts.
reimar
parents: 26159
diff changeset
1830 }
089dc00275b6 Experimental support for -framedrop with -correct-pts.
reimar
parents: 26159
diff changeset
1831 return 0;
089dc00275b6 Experimental support for -framedrop with -correct-pts.
reimar
parents: 26159
diff changeset
1832 }
089dc00275b6 Experimental support for -framedrop with -correct-pts.
reimar
parents: 26159
diff changeset
1833
18917
d9a75b26da6c Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents: 18913
diff changeset
1834 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
1835 {
d9a75b26da6c Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents: 18913
diff changeset
1836 unsigned char *start;
d9a75b26da6c Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents: 18913
diff changeset
1837 int in_size;
d9a75b26da6c Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents: 18913
diff changeset
1838 int hit_eof=0;
d9a75b26da6c Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents: 18913
diff changeset
1839 double pts;
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 while (1) {
26228
089dc00275b6 Experimental support for -framedrop with -correct-pts.
reimar
parents: 26159
diff changeset
1842 int drop_frame = check_framedrop(sh_video->frametime);
20904
e5456123de82 Fix statement-before-declaration warnings.
reimar
parents: 20903
diff changeset
1843 void *decoded_frame;
18917
d9a75b26da6c Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents: 18913
diff changeset
1844 current_module = "decode video";
d9a75b26da6c Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents: 18913
diff changeset
1845 // 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
1846 // 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
1847 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
1848 break;
d9a75b26da6c Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents: 18913
diff changeset
1849 current_module = "video_read_frame";
d9a75b26da6c Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents: 18913
diff changeset
1850 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
1851 if (in_size < 0) {
d9a75b26da6c Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents: 18913
diff changeset
1852 // 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
1853 in_size = 0;
31148
6957d78df897 Use MP_NOPTS_VALUE as "default" pts for delayed frames instead of some
reimar
parents: 31048
diff changeset
1854 pts = MP_NOPTS_VALUE;
18917
d9a75b26da6c Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents: 18913
diff changeset
1855 hit_eof = 1;
d9a75b26da6c Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents: 18913
diff changeset
1856 }
d9a75b26da6c Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents: 18913
diff changeset
1857 if (in_size > max_framesize)
d9a75b26da6c Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents: 18913
diff changeset
1858 max_framesize = in_size;
20902
bfb6eacd9c4a Update OSD contents only after the correct values for the frame are known.
uau
parents: 20900
diff changeset
1859 current_module = "decode video";
26228
089dc00275b6 Experimental support for -framedrop with -correct-pts.
reimar
parents: 26159
diff changeset
1860 decoded_frame = decode_video(sh_video, start, in_size, drop_frame, pts);
20902
bfb6eacd9c4a Update OSD contents only after the correct values for the frame are known.
uau
parents: 20900
diff changeset
1861 if (decoded_frame) {
29668
ecc719c6d7a9 Make update_subtitles work without sh_video for text subtitles.
reimar
parents: 29642
diff changeset
1862 update_subtitles(sh_video, sh_video->pts, mpctx->d_sub, 0);
23903
037737866f6a Teletext support
voroshil
parents: 23889
diff changeset
1863 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
1864 update_osd_msg();
21055
bc2cf8eb55b3 Move subtitle updating to a separate function, fix inverted condition
uau
parents: 21042
diff changeset
1865 current_module = "filter video";
20902
bfb6eacd9c4a Update OSD contents only after the correct values for the frame are known.
uau
parents: 20900
diff changeset
1866 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
1867 break;
26228
089dc00275b6 Experimental support for -framedrop with -correct-pts.
reimar
parents: 26159
diff changeset
1868 } else if (drop_frame)
089dc00275b6 Experimental support for -framedrop with -correct-pts.
reimar
parents: 26159
diff changeset
1869 return -1;
18917
d9a75b26da6c Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents: 18913
diff changeset
1870 if (hit_eof)
d9a75b26da6c Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents: 18913
diff changeset
1871 return 0;
d9a75b26da6c Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents: 18913
diff changeset
1872 }
d9a75b26da6c Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents: 18913
diff changeset
1873 return 1;
d9a75b26da6c Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents: 18913
diff changeset
1874 }
d9a75b26da6c Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents: 18913
diff changeset
1875
20887
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1876 #ifdef HAVE_RTC
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1877 int rtc_fd = -1;
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1878 #endif
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1879
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1880 static float timing_sleep(float time_frame)
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1881 {
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1882 #ifdef HAVE_RTC
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1883 if (rtc_fd >= 0){
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1884 // -------- RTC -----------
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1885 current_module="sleep_rtc";
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1886 while (time_frame > 0.000) {
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1887 unsigned long rtc_ts;
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1888 if (read(rtc_fd, &rtc_ts, sizeof(rtc_ts)) <= 0)
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1889 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_LinuxRTCReadError, strerror(errno));
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1890 time_frame -= GetRelativeTime();
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1891 }
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1892 } else
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1893 #endif
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1894 {
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1895 // 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
1896 // unnecessarily high CPU usage
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1897 float margin = softsleep ? 0.011 : 0;
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1898 current_module = "sleep_timer";
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1899 while (time_frame > margin) {
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1900 usec_sleep(1000000 * (time_frame - margin));
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1901 time_frame -= GetRelativeTime();
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1902 }
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1903 if (softsleep){
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1904 current_module = "sleep_soft";
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1905 if (time_frame < 0)
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1906 mp_msg(MSGT_AVSYNC, MSGL_WARN, MSGTR_SoftsleepUnderflow);
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1907 while (time_frame > 0)
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1908 time_frame-=GetRelativeTime(); // burn the CPU
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1909 }
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1910 }
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1911 return time_frame;
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1912 }
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
1913
31201
203789464176 misc cosmetics: K&R style nits, #include placement, indentation
diego
parents: 31148
diff changeset
1914 static void select_subtitle(MPContext *mpctx)
203789464176 misc cosmetics: K&R style nits, #include placement, indentation
diego
parents: 31148
diff changeset
1915 {
29854
00ebdb6cb87f Factor out code that decides which subtitle to play.
reimar
parents: 29804
diff changeset
1916 // find the best sub to use
00ebdb6cb87f Factor out code that decides which subtitle to play.
reimar
parents: 29804
diff changeset
1917 int vobsub_index_id = vobsub_get_index_by_id(vo_vobsub, vobsub_id);
00ebdb6cb87f Factor out code that decides which subtitle to play.
reimar
parents: 29804
diff changeset
1918 mpctx->global_sub_pos = -1; // no subs by default
00ebdb6cb87f Factor out code that decides which subtitle to play.
reimar
parents: 29804
diff changeset
1919 if (vobsub_index_id >= 0) {
00ebdb6cb87f Factor out code that decides which subtitle to play.
reimar
parents: 29804
diff changeset
1920 // if user asks for a vobsub id, use that first.
00ebdb6cb87f Factor out code that decides which subtitle to play.
reimar
parents: 29804
diff changeset
1921 mpctx->global_sub_pos = mpctx->global_sub_indices[SUB_SOURCE_VOBSUB] + vobsub_index_id;
00ebdb6cb87f Factor out code that decides which subtitle to play.
reimar
parents: 29804
diff changeset
1922 } else if (dvdsub_id >= 0 && mpctx->global_sub_indices[SUB_SOURCE_DEMUX] >= 0) {
00ebdb6cb87f Factor out code that decides which subtitle to play.
reimar
parents: 29804
diff changeset
1923 // if user asks for a dvd sub id, use that next.
00ebdb6cb87f Factor out code that decides which subtitle to play.
reimar
parents: 29804
diff changeset
1924 mpctx->global_sub_pos = mpctx->global_sub_indices[SUB_SOURCE_DEMUX] + dvdsub_id;
00ebdb6cb87f Factor out code that decides which subtitle to play.
reimar
parents: 29804
diff changeset
1925 } else if (mpctx->global_sub_indices[SUB_SOURCE_SUBS] >= 0) {
00ebdb6cb87f Factor out code that decides which subtitle to play.
reimar
parents: 29804
diff changeset
1926 // if there are text subs to use, use those. (autosubs come last here)
00ebdb6cb87f Factor out code that decides which subtitle to play.
reimar
parents: 29804
diff changeset
1927 mpctx->global_sub_pos = mpctx->global_sub_indices[SUB_SOURCE_SUBS];
00ebdb6cb87f Factor out code that decides which subtitle to play.
reimar
parents: 29804
diff changeset
1928 } else if (dvdsub_id == -1 && mpctx->global_sub_indices[SUB_SOURCE_DEMUX] >= 0) {
00ebdb6cb87f Factor out code that decides which subtitle to play.
reimar
parents: 29804
diff changeset
1929 // finally select subs by language and container hints
00ebdb6cb87f Factor out code that decides which subtitle to play.
reimar
parents: 29804
diff changeset
1930 if (dvdsub_id == -1 && dvdsub_lang)
00ebdb6cb87f Factor out code that decides which subtitle to play.
reimar
parents: 29804
diff changeset
1931 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
1932 if (dvdsub_id == -1)
00ebdb6cb87f Factor out code that decides which subtitle to play.
reimar
parents: 29804
diff changeset
1933 dvdsub_id = demuxer_default_sub_track(mpctx->demuxer);
00ebdb6cb87f Factor out code that decides which subtitle to play.
reimar
parents: 29804
diff changeset
1934 if (dvdsub_id >= 0)
00ebdb6cb87f Factor out code that decides which subtitle to play.
reimar
parents: 29804
diff changeset
1935 mpctx->global_sub_pos = mpctx->global_sub_indices[SUB_SOURCE_DEMUX] + dvdsub_id;
00ebdb6cb87f Factor out code that decides which subtitle to play.
reimar
parents: 29804
diff changeset
1936 }
00ebdb6cb87f Factor out code that decides which subtitle to play.
reimar
parents: 29804
diff changeset
1937 // rather than duplicate code, use the SUB_SELECT handler to init the right one.
00ebdb6cb87f Factor out code that decides which subtitle to play.
reimar
parents: 29804
diff changeset
1938 mpctx->global_sub_pos--;
00ebdb6cb87f Factor out code that decides which subtitle to play.
reimar
parents: 29804
diff changeset
1939 mp_property_do("sub",M_PROPERTY_STEP_UP,NULL, mpctx);
00ebdb6cb87f Factor out code that decides which subtitle to play.
reimar
parents: 29804
diff changeset
1940 }
00ebdb6cb87f Factor out code that decides which subtitle to play.
reimar
parents: 29804
diff changeset
1941
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
1942 #ifdef CONFIG_DVDNAV
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1943 #ifndef FF_B_TYPE
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1944 #define FF_B_TYPE 3
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1945 #endif
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1946 /// store decoded video image
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1947 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
1948 mp_image_t *from_mpi) {
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1949 mp_image_t *mpi;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1950
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1951 /// Do not store B-frames
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1952 if (from_mpi->pict_type == FF_B_TYPE)
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1953 return to_mpi;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1954
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1955 if (to_mpi &&
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1956 to_mpi->w == from_mpi->w &&
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1957 to_mpi->h == from_mpi->h &&
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1958 to_mpi->imgfmt == from_mpi->imgfmt)
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1959 mpi = to_mpi;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1960 else {
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1961 if (to_mpi)
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1962 free_mp_image(to_mpi);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1963 if (from_mpi->w == 0 || from_mpi->h == 0)
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1964 return NULL;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1965 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
1966 }
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1967
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1968 copy_mpi(mpi,from_mpi);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1969 return mpi;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1970 }
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 static void mp_dvdnav_reset_stream (MPContext *ctx) {
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1973 if (ctx->sh_video) {
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1974 /// clear video pts
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1975 ctx->d_video->pts = 0.0f;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1976 ctx->sh_video->pts = 0.0f;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1977 ctx->sh_video->i_pts = 0.0f;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1978 ctx->sh_video->last_pts = 0.0f;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1979 ctx->sh_video->num_buffered_pts = 0;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1980 ctx->sh_video->num_frames = 0;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1981 ctx->sh_video->num_frames_decoded = 0;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1982 ctx->sh_video->timer = 0.0f;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1983 ctx->sh_video->stream_delay = 0.0f;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1984 ctx->sh_video->timer = 0;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1985 ctx->demuxer->stream_pts = MP_NOPTS_VALUE;
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
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1988 if (ctx->sh_audio) {
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1989 /// free audio packets and reset
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1990 ds_free_packs(ctx->d_audio);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1991 audio_delay -= ctx->sh_audio->stream_delay;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1992 ctx->delay =- audio_delay;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1993 ctx->audio_out->reset();
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1994 resync_audio_stream(ctx->sh_audio);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1995 }
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1996
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
1997 audio_delay = 0.0f;
29922
3991a8fd6a02 Readjust the global number of subs when switching dvdnav track to take
reimar
parents: 29885
diff changeset
1998 mpctx->global_sub_size = mpctx->global_sub_indices[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
1999 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
2000 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
2001 if (dvdsub_lang_id != dvdsub_id) {
5e279f7d7e5d Remember which subtitle was auto-selected for dvdnav due to -slang
reimar
parents: 29854
diff changeset
2002 dvdsub_id = dvdsub_lang_id;
5e279f7d7e5d Remember which subtitle was auto-selected for dvdnav due to -slang
reimar
parents: 29854
diff changeset
2003 select_subtitle(ctx);
5e279f7d7e5d Remember which subtitle was auto-selected for dvdnav due to -slang
reimar
parents: 29854
diff changeset
2004 }
5e279f7d7e5d Remember which subtitle was auto-selected for dvdnav due to -slang
reimar
parents: 29854
diff changeset
2005 }
25824
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 /// clear all EOF related flags
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2008 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
2009 }
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 /// Restore last decoded DVDNAV (still frame)
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2012 static mp_image_t *mp_dvdnav_restore_smpi(int *in_size,
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2013 unsigned char **start,
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2014 mp_image_t *decoded_frame)
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2015 {
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2016 if (mpctx->stream->type != STREAMTYPE_DVDNAV)
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2017 return decoded_frame;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2018
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2019 /// a change occured in dvdnav stream
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2020 if (mp_dvdnav_cell_has_changed(mpctx->stream,0)) {
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2021 mp_dvdnav_read_wait(mpctx->stream, 1, 1);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2022 mp_dvdnav_context_free(mpctx);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2023 mp_dvdnav_reset_stream(mpctx);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2024 mp_dvdnav_read_wait(mpctx->stream, 0, 1);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2025 mp_dvdnav_cell_has_changed(mpctx->stream,1);
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 if (*in_size < 0) {
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2029 float len;
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 /// Display still frame, if any
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2032 if (mpctx->nav_smpi && !mpctx->nav_buffer)
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2033 decoded_frame = mpctx->nav_smpi;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2034
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2035 /// increment video frame : continue playing after still frame
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2036 len = demuxer_get_time_length(mpctx->demuxer);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2037 if (mpctx->sh_video->pts >= len &&
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2038 mpctx->sh_video->pts > 0.0 && len > 0.0) {
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2039 mp_dvdnav_skip_still(mpctx->stream);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2040 mp_dvdnav_skip_wait(mpctx->stream);
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->sh_video->pts += 1 / mpctx->sh_video->fps;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
2043
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2044 if (mpctx->nav_buffer) {
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2045 *start = mpctx->nav_start;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2046 *in_size = mpctx->nav_in_size;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2047 if (mpctx->nav_start)
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2048 memcpy(*start,mpctx->nav_buffer,mpctx->nav_in_size);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2049 }
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2050 }
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2051
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2052 return decoded_frame;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2053 }
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2054
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2055 /// Save last decoded DVDNAV (still frame)
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2056 static void mp_dvdnav_save_smpi(int in_size,
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2057 unsigned char *start,
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2058 mp_image_t *decoded_frame)
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2059 {
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2060 if (mpctx->stream->type != STREAMTYPE_DVDNAV)
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2061 return;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
2062
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2063 if (mpctx->nav_buffer)
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2064 free(mpctx->nav_buffer);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2065
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2066 mpctx->nav_buffer = malloc(in_size);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2067 mpctx->nav_start = start;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2068 mpctx->nav_in_size = mpctx->nav_buffer ? in_size : -1;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2069 if (mpctx->nav_buffer)
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2070 memcpy(mpctx->nav_buffer,start,in_size);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2071
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2072 if (decoded_frame && mpctx->nav_smpi != decoded_frame)
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2073 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
2074 }
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
2075 #endif /* CONFIG_DVDNAV */
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2076
20887
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2077 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
2078 {
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2079 current_module="av_sync";
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2080
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
2081 if(mpctx->sh_audio){
20887
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2082 double a_pts, v_pts;
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2083
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2084 if (autosync)
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 is enabled, the value for delay must be calculated
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2087 * a bit differently. It is set only to the difference between
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2088 * the audio and video timers. Any attempt to include the real
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2089 * or corrected delay causes the pts_correction code below to
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2090 * try to correct for the changes in delay which autosync is
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2091 * trying to measure. This keeps the two from competing, but still
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2092 * 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
2093 * value here, even a "corrected" one, would be incompatible with
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2094 * autosync mode.)
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2095 */
22488
b6aa3eedf49b Move the sh_audio->delay field to mpctx->delay.
uau
parents: 22458
diff changeset
2096 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
2097 else
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
2098 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
2099
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
2100 v_pts = mpctx->sh_video->pts;
20887
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2101
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2102 {
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2103 static int drop_message=0;
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2104 double AV_delay = a_pts - audio_delay - v_pts;
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2105 double x;
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2106 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
2107 ++drop_message;
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2108 mp_msg(MSGT_AVSYNC,MSGL_WARN,MSGTR_SystemTooSlow);
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2109 }
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2110 if (autosync)
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2111 x = AV_delay*0.1f;
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2112 else
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2113 /* 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
2114 * was late not because of wrong target time but because the
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2115 * target time could not be met */
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2116 x = (AV_delay + timing_error * playback_speed) * 0.1f;
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2117 if (x < -max_pts_correction)
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2118 x = -max_pts_correction;
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2119 else if (x> max_pts_correction)
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2120 x = max_pts_correction;
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2121 if (default_max_pts_correction >= 0)
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2122 max_pts_correction = default_max_pts_correction;
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2123 else
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
2124 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
2125 if (!between_frames) {
22488
b6aa3eedf49b Move the sh_audio->delay field to mpctx->delay.
uau
parents: 22458
diff changeset
2126 mpctx->delay+=x;
20887
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2127 c_total+=x;
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2128 }
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2129 if(!quiet)
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2130 print_status(a_pts - audio_delay, AV_delay, c_total);
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2131 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
2132
20887
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2133 } else {
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2134 // No audio:
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
2135
20887
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2136 if (!quiet)
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2137 print_status(0, 0, 0);
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2138 }
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2139 }
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2140
20986
2422495f5e78 Mark some functions static
uau
parents: 20978
diff changeset
2141 static int fill_audio_out_buffers(void)
20889
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2142 {
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2143 unsigned int t;
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2144 double tt;
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2145 int playsize;
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2146 int playflags=0;
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2147 int audio_eof=0;
20890
9e2d69c27ddb Try filling audio buffers more if they're very large, add some comments.
uau
parents: 20889
diff changeset
2148 int bytes_to_write;
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
2149 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
2150
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2151 current_module="play_audio";
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2152
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2153 while (1) {
28185
a3ec147048ce Avoid a uselessly high number of wakeups when playing audio-only files.
reimar
parents: 28051
diff changeset
2154 int sleep_time;
20890
9e2d69c27ddb Try filling audio buffers more if they're very large, add some comments.
uau
parents: 20889
diff changeset
2155 // 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
2156 // 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
2157 // in get_space()
22488
b6aa3eedf49b Move the sh_audio->delay field to mpctx->delay.
uau
parents: 22458
diff changeset
2158 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
2159 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
2160 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
2161 break;
20889
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2162
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2163 // handle audio-only case:
20890
9e2d69c27ddb Try filling audio buffers more if they're very large, add some comments.
uau
parents: 20889
diff changeset
2164 // 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
2165 // 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
2166 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
2167 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
2168 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
2169 }
9e2d69c27ddb Try filling audio buffers more if they're very large, add some comments.
uau
parents: 20889
diff changeset
2170
9e2d69c27ddb Try filling audio buffers more if they're very large, add some comments.
uau
parents: 20889
diff changeset
2171 while (bytes_to_write) {
9e2d69c27ddb Try filling audio buffers more if they're very large, add some comments.
uau
parents: 20889
diff changeset
2172 playsize = bytes_to_write;
20889
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2173 if (playsize > MAX_OUTBURST)
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2174 playsize = MAX_OUTBURST;
20890
9e2d69c27ddb Try filling audio buffers more if they're very large, add some comments.
uau
parents: 20889
diff changeset
2175 bytes_to_write -= playsize;
20889
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2176
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2177 // Fill buffer if needed:
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2178 current_module="decode_audio";
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2179 t = GetTimer();
24892
80180dc13565 Change decode_audio() interface
uau
parents: 24891
diff changeset
2180 if (decode_audio(sh_audio, playsize) < 0) // EOF or error
80180dc13565 Change decode_audio() interface
uau
parents: 24891
diff changeset
2181 if (mpctx->d_audio->eof) {
80180dc13565 Change decode_audio() interface
uau
parents: 24891
diff changeset
2182 audio_eof = 1;
80180dc13565 Change decode_audio() interface
uau
parents: 24891
diff changeset
2183 if (sh_audio->a_out_buffer_len == 0)
80180dc13565 Change decode_audio() interface
uau
parents: 24891
diff changeset
2184 return 0;
20889
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2185 }
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2186 t = GetTimer() - t;
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2187 tt = t*0.000001f; audio_time_usage+=tt;
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2188 if (playsize > sh_audio->a_out_buffer_len) {
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2189 playsize = sh_audio->a_out_buffer_len;
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2190 if (audio_eof)
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2191 playflags |= AOPLAY_FINAL_CHUNK;
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2192 }
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2193 if (!playsize)
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2194 break;
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2195
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
2196 // play audio:
20889
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2197 current_module="play_audio";
20890
9e2d69c27ddb Try filling audio buffers more if they're very large, add some comments.
uau
parents: 20889
diff changeset
2198
9e2d69c27ddb Try filling audio buffers more if they're very large, add some comments.
uau
parents: 20889
diff changeset
2199 // 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
2200 // 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
2201 // 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
2202 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
2203 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
2204
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2205 if (playsize > 0) {
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2206 sh_audio->a_out_buffer_len -= playsize;
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2207 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
2208 sh_audio->a_out_buffer_len);
22488
b6aa3eedf49b Move the sh_audio->delay field to mpctx->delay.
uau
parents: 22458
diff changeset
2209 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
2210 }
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
2211 else if (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
2212 // 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
2213 // 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
2214 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
2215 sh_audio->a_out_buffer_len = 0;
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2216 }
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2217 }
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2218 return 1;
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
2219 }
20887
bf66030474ae Split some from main() into separate functions.
uau
parents: 20771
diff changeset
2220
20986
2422495f5e78 Mark some functions static
uau
parents: 20978
diff changeset
2221 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
2222 {
20904
e5456123de82 Fix statement-before-declaration warnings.
reimar
parents: 20903
diff changeset
2223 int frame_time_remaining = 0;
20899
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2224 current_module="calc_sleep_time";
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2225
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2226 *time_frame -= GetRelativeTime(); // reset timer
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2227
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
2228 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
2229 float delay = mpctx->audio_out->get_delay();
20899
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2230 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
2231
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2232 if (autosync) {
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2233 /*
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2234 * 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
2235 * 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
2236 * 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
2237 * 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
2238 * 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
2239 * 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
2240 * 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
2241 */
22488
b6aa3eedf49b Move the sh_audio->delay field to mpctx->delay.
uau
parents: 22458
diff changeset
2242 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
2243 float difference = delay - predicted;
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2244 delay = predicted + difference / (float)autosync;
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
22488
b6aa3eedf49b Move the sh_audio->delay field to mpctx->delay.
uau
parents: 22458
diff changeset
2247 *time_frame = delay - mpctx->delay / playback_speed;
20899
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2248
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2249 // delay = amount of audio buffered in soundcard/driver
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2250 if (delay > 0.25) delay=0.25; else
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2251 if (delay < 0.10) delay=0.10;
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2252 if (*time_frame > delay*0.6) {
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2253 // 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
2254 frame_time_remaining = 1;
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2255 *time_frame = delay*0.5;
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2256 }
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2257 } else {
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2258 // 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
2259 // don't try to "catch up".
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2260 // 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
2261 // without sleeping.
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2262 if (*time_frame < -0.2 || benchmark)
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2263 *time_frame = 0;
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 *aq_sleep_time += *time_frame;
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
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2269 //============================== SLEEP: ===================================
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2270
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2271 // 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
2272 if (*time_frame > 0.001 && !(vo_flags&256))
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2273 *time_frame = timing_sleep(*time_frame);
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2274 return frame_time_remaining;
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2275 }
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2276
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
2277 int reinit_video_chain(void) {
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
2278 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
2279 double ar=-1.0;
20947
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2280 //================== Init VIDEO (codec & libvo) ==========================
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
2281 if(!fixed_vo || !(initialized_flags&INITIALIZED_VO)){
20947
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2282 current_module="preinit_libvo";
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2283
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2284 //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
2285 vo_config_count=0;
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
2286 //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
2287 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
2288 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
2289 goto err_out;
20947
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2290 }
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
2291 initialized_flags|=INITIALIZED_VO;
20947
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2292 }
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2293
24302
7d58773ead24 moved to reinit_video_chain() the assignment of sh_video->stream_aspect, where it makes more sense
nicodvb
parents: 24300
diff changeset
2294 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
2295 mpctx->sh_video->stream_aspect = ar;
20947
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2296 current_module="init_video_filters";
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2297 {
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
2298 char* vf_arg[] = { "_oldargs_", (char*)mpctx->video_out , NULL };
20947
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2299 sh_video->vfilter=(void*)vf_open_filter(NULL,"vo",vf_arg);
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2300 }
27345
b597fd2924b4 Rename preprocessor directive HAVE_MENU --> CONFIG_MENU.
diego
parents: 27343
diff changeset
2301 #ifdef CONFIG_MENU
20947
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2302 if(use_menu) {
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2303 char* vf_arg[] = { "_oldargs_", menu_root, NULL };
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2304 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
2305 if(!vf_menu) {
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2306 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
2307 use_menu = 0;
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2308 }
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2309 }
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2310 if(vf_menu)
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2311 sh_video->vfilter=(void*)vf_menu;
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2312 #endif
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2313
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
2314 #ifdef CONFIG_ASS
20947
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2315 if(ass_enabled) {
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2316 int i;
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2317 int insert = 1;
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2318 if (vf_settings)
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2319 for (i = 0; vf_settings[i].name; ++i)
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2320 if (strcmp(vf_settings[i].name, "ass") == 0) {
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2321 insert = 0;
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2322 break;
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2323 }
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2324 if (insert) {
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2325 extern vf_info_t vf_info_ass;
26288
6e53dfe38594 Add some const qualifiers to reduce warnings
uau
parents: 26281
diff changeset
2326 const vf_info_t* libass_vfs[] = {&vf_info_ass, NULL};
20947
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2327 char* vf_arg[] = {"auto", "1", NULL};
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2328 vf_instance_t* vf_ass = vf_open_plugin(libass_vfs,sh_video->vfilter,"ass",vf_arg);
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2329 if (vf_ass)
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2330 sh_video->vfilter=(void*)vf_ass;
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2331 else
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2332 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
2333 }
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2334 }
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2335 #endif
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2336
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2337 sh_video->vfilter=(void*)append_filters(sh_video->vfilter);
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2338
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
2339 #ifdef CONFIG_ASS
20947
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2340 if (ass_enabled)
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2341 ((vf_instance_t *)sh_video->vfilter)->control(sh_video->vfilter, VFCTRL_INIT_EOSD, ass_library);
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2342 #endif
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2343
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2344 current_module="init_video_codec";
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2345
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2346 mp_msg(MSGT_CPLAYER,MSGL_INFO,"==========================================================================\n");
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2347 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
2348 mp_msg(MSGT_CPLAYER,MSGL_INFO,"==========================================================================\n");
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2349
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
2350 if(!sh_video->initialized){
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
2351 if(!fixed_vo) uninit_player(INITIALIZED_VO);
21031
e45bb0ee5558 Make sure sh_video == NULL when reinit_video_chain fails.
reimar
parents: 21030
diff changeset
2352 goto err_out;
20947
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2353 }
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 initialized_flags|=INITIALIZED_VCODEC;
20947
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2356
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2357 if (sh_video->codec)
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2358 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
2359
21077
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2360 sh_video->last_pts = MP_NOPTS_VALUE;
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2361 sh_video->num_buffered_pts = 0;
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2362 sh_video->next_frame_time = 0;
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2363
20947
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2364 if(auto_quality>0){
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2365 // Auto quality option enabled
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2366 output_quality=get_video_quality_max(sh_video);
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2367 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
2368 else output_quality=auto_quality;
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2369 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
2370 set_video_quality(sh_video,output_quality);
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2371 }
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2372
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2373 // ========== 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
2374
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2375 current_module="init_vo";
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 return 1;
21031
e45bb0ee5558 Make sure sh_video == NULL when reinit_video_chain fails.
reimar
parents: 21030
diff changeset
2378
e45bb0ee5558 Make sure sh_video == NULL when reinit_video_chain fails.
reimar
parents: 21030
diff changeset
2379 err_out:
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
2380 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
2381 return 0;
20947
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
2382 }
20899
c00d8c1aa0ab Replace sleep time calculation in main() with a separate function.
uau
parents: 20898
diff changeset
2383
21077
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2384 static double update_video(int *blit_frame)
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2385 {
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
2386 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
2387 //-------------------- Decode a frame: -----------------------
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2388 double frame_time;
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2389 *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
2390 if (!correct_pts) {
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2391 unsigned char* start=NULL;
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2392 void *decoded_frame = NULL;
21077
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2393 int drop_frame=0;
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2394 int in_size;
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2395
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2396 current_module = "video_read_frame";
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2397 frame_time = sh_video->next_frame_time;
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2398 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
2399 &start, force_fps);
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
2400 #ifdef CONFIG_DVDNAV
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2401 /// wait, still frame or EOF
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2402 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
2403 if (mp_dvdnav_is_eof(mpctx->stream))
203789464176 misc cosmetics: K&R style nits, #include placement, indentation
diego
parents: 31148
diff changeset
2404 return -1;
203789464176 misc cosmetics: K&R style nits, #include placement, indentation
diego
parents: 31148
diff changeset
2405 if (mpctx->d_video)
203789464176 misc cosmetics: K&R style nits, #include placement, indentation
diego
parents: 31148
diff changeset
2406 mpctx->d_video->eof = 0;
203789464176 misc cosmetics: K&R style nits, #include placement, indentation
diego
parents: 31148
diff changeset
2407 if (mpctx->d_audio)
203789464176 misc cosmetics: K&R style nits, #include placement, indentation
diego
parents: 31148
diff changeset
2408 mpctx->d_audio->eof = 0;
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2409 mpctx->stream->eof = 0;
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2410 } else
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2411 #endif
21077
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2412 if (in_size < 0)
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2413 return -1;
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2414 if (in_size > max_framesize)
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2415 max_framesize = in_size; // stats
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2416 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
2417 if (mpctx->sh_audio)
22488
b6aa3eedf49b Move the sh_audio->delay field to mpctx->delay.
uau
parents: 22458
diff changeset
2418 mpctx->delay -= frame_time;
21077
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2419 // video_read_frame can change fps (e.g. for ASF video)
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2420 vo_fps = sh_video->fps;
26228
089dc00275b6 Experimental support for -framedrop with -correct-pts.
reimar
parents: 26159
diff changeset
2421 drop_frame = check_framedrop(frame_time);
29668
ecc719c6d7a9 Make update_subtitles work without sh_video for text subtitles.
reimar
parents: 29642
diff changeset
2422 update_subtitles(sh_video, sh_video->pts, mpctx->d_sub, 0);
23903
037737866f6a Teletext support
voroshil
parents: 23889
diff changeset
2423 update_teletext(sh_video, mpctx->demuxer, 0);
21077
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2424 update_osd_msg();
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2425 current_module = "decode_video";
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
2426 #ifdef CONFIG_DVDNAV
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,
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2432 sh_video->pts);
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
2433 #ifdef CONFIG_DVDNAV
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2434 /// save back last still frame for future display
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2435 mp_dvdnav_save_smpi(in_size,start,decoded_frame);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
2436 #endif
21077
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2437 current_module = "filter_video";
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2438 *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
2439 sh_video->pts));
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2440 }
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2441 else {
26228
089dc00275b6 Experimental support for -framedrop with -correct-pts.
reimar
parents: 26159
diff changeset
2442 int res = generate_video_frame(sh_video, mpctx->d_video);
089dc00275b6 Experimental support for -framedrop with -correct-pts.
reimar
parents: 26159
diff changeset
2443 if (!res)
21077
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2444 return -1;
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2445 ((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
2446 VFCTRL_GET_PTS, &sh_video->pts);
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2447 if (sh_video->pts == MP_NOPTS_VALUE) {
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2448 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
2449 sh_video->pts = sh_video->last_pts;
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2450 }
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2451 if (sh_video->last_pts == MP_NOPTS_VALUE)
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2452 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
2453 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
2454 // 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
2455 // 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
2456 // 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
2457 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
2458 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
2459 else
a3adde0a5b83 If an invalid pts value is detected, try to to make up some if it seems
reimar
parents: 31243
diff changeset
2460 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
2461 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
2462 }
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2463 frame_time = sh_video->pts - sh_video->last_pts;
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2464 sh_video->last_pts = sh_video->pts;
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2465 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
2466 if(mpctx->sh_audio)
22488
b6aa3eedf49b Move the sh_audio->delay field to mpctx->delay.
uau
parents: 22458
diff changeset
2467 mpctx->delay -= frame_time;
26228
089dc00275b6 Experimental support for -framedrop with -correct-pts.
reimar
parents: 26159
diff changeset
2468 *blit_frame = res > 0;
21077
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2469 }
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2470 return frame_time;
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2471 }
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
2472
25606
a3f9b22287ca Make some functions in mplayer.c static
reimar
parents: 25467
diff changeset
2473 static void pause_loop(void)
21082
ef6a6e777fdd Move pause loop into a separate function.
uau
parents: 21077
diff changeset
2474 {
ef6a6e777fdd Move pause loop into a separate function.
uau
parents: 21077
diff changeset
2475 mp_cmd_t* cmd;
ef6a6e777fdd Move pause loop into a separate function.
uau
parents: 21077
diff changeset
2476 if (!quiet) {
ef6a6e777fdd Move pause loop into a separate function.
uau
parents: 21077
diff changeset
2477 // Small hack to display the pause message on the OSD line.
ef6a6e777fdd Move pause loop into a separate function.
uau
parents: 21077
diff changeset
2478 // The pause string is: "\n == PAUSE == \r" so we need to
ef6a6e777fdd Move pause loop into a separate function.
uau
parents: 21077
diff changeset
2479 // 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
2480 if (term_osd && !mpctx->sh_video) {
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2481 char msg[128] = MSGTR_Paused;
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2482 int mlen = strlen(msg);
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2483 msg[mlen-1] = '\0';
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2484 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
2485 update_osd_msg();
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2486 } else
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2487 mp_msg(MSGT_CPLAYER,MSGL_STATUS,MSGTR_Paused);
21082
ef6a6e777fdd Move pause loop into a separate function.
uau
parents: 21077
diff changeset
2488 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_PAUSED\n");
ef6a6e777fdd Move pause loop into a separate function.
uau
parents: 21077
diff changeset
2489 }
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
2490 #ifdef CONFIG_GUI
21082
ef6a6e777fdd Move pause loop into a separate function.
uau
parents: 21077
diff changeset
2491 if (use_gui)
29857
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2492 guiGetEvent(guiCEvent, (char *)guiSetPause);
21082
ef6a6e777fdd Move pause loop into a separate function.
uau
parents: 21077
diff changeset
2493 #endif
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
2494 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
2495 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
2496
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
2497 if (mpctx->audio_out && mpctx->sh_audio)
29857
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2498 mpctx->audio_out->pause(); // pause audio, keep data if possible
21082
ef6a6e777fdd Move pause loop into a separate function.
uau
parents: 21077
diff changeset
2499
28835
6f5824a39ada Make pausing_keep_force the default for the set_mouse_pos and key_down_event -
reimar
parents: 28656
diff changeset
2500 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
2501 if (cmd) {
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2502 cmd = mp_input_get_cmd(0,1,0);
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2503 run_command(mpctx, cmd);
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2504 mp_cmd_free(cmd);
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2505 continue;
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2506 }
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2507 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
2508 mpctx->video_out->check_events();
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
2509 #ifdef CONFIG_GUI
29857
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2510 if (use_gui) {
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2511 guiEventHandling();
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2512 guiGetEvent(guiReDraw, NULL);
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2513 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
2514 break;
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2515 }
21082
ef6a6e777fdd Move pause loop into a separate function.
uau
parents: 21077
diff changeset
2516 #endif
27345
b597fd2924b4 Rename preprocessor directive HAVE_MENU --> CONFIG_MENU.
diego
parents: 27343
diff changeset
2517 #ifdef CONFIG_MENU
29857
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2518 if (vf_menu)
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2519 vf_menu_pause_update(vf_menu);
21082
ef6a6e777fdd Move pause loop into a separate function.
uau
parents: 21077
diff changeset
2520 #endif
29857
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2521 usec_sleep(20000);
21082
ef6a6e777fdd Move pause loop into a separate function.
uau
parents: 21077
diff changeset
2522 }
ef6a6e777fdd Move pause loop into a separate function.
uau
parents: 21077
diff changeset
2523 if (cmd && cmd->id == MP_CMD_PAUSE) {
29857
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2524 cmd = mp_input_get_cmd(0,1,0);
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2525 mp_cmd_free(cmd);
21082
ef6a6e777fdd Move pause loop into a separate function.
uau
parents: 21077
diff changeset
2526 }
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
2527 mpctx->osd_function=OSD_PLAY;
29937
d654021c9652 Add braces to avoid ambiguous else.
reimar
parents: 29922
diff changeset
2528 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
2529 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
2530 mpctx->audio_out->reset();
3a6ae46759de Do not call resume on unpausing if we have already reached eof while
reimar
parents: 29855
diff changeset
2531 else
29857
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2532 mpctx->audio_out->resume(); // resume audio
29937
d654021c9652 Add braces to avoid ambiguous else.
reimar
parents: 29922
diff changeset
2533 }
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
2534 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
2535 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
2536 (void)GetRelativeTime(); // ignore time that passed during pause
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
2537 #ifdef CONFIG_GUI
21082
ef6a6e777fdd Move pause loop into a separate function.
uau
parents: 21077
diff changeset
2538 if (use_gui) {
29857
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2539 if (guiIntfStruct.Playing == guiSetStop)
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2540 mpctx->eof = 1;
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2541 else
d2853289006d Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs.
reimar
parents: 29856
diff changeset
2542 guiGetEvent(guiCEvent, (char *)guiSetPlay);
21082
ef6a6e777fdd Move pause loop into a separate function.
uau
parents: 21077
diff changeset
2543 }
ef6a6e777fdd Move pause loop into a separate function.
uau
parents: 21077
diff changeset
2544 #endif
ef6a6e777fdd Move pause loop into a separate function.
uau
parents: 21077
diff changeset
2545 }
ef6a6e777fdd Move pause loop into a separate function.
uau
parents: 21077
diff changeset
2546
22298
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2547
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2548 // Find the right mute status and record position for new file position
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2549 static void edl_seek_reset(MPContext *mpctx)
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2550 {
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2551 mpctx->edl_muted = 0;
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2552 next_edl_record = edl_records;
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2553
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2554 while (next_edl_record) {
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2555 if (next_edl_record->start_sec >= mpctx->sh_video->pts)
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2556 break;
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2557
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2558 if (next_edl_record->action == EDL_MUTE)
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2559 mpctx->edl_muted = !mpctx->edl_muted;
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2560 next_edl_record = next_edl_record->next;
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2561 }
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2562 if ((mpctx->user_muted | mpctx->edl_muted) != mpctx->mixer.muted)
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2563 mixer_mute(&mpctx->mixer);
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2564 }
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2565
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2566
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2567 // Execute EDL command for the current position if one exists
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2568 static void edl_update(MPContext *mpctx)
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2569 {
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2570 if (!next_edl_record)
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2571 return;
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2572
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2573 if (!mpctx->sh_video) {
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2574 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_EdlNOsh_video);
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2575 free_edl(edl_records);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
2576 next_edl_record = NULL;
22298
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2577 edl_records = NULL;
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2578 return;
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2579 }
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2580
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2581 if (mpctx->sh_video->pts >= next_edl_record->start_sec) {
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2582 if (next_edl_record->action == EDL_SKIP) {
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2583 mpctx->osd_function = OSD_FFW;
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2584 abs_seek_pos = 0;
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2585 rel_seek_secs = next_edl_record->length_sec;
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2586 mp_msg(MSGT_CPLAYER, MSGL_DBG4, "EDL_SKIP: start [%f], stop "
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2587 "[%f], length [%f]\n", next_edl_record->start_sec,
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2588 next_edl_record->stop_sec, next_edl_record->length_sec);
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2589 edl_decision = 1;
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2590 }
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2591 else if (next_edl_record->action == EDL_MUTE) {
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2592 mpctx->edl_muted = !mpctx->edl_muted;
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2593 if ((mpctx->user_muted | mpctx->edl_muted) != mpctx->mixer.muted)
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2594 mixer_mute(&mpctx->mixer);
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2595 mp_msg(MSGT_CPLAYER, MSGL_DBG4, "EDL_MUTE: [%f]\n",
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2596 next_edl_record->start_sec );
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2597 }
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2598 next_edl_record = next_edl_record->next;
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2599 }
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
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
2602
25883
baf32110d3fc Use defines to give names to the different seek flags.
reimar
parents: 25852
diff changeset
2603 // 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
2604 // 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
2605 // return -1 if seek failed (non-seekable stream?), 0 otherwise
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2606 static int seek(MPContext *mpctx, double amount, int style)
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2607 {
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2608 current_module = "seek";
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2609 if (demux_seek(mpctx->demuxer, amount, audio_delay, style) == 0)
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2610 return -1;
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2611
30176
6fb92182aff3 At startup and while seeking avoid to introduce pointless sleeps and possibly
reimar
parents: 30175
diff changeset
2612 mpctx->startup_decode_retry = DEFAULT_STARTUP_DECODE_RETRY;
22300
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2613 if (mpctx->sh_video) {
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2614 current_module = "seek_video_reset";
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2615 if (vo_config_count)
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2616 mpctx->video_out->control(VOCTRL_RESET, NULL);
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2617 mpctx->num_buffered_frames = 0;
22488
b6aa3eedf49b Move the sh_audio->delay field to mpctx->delay.
uau
parents: 22458
diff changeset
2618 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
2619 mpctx->time_frame = 0;
22300
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2620 // Not all demuxers set d_video->pts during seek, so this value
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2621 // (which is used by at least vobsub and edl code below) may
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2622 // be completely wrong (probably 0).
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2623 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
2624 update_subtitles(mpctx->sh_video, mpctx->sh_video->pts, mpctx->d_sub, 1);
23903
037737866f6a Teletext support
voroshil
parents: 23889
diff changeset
2625 update_teletext(mpctx->sh_video, mpctx->demuxer, 1);
22300
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2626 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
2627
22300
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2628 if (mpctx->sh_audio) {
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2629 current_module = "seek_audio_reset";
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2630 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
2631 if (!mpctx->sh_video)
2e3751815a21 Add support for displaying subtitles on the command-line when playing
reimar
parents: 29668
diff changeset
2632 update_subtitles(NULL, mpctx->sh_audio->pts, mpctx->d_sub, 1);
22300
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2633 }
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2634
25416
a79a22add62a Do not operate on vobsub when no video (Bug #312).
ulion
parents: 25397
diff changeset
2635 if (vo_vobsub && mpctx->sh_video) {
22300
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2636 current_module = "seek_vobsub_reset";
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2637 vobsub_seek(vo_vobsub, mpctx->sh_video->pts);
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2638 }
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2639
31251
ff83a7122367 Do not use libass functions if it is disabled.
reimar
parents: 31245
diff changeset
2640 #if defined(CONFIG_ASS) && defined(LIBASS_VERSION) && LIBASS_VERSION >= 0x00910000
31227
ee7beb1a3a6e backport ass_flush_events() from upstream libass and make use of it
aurel
parents: 31201
diff changeset
2641 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
2642 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
2643 #endif
ee7beb1a3a6e backport ass_flush_events() from upstream libass and make use of it
aurel
parents: 31201
diff changeset
2644
22300
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2645 edl_seek_reset(mpctx);
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2646
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2647 c_total = 0;
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2648 max_pts_correction = 0.1;
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2649 audio_time_usage = 0; video_time_usage = 0; vout_time_usage = 0;
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2650 drop_frame_cnt = 0;
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2651
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2652 current_module = NULL;
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2653 return 0;
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2654 }
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
2655
26963
8825552ee585 Fix the linking of TOOLS/netstream and TOOLS/vivodump.
diego
parents: 26877
diff changeset
2656 /* 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
2657 * file for some tools to link against. */
8825552ee585 Fix the linking of TOOLS/netstream and TOOLS/vivodump.
diego
parents: 26877
diff changeset
2658 #ifndef DISABLE_MAIN
21764
309992959801 avoid code duplication.
vayne
parents: 21604
diff changeset
2659 int main(int argc,char* argv[]){
309992959801 avoid code duplication.
vayne
parents: 21604
diff changeset
2660
309992959801 avoid code duplication.
vayne
parents: 21604
diff changeset
2661
309992959801 avoid code duplication.
vayne
parents: 21604
diff changeset
2662 char * mem_ptr;
309992959801 avoid code duplication.
vayne
parents: 21604
diff changeset
2663
309992959801 avoid code duplication.
vayne
parents: 21604
diff changeset
2664 // movie info:
309992959801 avoid code duplication.
vayne
parents: 21604
diff changeset
2665
309992959801 avoid code duplication.
vayne
parents: 21604
diff changeset
2666 /* Flag indicating whether MPlayer should exit without playing anything. */
309992959801 avoid code duplication.
vayne
parents: 21604
diff changeset
2667 int opt_exit = 0;
309992959801 avoid code duplication.
vayne
parents: 21604
diff changeset
2668
309992959801 avoid code duplication.
vayne
parents: 21604
diff changeset
2669 //float a_frame=0; // Audio
309992959801 avoid code duplication.
vayne
parents: 21604
diff changeset
2670
309992959801 avoid code duplication.
vayne
parents: 21604
diff changeset
2671 int i;
309992959801 avoid code duplication.
vayne
parents: 21604
diff changeset
2672
309992959801 avoid code duplication.
vayne
parents: 21604
diff changeset
2673 int gui_no_filename=0;
309992959801 avoid code duplication.
vayne
parents: 21604
diff changeset
2674
309992959801 avoid code duplication.
vayne
parents: 21604
diff changeset
2675 InitTimer();
27321
2c0abab6b9b7 Use GetTimerMS() instead of time() with srand.
reimar
parents: 27060
diff changeset
2676 srand(GetTimerMS());
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
2677
21764
309992959801 avoid code duplication.
vayne
parents: 21604
diff changeset
2678 mp_msg_init();
309992959801 avoid code duplication.
vayne
parents: 21604
diff changeset
2679
26408
7a36d5941fd8 Replace the trivial command line preparser with a more robust version
albeu
parents: 26326
diff changeset
2680 // 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
2681 mconfig = m_config_new();
7a36d5941fd8 Replace the trivial command line preparser with a more robust version
albeu
parents: 26326
diff changeset
2682 m_config_register_options(mconfig,mplayer_opts);
7a36d5941fd8 Replace the trivial command line preparser with a more robust version
albeu
parents: 26326
diff changeset
2683 mp_input_register_options(mconfig);
7a36d5941fd8 Replace the trivial command line preparser with a more robust version
albeu
parents: 26326
diff changeset
2684
7a36d5941fd8 Replace the trivial command line preparser with a more robust version
albeu
parents: 26326
diff changeset
2685 // Preparse the command line
7a36d5941fd8 Replace the trivial command line preparser with a more robust version
albeu
parents: 26326
diff changeset
2686 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
2687
27727
48c1ae64255b Replace preprocessor check for WIN32 with checks for __MINGW32__ and __CYGWIN__.
diego
parents: 27635
diff changeset
2688 #if (defined(__MINGW32__) || defined(__CYGWIN__)) && defined(CONFIG_WIN32DLL)
16781
6809ca5dd307 allow mencoder to load win32 codecs properly patch by Zuxy <zuxy.meng at gmail.com>
faust3
parents: 16758
diff changeset
2689 set_path_env();
27727
48c1ae64255b Replace preprocessor check for WIN32 with checks for __MINGW32__ and __CYGWIN__.
diego
parents: 27635
diff changeset
2690 #endif
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
2691
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
2692 #ifdef CONFIG_TV
23889
0ad7037df91f Removing global variables from tv://
voroshil
parents: 23808
diff changeset
2693 stream_tv_defaults.immediate = 1;
7068
6c2d746b17bf 10l, fix compiling without tv. patch by Andreas Hess <jaska@gmx.net>
arpi
parents: 7058
diff changeset
2694 #endif
5572
8cd761968f35 BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents: 5520
diff changeset
2695
19355
ba95c4fa0684 Reintroduce an ugly variant of the -gui/-nogui options.
reimar
parents: 19342
diff changeset
2696 if (argc > 1 && argv[1] &&
ba95c4fa0684 Reintroduce an ugly variant of the -gui/-nogui options.
reimar
parents: 19342
diff changeset
2697 (!strcmp(argv[1], "-gui") || !strcmp(argv[1], "-nogui"))) {
ba95c4fa0684 Reintroduce an ugly variant of the -gui/-nogui options.
reimar
parents: 19342
diff changeset
2698 use_gui = !strcmp(argv[1], "-gui");
ba95c4fa0684 Reintroduce an ugly variant of the -gui/-nogui options.
reimar
parents: 19342
diff changeset
2699 } else
1709
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
2700 if ( argv[0] )
18939
cde5b56f1610 Change use_gui detection to accept also filenames only containing
reimar
parents: 18938
diff changeset
2701 {
cde5b56f1610 Change use_gui detection to accept also filenames only containing
reimar
parents: 18938
diff changeset
2702 char *base = strrchr(argv[0], '/');
cde5b56f1610 Change use_gui detection to accept also filenames only containing
reimar
parents: 18938
diff changeset
2703 if (!base)
cde5b56f1610 Change use_gui detection to accept also filenames only containing
reimar
parents: 18938
diff changeset
2704 base = strrchr(argv[0], '\\');
cde5b56f1610 Change use_gui detection to accept also filenames only containing
reimar
parents: 18938
diff changeset
2705 if (!base)
cde5b56f1610 Change use_gui detection to accept also filenames only containing
reimar
parents: 18938
diff changeset
2706 base = argv[0];
cde5b56f1610 Change use_gui detection to accept also filenames only containing
reimar
parents: 18938
diff changeset
2707 if(strstr(base, "gmplayer"))
1709
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
2708 use_gui=1;
18939
cde5b56f1610 Change use_gui detection to accept also filenames only containing
reimar
parents: 18938
diff changeset
2709 }
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
2710
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2711 parse_cfgfiles(mconfig);
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2712
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
2713 #ifdef CONFIG_GUI
7019
e37a67d5e117 fix (?) cmd line handling
pontscho
parents: 7009
diff changeset
2714 if ( use_gui ) cfg_read();
e37a67d5e117 fix (?) cmd line handling
pontscho
parents: 7009
diff changeset
2715 #endif
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
2716
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
2717 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
2718 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
2719 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
2720 else {
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
2721 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
2722 if(mpctx->playtree) {
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
2723 mpctx->playtree_iter = play_tree_iter_new(mpctx->playtree,mconfig);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
2724 if(mpctx->playtree_iter) {
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
2725 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
2726 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
2727 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
2728 }
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
2729 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
2730 }
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
2731 }
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
2732 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
2733
28656
5a0e7cec3f9f Print the version string after the command line has been parsed.
diego
parents: 28485
diff changeset
2734 print_version("MPlayer");
5a0e7cec3f9f Print the version string after the command line has been parsed.
diego
parents: 28485
diff changeset
2735
29642
0e6de6bc0eec Merge two Windows-specific #if sections to simplify the condition.
reimar
parents: 29641
diff changeset
2736 #if defined(__MINGW32__) || defined(__CYGWIN__)
0e6de6bc0eec Merge two Windows-specific #if sections to simplify the condition.
reimar
parents: 29641
diff changeset
2737 #ifdef CONFIG_GUI
18913
2dc84d07332c Initial win32 gui release.
vayne
parents: 18911
diff changeset
2738 void *runningmplayer = FindWindow("MPlayer GUI for Windows", "MPlayer for Windows");
2dc84d07332c Initial win32 gui release.
vayne
parents: 18911
diff changeset
2739 if(runningmplayer && filename && use_gui){
2dc84d07332c Initial win32 gui release.
vayne
parents: 18911
diff changeset
2740 COPYDATASTRUCT csData;
2dc84d07332c Initial win32 gui release.
vayne
parents: 18911
diff changeset
2741 char file[MAX_PATH];
2dc84d07332c Initial win32 gui release.
vayne
parents: 18911
diff changeset
2742 char *filepart = filename;
2dc84d07332c Initial win32 gui release.
vayne
parents: 18911
diff changeset
2743 if(GetFullPathName(filename, MAX_PATH, file, &filepart)){
2dc84d07332c Initial win32 gui release.
vayne
parents: 18911
diff changeset
2744 csData.dwData = 0;
2dc84d07332c Initial win32 gui release.
vayne
parents: 18911
diff changeset
2745 csData.cbData = strlen(file)*2;
2dc84d07332c Initial win32 gui release.
vayne
parents: 18911
diff changeset
2746 csData.lpData = file;
2dc84d07332c Initial win32 gui release.
vayne
parents: 18911
diff changeset
2747 SendMessage(runningmplayer, WM_COPYDATA, (WPARAM)runningmplayer, (LPARAM)&csData);
2dc84d07332c Initial win32 gui release.
vayne
parents: 18911
diff changeset
2748 }
2dc84d07332c Initial win32 gui release.
vayne
parents: 18911
diff changeset
2749 }
2dc84d07332c Initial win32 gui release.
vayne
parents: 18911
diff changeset
2750 #endif
2dc84d07332c Initial win32 gui release.
vayne
parents: 18911
diff changeset
2751
29641
52e00a25ab71 Hack: set DEP/NX on Windows via SetProcessDEPPolicy.
reimar
parents: 29595
diff changeset
2752 {
52e00a25ab71 Hack: set DEP/NX on Windows via SetProcessDEPPolicy.
reimar
parents: 29595
diff changeset
2753 HMODULE kernel32 = GetModuleHandle("Kernel32.dll");
52e00a25ab71 Hack: set DEP/NX on Windows via SetProcessDEPPolicy.
reimar
parents: 29595
diff changeset
2754 BOOL WINAPI (*setDEP)(DWORD) = NULL;
52e00a25ab71 Hack: set DEP/NX on Windows via SetProcessDEPPolicy.
reimar
parents: 29595
diff changeset
2755 if (kernel32)
52e00a25ab71 Hack: set DEP/NX on Windows via SetProcessDEPPolicy.
reimar
parents: 29595
diff changeset
2756 setDEP = GetProcAddress(kernel32, "SetProcessDEPPolicy");
52e00a25ab71 Hack: set DEP/NX on Windows via SetProcessDEPPolicy.
reimar
parents: 29595
diff changeset
2757 if (setDEP) setDEP(3);
52e00a25ab71 Hack: set DEP/NX on Windows via SetProcessDEPPolicy.
reimar
parents: 29595
diff changeset
2758 }
28462
f26f60223e72 Use SetErrorMode so Windows will not show all kinds of error dialogs
reimar
parents: 28410
diff changeset
2759 // stop Windows from showing all kinds of annoying error dialogs
f26f60223e72 Use SetErrorMode so Windows will not show all kinds of error dialogs
reimar
parents: 28410
diff changeset
2760 SetErrorMode(0x8003);
26689
4cf30c0ca561 Request a timer resolution of 1 ms on Windows, the default of
reimar
parents: 26479
diff changeset
2761 // request 1ms timer resolution
4cf30c0ca561 Request a timer resolution of 1 ms on Windows, the default of
reimar
parents: 26479
diff changeset
2762 timeBeginPeriod(1);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
2763 #endif
28485
3f597aacbb69 Add priority support for OS/2 and factorize the Windows priority support.
diego
parents: 28462
diff changeset
2764
3f597aacbb69 Add priority support for OS/2 and factorize the Windows priority support.
diego
parents: 28462
diff changeset
2765 #ifdef CONFIG_PRIORITY
3f597aacbb69 Add priority support for OS/2 and factorize the Windows priority support.
diego
parents: 28462
diff changeset
2766 set_priority();
3f597aacbb69 Add priority support for OS/2 and factorize the Windows priority support.
diego
parents: 28462
diff changeset
2767 #endif
3f597aacbb69 Add priority support for OS/2 and factorize the Windows priority support.
diego
parents: 28462
diff changeset
2768
30855
977fd535cc9d Add -codecpath option.
komh
parents: 30815
diff changeset
2769 if (codec_path)
30902
f405a747a35a Rename SetCodecPath() --> set_codec_path().
diego
parents: 30901
diff changeset
2770 set_codec_path(codec_path);
30855
977fd535cc9d Add -codecpath option.
komh
parents: 30815
diff changeset
2771
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
2772 #ifndef CONFIG_GUI
1709
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
2773 if(use_gui){
1973
5216f108cb4f all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents: 1962
diff changeset
2774 mp_msg(MSGT_CPLAYER,MSGL_WARN,MSGTR_NoGui);
1709
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
2775 use_gui=0;
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
2776 }
1723
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1709
diff changeset
2777 #else
27727
48c1ae64255b Replace preprocessor check for WIN32 with checks for __MINGW32__ and __CYGWIN__.
diego
parents: 27635
diff changeset
2778 #if !defined(__MINGW32__) && !defined(__CYGWIN__)
1723
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1709
diff changeset
2779 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
2780 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
2781 use_gui=0;
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1709
diff changeset
2782 }
18945
337d4324c766 No point in checking for X for windows gui, in addition the hackish
reimar
parents: 18939
diff changeset
2783 #endif
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
2784 if (use_gui && mpctx->playtree_iter){
9319
arpi
parents: 9318
diff changeset
2785 char cwd[PATH_MAX+2];
18316
b3be7df634b0 spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents: 18315
diff changeset
2786 // 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
2787 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
2788 mpctx->playtree_iter=NULL;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
2789
9318
51a9af80d874 PATH_MAX should be more portable, and we even include limits.h to be sure
arpi
parents: 9317
diff changeset
2790 if (getcwd(cwd, PATH_MAX) != (char *)NULL)
9301
7841308ad250 this patch fixes latest bug, discovered by .so ... (relative filenames &
arpi
parents: 9291
diff changeset
2791 {
7841308ad250 this patch fixes latest bug, discovered by .so ... (relative filenames &
arpi
parents: 9291
diff changeset
2792 strcat(cwd, "/");
7841308ad250 this patch fixes latest bug, discovered by .so ... (relative filenames &
arpi
parents: 9291
diff changeset
2793 // 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
2794 play_tree_add_bpf(mpctx->playtree, cwd);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
2795 }
18316
b3be7df634b0 spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents: 18315
diff changeset
2796 // 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
2797 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
2798 }
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
2799 #endif /* CONFIG_GUI */
1709
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
2800
7562
92188b57a062 video out driver list support (like -vc, example: -vo xmga,xv,x11,)
arpi
parents: 7559
diff changeset
2801 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
2802 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
2803 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
2804 }
5072
a760c9f074df libvo2 #ifs removed
arpi
parents: 5055
diff changeset
2805
7563
e9e4398029de audio out driver list support (example: -ao alsa9,sdl:esd,oss,sdl:oss,)
arpi
parents: 7562
diff changeset
2806 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
2807 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
2808 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
2809 }
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
2810
18316
b3be7df634b0 spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents: 18315
diff changeset
2811 /* Check codecs.conf. */
11759
29eea271490e add -codecs-file for selecting a specific codecs.conf on the comand line
attila
parents: 11592
diff changeset
2812 if(!codecs_file || !parse_codec_cfg(codecs_file)){
12890
9a45f43bf9a0 false-use-of-get_path() memleak fixes.
al
parents: 12841
diff changeset
2813 if(!parse_codec_cfg(mem_ptr=get_path("codecs.conf"))){
11759
29eea271490e add -codecs-file for selecting a specific codecs.conf on the comand line
attila
parents: 11592
diff changeset
2814 if(!parse_codec_cfg(MPLAYER_CONFDIR "/codecs.conf")){
29eea271490e add -codecs-file for selecting a specific codecs.conf on the comand line
attila
parents: 11592
diff changeset
2815 if(!parse_codec_cfg(NULL)){
28032
92e770f6e890 Print ID_EXIT and exit reason message in identify mode when exiting.
reimar
parents: 27953
diff changeset
2816 exit_player_with_rc(EXIT_NONE, 0);
11759
29eea271490e add -codecs-file for selecting a specific codecs.conf on the comand line
attila
parents: 11592
diff changeset
2817 }
13946
e632b43f0598 Reduce excessive verbosity.
diego
parents: 13928
diff changeset
2818 mp_msg(MSGT_CPLAYER,MSGL_V,MSGTR_BuiltinCodecsConf);
8467
3ca9cc46df5c Fallback to builtin (generated from etc/codecs.conf at compile time)
arpi
parents: 8450
diff changeset
2819 }
1983
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
2820 }
12890
9a45f43bf9a0 false-use-of-get_path() memleak fixes.
al
parents: 12841
diff changeset
2821 free( mem_ptr ); // release the buffer created by get_path()
1983
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
2822 }
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
2823
7506
c1cb94198e05 -vc/-vfm accepts codec/driver _list_ now. empty list element for -vc means
arpi
parents: 7502
diff changeset
2824 #if 0
c1cb94198e05 -vc/-vfm accepts codec/driver _list_ now. empty list element for -vc means
arpi
parents: 7502
diff changeset
2825 if(video_codec_list){
c1cb94198e05 -vc/-vfm accepts codec/driver _list_ now. empty list element for -vc means
arpi
parents: 7502
diff changeset
2826 int i;
c1cb94198e05 -vc/-vfm accepts codec/driver _list_ now. empty list element for -vc means
arpi
parents: 7502
diff changeset
2827 video_codec=video_codec_list[0];
c1cb94198e05 -vc/-vfm accepts codec/driver _list_ now. empty list element for -vc means
arpi
parents: 7502
diff changeset
2828 for(i=0;video_codec_list[i];i++)
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
2829 mp_msg(MSGT_FIXME,MSGL_FIXME,"vc#%d: '%s'\n",i,video_codec_list[i]);
7506
c1cb94198e05 -vc/-vfm accepts codec/driver _list_ now. empty list element for -vc means
arpi
parents: 7502
diff changeset
2830 }
c1cb94198e05 -vc/-vfm accepts codec/driver _list_ now. empty list element for -vc means
arpi
parents: 7502
diff changeset
2831 #endif
7522
aa1a1249f239 -ac/-afm rewrite, now works the same way as -vc/-vfm
arpi
parents: 7517
diff changeset
2832 if(audio_codec_list && strcmp(audio_codec_list[0],"help")==0){
6930
cae1dd6343e7 moved messages to help_mp-??.h
jaf
parents: 6921
diff changeset
2833 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
2834 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AUDIO_CODECS\n");
1983
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
2835 list_codecs(1);
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
2836 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
2837 opt_exit = 1;
1983
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
2838 }
7506
c1cb94198e05 -vc/-vfm accepts codec/driver _list_ now. empty list element for -vc means
arpi
parents: 7502
diff changeset
2839 if(video_codec_list && strcmp(video_codec_list[0],"help")==0){
6930
cae1dd6343e7 moved messages to help_mp-??.h
jaf
parents: 6921
diff changeset
2840 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
2841 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_CODECS\n");
1983
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
2842 list_codecs(0);
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
2843 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
2844 opt_exit = 1;
1983
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
2845 }
7506
c1cb94198e05 -vc/-vfm accepts codec/driver _list_ now. empty list element for -vc means
arpi
parents: 7502
diff changeset
2846 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
2847 vfm_help();
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
2848 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
2849 opt_exit = 1;
7191
1eadce15446c -afm/-vfm help implemenetd, some cosmetics of ad/vd codec names/comments
arpi
parents: 7180
diff changeset
2850 }
7522
aa1a1249f239 -ac/-afm rewrite, now works the same way as -vc/-vfm
arpi
parents: 7517
diff changeset
2851 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
2852 afm_help();
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
2853 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
2854 opt_exit = 1;
7191
1eadce15446c -afm/-vfm help implemenetd, some cosmetics of ad/vd codec names/comments
arpi
parents: 7180
diff changeset
2855 }
13269
aa13937da8a0 mplayer -af help now lists all available audio filters.
ivo
parents: 13228
diff changeset
2856 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
2857 af_help();
aa13937da8a0 mplayer -af help now lists all available audio filters.
ivo
parents: 13228
diff changeset
2858 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
2859 opt_exit = 1;
13269
aa13937da8a0 mplayer -af help now lists all available audio filters.
ivo
parents: 13228
diff changeset
2860 }
27377
d58d06eafe83 Change a bunch of X11-specific preprocessor directives.
diego
parents: 27370
diff changeset
2861 #ifdef CONFIG_X11
9317
c7f5df43b937 - support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents: 9315
diff changeset
2862 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
2863 fstype_help();
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
2864 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
2865 opt_exit = 1;
9317
c7f5df43b937 - support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents: 9315
diff changeset
2866 }
9336
4d39aa85a723 Forgot about #ifdef HAVE_X11. 10l
filon
parents: 9319
diff changeset
2867 #endif
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
2868 if((demuxer_name && strcmp(demuxer_name,"help")==0) ||
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
2869 (audio_demuxer_name && strcmp(audio_demuxer_name,"help")==0) ||
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
2870 (sub_demuxer_name && strcmp(sub_demuxer_name,"help")==0)){
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
2871 demuxer_help();
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
2872 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
2873 opt_exit = 1;
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
2874 }
17914
f9cb6fc1608a Add an option to list the properties: -list-properties
albeu
parents: 17911
diff changeset
2875 if(list_properties) {
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
2876 property_print_help();
17914
f9cb6fc1608a Add an option to list the properties: -list-properties
albeu
parents: 17911
diff changeset
2877 opt_exit = 1;
f9cb6fc1608a Add an option to list the properties: -list-properties
albeu
parents: 17911
diff changeset
2878 }
1983
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
2879
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
2880 if(opt_exit)
28032
92e770f6e890 Print ID_EXIT and exit reason message in identify mode when exiting.
reimar
parents: 27953
diff changeset
2881 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
2882
16347
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
2883 if (player_idle_mode && use_gui) {
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
2884 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
2885 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
2886 }
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
2887
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
2888 if(!filename && !player_idle_mode){
1787
de6a0987a08d stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents: 1772
diff changeset
2889 if(!use_gui){
1690
09f9297d2ee6 -vo help fixed
arpi
parents: 1674
diff changeset
2890 // no file/vcd/dvd -> show HELP:
5112
70fb281bb13c changed printf's to mp_msg
alex
parents: 5106
diff changeset
2891 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
2892 exit_player_with_rc(EXIT_NONE, 0);
1787
de6a0987a08d stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents: 1772
diff changeset
2893 } else gui_no_filename=1;
1690
09f9297d2ee6 -vo help fixed
arpi
parents: 1674
diff changeset
2894 }
09f9297d2ee6 -vo help fixed
arpi
parents: 1674
diff changeset
2895
21342
dc98645820b7 Make MPlayer/MEncoder print the compile-time configuration in verbose mode.
diego
parents: 21219
diff changeset
2896 /* Display what configure line was used */
dc98645820b7 Make MPlayer/MEncoder print the compile-time configuration in verbose mode.
diego
parents: 21219
diff changeset
2897 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
2898
1690
09f9297d2ee6 -vo help fixed
arpi
parents: 1674
diff changeset
2899 // 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
2900 if( mp_msg_test(MSGT_CPLAYER,MSGL_V) ){
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
2901 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_CommandLine);
14530
ea8a371b7d8d print the actual commandline to stdout, too
faust3
parents: 14381
diff changeset
2902 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
2903 mp_msg(MSGT_CPLAYER, MSGL_INFO, "\n");
1690
09f9297d2ee6 -vo help fixed
arpi
parents: 1674
diff changeset
2904 }
09f9297d2ee6 -vo help fixed
arpi
parents: 1674
diff changeset
2905
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
2906 //------ load global data first ------
955
3a3304cd9fd5 libao support
arpi_esp
parents: 940
diff changeset
2907
11580
90953d955165 Fontconfig support based on patch by Arwed von Merkatz <v.merkatz@gmx.net>, but slightly reworked
alex
parents: 11542
diff changeset
2908 // check font
27393
4876c89bafdd Rename font-related preprocessor directives.
diego
parents: 27391
diff changeset
2909 #ifdef CONFIG_FREETYPE
11580
90953d955165 Fontconfig support based on patch by Arwed von Merkatz <v.merkatz@gmx.net>, but slightly reworked
alex
parents: 11542
diff changeset
2910 init_freetype();
90953d955165 Fontconfig support based on patch by Arwed von Merkatz <v.merkatz@gmx.net>, but slightly reworked
alex
parents: 11542
diff changeset
2911 #endif
27393
4876c89bafdd Rename font-related preprocessor directives.
diego
parents: 27391
diff changeset
2912 #ifdef CONFIG_FONTCONFIG
25351
f46e91c64b39 Fix libass to support -nofontconfig.
ulion
parents: 25264
diff changeset
2913 if(font_fontconfig <= 0)
11580
90953d955165 Fontconfig support based on patch by Arwed von Merkatz <v.merkatz@gmx.net>, but slightly reworked
alex
parents: 11542
diff changeset
2914 {
90953d955165 Fontconfig support based on patch by Arwed von Merkatz <v.merkatz@gmx.net>, but slightly reworked
alex
parents: 11542
diff changeset
2915 #endif
27391
1d2faa1020fb Rename a bunch of miscellaneous preprocessor directives.
diego
parents: 27377
diff changeset
2916 #ifdef CONFIG_BITMAP_FONT
212
7034ef1f685d new option: -font
arpi_esp
parents: 208
diff changeset
2917 if(font_name){
337
3ca0b1b739a5 changed fs+vm+zoom flags for libvo
arpi_esp
parents: 332
diff changeset
2918 vo_font=read_font_desc(font_name,font_factor,verbose>1);
22002
ebd2d5efb11b filename double-conversion, especially usefull for CJK users :-)
gpoirier
parents: 21930
diff changeset
2919 if(!vo_font) mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadFont,
ebd2d5efb11b filename double-conversion, especially usefull for CJK users :-)
gpoirier
parents: 21930
diff changeset
2920 filename_recode(font_name));
220
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
2921 } else {
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
2922 // try default:
12890
9a45f43bf9a0 false-use-of-get_path() memleak fixes.
al
parents: 12841
diff changeset
2923 vo_font=read_font_desc( mem_ptr=get_path("font/font.desc"),font_factor,verbose>1);
9a45f43bf9a0 false-use-of-get_path() memleak fixes.
al
parents: 12841
diff changeset
2924 free(mem_ptr); // release the buffer created by get_path()
1353
c3e3b0ae4d06 Applied DATADIR patch by Vladimir Kushnir
arpi
parents: 1338
diff changeset
2925 if(!vo_font)
10272
7b0bc557987b renames: DATADIR->MPLAYER_DATADIR, CONFDIR->MPLAYER_CONFDIR, LIBDIR->MPLAYER_LIBDIR
arpi
parents: 10240
diff changeset
2926 vo_font=read_font_desc(MPLAYER_DATADIR "/font/font.desc",font_factor,verbose>1);
212
7034ef1f685d new option: -font
arpi_esp
parents: 208
diff changeset
2927 }
23338
2a66d95355f0 add new -subfont option, that allows having a different font for OSD (controls and menu) and subtitles
ben
parents: 23294
diff changeset
2928 if (sub_font_name)
2a66d95355f0 add new -subfont option, that allows having a different font for OSD (controls and menu) and subtitles
ben
parents: 23294
diff changeset
2929 sub_font = read_font_desc(sub_font_name, font_factor, verbose>1);
2a66d95355f0 add new -subfont option, that allows having a different font for OSD (controls and menu) and subtitles
ben
parents: 23294
diff changeset
2930 else
2a66d95355f0 add new -subfont option, that allows having a different font for OSD (controls and menu) and subtitles
ben
parents: 23294
diff changeset
2931 sub_font = vo_font;
19485
d04ee0eb6a11 support for disabling/enabling bitmap font support from configure
diego
parents: 19478
diff changeset
2932 #endif
27393
4876c89bafdd Rename font-related preprocessor directives.
diego
parents: 27391
diff changeset
2933 #ifdef CONFIG_FONTCONFIG
11580
90953d955165 Fontconfig support based on patch by Arwed von Merkatz <v.merkatz@gmx.net>, but slightly reworked
alex
parents: 11542
diff changeset
2934 }
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
2935 #endif
21161
ad7747bce52d Make compilation depending on USE_OSD unconditional.
uau
parents: 21140
diff changeset
2936
5638
86663f1b9b00 new osd code, use osd objs to follow changes and do minimal updates
arpi
parents: 5627
diff changeset
2937 vo_init_osd();
86663f1b9b00 new osd code, use osd objs to follow changes and do minimal updates
arpi
parents: 5627
diff changeset
2938
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
2939 #ifdef CONFIG_ASS
20502
81a92ae66d78 Move ass_library initialization code to ass_mp.c.
eugeni
parents: 20483
diff changeset
2940 ass_library = ass_init();
20477
de4a66d99f41 Libass interface reworked:
eugeni
parents: 20341
diff changeset
2941 #endif
de4a66d99f41 Libass interface reworked:
eugeni
parents: 20341
diff changeset
2942
3015
8bf21c807656 RTC is autodetected
arpi
parents: 2941
diff changeset
2943 #ifdef HAVE_RTC
5055
534167719e91 nortc patch by Attila Kinali
atmos4
parents: 5046
diff changeset
2944 if(!nortc)
534167719e91 nortc patch by Attila Kinali
atmos4
parents: 5046
diff changeset
2945 {
7494
229287c14cd4 RTC fixes by Sidik Isani <lksi@cfht.hawaii.edu>
arpi
parents: 7486
diff changeset
2946 // 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
2947 if ((rtc_fd = open(rtc_device ? rtc_device : "/dev/rtc", O_RDONLY)) < 0)
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
2948 mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_RTCDeviceNotOpenable,
12681
6d815f12e3e5 rtc-device cmd option by James Noble
alex
parents: 12672
diff changeset
2949 rtc_device ? rtc_device : "/dev/rtc", strerror(errno));
7494
229287c14cd4 RTC fixes by Sidik Isani <lksi@cfht.hawaii.edu>
arpi
parents: 7486
diff changeset
2950 else {
229287c14cd4 RTC fixes by Sidik Isani <lksi@cfht.hawaii.edu>
arpi
parents: 7486
diff changeset
2951 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
2952
229287c14cd4 RTC fixes by Sidik Isani <lksi@cfht.hawaii.edu>
arpi
parents: 7486
diff changeset
2953 if (ioctl(rtc_fd, RTC_IRQP_SET, irqp) < 0) {
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
2954 mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_LinuxRTCInitErrorIrqpSet, irqp, strerror(errno));
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
2955 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
2956 close (rtc_fd);
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
2957 rtc_fd = -1;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
2958 } 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
2959 /* variable only by the root */
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
2960 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
2961 close (rtc_fd);
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
2962 rtc_fd = -1;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
2963 } else
13946
e632b43f0598 Reduce excessive verbosity.
diego
parents: 13928
diff changeset
2964 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
2965 }
5055
534167719e91 nortc patch by Attila Kinali
atmos4
parents: 5046
diff changeset
2966 }
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
2967 #ifdef CONFIG_GUI
3825
7735c5a87121 setuid hack disabled
arpi
parents: 3823
diff changeset
2968 // 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
2969 // 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
2970 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
2971 #endif
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
2972 if(rtc_fd<0)
16490
f17b3c152fd6 Add comments to a few #endif statements in order to make clear which
diego
parents: 16489
diff changeset
2973 #endif /* HAVE_RTC */
13946
e632b43f0598 Reduce excessive verbosity.
diego
parents: 13928
diff changeset
2974 mp_msg(MSGT_CPLAYER, MSGL_V, "Using %s timing\n",
12954
f9755d9c479a Native darwin timer update.
wight
parents: 12893
diff changeset
2975 softsleep?"software":timer_name);
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
2976
27359
d788e177a35e Rename some preprocessor directives from CONFIG_* to HAVE_* where appropriate;
diego
parents: 27345
diff changeset
2977 #ifdef HAVE_TERMCAP
3618
772729dd7b40 better dvd support
pontscho
parents: 3597
diff changeset
2978 if ( !use_gui ) load_termcap(NULL); // load key-codes
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
2979 #endif
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
2980
1816
c8bc613eb4f8 fixed 'n' key bug :)
arpi
parents: 1809
diff changeset
2981 // ========== Init keyboard FIFO (connection to libvo) ============
1694
0def229bd8bc GUI support (--enable-gui)
arpi
parents: 1690
diff changeset
2982
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2983 // Init input system
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2984 current_module = "init_input";
17890
633f3d0a621b Enable gui key bindings only when running the gui. Fix enter and esc
albeu
parents: 17732
diff changeset
2985 mp_input_init(use_gui);
9831
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
2986 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
2987 if(slave_mode)
26016
528bdf17dd8a OS/2 getch2() support
diego
parents: 26015
diff changeset
2988 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
2989 else if(!noconsolecontrols)
24132
9f234010c4be Add separate event input type for terminal+vo
uau
parents: 24092
diff changeset
2990 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
2991 // 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
2992 stream_set_interrupt_callback(mp_input_check_interrupt);
9831
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
2993
27345
b597fd2924b4 Rename preprocessor directive HAVE_MENU --> CONFIG_MENU.
diego
parents: 27343
diff changeset
2994 #ifdef CONFIG_MENU
8198
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
2995 if(use_menu) {
22284
83366c8e1928 Fix menu to work with mpctx
uau
parents: 22281
diff changeset
2996 if(menu_cfg && menu_init(mpctx, menu_cfg))
29189
a7bb794af98d sane verbosity levels for menu initialization
diego
parents: 29114
diff changeset
2997 mp_msg(MSGT_CPLAYER, MSGL_V, MSGTR_MenuInitialized, menu_cfg);
8198
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
2998 else {
8723
48a2c2545d5c Use system-wide menu.conf file if nothing else is availible,
filon
parents: 8672
diff changeset
2999 menu_cfg = get_path("menu.conf");
22284
83366c8e1928 Fix menu to work with mpctx
uau
parents: 22281
diff changeset
3000 if(menu_init(mpctx, menu_cfg))
29189
a7bb794af98d sane verbosity levels for menu initialization
diego
parents: 29114
diff changeset
3001 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
3002 else {
22284
83366c8e1928 Fix menu to work with mpctx
uau
parents: 22281
diff changeset
3003 if(menu_init(mpctx, MPLAYER_CONFDIR "/menu.conf"))
29189
a7bb794af98d sane verbosity levels for menu initialization
diego
parents: 29114
diff changeset
3004 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
3005 else {
29189
a7bb794af98d sane verbosity levels for menu initialization
diego
parents: 29114
diff changeset
3006 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
3007 use_menu = 0;
48a2c2545d5c Use system-wide menu.conf file if nothing else is availible,
filon
parents: 8672
diff changeset
3008 }
48a2c2545d5c Use system-wide menu.conf file if nothing else is availible,
filon
parents: 8672
diff changeset
3009 }
8198
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
3010 }
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
3011 }
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
3012 #endif
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
3013
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
3014 initialized_flags|=INITIALIZED_INPUT;
25433
55e3b1a32c65 Make libmenu init and uninit in proper place.
ulion
parents: 25416
diff changeset
3015 current_module = NULL;
55e3b1a32c65 Make libmenu init and uninit in proper place.
ulion
parents: 25416
diff changeset
3016
13391
b6c3752d9544 handle sigchld in mplayer.c
faust3
parents: 13358
diff changeset
3017 /// Catch signals
b6c3752d9544 handle sigchld in mplayer.c
faust3
parents: 13358
diff changeset
3018 #ifndef __MINGW32__
b6c3752d9544 handle sigchld in mplayer.c
faust3
parents: 13358
diff changeset
3019 signal(SIGCHLD,child_sighandler);
b6c3752d9544 handle sigchld in mplayer.c
faust3
parents: 13358
diff changeset
3020 #endif
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3021
27397
d47744b95b78 Give a CONFIG_ prefix to preprocessor directives that lacked one and
diego
parents: 27393
diff changeset
3022 #ifdef CONFIG_CRASH_DEBUG
13794
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
3023 prog_path = argv[0];
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
3024 #endif
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
3025 //========= Catch terminate signals: ================
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
3026 // terminate requests:
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
3027 signal(SIGTERM,exit_sighandler); // kill
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
3028 signal(SIGHUP,exit_sighandler); // kill -HUP / xterm closed
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
3029
1729
d6c99f70449e fix hprogressbar
pontscho
parents: 1727
diff changeset
3030 signal(SIGINT,exit_sighandler); // Interrupt from keyboard
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
3031
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
3032 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
3033 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
3034 #ifdef CONFIG_SIGHANDLER
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
3035 // fatal errors:
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
3036 signal(SIGBUS,exit_sighandler); // bus error
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
3037 signal(SIGSEGV,exit_sighandler); // segfault
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
3038 signal(SIGILL,exit_sighandler); // illegal instruction
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
3039 signal(SIGFPE,exit_sighandler); // floating point exc.
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
3040 signal(SIGABRT,exit_sighandler); // abort()
27397
d47744b95b78 Give a CONFIG_ prefix to preprocessor directives that lacked one and
diego
parents: 27393
diff changeset
3041 #ifdef CONFIG_CRASH_DEBUG
13794
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
3042 if (crash_debug)
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
3043 signal(SIGTRAP,exit_sighandler);
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
3044 #endif
5367
658ea5d7316a Allow to disable crasj sighandler to enable creation of coredump files.
atmos4
parents: 5326
diff changeset
3045 #endif
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
3046
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
3047 #ifdef CONFIG_GUI
4963
13262bd21965 small changes
pontscho
parents: 4950
diff changeset
3048 if(use_gui){
6218
8cfddba867b4 fix text render chrash ...
pontscho
parents: 6217
diff changeset
3049 guiInit();
22286
a7e5b99ac083 Fix GUI compilation
uau
parents: 22285
diff changeset
3050 guiGetEvent(guiSetContext, mpctx);
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
3051 initialized_flags|=INITIALIZED_GUI;
4974
5da7b1522a9f small bug fixed and workarounds :(
pontscho
parents: 4965
diff changeset
3052 guiGetEvent( guiCEvent,(char *)((gui_no_filename) ? 0 : 1) );
4963
13262bd21965 small changes
pontscho
parents: 4950
diff changeset
3053 }
13262bd21965 small changes
pontscho
parents: 4950
diff changeset
3054 #endif
13262bd21965 small changes
pontscho
parents: 4950
diff changeset
3055
5983
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
3056 // ******************* Now, let's see the per-file stuff ********************
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
3057
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
3058 play_next_file:
1787
de6a0987a08d stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents: 1772
diff changeset
3059
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
3060 // init global sub numbers
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3061 mpctx->global_sub_size = 0;
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3062 { int i; for (i = 0; i < SUB_SOURCES; i++) mpctx->global_sub_indices[i] = -1; }
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
3063
25636
3b0fed65048d factorizes variable check
ben
parents: 25635
diff changeset
3064 if (filename) {
3b0fed65048d factorizes variable check
ben
parents: 25635
diff changeset
3065 load_per_protocol_config (mconfig, filename);
3b0fed65048d factorizes variable check
ben
parents: 25635
diff changeset
3066 load_per_extension_config (mconfig, filename);
3b0fed65048d factorizes variable check
ben
parents: 25635
diff changeset
3067 load_per_file_config (mconfig, filename);
3b0fed65048d factorizes variable check
ben
parents: 25635
diff changeset
3068 }
8614
49e36bf2f342 The patch adds support for a per-file config, which is loaded before
arpi
parents: 8612
diff changeset
3069
25641
58fd8ebcd6e3 allow profile loading per audio/video output
ben
parents: 25636
diff changeset
3070 if (video_driver_list)
58fd8ebcd6e3 allow profile loading per audio/video output
ben
parents: 25636
diff changeset
3071 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
3072 if (audio_driver_list)
58fd8ebcd6e3 allow profile loading per audio/video output
ben
parents: 25636
diff changeset
3073 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
3074
4835
1f59d4d73558 Fix my mistake (forgot to remove a getch2_enable) but in the rigth
albeu
parents: 4834
diff changeset
3075 // 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
3076 // or cache filling
12816
fba780800efe -use-stdin renamed to -noconsolecontrols.
diego
parents: 12753
diff changeset
3077 if(!noconsolecontrols && !slave_mode){
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
3078 if(initialized_flags&INITIALIZED_GETCH2)
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
3079 mp_msg(MSGT_CPLAYER,MSGL_WARN,MSGTR_Getch2InitializedTwice);
5983
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
3080 else
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
3081 getch2_enable(); // prepare stdin for hotkeys...
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
3082 initialized_flags|=INITIALIZED_GETCH2;
5154
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
3083 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
3084 }
4825
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
3085
5983
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
3086 // =================== GUI idle loop (STOP state) ===========================
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
3087 #ifdef CONFIG_GUI
1787
de6a0987a08d stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents: 1772
diff changeset
3088 if ( use_gui ) {
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3089 mpctx->file_format=DEMUXER_TYPE_UNKNOWN;
8423
c6a1a5b6ba25 - fix three submenu bug
pontscho
parents: 8366
diff changeset
3090 guiGetEvent( guiSetDefaults,0 );
5665
3e7f39c4110c fix dvd playing under gui
pontscho
parents: 5655
diff changeset
3091 while ( guiIntfStruct.Playing != 1 )
3e7f39c4110c fix dvd playing under gui
pontscho
parents: 5655
diff changeset
3092 {
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
3093 mp_cmd_t* cmd;
9464
a4e50ab9ac14 3x10l found by Dan Christiansen <danchr@daimi.au.dk>
alex
parents: 9380
diff changeset
3094 usec_sleep(20000);
4798
c39affa2b376 new interface ? :)
pontscho
parents: 4788
diff changeset
3095 guiEventHandling();
6619
f554e7271587 fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents: 6590
diff changeset
3096 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
3097 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
3098 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
3099 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
3100 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
3101 }
8423
c6a1a5b6ba25 - fix three submenu bug
pontscho
parents: 8366
diff changeset
3102 guiGetEvent( guiSetParameters,NULL );
c6a1a5b6ba25 - fix three submenu bug
pontscho
parents: 8366
diff changeset
3103 if ( guiIntfStruct.StreamType == STREAMTYPE_STREAM )
3543
5a11cbf8791f some small sub bug fix
pontscho
parents: 3540
diff changeset
3104 {
4950
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
3105 play_tree_t * entry = play_tree_new();
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
3106 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
3107 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
3108 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
3109 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
3110 if(mpctx->playtree)
4950
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
3111 {
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3112 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
3113 if(mpctx->playtree_iter)
4950
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
3114 {
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3115 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
3116 {
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3117 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
3118 mpctx->playtree_iter = NULL;
4950
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
3119 }
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3120 filename = play_tree_iter_get_file(mpctx->playtree_iter,1);
4950
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
3121 }
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
3122 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
3123 }
1787
de6a0987a08d stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents: 1772
diff changeset
3124 }
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
3125 #endif /* CONFIG_GUI */
16347
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
3126
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
3127 while (player_idle_mode && !filename) {
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
3128 play_tree_t * entry = NULL;
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
3129 mp_cmd_t * cmd;
30618
c061152a5d84 Send VOCTRL_PAUSE/VOCTRL_RESUME events also when pausing for idle mode.
reimar
parents: 30616
diff changeset
3130 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
3131 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
3132 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
3133 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
3134 usec_sleep(20000);
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
3135 }
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
3136 switch (cmd->id) {
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
3137 case MP_CMD_LOADFILE:
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
3138 // 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
3139 entry = play_tree_new();
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
3140 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
3141 // 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
3142 break;
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
3143 case MP_CMD_LOADLIST:
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
3144 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
3145 break;
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
3146 case MP_CMD_QUIT:
28032
92e770f6e890 Print ID_EXIT and exit reason message in identify mode when exiting.
reimar
parents: 27953
diff changeset
3147 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
3148 break;
26264
a80db7629478 Handle property commands in idle mode.
reimar
parents: 26228
diff changeset
3149 case MP_CMD_GET_PROPERTY:
a80db7629478 Handle property commands in idle mode.
reimar
parents: 26228
diff changeset
3150 case MP_CMD_SET_PROPERTY:
a80db7629478 Handle property commands in idle mode.
reimar
parents: 26228
diff changeset
3151 case MP_CMD_STEP_PROPERTY:
a80db7629478 Handle property commands in idle mode.
reimar
parents: 26228
diff changeset
3152 run_command(mpctx, cmd);
a80db7629478 Handle property commands in idle mode.
reimar
parents: 26228
diff changeset
3153 break;
16347
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
3154 }
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
3155
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
3156 mp_cmd_free(cmd);
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
3157
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
3158 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
3159 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
3160 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
3161 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
3162
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3163 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
3164
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3165 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
3166
18316
b3be7df634b0 spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents: 18315
diff changeset
3167 /* 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
3168 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
3169 if (!mpctx->playtree_iter) continue;
16347
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
3170
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
3171 // 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
3172 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
3173 // no items!
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3174 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
3175 mpctx->playtree_iter = NULL;
16347
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
3176 continue; // wait for next command
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
3177 }
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3178 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
3179 }
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
3180 }
5983
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
3181 //---------------------------------------------------------------------------
1787
de6a0987a08d stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents: 1772
diff changeset
3182
30618
c061152a5d84 Send VOCTRL_PAUSE/VOCTRL_RESUME events also when pausing for idle mode.
reimar
parents: 30616
diff changeset
3183 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
3184 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
3185
29862
fbb1f57a313e Added -name, -title and -use-filename-title options and implementation in X11 vos
ptt
parents: 29857
diff changeset
3186 if(filename) {
22002
ebd2d5efb11b filename double-conversion, especially usefull for CJK users :-)
gpoirier
parents: 21930
diff changeset
3187 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_Playing,
ebd2d5efb11b filename double-conversion, especially usefull for CJK users :-)
gpoirier
parents: 21930
diff changeset
3188 filename_recode(filename));
29862
fbb1f57a313e Added -name, -title and -use-filename-title options and implementation in X11 vos
ptt
parents: 29857
diff changeset
3189 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
3190 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
3191 }
1650
7502b16bce63 make automatic subfile detection working with many files
atlka
parents: 1641
diff changeset
3192
17109
327be31a101d Fix EDL to be per file, allow -edlout and -edl together as there is really
ods15
parents: 17106
diff changeset
3193 if (edl_filename) {
327be31a101d Fix EDL to be per file, allow -edlout and -edl together as there is really
ods15
parents: 17106
diff changeset
3194 if (edl_records) free_edl(edl_records);
327be31a101d Fix EDL to be per file, allow -edlout and -edl together as there is really
ods15
parents: 17106
diff changeset
3195 next_edl_record = edl_records = edl_parse_file();
327be31a101d Fix EDL to be per file, allow -edlout and -edl together as there is really
ods15
parents: 17106
diff changeset
3196 }
327be31a101d Fix EDL to be per file, allow -edlout and -edl together as there is really
ods15
parents: 17106
diff changeset
3197 if (edl_output_filename) {
327be31a101d Fix EDL to be per file, allow -edlout and -edl together as there is really
ods15
parents: 17106
diff changeset
3198 if (edl_fd) fclose(edl_fd);
327be31a101d Fix EDL to be per file, allow -edlout and -edl together as there is really
ods15
parents: 17106
diff changeset
3199 if ((edl_fd = fopen(edl_output_filename, "w")) == NULL)
327be31a101d Fix EDL to be per file, allow -edlout and -edl together as there is really
ods15
parents: 17106
diff changeset
3200 {
327be31a101d Fix EDL to be per file, allow -edlout and -edl together as there is really
ods15
parents: 17106
diff changeset
3201 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_EdlCantOpenForWrite,
22002
ebd2d5efb11b filename double-conversion, especially usefull for CJK users :-)
gpoirier
parents: 21930
diff changeset
3202 filename_recode(edl_output_filename));
17109
327be31a101d Fix EDL to be per file, allow -edlout and -edl together as there is really
ods15
parents: 17106
diff changeset
3203 }
327be31a101d Fix EDL to be per file, allow -edlout and -edl together as there is really
ods15
parents: 17106
diff changeset
3204 }
327be31a101d Fix EDL to be per file, allow -edlout and -edl together as there is really
ods15
parents: 17106
diff changeset
3205
5983
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
3206 //==================== Open VOB-Sub ============================
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
3207
4770
59f8fd64538b autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents: 4754
diff changeset
3208 current_module="vobsub";
59f8fd64538b autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents: 4754
diff changeset
3209 if (vobsub_name){
6110
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
3210 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
3211 if(vo_vobsub==NULL)
22002
ebd2d5efb11b filename double-conversion, especially usefull for CJK users :-)
gpoirier
parents: 21930
diff changeset
3212 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadSub,
ebd2d5efb11b filename double-conversion, especially usefull for CJK users :-)
gpoirier
parents: 21930
diff changeset
3213 filename_recode(vobsub_name));
25790
6aad76cd84d3 Fix auto-sub code to support filenames with any extension length.
ulion
parents: 25765
diff changeset
3214 } else if (sub_auto && filename){
4770
59f8fd64538b autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents: 4754
diff changeset
3215 /* 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
3216 char *buf = strdup(filename), *psub;
6aad76cd84d3 Fix auto-sub code to support filenames with any extension length.
ulion
parents: 25765
diff changeset
3217 char *pdot = strrchr(buf, '.');
6aad76cd84d3 Fix auto-sub code to support filenames with any extension length.
ulion
parents: 25765
diff changeset
3218 char *pslash = strrchr(buf, '/');
27727
48c1ae64255b Replace preprocessor check for WIN32 with checks for __MINGW32__ and __CYGWIN__.
diego
parents: 27635
diff changeset
3219 #if defined(__MINGW32__) || defined(__CYGWIN__)
25790
6aad76cd84d3 Fix auto-sub code to support filenames with any extension length.
ulion
parents: 25765
diff changeset
3220 if (!pslash) pslash = strrchr(buf, '\\');
6aad76cd84d3 Fix auto-sub code to support filenames with any extension length.
ulion
parents: 25765
diff changeset
3221 #endif
6aad76cd84d3 Fix auto-sub code to support filenames with any extension length.
ulion
parents: 25765
diff changeset
3222 if (pdot && (!pslash || pdot > pslash))
6aad76cd84d3 Fix auto-sub code to support filenames with any extension length.
ulion
parents: 25765
diff changeset
3223 *pdot = '\0';
6110
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
3224 vo_vobsub=vobsub_open(buf,spudec_ifo,0,&vo_spudec);
16897
ed8e079a1705 Autoload vobsub's from ~/.mplayer/sub
albeu
parents: 16788
diff changeset
3225 /* try from ~/.mplayer/sub */
ed8e079a1705 Autoload vobsub's from ~/.mplayer/sub
albeu
parents: 16788
diff changeset
3226 if(!vo_vobsub && (psub = get_path( "sub/" ))) {
ed8e079a1705 Autoload vobsub's from ~/.mplayer/sub
albeu
parents: 16788
diff changeset
3227 char *bname;
ed8e079a1705 Autoload vobsub's from ~/.mplayer/sub
albeu
parents: 16788
diff changeset
3228 int l;
ed8e079a1705 Autoload vobsub's from ~/.mplayer/sub
albeu
parents: 16788
diff changeset
3229 bname = strrchr(buf,'/');
27727
48c1ae64255b Replace preprocessor check for WIN32 with checks for __MINGW32__ and __CYGWIN__.
diego
parents: 27635
diff changeset
3230 #if defined(__MINGW32__) || defined(__CYGWIN__)
16897
ed8e079a1705 Autoload vobsub's from ~/.mplayer/sub
albeu
parents: 16788
diff changeset
3231 if(!bname) bname = strrchr(buf,'\\');
ed8e079a1705 Autoload vobsub's from ~/.mplayer/sub
albeu
parents: 16788
diff changeset
3232 #endif
ed8e079a1705 Autoload vobsub's from ~/.mplayer/sub
albeu
parents: 16788
diff changeset
3233 if(bname) bname++;
ed8e079a1705 Autoload vobsub's from ~/.mplayer/sub
albeu
parents: 16788
diff changeset
3234 else bname = buf;
ed8e079a1705 Autoload vobsub's from ~/.mplayer/sub
albeu
parents: 16788
diff changeset
3235 l = strlen(psub) + strlen(bname) + 1;
ed8e079a1705 Autoload vobsub's from ~/.mplayer/sub
albeu
parents: 16788
diff changeset
3236 psub = realloc(psub,l);
ed8e079a1705 Autoload vobsub's from ~/.mplayer/sub
albeu
parents: 16788
diff changeset
3237 strcat(psub,bname);
ed8e079a1705 Autoload vobsub's from ~/.mplayer/sub
albeu
parents: 16788
diff changeset
3238 vo_vobsub=vobsub_open(psub,spudec_ifo,0,&vo_spudec);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
3239 free(psub);
16897
ed8e079a1705 Autoload vobsub's from ~/.mplayer/sub
albeu
parents: 16788
diff changeset
3240 }
4770
59f8fd64538b autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents: 4754
diff changeset
3241 free(buf);
59f8fd64538b autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents: 4754
diff changeset
3242 }
7621
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
3243 if(vo_vobsub){
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
3244 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
3245 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
3246 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
3247
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
3248 // setup global sub numbering
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3249 mpctx->global_sub_indices[SUB_SOURCE_VOBSUB] = mpctx->global_sub_size; // the global # of the first vobsub.
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3250 mpctx->global_sub_size += vobsub_get_indexes_count(vo_vobsub);
7621
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
3251 }
4770
59f8fd64538b autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents: 4754
diff changeset
3252
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
3253 //============ Open & Sync STREAM --- fork cache2 ====================
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
3254
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3255 mpctx->stream=NULL;
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3256 mpctx->demuxer=NULL;
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3257 if (mpctx->d_audio) {
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3258 //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
3259 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
3260 }
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3261 if (mpctx->d_video) {
10997
2f7c74ce8c9a 1000l to pl, this made mplayer crash when playing playlists longer
rfelker
parents: 10959
diff changeset
3262 //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
3263 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
3264 }
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3265 mpctx->sh_audio=NULL;
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3266 mpctx->sh_video=NULL;
5983
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
3267
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
3268 current_module="open_stream";
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3269 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
3270 if(!mpctx->stream) { // error...
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3271 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
3272 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
3273 }
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
3274 initialized_flags|=INITIALIZED_STREAM;
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
3275
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
3276 #ifdef CONFIG_GUI
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3277 if ( use_gui ) guiGetEvent( guiSetStream,(char *)mpctx->stream );
8423
c6a1a5b6ba25 - fix three submenu bug
pontscho
parents: 8366
diff changeset
3278 #endif
c6a1a5b6ba25 - fix three submenu bug
pontscho
parents: 8366
diff changeset
3279
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3280 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
3281 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
3282 // Handle playlist
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
3283 current_module="handle_playlist";
22002
ebd2d5efb11b filename double-conversion, especially usefull for CJK users :-)
gpoirier
parents: 21930
diff changeset
3284 mp_msg(MSGT_CPLAYER,MSGL_V,"Parsing playlist %s...\n",
ebd2d5efb11b filename double-conversion, especially usefull for CJK users :-)
gpoirier
parents: 21930
diff changeset
3285 filename_recode(filename));
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3286 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
3287 mpctx->eof=playtree_add_playlist(entry);
4825
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
3288 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
3289 }
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3290 mpctx->stream->start_pos+=seek_to_byte;
598
c7117e17e20b OSD seekbar fixed for mpeg/VCD
arpi_esp
parents: 595
diff changeset
3291
3257
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
3292 if(stream_dump_type==5){
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
3293 unsigned char buf[4096];
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
3294 int len;
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
3295 FILE *f;
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
3296 current_module="dumpstream";
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3297 stream_reset(mpctx->stream);
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3298 stream_seek(mpctx->stream,mpctx->stream->start_pos);
3257
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
3299 f=fopen(stream_dump_name,"wb");
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
3300 if(!f){
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
3301 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
3302 exit_player(EXIT_ERROR);
3257
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
3303 }
26832
6af954f69fe4 Re-add (hackish) support for -chapter (only start chapter, end is not supported) with -dumpstream.
reimar
parents: 26818
diff changeset
3304 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
3305 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
3306 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
3307 }
27060
351c7a56708e Try harder to honour CTRL+C etc. during dumpstream
reimar
parents: 27039
diff changeset
3308 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
3309 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
3310 if(len>0) {
785c945f6796 check for -dumpstream file writes, patch by Eric Lammerts <eric@lammerts.org>
alex
parents: 10223
diff changeset
3311 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
3312 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
3313 exit_player(EXIT_ERROR);
10225
785c945f6796 check for -dumpstream file writes, patch by Eric Lammerts <eric@lammerts.org>
alex
parents: 10223
diff changeset
3314 }
785c945f6796 check for -dumpstream file writes, patch by Eric Lammerts <eric@lammerts.org>
alex
parents: 10223
diff changeset
3315 }
27953
e5918aa8557f Reimplement -endchapter support again for -dump*, it was broken in r25987.
reimar
parents: 27838
diff changeset
3316 if(dvd_last_chapter > 0) {
e5918aa8557f Reimplement -endchapter support again for -dump*, it was broken in r25987.
reimar
parents: 27838
diff changeset
3317 int chapter = -1;
e5918aa8557f Reimplement -endchapter support again for -dump*, it was broken in r25987.
reimar
parents: 27838
diff changeset
3318 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
3319 &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
3320 break;
e5918aa8557f Reimplement -endchapter support again for -dump*, it was broken in r25987.
reimar
parents: 27838
diff changeset
3321 }
3257
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
3322 }
10225
785c945f6796 check for -dumpstream file writes, patch by Eric Lammerts <eric@lammerts.org>
alex
parents: 10223
diff changeset
3323 if(fclose(f)) {
785c945f6796 check for -dumpstream file writes, patch by Eric Lammerts <eric@lammerts.org>
alex
parents: 10223
diff changeset
3324 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
3325 exit_player(EXIT_ERROR);
10225
785c945f6796 check for -dumpstream file writes, patch by Eric Lammerts <eric@lammerts.org>
alex
parents: 10223
diff changeset
3326 }
3257
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
3327 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
3328 exit_player_with_rc(EXIT_EOF, 0);
3257
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
3329 }
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
3330
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
3331 #ifdef CONFIG_DVDREAD
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3332 if(mpctx->stream->type==STREAMTYPE_DVD){
5425
f3a451b6f794 -alang sig11 when playing avis fixed - 10l
arpi
parents: 5411
diff changeset
3333 current_module="dvd lang->id";
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3334 if(audio_id==-1) audio_id=dvd_aid_from_lang(mpctx->stream,audio_lang);
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3335 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
3336 // setup global sub numbering
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3337 mpctx->global_sub_indices[SUB_SOURCE_DEMUX] = mpctx->global_sub_size; // the global # of the first demux-specific sub.
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3338 mpctx->global_sub_size += dvd_number_of_subs(mpctx->stream);
5425
f3a451b6f794 -alang sig11 when playing avis fixed - 10l
arpi
parents: 5411
diff changeset
3339 current_module=NULL;
f3a451b6f794 -alang sig11 when playing avis fixed - 10l
arpi
parents: 5411
diff changeset
3340 }
4274
f5759bbdd7be -alang/-slang fixed
arpi
parents: 4260
diff changeset
3341 #endif
f5759bbdd7be -alang/-slang fixed
arpi
parents: 4260
diff changeset
3342
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
3343 #ifdef CONFIG_DVDNAV
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3344 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
3345 current_module="dvdnav lang->id";
26986
4bee4b9ec054 Rename some functions as they are mplayer related and not
ben
parents: 26963
diff changeset
3346 if(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
3347 dvdsub_lang_id = -3;
5e279f7d7e5d Remember which subtitle was auto-selected for dvdnav due to -slang
reimar
parents: 29854
diff changeset
3348 if(dvdsub_lang && dvdsub_id==-1)
5e279f7d7e5d Remember which subtitle was auto-selected for dvdnav due to -slang
reimar
parents: 29854
diff changeset
3349 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
3350 // setup global sub numbering
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3351 mpctx->global_sub_indices[SUB_SOURCE_DEMUX] = mpctx->global_sub_size; // the global # of the first demux-specific sub.
26986
4bee4b9ec054 Rename some functions as they are mplayer related and not
ben
parents: 26963
diff changeset
3352 mpctx->global_sub_size += 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
3353 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
3354 }
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
3355 #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
3356
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
3357 // CACHE2: initial prefill: 20% later: 5% (should be set by -cacheopts)
11352
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 11331
diff changeset
3358 goto_enable_cache:
7881
aba9301ed3c4 allow cache to be disabled (-nocache should override cachesize autodetection
arpi
parents: 7867
diff changeset
3359 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
3360 int res;
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
3361 current_module="enable_cache";
30360
c74a5f8ffab3 Change code to allow playing a stream even if enabling the cache failed
reimar
parents: 30176
diff changeset
3362 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
3363 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
3364 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
3365 if(res == 0)
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3366 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
3367 }
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
3368
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
3369 //============ Open DEMUXERS --- DETECT file type =======================
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
3370 current_module="demux_open";
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
3371
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3372 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
3373
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3374 // HACK to get MOV Reference Files working
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3375
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3376 if (mpctx->demuxer && mpctx->demuxer->type==DEMUXER_TYPE_PLAYLIST)
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
3377 {
8937
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3378 unsigned char* playlist_entry;
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3379 play_tree_t *list = NULL, *entry = NULL;
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3380
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3381 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
3382 while (ds_get_packet(mpctx->demuxer->video,&playlist_entry)>0)
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
3383 {
8937
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3384 char *temp, *bname;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
3385
22002
ebd2d5efb11b filename double-conversion, especially usefull for CJK users :-)
gpoirier
parents: 21930
diff changeset
3386 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
3387 filename_recode(playlist_entry));
8937
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 bname=mp_basename(playlist_entry);
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3390 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
3391 continue;
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3392
29571
94524110f645 Make the loop detection for mov reference files less aggressive, fixes
reimar
parents: 29562
diff changeset
3393 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
3394 continue;
ff773800b598 I also added that a self-reference is not endlessly played ... (Happened
arpi
parents: 9105
diff changeset
3395
8937
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3396 entry = play_tree_new();
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
3397
8937
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3398 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
3399 {
18857
0ba653cbc29f more sizeof(char) fun
reynaldo
parents: 18818
diff changeset
3400 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
3401 if (temp)
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3402 {
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3403 strncpy(temp, filename, strlen(filename)-strlen(mp_basename(filename)));
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3404 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
3405 strcat(temp, playlist_entry);
29571
94524110f645 Make the loop detection for mov reference files less aggressive, fixes
reimar
parents: 29562
diff changeset
3406 if (!strcmp(temp, filename)) {
94524110f645 Make the loop detection for mov reference files less aggressive, fixes
reimar
parents: 29562
diff changeset
3407 free(temp);
94524110f645 Make the loop detection for mov reference files less aggressive, fixes
reimar
parents: 29562
diff changeset
3408 continue;
94524110f645 Make the loop detection for mov reference files less aggressive, fixes
reimar
parents: 29562
diff changeset
3409 }
8937
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3410 play_tree_add_file(entry,temp);
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
3411 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
3412 free(temp);
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3413 }
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3414 }
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3415 else
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3416 play_tree_add_file(entry,playlist_entry);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
3417
8937
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3418 if(!list)
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3419 list = entry;
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3420 else
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3421 play_tree_append_entry(list,entry);
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3422 }
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3423 free_demuxer(mpctx->demuxer);
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3424 mpctx->demuxer = NULL;
8937
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3425
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3426 if (list)
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3427 {
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3428 entry = play_tree_new();
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3429 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
3430 mpctx->eof=playtree_add_playlist(entry);
8937
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3431 goto goto_next_file;
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3432 }
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3433 }
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
3434
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
3435 if(!mpctx->demuxer)
8925
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8913
diff changeset
3436 goto goto_next_file;
25955
eff9e1b25743 -chapter is now handled uniformly calling demuxer_seek_chapter() instead
nicodvb
parents: 25920
diff changeset
3437 if(dvd_chapter>1) {
eff9e1b25743 -chapter is now handled uniformly calling demuxer_seek_chapter() instead
nicodvb
parents: 25920
diff changeset
3438 float pts;
26081
2cb4aabb7dd8 Attempt to fix -chapter broken for mkv in r25987
reimar
parents: 26027
diff changeset
3439 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
3440 seek(mpctx, pts, SEEK_ABSOLUTE);
25955
eff9e1b25743 -chapter is now handled uniformly calling demuxer_seek_chapter() instead
nicodvb
parents: 25920
diff changeset
3441 }
eff9e1b25743 -chapter is now handled uniformly calling demuxer_seek_chapter() instead
nicodvb
parents: 25920
diff changeset
3442
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
3443 initialized_flags|=INITIALIZED_DEMUXER;
7058
2e5c07262861 new v4l capture patch by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>:
arpi
parents: 7055
diff changeset
3444
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3445 if (mpctx->stream->type != STREAMTYPE_DVD && mpctx->stream->type != STREAMTYPE_DVDNAV) {
21038
bfd340cdac88 Generalize subtitle switching, demux_ogg does not need a special case
reimar
parents: 21031
diff changeset
3446 int i;
23807
f4f7dd84188b Make sure all demuxer subtitles can be selected with 'j', even
reimar
parents: 23797
diff changeset
3447 int maxid = -1;
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
3448 // setup global sub numbering
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3449 mpctx->global_sub_indices[SUB_SOURCE_DEMUX] = mpctx->global_sub_size; // the global # of the first demux-specific sub.
21038
bfd340cdac88 Generalize subtitle switching, demux_ogg does not need a special case
reimar
parents: 21031
diff changeset
3450 for (i = 0; i < MAX_S_STREAMS; i++)
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3451 if (mpctx->demuxer->s_streams[i])
23807
f4f7dd84188b Make sure all demuxer subtitles can be selected with 'j', even
reimar
parents: 23797
diff changeset
3452 maxid = FFMAX(maxid, ((sh_sub_t *)mpctx->demuxer->s_streams[i])->sid);
f4f7dd84188b Make sure all demuxer subtitles can be selected with 'j', even
reimar
parents: 23797
diff changeset
3453 mpctx->global_sub_size += maxid + 1;
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
3454 }
24934
919e3927809b Old code for dvdsub_id fix assume the global_sub_indices[SUB_SOURCE_DEMUX]
ulion
parents: 24913
diff changeset
3455 // Make dvdsub_id always selectable if set.
919e3927809b Old code for dvdsub_id fix assume the global_sub_indices[SUB_SOURCE_DEMUX]
ulion
parents: 24913
diff changeset
3456 if (mpctx->global_sub_size <= mpctx->global_sub_indices[SUB_SOURCE_DEMUX] + dvdsub_id)
919e3927809b Old code for dvdsub_id fix assume the global_sub_indices[SUB_SOURCE_DEMUX]
ulion
parents: 24913
diff changeset
3457 mpctx->global_sub_size = mpctx->global_sub_indices[SUB_SOURCE_DEMUX] + dvdsub_id + 1;
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
3458
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
3459 #ifdef CONFIG_ASS
25658
0d0c48ecba90 Instead of keeping attachments in mkv demuxer, use demuxer_add_attachment().
eugeni
parents: 25641
diff changeset
3460 if (ass_enabled && ass_library) {
0d0c48ecba90 Instead of keeping attachments in mkv demuxer, use demuxer_add_attachment().
eugeni
parents: 25641
diff changeset
3461 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
3462 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
3463 if (extract_embedded_fonts &&
0d0c48ecba90 Instead of keeping attachments in mkv demuxer, use demuxer_add_attachment().
eugeni
parents: 25641
diff changeset
3464 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
3465 (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
3466 strcmp(att->type, "application/x-font") == 0))
0d0c48ecba90 Instead of keeping attachments in mkv demuxer, use demuxer_add_attachment().
eugeni
parents: 25641
diff changeset
3467 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
3468 }
0d0c48ecba90 Instead of keeping attachments in mkv demuxer, use demuxer_add_attachment().
eugeni
parents: 25641
diff changeset
3469 }
0d0c48ecba90 Instead of keeping attachments in mkv demuxer, use demuxer_add_attachment().
eugeni
parents: 25641
diff changeset
3470 #endif
0d0c48ecba90 Instead of keeping attachments in mkv demuxer, use demuxer_add_attachment().
eugeni
parents: 25641
diff changeset
3471
5175
8354d89498d4 video codec selection redesigned and moved to libmpcodecs - now it's 'intelligent'
arpi
parents: 5154
diff changeset
3472 current_module="demux_open2";
8354d89498d4 video codec selection redesigned and moved to libmpcodecs - now it's 'intelligent'
arpi
parents: 5154
diff changeset
3473
1660
0ed5a9568d0f file_format -> demuxer->file_format
arpi
parents: 1654
diff changeset
3474 //file_format=demuxer->file_format;
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1369
diff changeset
3475
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3476 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
3477 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
3478 mpctx->d_sub=mpctx->demuxer->sub;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3479
29804
edecbb61e41f Use switch_program property from mplayer.c to set ts_prog.
reimar
parents: 29801
diff changeset
3480 if (ts_prog) {
edecbb61e41f Use switch_program property from mplayer.c to set ts_prog.
reimar
parents: 29801
diff changeset
3481 int tmp = ts_prog;
edecbb61e41f Use switch_program property from mplayer.c to set ts_prog.
reimar
parents: 29801
diff changeset
3482 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
3483 }
26090
c585e2ad8ebf Select audio stream in mplayer and mencoder, overriding demuxer decision.
eugeni
parents: 26087
diff changeset
3484 // select audio stream
c585e2ad8ebf Select audio stream in mplayer and mencoder, overriding demuxer decision.
eugeni
parents: 26087
diff changeset
3485 select_audio(mpctx->demuxer, audio_id, audio_lang);
c585e2ad8ebf Select audio stream in mplayer and mencoder, overriding demuxer decision.
eugeni
parents: 26087
diff changeset
3486
792
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
3487 // DUMP STREAMS:
6209
e46b3bf16df5 added -dumpsrtsub option for SubRip format
iive
parents: 6204
diff changeset
3488 if((stream_dump_type)&&(stream_dump_type<4)){
792
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
3489 FILE *f;
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
3490 demux_stream_t *ds=NULL;
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
3491 current_module="dump";
792
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
3492 // select stream to dump
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
3493 switch(stream_dump_type){
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3494 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
3495 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
3496 case 3: ds=mpctx->d_sub;break;
792
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
3497 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
3498 if(!ds){
7805
f71bc57c4da9 Fixed two typos noticed by Sycotic Smith (I think).
diego
parents: 7790
diff changeset
3499 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
3500 exit_player(EXIT_ERROR);
792
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
3501 }
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
3502 // disable other streams:
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3503 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
3504 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
3505 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
3506 // let's dump it!
3257
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
3507 f=fopen(stream_dump_name,"wb");
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
3508 if(!f){
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
3509 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
3510 exit_player(EXIT_ERROR);
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
3511 }
792
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
3512 while(!ds->eof){
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
3513 unsigned char* start;
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
3514 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
3515 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
3516 && stream_dump_type==2) fwrite(&in_size,1,4,f);
792
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
3517 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
3518 if(dvd_last_chapter>0) {
e5918aa8557f Reimplement -endchapter support again for -dump*, it was broken in r25987.
reimar
parents: 27838
diff changeset
3519 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
3520 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
3521 break;
e5918aa8557f Reimplement -endchapter support again for -dump*, it was broken in r25987.
reimar
parents: 27838
diff changeset
3522 }
792
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
3523 }
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
3524 fclose(f);
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
3525 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
3526 exit_player_with_rc(EXIT_EOF, 0);
792
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
3527 }
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
3528
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3529 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
3530 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
3531
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3532 if(mpctx->sh_video){
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3533
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
3534 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
3535 if(!video_read_properties(mpctx->sh_video)) {
7805
f71bc57c4da9 Fixed two typos noticed by Sycotic Smith (I think).
diego
parents: 7790
diff changeset
3536 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
3537 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
3538 } else {
26479
0e069fe7cf0d use existing MSGTR_FilefmtFourccSizeFpsFtime translatable string macro
corey
parents: 26416
diff changeset
3539 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
3540 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
3541 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
3542 );
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3543
4598
badb76094897 setting vo_fps, required for vo_yuv4mpeg
arpi
parents: 4593
diff changeset
3544 /* 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
3545 if(force_fps){
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3546 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
3547 mpctx->sh_video->frametime=1.0f/mpctx->sh_video->fps;
4598
badb76094897 setting vo_fps, required for vo_yuv4mpeg
arpi
parents: 4593
diff changeset
3548 }
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3549 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
3550
31262
a22559ea1c28 If we have no FPS value, try enabling -correct-pts mode, it does
reimar
parents: 31251
diff changeset
3551 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
3552 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
3553 correct_pts = 1;
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
3554 }
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1369
diff changeset
3555 }
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1369
diff changeset
3556
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1369
diff changeset
3557 }
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
3558
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3559 if(!mpctx->sh_video && !mpctx->sh_audio){
6930
cae1dd6343e7 moved messages to help_mp-??.h
jaf
parents: 6921
diff changeset
3560 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
3561 #ifdef CONFIG_DVBIN
25377
31e0937ebe38 dvb cleanup: call dvb_(set|step)_channel() without dereferencing stream->priv (1000l to me)
nicodvb
parents: 25364
diff changeset
3562 if(mpctx->stream->type == STREAMTYPE_DVB)
10708
a57e8d980652 This patch fixes:
alex
parents: 10707
diff changeset
3563 {
a57e8d980652 This patch fixes:
alex
parents: 10707
diff changeset
3564 int dir;
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3565 int v = mpctx->last_dvb_step;
10708
a57e8d980652 This patch fixes:
alex
parents: 10707
diff changeset
3566 if(v > 0)
a57e8d980652 This patch fixes:
alex
parents: 10707
diff changeset
3567 dir = DVB_CHANNEL_HIGHER;
a57e8d980652 This patch fixes:
alex
parents: 10707
diff changeset
3568 else
a57e8d980652 This patch fixes:
alex
parents: 10707
diff changeset
3569 dir = DVB_CHANNEL_LOWER;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
3570
25377
31e0937ebe38 dvb cleanup: call dvb_(set|step)_channel() without dereferencing stream->priv (1000l to me)
nicodvb
parents: 25364
diff changeset
3571 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
3572 mpctx->eof = mpctx->dvbin_reopen = 1;
10708
a57e8d980652 This patch fixes:
alex
parents: 10707
diff changeset
3573 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
3574 #endif
1641
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
3575 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
3576 }
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
3577
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
3578 /* display clip info */
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3579 demux_info_print(mpctx->demuxer);
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
3580
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
3581 //================== 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
3582 if(vo_spudec==NULL &&
27805
92f83263b154 Avoid calling init_vo_spudec() too early.
aurel
parents: 27727
diff changeset
3583 (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
3584 init_vo_spudec();
6110
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
3585 }
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
3586
29686
add9ce0b0e55 Enable loading of external subtitles also for audio-only files.
reimar
parents: 29685
diff changeset
3587 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
3588 // 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
3589 // 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
3590 // check .sub
29686
add9ce0b0e55 Enable loading of external subtitles also for audio-only files.
reimar
parents: 29685
diff changeset
3591 double fps = mpctx->sh_video ? mpctx->sh_video->fps : 25;
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
3592 current_module="read_subtitles_file";
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
3593 if(sub_name){
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
3594 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
3595 add_subtitles (sub_name[i], fps, 0);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
3596 }
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
3597 if(sub_auto) { // auto load sub file ...
11767
e6db1c939c25 prevent sig11 when $HOME is not set
attila
parents: 11759
diff changeset
3598 char *psub = get_path( "sub/" );
e6db1c939c25 prevent sig11 when $HOME is not set
attila
parents: 11759
diff changeset
3599 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
3600 int i = 0;
12890
9a45f43bf9a0 false-use-of-get_path() memleak fixes.
al
parents: 12841
diff changeset
3601 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
3602 while (tmp[i]) {
29686
add9ce0b0e55 Enable loading of external subtitles also for audio-only files.
reimar
parents: 29685
diff changeset
3603 add_subtitles (tmp[i], fps, 1);
15603
2d1ad16b6021 strdup subtitle filename at a more appropriate place, fixing memleaks and
reimar
parents: 15584
diff changeset
3604 free(tmp[i++]);
2d1ad16b6021 strdup subtitle filename at a more appropriate place, fixing memleaks and
reimar
parents: 15584
diff changeset
3605 }
9870
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
3606 free(tmp);
4064
3c747168eb6e 1. subs know are readed after reading AVI header so we already know fps
atlka
parents: 4052
diff changeset
3607 }
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3608 if (mpctx->set_of_sub_size > 0) {
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
3609 // setup global sub numbering
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3610 mpctx->global_sub_indices[SUB_SOURCE_SUBS] = mpctx->global_sub_size; // the global # of the first sub.
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3611 mpctx->global_sub_size += mpctx->set_of_sub_size;
9870
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
3612 }
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
3613 }
6110
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
3614
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3615 if (mpctx->global_sub_size) {
29854
00ebdb6cb87f Factor out code that decides which subtitle to play.
reimar
parents: 29804
diff changeset
3616 select_subtitle(mpctx);
17935
d72e7330c548 Subtitles properties: move sub_select, sub_pos, sub_visibilty,
albeu
parents: 17932
diff changeset
3617 if(subdata)
d72e7330c548 Subtitles properties: move sub_select, sub_pos, sub_visibilty,
albeu
parents: 17932
diff changeset
3618 switch (stream_dump_type) {
d72e7330c548 Subtitles properties: move sub_select, sub_pos, sub_visibilty,
albeu
parents: 17932
diff changeset
3619 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
3620 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
3621 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
3622 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
3623 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
3624 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
3625 }
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
3626 }
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
3627
31277
5d5bda998a2f Move code printing -identify output for a file to a separate function.
reimar
parents: 31262
diff changeset
3628 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
3629
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3630 if(!mpctx->sh_video) goto main; // audio-only
175
d43c7e6412f0 added DirectShow support
arpi_esp
parents: 162
diff changeset
3631
20947
6baefa24946f moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents: 20915
diff changeset
3632 if(!reinit_video_chain()) {
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3633 if(!mpctx->sh_video){
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3634 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
3635 goto main; // exit_player(MSGTR_Exit_error);
8198
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
3636 }
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
3637 }
6755
a31b9f15cbff - fix audio equalizer
pontscho
parents: 6713
diff changeset
3638
6110
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
3639 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
3640 spudec_set_hw_spu(vo_spudec,mpctx->video_out);
6110
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
3641
27393
4876c89bafdd Rename font-related preprocessor directives.
diego
parents: 27391
diff changeset
3642 #ifdef CONFIG_FREETYPE
7122
0dc9cb756b68 freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents: 7111
diff changeset
3643 force_load_font = 1;
0dc9cb756b68 freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents: 7111
diff changeset
3644 #endif
0dc9cb756b68 freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents: 7111
diff changeset
3645
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3646 //================== MAIN: ==========================
7502
6a2b6f3d619c best audio/video codec selection & init moved to libmpcodecs
arpi
parents: 7495
diff changeset
3647 main:
6a2b6f3d619c best audio/video codec selection & init moved to libmpcodecs
arpi
parents: 7495
diff changeset
3648 current_module="main";
6a2b6f3d619c best audio/video codec selection & init moved to libmpcodecs
arpi
parents: 7495
diff changeset
3649
17911
52f95509cd05 Add the new property API and implement a couple properties.
albeu
parents: 17910
diff changeset
3650 if(playing_msg) {
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3651 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
3652 mp_msg(MSGT_CPLAYER,MSGL_INFO,"%s",msg);
52f95509cd05 Add the new property API and implement a couple properties.
albeu
parents: 17910
diff changeset
3653 free(msg);
52f95509cd05 Add the new property API and implement a couple properties.
albeu
parents: 17910
diff changeset
3654 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
3655
17911
52f95509cd05 Add the new property API and implement a couple properties.
albeu
parents: 17910
diff changeset
3656
18316
b3be7df634b0 spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents: 18315
diff changeset
3657 // 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
3658 if(verbose) term_osd = 0;
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
3659
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3660 {
1420
d97816161256 removed obsolote frame_corr_* stuff
arpi
parents: 1410
diff changeset
3661 //int frame_corr_num=0; //
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
3662 //float v_frame=0; // Video
1400
2bf9c561b01d stage2 step 1
arpi
parents: 1382
diff changeset
3663 //float num_frames=0; // number of frames played
21077
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
3664
5929
9e7d54e7be58 - frame_time delayed one frame, as it's really duration of current frame,
arpi
parents: 5927
diff changeset
3665 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
3666 int blit_frame=0;
22288
da8ba4c0fc57 Cleanup, move "global" state from the frame_time_remaining mainloop
uau
parents: 22286
diff changeset
3667 mpctx->num_buffered_frames=0;
5929
9e7d54e7be58 - frame_time delayed one frame, as it's really duration of current frame,
arpi
parents: 5927
diff changeset
3668
18316
b3be7df634b0 spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents: 18315
diff changeset
3669 // Make sure old OSD does not stay around,
16402
75532be41c6d clear OSD when playing new file
reimar
parents: 16360
diff changeset
3670 // e.g. with -fixed-vo and same-resolution files
17938
810b407ba6c4 Get rid of 2 osd related hacks.
albeu
parents: 17935
diff changeset
3671 clear_osd_msgs();
810b407ba6c4 Get rid of 2 osd related hacks.
albeu
parents: 17935
diff changeset
3672 update_osd_msg();
6028
bd016664dc18 UMRs fixed - noticed by Nilmoni Deb <ndeb@ece.cmu.edu>
arpi
parents: 6016
diff changeset
3673
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3674 //================ SETUP AUDIO ==========================
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3675
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3676 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
3677 reinit_audio_chain();
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3678 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
3679 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
3680 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3681
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
3682 current_module="av_init";
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
3683
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3684 if(mpctx->sh_video){
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3685 mpctx->sh_video->timer=0;
17654
16633b9c0953 New option: -ignore-start
corey
parents: 17643
diff changeset
3686 if (! ignore_start)
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3687 audio_delay += mpctx->sh_video->stream_delay;
17643
cea08919336b dwStart support for mplayer.
corey
parents: 17636
diff changeset
3688 }
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3689 if(mpctx->sh_audio){
27838
13738bdebf9a Add an option that sets initial playback volume.
diego
parents: 27807
diff changeset
3690 if (start_volume >= 0)
13738bdebf9a Add an option that sets initial playback volume.
diego
parents: 27807
diff changeset
3691 mixer_setvolume(&mpctx->mixer, start_volume, start_volume);
17654
16633b9c0953 New option: -ignore-start
corey
parents: 17643
diff changeset
3692 if (! ignore_start)
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3693 audio_delay -= mpctx->sh_audio->stream_delay;
22488
b6aa3eedf49b Move the sh_audio->delay field to mpctx->delay.
uau
parents: 22458
diff changeset
3694 mpctx->delay=-audio_delay;
17643
cea08919336b dwStart support for mplayer.
corey
parents: 17636
diff changeset
3695 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3696
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3697 if(!mpctx->sh_audio){
1973
5216f108cb4f all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents: 1962
diff changeset
3698 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
3699 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
3700 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
3701 //mpctx->d_audio->id=-2; // do not read audio chunks
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
3702 //uninit_player(INITIALIZED_AO); // close device
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3703 }
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3704 if(!mpctx->sh_video){
6930
cae1dd6343e7 moved messages to help_mp-??.h
jaf
parents: 6921
diff changeset
3705 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
3706 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
3707 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
3708 mpctx->d_video->id=-2;
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
3709 //if(!fixed_vo) uninit_player(INITIALIZED_VO);
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
3710 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3711
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3712 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
3713 goto goto_next_file;
7e769ea2acc7 jump to next file (or exit) if can't decode audio && video
alex
parents: 6183
diff changeset
3714
8030
2b39ff3860b7 cleanup of .AVI timestamp calculation (ugly hack from mplayer.c removed,
arpi
parents: 8027
diff changeset
3715 //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
3716 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
3717 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
3718 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
3719 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
3720 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3721
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
3722 #ifdef CONFIG_GUI
19946
ef94dfe93fe8 Fix the sound mute switch in the GUI menu by moving the corresponding
diego
parents: 19945
diff changeset
3723 if ( use_gui ) {
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3724 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
3725 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
3726 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
3727 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
3728 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
3729 }
ef94dfe93fe8 Fix the sound mute switch in the GUI menu by moving the corresponding
diego
parents: 19945
diff changeset
3730 #endif
ef94dfe93fe8 Fix the sound mute switch in the GUI menu by moving the corresponding
diego
parents: 19945
diff changeset
3731
23477
15710094cb15 implement "bind sections"
voroshil
parents: 23460
diff changeset
3732 mp_input_set_section(NULL);
15710094cb15 implement "bind sections"
voroshil
parents: 23460
diff changeset
3733 //TODO: add desired (stream-based) sections here
15710094cb15 implement "bind sections"
voroshil
parents: 23460
diff changeset
3734 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
3735 if (mpctx->stream->type==STREAMTYPE_DVDNAV) mp_input_set_section("dvdnav");
23477
15710094cb15 implement "bind sections"
voroshil
parents: 23460
diff changeset
3736
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
3737 //==================== START PLAYING =======================
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
3738
23726
11abe5f3dcaa Move loop_times into mpctx.
albeu
parents: 23573
diff changeset
3739 if(mpctx->loop_times>1) mpctx->loop_times--; else
11abe5f3dcaa Move loop_times into mpctx.
albeu
parents: 23573
diff changeset
3740 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
3741
22299
073bd05d00a6 Remove useless fflush(stdout) calls. mp_msg already flushes output, and
uau
parents: 22298
diff changeset
3742 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_StartPlaying);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3743
1124
0e95f30ffd4c -frames and -benchmark options to make chl & gabucino happy
arpi_esp
parents: 1059
diff changeset
3744 total_time_usage_start=GetTimer();
3934
e8e7ca8995a1 codecs.conf parser hangup fixed by iive, cpu usage reset at start
arpi
parents: 3843
diff changeset
3745 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
3746 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
3747 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
3748 mpctx->startup_decode_retry = DEFAULT_STARTUP_DECODE_RETRY;
6590
bfc209bb3f48 -frames 0 fix, multifile frames support by tibcu
alex
parents: 6585
diff changeset
3749
bfc209bb3f48 -frames 0 fix, multifile frames support by tibcu
alex
parents: 6585
diff changeset
3750 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
3751 mpctx->eof=PT_NEXT_ENTRY; goto goto_next_file;
6590
bfc209bb3f48 -frames 0 fix, multifile frames support by tibcu
alex
parents: 6585
diff changeset
3752 }
bfc209bb3f48 -frames 0 fix, multifile frames support by tibcu
alex
parents: 6585
diff changeset
3753
22338
434cd072b0d3 Seek to -ss position without first starting audio/video from the start.
uau
parents: 22313
diff changeset
3754 if (seek_to_sec) {
25883
baf32110d3fc Use defines to give names to the different seek flags.
reimar
parents: 25852
diff changeset
3755 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
3756 end_at.pos += seek_to_sec;
434cd072b0d3 Seek to -ss position without first starting audio/video from the start.
uau
parents: 22313
diff changeset
3757 }
434cd072b0d3 Seek to -ss position without first starting audio/video from the start.
uau
parents: 22313
diff changeset
3758
434cd072b0d3 Seek to -ss position without first starting audio/video from the start.
uau
parents: 22313
diff changeset
3759 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
3760 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
3761 end_at.type = END_AT_NONE;
434cd072b0d3 Seek to -ss position without first starting audio/video from the start.
uau
parents: 22313
diff changeset
3762 }
434cd072b0d3 Seek to -ss position without first starting audio/video from the start.
uau
parents: 22313
diff changeset
3763
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
3764 #ifdef CONFIG_DVDNAV
25824
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
3765 mp_dvdnav_context_free(mpctx);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
3766 if (mpctx->stream->type == STREAMTYPE_DVDNAV) {
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
3767 mp_dvdnav_read_wait(mpctx->stream, 0, 1);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
3768 mp_dvdnav_cell_has_changed(mpctx->stream,1);
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
3769 }
eb338d06c638 Add support for dvdnav still frames playback.
ben
parents: 25790
diff changeset
3770 #endif
22338
434cd072b0d3 Seek to -ss position without first starting audio/video from the start.
uau
parents: 22313
diff changeset
3771
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3772 while(!mpctx->eof){
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
3773 float aq_sleep_time=0;
25955
eff9e1b25743 -chapter is now handled uniformly calling demuxer_seek_chapter() instead
nicodvb
parents: 25920
diff changeset
3774
eff9e1b25743 -chapter is now handled uniformly calling demuxer_seek_chapter() instead
nicodvb
parents: 25920
diff changeset
3775 if(dvd_last_chapter>0) {
eff9e1b25743 -chapter is now handled uniformly calling demuxer_seek_chapter() instead
nicodvb
parents: 25920
diff changeset
3776 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
3777 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
3778 goto goto_next_file;
eff9e1b25743 -chapter is now handled uniformly calling demuxer_seek_chapter() instead
nicodvb
parents: 25920
diff changeset
3779 }
eff9e1b25743 -chapter is now handled uniformly calling demuxer_seek_chapter() instead
nicodvb
parents: 25920
diff changeset
3780
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3781 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
3782 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
3783 mpctx->sh_audio->ds = mpctx->d_audio;
18897
78547a882a09 support for audio streams that appear after unsuccessful probing
nicodvb
parents: 18888
diff changeset
3784 reinit_audio_chain();
78547a882a09 support for audio streams that appear after unsuccessful probing
nicodvb
parents: 18888
diff changeset
3785 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3786
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3787 /*========================== PLAY AUDIO ============================*/
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
3788
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3789 if (mpctx->sh_audio)
20889
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
3790 if (!fill_audio_out_buffers())
35f37142f3b8 Move audio playing code from main() into a separate function.
uau
parents: 20888
diff changeset
3791 // 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
3792 if (!mpctx->sh_video)
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3793 mpctx->eof = PT_NEXT_ENTRY;
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3794
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3795
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3796 if(!mpctx->sh_video) {
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
3797 // handle audio-only case:
19973
02a18c52a42a after a long time, finally i could add -endpos option to mplayer executable.
ptt
parents: 19946
diff changeset
3798 double a_pos=0;
26818
089ac698f8b1 Avoid crash with video stream switching and -nosound
reimar
parents: 26728
diff changeset
3799 // sh_audio can be NULL due to video stream switching
089ac698f8b1 Avoid crash with video stream switching and -nosound
reimar
parents: 26728
diff changeset
3800 // TODO: handle this better
089ac698f8b1 Avoid crash with video stream switching and -nosound
reimar
parents: 26728
diff changeset
3801 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
3802 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
3803
02a18c52a42a after a long time, finally i could add -endpos option to mplayer executable.
ptt
parents: 19946
diff changeset
3804 if(!quiet)
13857
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
3805 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
3806
02a18c52a42a after a long time, finally i could add -endpos option to mplayer executable.
ptt
parents: 19946
diff changeset
3807 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
3808 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
3809 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
3810 update_osd_msg();
19973
02a18c52a42a after a long time, finally i could add -endpos option to mplayer executable.
ptt
parents: 19946
diff changeset
3811
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
3812 } else {
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
3813
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3814 /*========================== PLAY VIDEO ============================*/
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3815
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3816 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
3817 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
3818
22288
da8ba4c0fc57 Cleanup, move "global" state from the frame_time_remaining mainloop
uau
parents: 22286
diff changeset
3819 if (!mpctx->num_buffered_frames) {
21077
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
3820 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
3821 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
3822 double delay = mpctx->delay;
6fb92182aff3 At startup and while seeking avoid to introduce pointless sleeps and possibly
reimar
parents: 30175
diff changeset
3823 // 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
3824 // 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
3825 update_video(&blit_frame);
6fb92182aff3 At startup and while seeking avoid to introduce pointless sleeps and possibly
reimar
parents: 30175
diff changeset
3826 mpctx->delay = delay;
6fb92182aff3 At startup and while seeking avoid to introduce pointless sleeps and possibly
reimar
parents: 30175
diff changeset
3827 mpctx->startup_decode_retry--;
6fb92182aff3 At startup and while seeking avoid to introduce pointless sleeps and possibly
reimar
parents: 30175
diff changeset
3828 }
6fb92182aff3 At startup and while seeking avoid to introduce pointless sleeps and possibly
reimar
parents: 30175
diff changeset
3829 mpctx->startup_decode_retry = 0;
21077
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
3830 mp_dbg(MSGT_AVSYNC,MSGL_DBG2,"*** ftime=%5.3f ***\n",frame_time);
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
3831 if (mpctx->sh_video->vf_initialized < 0) {
21077
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
3832 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
3833 mpctx->eof = 1; goto goto_next_file;
21077
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
3834 }
7f3cccd16b26 Reorganize code to move more things out of main().
uau
parents: 21068
diff changeset
3835 if (frame_time < 0)
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3836 mpctx->eof = 1;
22288
da8ba4c0fc57 Cleanup, move "global" state from the frame_time_remaining mainloop
uau
parents: 22286
diff changeset
3837 else {
da8ba4c0fc57 Cleanup, move "global" state from the frame_time_remaining mainloop
uau
parents: 22286
diff changeset
3838 // 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
3839 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
3840 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
3841 }
5929
9e7d54e7be58 - frame_time delayed one frame, as it's really duration of current frame,
arpi
parents: 5927
diff changeset
3842 }
9e7d54e7be58 - frame_time delayed one frame, as it's really duration of current frame,
arpi
parents: 5927
diff changeset
3843
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
3844 // ==========================================================================
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
3845
5643
3d9de27d9bd0 OSD handled by vf control()
arpi
parents: 5640
diff changeset
3846 // current_module="draw_osd";
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3847 // if(vo_config_count) mpctx->video_out->draw_osd();
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3848
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
3849 #ifdef CONFIG_GUI
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
3850 if(use_gui) guiEventHandling();
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
3851 #endif
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
3852
20894
8753befb60ad move vo event check together with gui event check
uau
parents: 20892
diff changeset
3853 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
3854 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
3855
27377
d58d06eafe83 Change a bunch of X11-specific preprocessor directives.
diego
parents: 27370
diff changeset
3856 #ifdef CONFIG_X11
20900
b0f2e9a16bb1 Move xscreensaver_heartbeat call next to vo check_events
uau
parents: 20899
diff changeset
3857 if (stop_xscreensaver) {
b0f2e9a16bb1 Move xscreensaver_heartbeat call next to vo check_events
uau
parents: 20899
diff changeset
3858 current_module = "stop_xscreensaver";
b0f2e9a16bb1 Move xscreensaver_heartbeat call next to vo check_events
uau
parents: 20899
diff changeset
3859 xscreensaver_heartbeat();
b0f2e9a16bb1 Move xscreensaver_heartbeat call next to vo check_events
uau
parents: 20899
diff changeset
3860 }
b0f2e9a16bb1 Move xscreensaver_heartbeat call next to vo check_events
uau
parents: 20899
diff changeset
3861 #endif
25611
27ffe914df15 Add heartbeat-cmd option
reimar
parents: 25606
diff changeset
3862 if (heartbeat_cmd) {
27ffe914df15 Add heartbeat-cmd option
reimar
parents: 25606
diff changeset
3863 static unsigned last_heartbeat;
27ffe914df15 Add heartbeat-cmd option
reimar
parents: 25606
diff changeset
3864 unsigned now = GetTimerMS();
27ffe914df15 Add heartbeat-cmd option
reimar
parents: 25606
diff changeset
3865 if (now - last_heartbeat > 30000) {
27ffe914df15 Add heartbeat-cmd option
reimar
parents: 25606
diff changeset
3866 last_heartbeat = now;
27ffe914df15 Add heartbeat-cmd option
reimar
parents: 25606
diff changeset
3867 system(heartbeat_cmd);
27ffe914df15 Add heartbeat-cmd option
reimar
parents: 25606
diff changeset
3868 }
27ffe914df15 Add heartbeat-cmd option
reimar
parents: 25606
diff changeset
3869 }
20900
b0f2e9a16bb1 Move xscreensaver_heartbeat call next to vo check_events
uau
parents: 20899
diff changeset
3870
30175
b7bb4a899a6b Also reset time_frame and next_frame_time on reset, it makes no sense to
reimar
parents: 30136
diff changeset
3871 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
3872
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
3873 //====================== FLIP PAGE (VIDEO BLT): =========================
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
3874
715
2bd7c16d89e1 frame dropping hack
arpi_esp
parents: 701
diff changeset
3875 current_module="flip_page";
20898
7c5be93b619b simplify
uau
parents: 20897
diff changeset
3876 if (!frame_time_remaining && blit_frame) {
1962
a0bd07b10667 fixed VO time usage (now including page-flip)
arpi
parents: 1953
diff changeset
3877 unsigned int t2=GetTimer();
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
3878
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3879 if(vo_config_count) mpctx->video_out->flip_page();
22288
da8ba4c0fc57 Cleanup, move "global" state from the frame_time_remaining mainloop
uau
parents: 22286
diff changeset
3880 mpctx->num_buffered_frames--;
15895
7742302e793d Do not count skipped/broken frames when using -frames
reimar
parents: 15865
diff changeset
3881
20898
7c5be93b619b simplify
uau
parents: 20897
diff changeset
3882 vout_time_usage += (GetTimer() - t2) * 0.000001;
8450
8cfc9309f0cc notice vo driver about skipped/dropped frames
arpi
parents: 8423
diff changeset
3883 }
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
3884 //====================== A-V TIMESTAMP CORRECTION: =========================
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
3885
30175
b7bb4a899a6b Also reset time_frame and next_frame_time on reset, it makes no sense to
reimar
parents: 30136
diff changeset
3886 adjust_sync_and_print_status(frame_time_remaining, mpctx->time_frame);
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
3887
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
3888 //============================ Auto QUALITY ============================
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3889
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
3890 /*Output quality adjustments:*/
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
3891 if(auto_quality>0){
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
3892 current_module="autoq";
1496
8c3e93ef116d cleanup...
arpi
parents: 1487
diff changeset
3893 // float total=0.000001f * (GetTimer()-aq_total_time);
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
3894 // if(output_quality<auto_quality && aq_sleep_time>0.05f*total)
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
3895 if(output_quality<auto_quality && aq_sleep_time>0)
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
3896 ++output_quality;
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
3897 else
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
3898 // if(output_quality>0 && aq_sleep_time<-0.05f*total)
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
3899 if(output_quality>1 && aq_sleep_time<0)
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
3900 --output_quality;
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
3901 else
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
3902 if(output_quality>0 && aq_sleep_time<-0.050f) // 50ms
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
3903 output_quality=0;
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
3904 // 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
3905 set_video_quality(mpctx->sh_video,output_quality);
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
3906 }
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
3907
20897
b85131ecee3d Move -frames check out of frame flip code (like -endpos earlier)
uau
parents: 20896
diff changeset
3908 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
3909 --play_n_frames;
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3910 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
3911 }
b85131ecee3d Move -frames check out of frame flip code (like -endpos earlier)
uau
parents: 20896
diff changeset
3912
b85131ecee3d Move -frames check out of frame flip code (like -endpos earlier)
uau
parents: 20896
diff changeset
3913
20895
798356663969 Move endpos handling from page flip code to a saner location, change < to <=
uau
parents: 20894
diff changeset
3914 // 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
3915 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
3916 !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
3917 mpctx->eof = PT_NEXT_ENTRY;
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3918
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3919 } // end if(mpctx->sh_video)
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
3920
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
3921 #ifdef CONFIG_DVDNAV
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3922 if (mpctx->stream->type == STREAMTYPE_DVDNAV) {
21200
c7b5dd2b2291 better nav highlight handling
ben
parents: 21193
diff changeset
3923 nav_highlight_t hl;
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3924 mp_dvdnav_get_highlight (mpctx->stream, &hl);
21219
8258747951d7 keep nav highlight event in dvdnav priv structure
ben
parents: 21203
diff changeset
3925 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
3926 vo_osd_changed (OSDTYPE_DVDNAV);
25831
9463ef1a0e63 Check for stream change in dvdnav.
ben
parents: 25824
diff changeset
3927
9463ef1a0e63 Check for stream change in dvdnav.
ben
parents: 25824
diff changeset
3928 if (mp_dvdnav_stream_has_changed(mpctx->stream)) {
9463ef1a0e63 Check for stream change in dvdnav.
ben
parents: 25824
diff changeset
3929 double ar = -1.0;
31048
ba91602b82c5 Fix crash if a DVD is played with dvdnav:// and without video
reimar
parents: 30902
diff changeset
3930 if (mpctx->sh_video &&
ba91602b82c5 Fix crash if a DVD is played with dvdnav:// and without video
reimar
parents: 30902
diff changeset
3931 stream_control (mpctx->demuxer->stream,
25831
9463ef1a0e63 Check for stream change in dvdnav.
ben
parents: 25824
diff changeset
3932 STREAM_CTRL_GET_ASPECT_RATIO, &ar)
9463ef1a0e63 Check for stream change in dvdnav.
ben
parents: 25824
diff changeset
3933 != STREAM_UNSUPPORTED)
9463ef1a0e63 Check for stream change in dvdnav.
ben
parents: 25824
diff changeset
3934 mpctx->sh_video->stream_aspect = ar;
9463ef1a0e63 Check for stream change in dvdnav.
ben
parents: 25824
diff changeset
3935 }
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
3936 }
a067e7e18b50 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents: 21161
diff changeset
3937 #endif
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29189
diff changeset
3938
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
3939 //============================ Handle PAUSE ===============================
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
3940
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
3941 current_module="pause";
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
3942
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3943 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
3944 mpctx->was_paused = 1;
21082
ef6a6e777fdd Move pause loop into a separate function.
uau
parents: 21077
diff changeset
3945 pause_loop();
371
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
3946 }
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
3947
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
3948 // handle -sstep
2436
18c12656c816 -sstep patch by Aleksander V. Dyomin <fly@shax.ru>
arpi
parents: 2365
diff changeset
3949 if(step_sec>0) {
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3950 mpctx->osd_function=OSD_FFW;
2436
18c12656c816 -sstep patch by Aleksander V. Dyomin <fly@shax.ru>
arpi
parents: 2365
diff changeset
3951 rel_seek_secs+=step_sec;
18c12656c816 -sstep patch by Aleksander V. Dyomin <fly@shax.ru>
arpi
parents: 2365
diff changeset
3952 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3953
22298
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
3954 edl_update(mpctx);
8531
1aa2c9b460af Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents: 8494
diff changeset
3955
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3956 //================= Keyboard events, SEEKing ====================
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3957
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
3958 current_module="key_events";
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
3959
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3960 {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3961 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
3962 int brk_cmd = 0;
13603
80fc8f48f14c Do not loose commands while paused.
reimar
parents: 13577
diff changeset
3963 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
3964 brk_cmd = run_command(mpctx, cmd);
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3965 mp_cmd_free(cmd);
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3966 if (brk_cmd == 2)
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3967 goto goto_enable_cache;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3968 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3969 }
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3970 mpctx->was_paused = 0;
7111
b65b78640d49 removed old input code
alex
parents: 7068
diff changeset
3971
2365
93616490c0dd -loop patch by Pascal Haakmat <a.haakmat@chello.nl>
arpi
parents: 2353
diff changeset
3972 /* Looping. */
23726
11abe5f3dcaa Move loop_times into mpctx.
albeu
parents: 23573
diff changeset
3973 if(mpctx->eof==1 && mpctx->loop_times>=0) {
11abe5f3dcaa Move loop_times into mpctx.
albeu
parents: 23573
diff changeset
3974 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
3975
11abe5f3dcaa Move loop_times into mpctx.
albeu
parents: 23573
diff changeset
3976 if(mpctx->loop_times>1) mpctx->loop_times--; else
11abe5f3dcaa Move loop_times into mpctx.
albeu
parents: 23573
diff changeset
3977 if(mpctx->loop_times==1) mpctx->loop_times=-1;
8198
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
3978 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
3979 mpctx->eof=0;
25883
baf32110d3fc Use defines to give names to the different seek flags.
reimar
parents: 25852
diff changeset
3980 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
3981 loop_seek = 1;
2365
93616490c0dd -loop patch by Pascal Haakmat <a.haakmat@chello.nl>
arpi
parents: 2353
diff changeset
3982 }
93616490c0dd -loop patch by Pascal Haakmat <a.haakmat@chello.nl>
arpi
parents: 2353
diff changeset
3983
1627
eeaee1632340 absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents: 1626
diff changeset
3984 if(rel_seek_secs || abs_seek_pos){
22300
83375f3a276b Separate function for seeking
uau
parents: 22299
diff changeset
3985 if (seek(mpctx, rel_seek_secs, abs_seek_pos) >= 0) {
1334
061cabfbc07b some more cleanup
arpi
parents: 1331
diff changeset
3986 // Set OSD:
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
3987 if(!loop_seek){
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
3988 if( !edl_decision )
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
3989 set_osd_bar(0,"Position",0,100,demuxer_get_percent_pos(mpctx->demuxer));
1334
061cabfbc07b some more cleanup
arpi
parents: 1331
diff changeset
3990 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3991 }
22298
a34c7ed7ff6d Move EDL code to separate functions
uau
parents: 22290
diff changeset
3992
1405
8ecf18884ad8 seeking code moved out from mplayer.c -> seek.c
arpi
parents: 1402
diff changeset
3993 rel_seek_secs=0;
1627
eeaee1632340 absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents: 1626
diff changeset
3994 abs_seek_pos=0;
8784
6e190ea2abba don't show OSD progbar when -loop seeks back
arpi
parents: 8745
diff changeset
3995 loop_seek=0;
22301
e4950f7dc165 Reset the edl_decision flag after the seek is done.
uau
parents: 22300
diff changeset
3996 edl_decision = 0;
1466
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1462
diff changeset
3997 }
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1462
diff changeset
3998
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
3999 #ifdef CONFIG_GUI
1723
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1709
diff changeset
4000 if(use_gui){
5789
0132c5747e8a fix audio only files play
pontscho
parents: 5698
diff changeset
4001 guiEventHandling();
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
4002 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
4003 // 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
4004 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
4005 } else {
22808
c9b6a804f753 Gui: Allow progress bar to move when playing mov or mp4 files
cehoyos
parents: 22751
diff changeset
4006 guiIntfStruct.Position=demuxer_get_percent_pos(mpctx->demuxer);
1735
bdc1ec6fe668 gui seekbar position fixed
arpi
parents: 1730
diff changeset
4007 }
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
4008 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
4009 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
4010 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
4011 guiGetEvent( guiReDraw,NULL );
6903
c2d4100c964e - fix mixer handling
pontscho
parents: 6888
diff changeset
4012 guiGetEvent( guiSetVolume,NULL );
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4807
diff changeset
4013 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
4014 if(guiIntfStruct.Playing==2) mpctx->osd_function=OSD_PAUSE;
8423
c6a1a5b6ba25 - fix three submenu bug
pontscho
parents: 8366
diff changeset
4015 if ( guiIntfStruct.DiskChanged || guiIntfStruct.NewPlay ) goto goto_next_file;
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
4016 #ifdef CONFIG_DVDREAD
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
4017 if ( mpctx->stream->type == STREAMTYPE_DVD )
3054
9507f90d8254 add half dvd support for gui
pontscho
parents: 3050
diff changeset
4018 {
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
4019 dvd_priv_t * dvdp = mpctx->stream->priv;
7854
d6c29d863f15 dvd chapter detect function from Gregory Kovriga
pontscho
parents: 7805
diff changeset
4020 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
4021 }
9507f90d8254 add half dvd support for gui
pontscho
parents: 3050
diff changeset
4022 #endif
1723
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1709
diff changeset
4023 }
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
4024 #endif /* CONFIG_GUI */
1723
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1709
diff changeset
4025
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
4026 } // while(!mpctx->eof)
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
4027
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
4028 mp_msg(MSGT_GLOBAL,MSGL_V,"EOF code: %d \n",mpctx->eof);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
4029
27370
14c5017f40d2 Change a bunch of video/audio-output-specific preprocessor directives from
diego
parents: 27359
diff changeset
4030 #ifdef CONFIG_DVBIN
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
4031 if(mpctx->dvbin_reopen)
18286
e0470e00b3bd simplified management of dvb channel switching
nicodvb
parents: 18261
diff changeset
4032 {
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
4033 mpctx->eof = 0;
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
4034 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
4035 cache_uninit(mpctx->stream);
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
4036 mpctx->dvbin_reopen = 0;
18286
e0470e00b3bd simplified management of dvb channel switching
nicodvb
parents: 18261
diff changeset
4037 goto goto_enable_cache;
e0470e00b3bd simplified management of dvb channel switching
nicodvb
parents: 18261
diff changeset
4038 }
e0470e00b3bd simplified management of dvb channel switching
nicodvb
parents: 18261
diff changeset
4039 #endif
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
4040 }
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
4041
3618
772729dd7b40 better dvd support
pontscho
parents: 3597
diff changeset
4042 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
4043
6138
523014df7d32 big cosmetics patch, cleanup of messages printed by mplayer and libs.
arpi
parents: 6135
diff changeset
4044 mp_msg(MSGT_CPLAYER,MSGL_INFO,"\n");
523014df7d32 big cosmetics patch, cleanup of messages printed by mplayer and libs.
arpi
parents: 6135
diff changeset
4045
4221
401149ba73fd Fixed bug with benchmark option
albeu
parents: 4203
diff changeset
4046 if(benchmark){
26159
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4047 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
4048 double total_time_usage;
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4049 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
4050 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
4051 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
4052 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
4053 total_time_usage-tot,total_time_usage);
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4054 if(total_time_usage>0.0)
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4055 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
4056 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
4057 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
4058 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
4059 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
4060 100.0);
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4061 if(total_frame_cnt && frame_dropping)
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4062 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
4063 total_frame_cnt-drop_frame_cnt,
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4064 (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
4065 drop_frame_cnt,
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4066 100*drop_frame_cnt/total_frame_cnt,
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4067 total_frame_cnt,
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4068 (total_time_usage>0.5)?(total_frame_cnt/total_time_usage):0);
4221
401149ba73fd Fixed bug with benchmark option
albeu
parents: 4203
diff changeset
4069 }
401149ba73fd Fixed bug with benchmark option
albeu
parents: 4203
diff changeset
4070
5983
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
4071 // time to uninit all, except global stuff:
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25955
diff changeset
4072 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
4073
26159
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4074 if(mpctx->set_of_sub_size > 0) {
9048
arpi
parents: 9045
diff changeset
4075 current_module="sub_free";
26159
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4076 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
4077 sub_free(mpctx->set_of_subtitles[i]);
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
4078 #ifdef CONFIG_ASS
26159
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4079 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
4080 ass_free_track( mpctx->set_of_ass_tracks[i] );
18937
9e95ac641e77 Initial libass release (without mencoder support).
eugeni
parents: 18934
diff changeset
4081 #endif
9e95ac641e77 Initial libass release (without mencoder support).
eugeni
parents: 18934
diff changeset
4082 }
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
4083 mpctx->set_of_sub_size = 0;
26159
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4084 }
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4085 vo_sub_last = vo_sub=NULL;
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4086 subdata=NULL;
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
4087 #ifdef CONFIG_ASS
26159
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4088 ass_track = NULL;
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4089 if(ass_library)
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4090 ass_clear_fonts(ass_library);
18937
9e95ac641e77 Initial libass release (without mencoder support).
eugeni
parents: 18934
diff changeset
4091 #endif
9048
arpi
parents: 9045
diff changeset
4092
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
4093 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
4094 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
4095 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
4096 mpctx->eof = 1;
9368
918248af048f fuckin' 10l
pontscho
parents: 9352
diff changeset
4097 } else {
26159
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4098 play_tree_iter_free(mpctx->playtree_iter);
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4099 mpctx->playtree_iter = NULL;
9368
918248af048f fuckin' 10l
pontscho
parents: 9352
diff changeset
4100 }
26159
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4101 mpctx->play_tree_step = 1;
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4102 } 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
4103 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
4104 if(mpctx->playtree_iter) {
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4105 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
4106 mpctx->eof = 1;
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 play_tree_iter_free(mpctx->playtree_iter);
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4109 mpctx->playtree_iter = NULL;
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4110 }
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4111 }
26877
4ab1cfcee430 Add a slave command to stop stream playback.
ben
parents: 26832
diff changeset
4112 } else if (mpctx->eof == PT_STOP) {
4ab1cfcee430 Add a slave command to stop stream playback.
ben
parents: 26832
diff changeset
4113 play_tree_iter_free(mpctx->playtree_iter);
4ab1cfcee430 Add a slave command to stop stream playback.
ben
parents: 26832
diff changeset
4114 mpctx->playtree_iter = NULL;
5154
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
4115 } else { // NEXT PREV SRC
26159
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4116 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
4117 }
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
4118
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
4119 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
4120
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
4121 while(mpctx->playtree_iter != NULL) {
26159
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4122 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
4123 if(filename == NULL) {
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4124 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
4125 play_tree_iter_free(mpctx->playtree_iter);
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4126 mpctx->playtree_iter = NULL;
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4127 };
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4128 } else
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4129 break;
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4130 }
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
4131
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 27341
diff changeset
4132 #ifdef CONFIG_GUI
26159
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4133 if(use_gui && !mpctx->playtree_iter) {
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27321
diff changeset
4134 #ifdef CONFIG_DVDREAD
26159
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4135 if(!guiIntfStruct.DiskChanged)
5910
20c335d98ab3 fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents: 5908
diff changeset
4136 #endif
26159
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4137 mplEnd();
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4138 }
5910
20c335d98ab3 fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents: 5908
diff changeset
4139 #endif
20c335d98ab3 fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents: 5908
diff changeset
4140
22280
a5e5b0c45c03 Split command/property handling from mplayer.c to a new file command.c.
uau
parents: 22255
diff changeset
4141 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
4142 if(!mpctx->playtree_iter) filename = NULL;
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4143 mpctx->eof = 0;
7862aea6a387 cosmetics: Decrapify the indentation of the last few blocks of main().
diego
parents: 26130
diff changeset
4144 goto play_next_file;
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
4145 }
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
4146
7122
0dc9cb756b68 freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents: 7111
diff changeset
4147
28032
92e770f6e890 Print ID_EXIT and exit reason message in identify mode when exiting.
reimar
parents: 27953
diff changeset
4148 exit_player_with_rc(EXIT_EOF, 0);
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
4149
109
ed4178146cc5 small code cleanup, removed unused variables
arpi_esp
parents: 103
diff changeset
4150 return 1;
ed4178146cc5 small code cleanup, removed unused variables
arpi_esp
parents: 103
diff changeset
4151 }
26963
8825552ee585 Fix the linking of TOOLS/netstream and TOOLS/vivodump.
diego
parents: 26877
diff changeset
4152 #endif /* DISABLE_MAIN */